- Convert to USES=gmake,libtool, drop .la files

- Stagify
- Fix DOCS installtion
- Sort plist
- Strip binaries
- Use new LIB_DEPENDS syntax
- Chase libnetdude update

2 files changed, 43 insertions, 114 deletions

diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 49f2313898e4..9e4b0ea4b283 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -3,30 +3,28 @@
 
 PORTNAME=	netdude
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NETwork DUmp data Displayer and Editor for tcpdump tracefiles
 
-LIB_DEPENDS=	netdude.0:${PORTSDIR}/net/libnetdude
+LIB_DEPENDS=	libnetdude.so:${PORTSDIR}/net/libnetdude
 
-USE_AUTOTOOLS=	libltdl libtool
-USES=		gettext iconv
+USES=		gettext iconv libtool gmake
+USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lltdl"
-USE_GMAKE=	yes
 USE_GNOME=	glib12 gtk12
+INSTALL_TARGET=	install-strip
 
-MAN1=	netdude.1
+PORTDOCS=	*
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|DOC_MODULE = netdude|DOC_MODULE =|' \
-	${WRKSRC}/doc/netdude-manual/Makefile.in
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|doc||' ${WRKSRC}/Makefile.in
-.endif
+		${WRKSRC}/doc/netdude-manual/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net/netdude/pkg-plist b/net/netdude/pkg-plist
index b7ba0cce78db..81493253eeec 100644
--- a/net/netdude/pkg-plist
+++ b/net/netdude/pkg-plist
@@ -1,9 +1,8 @@
-bin/netdude0.5
 bin/netdude
+bin/netdude0.5
 include/netdude/0.5/nd.h
-include/netdude/0.5/nd_debug.h
-include/netdude/0.5/nd_macros.h
 include/netdude/0.5/nd_clipboard.h
+include/netdude/0.5/nd_debug.h
 include/netdude/0.5/nd_dialog.h
 include/netdude/0.5/nd_fam.h
 include/netdude/0.5/nd_filter_gui.h
@@ -11,6 +10,7 @@ include/netdude/0.5/nd_gettext.h
 include/netdude/0.5/nd_globals.h
 include/netdude/0.5/nd_gui.h
 include/netdude/0.5/nd_info_dialog.h
+include/netdude/0.5/nd_macros.h
 include/netdude/0.5/nd_main.h
 include/netdude/0.5/nd_packet.h
 include/netdude/0.5/nd_plugin.h
@@ -29,121 +29,52 @@ include/netdude/0.5/nd_trace_registry.h
 include/netdude/0.5/nd_types.h
 include/netdude/0.5/protocols/snap/nd_snap.h
 include/netdude/0.5/protocols/vlan/nd_vlan.h
-%%PORTDOCS%%%%DOCSDIR%%/images/about_menu.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/arch.png
-%%PORTDOCS%%%%DOCSDIR%%/images/ascii_editor.png
-%%PORTDOCS%%%%DOCSDIR%%/images/caution.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/exit.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/filter_applied.png
-%%PORTDOCS%%%%DOCSDIR%%/images/filter_apply.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/filters.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/hex_editor.png
-%%PORTDOCS%%%%DOCSDIR%%/images/info.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/main_window.png
-%%PORTDOCS%%%%DOCSDIR%%/images/navigation.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/note.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/plugin_menu.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/preferences.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/trace_areas.png
-%%PORTDOCS%%%%DOCSDIR%%/api.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/a6326.html
-%%PORTDOCS%%%%DOCSDIR%%/b6338.html
-%%PORTDOCS%%%%DOCSDIR%%/c106.html
-%%PORTDOCS%%%%DOCSDIR%%/c21.html
-%%PORTDOCS%%%%DOCSDIR%%/c480.html
-%%PORTDOCS%%%%DOCSDIR%%/c72.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-gtkhex.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-clipboard.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-debug.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-dialog.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-fam.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-filter-gui.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-filter-registry.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-gettext.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-globals.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-gui.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-info-dialog.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-macros.html
-%%PORTDOCS%%%%DOCSDIR%%/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-main.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-packet.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-plugin.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-prefs.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-protocol-inst.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-protocol-plugin.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-protocol.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-raw-protocol.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-recent.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-timestamp.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-tp.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-tpm-gui.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-trace.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-trace-area-gui.html
-%%PORTDOCS%%%%DOCSDIR%%/netdude-nd-trace-registry.html
-%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
-%%DATADIR%%/0.5/plugins/nd_cksumfix.so
-%%DATADIR%%/0.5/plugins/nd_cksumfix.la
-%%DATADIR%%/0.5/plugins/nd_cksumfix.a
-%%DATADIR%%/0.5/plugins/nd_bpf.so
-%%DATADIR%%/0.5/plugins/nd_bpf.la
+man/man1/netdude.1.gz
+%%DATADIR%%/0.5/pixmaps/apply_to_all.xpm
+%%DATADIR%%/0.5/pixmaps/apply_to_part.xpm
+%%DATADIR%%/0.5/pixmaps/apply_to_sel.xpm
+%%DATADIR%%/0.5/pixmaps/delete.xpm
+%%DATADIR%%/0.5/pixmaps/delete_okay.xpm
+%%DATADIR%%/0.5/pixmaps/exclamation.xpm
+%%DATADIR%%/0.5/pixmaps/incomplete.xpm
+%%DATADIR%%/0.5/pixmaps/netdude-icon.png
+%%DATADIR%%/0.5/pixmaps/netdude_small.xpm
+%%DATADIR%%/0.5/pixmaps/netdude_splash.xpm
+%%DATADIR%%/0.5/pixmaps/question.xpm
 %%DATADIR%%/0.5/plugins/nd_bpf.a
