4 files changed, 19 insertions, 27 deletions

diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index ee9624d65638..a0b7c4b9b8ec 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libnetdude
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SF/netdude/${PORTNAME}/${PORTVERSION}
 
@@ -14,8 +14,11 @@ LIB_DEPENDS=	libpcapnav.so:${PORTSDIR}/net/libpcapnav
 
 USES=		libtool
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-gtk-doc --disable-static --with-html-dir=${DOCSDIR}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USE_AUTOTOOLS=	libltdl
 USE_GNOME=	glib12
-CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
@@ -29,5 +32,8 @@ post-patch:
 		${WRKSRC}/protocols/fddi/libnd_fddi.h
 	@${REINPLACE_CMD} -e 's|DOC_MODULE = libnetdude|DOC_MODULE =|' \
 		${WRKSRC}/docs/Makefile.in
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+		-e 's,-I$$(top_srcdir)/libltdl,@INCLTDL@,' \
+		-e '/LIBADD/s,$$(top_builddir)/libltdl/libltdlc.la,@LIBLTDL@,'
 
 .include <bsd.port.mk>
diff --git a/net/libnetdude/files/patch-plugins__ChecksumFix__Makefile.in b/net/libnetdude/files/patch-plugins__ChecksumFix__Makefile.in
deleted file mode 100644
index 39024042bd9b..000000000000
--- a/net/libnetdude/files/patch-plugins__ChecksumFix__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./plugins/ChecksumFix/Makefile.in.orig	2008-01-27 18:27:24.000000000 -0500
-+++ ./plugins/ChecksumFix/Makefile.in	2008-01-27 18:27:33.000000000 -0500
-@@ -79,7 +79,7 @@
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
-+pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
diff --git a/net/libnetdude/files/patch-tools-Makefile.in b/net/libnetdude/files/patch-tools-Makefile.in
new file mode 100644
index 000000000000..5d1f8c0666ca
--- /dev/null
+++ b/net/libnetdude/files/patch-tools-Makefile.in
@@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig
++++ tools/Makefile.in
+@@ -224,7 +224,7 @@
+ MAINTAINERCLEANFILES = Makefile.in Makefile lndtool.c
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/libltdl @glib_cflags@ @pcapnav_cflags@ -W -Wall ## -DMEMDEBUG
+ lndtool_SOURCES = lndtool.c
+-lndtool_LDADD = -L$(top_builddir)/src/ -lnetdude
++lndtool_LDADD = $(top_builddir)/src/libnetdude.la @pcapnav_libs@
+ lndtool_LDFLAGS = -export-dynamic
+ all: all-am
+ 
diff --git a/net/libnetdude/pkg-plist b/net/libnetdude/pkg-plist
index f232d35c7764..ea0b2e9a9a99 100644
--- a/net/libnetdude/pkg-plist
+++ b/net/libnetdude/pkg-plist
@@ -38,35 +38,21 @@ include/libnetdude/%%PORTVERSION%%/protocols/tcp/libnd_tcb.h
 include/libnetdude/%%PORTVERSION%%/protocols/tcp/libnd_tcp.h
 include/libnetdude/%%PORTVERSION%%/protocols/udp/libnd_udp.h
 include/libnetdude/%%PORTVERSION%%/protocols/vlan/libnd_vlan.h
-lib/libnetdude.a
 lib/libnetdude.so
 lib/libnetdude.so.0
 lib/libnetdude.so.0.0.0
-%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.a
 %%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.so
-%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.a
 %%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.so
-%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.a
 %%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.so
 @dirrm %%DATADIR%%/%%PORTVERSION%%/protocols
 @dirrm %%DATADIR%%/%%PORTVERSION%%/plugins