-%%DATADIR%%/0.5/protocols/nd_arp.so
-%%DATADIR%%/0.5/protocols/nd_arp.la
+%%DATADIR%%/0.5/plugins/nd_bpf.so
+%%DATADIR%%/0.5/plugins/nd_cksumfix.a
+%%DATADIR%%/0.5/plugins/nd_cksumfix.so
 %%DATADIR%%/0.5/protocols/nd_arp.a
-%%DATADIR%%/0.5/protocols/nd_ethernet.so
-%%DATADIR%%/0.5/protocols/nd_ethernet.la
+%%DATADIR%%/0.5/protocols/nd_arp.so
 %%DATADIR%%/0.5/protocols/nd_ethernet.a
-%%DATADIR%%/0.5/protocols/nd_fddi.so
-%%DATADIR%%/0.5/protocols/nd_fddi.la
+%%DATADIR%%/0.5/protocols/nd_ethernet.so
 %%DATADIR%%/0.5/protocols/nd_fddi.a
-%%DATADIR%%/0.5/protocols/nd_icmp.so
-%%DATADIR%%/0.5/protocols/nd_icmp.la
+%%DATADIR%%/0.5/protocols/nd_fddi.so
 %%DATADIR%%/0.5/protocols/nd_icmp.a
-%%DATADIR%%/0.5/protocols/nd_ip.so
-%%DATADIR%%/0.5/protocols/nd_ip.la
+%%DATADIR%%/0.5/protocols/nd_icmp.so
 %%DATADIR%%/0.5/protocols/nd_ip.a
+%%DATADIR%%/0.5/protocols/nd_ip.so
 %%DATADIR%%/0.5/protocols/nd_pcap.a
-%%DATADIR%%/0.5/protocols/nd_pcap.la
 %%DATADIR%%/0.5/protocols/nd_pcap.so
-%%DATADIR%%/0.5/protocols/nd_sll.so
-%%DATADIR%%/0.5/protocols/nd_sll.la
 %%DATADIR%%/0.5/protocols/nd_sll.a
-%%DATADIR%%/0.5/protocols/nd_snap.so
-%%DATADIR%%/0.5/protocols/nd_snap.la
+%%DATADIR%%/0.5/protocols/nd_sll.so
 %%DATADIR%%/0.5/protocols/nd_snap.a
-%%DATADIR%%/0.5/protocols/nd_tcp.so
-%%DATADIR%%/0.5/protocols/nd_tcp.la
+%%DATADIR%%/0.5/protocols/nd_snap.so
 %%DATADIR%%/0.5/protocols/nd_tcp.a
-%%DATADIR%%/0.5/protocols/nd_udp.so
-%%DATADIR%%/0.5/protocols/nd_udp.la
+%%DATADIR%%/0.5/protocols/nd_tcp.so
 %%DATADIR%%/0.5/protocols/nd_udp.a
-%%DATADIR%%/0.5/protocols/nd_vlan.so
-%%DATADIR%%/0.5/protocols/nd_vlan.la
+%%DATADIR%%/0.5/protocols/nd_udp.so
 %%DATADIR%%/0.5/protocols/nd_vlan.a
-%%DATADIR%%/0.5/pixmaps/incomplete.xpm
-%%DATADIR%%/0.5/pixmaps/delete.xpm
-%%DATADIR%%/0.5/pixmaps/delete_okay.xpm
-%%DATADIR%%/0.5/pixmaps/question.xpm
-%%DATADIR%%/0.5/pixmaps/exclamation.xpm
-%%DATADIR%%/0.5/pixmaps/netdude_small.xpm
-%%DATADIR%%/0.5/pixmaps/netdude_splash.xpm
-%%DATADIR%%/0.5/pixmaps/apply_to_all.xpm
-%%DATADIR%%/0.5/pixmaps/apply_to_part.xpm
-%%DATADIR%%/0.5/pixmaps/apply_to_sel.xpm
-%%DATADIR%%/0.5/pixmaps/netdude-icon.png
-@dirrm include/netdude/0.5/protocols/fddi
-@dirrm include/netdude/0.5/protocols/snap
-@dirrm include/netdude/0.5/protocols/vlan
-@dirrm include/netdude/0.5/protocols
-@dirrm include/netdude/0.5
-@dirrm include/netdude
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/0.5/plugins
+%%DATADIR%%/0.5/protocols/nd_vlan.so
 @dirrm %%DATADIR%%/0.5/protocols
+@dirrm %%DATADIR%%/0.5/plugins
 @dirrm %%DATADIR%%/0.5/pixmaps
 @dirrm %%DATADIR%%/0.5
 @dirrm %%DATADIR%%
+@dirrm include/netdude/0.5/protocols/vlan
+@dirrm include/netdude/0.5/protocols/snap
+@dirrm include/netdude/0.5/protocols/fddi
+@dirrm include/netdude/0.5/protocols
+@dirrm include/netdude/0.5
+@dirrm include/netdude