- don't use the internal libltdl...causes all sorts of havoc down the road.

net/libnetdude/libnetdude/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2011/09/21 17:20:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2011/12/08 22:16:28 jasper Exp $
 
 COMMENT=	packet manipulation backend of Netdude framework
 
 DISTNAME=	libnetdude-0.10a
-REVISION=	1
+REVISION=	2
 SHARED_LIBS=	netdude	1.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netdude/}
@@ -11,7 +11,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netdude/}
 HOMEPAGE=	http://netdude.sourceforge.net/
 
 LIB_DEPENDS=	net/libpcapnav \
-		devel/glib
+		devel/glib \
+		devel/libtool,-ltdl
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -19,11 +20,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c pcap pcapnav glib
+WANTLIB=		ltdl pcap pcapnav glib
 
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/libnetdude \
-			--disable-gtk-doc --datadir=${PREFIX}/lib
+			--disable-gtk-doc \
+			--datadir=${PREFIX}/lib
+# Make sure it can find and use our libltdl.
+CONFIGURE_ENV+= 	CPPFLAGS="-I${LOCALBASE}/include/libltdl/"
+CFLAGS+=		"-Dlt_ptr_t=lt_ptr"
 .include <bsd.port.mk>
 

net/libnetdude/libnetdude/patches/patch-Makefile_in

@@ -0,0 +1,15 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2011/12/08 22:16:28 jasper Exp $
+
+Don't use the bundled libltdl.
+
+--- Makefile.in.orig	Thu Dec  8 23:02:34 2011
++++ Makefile.in	Thu Dec  8 23:02:39 2011
+@@ -198,7 +198,7 @@ target_alias = @target_alias@
+ td = @td@
+ version_major = @version_major@
+ version_minor = @version_minor@
+-SUBDIRS = libltdl src tools protocols plugins test docs
++SUBDIRS = src tools protocols plugins test docs
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
+                        config.h.in config.sub configure install-sh \
+ 		       ltconfig ltmain.sh missing mkinstalldirs \

net/libnetdude/libnetdude/patches/patch-configure

@@ -0,0 +1,24 @@
+$OpenBSD: patch-configure,v 1.1 2011/12/08 22:16:28 jasper Exp $
+
+Don't use the bundled libltdl.
+
+--- configure.orig	Sun Jun 24 23:06:14 2007
++++ configure	Thu Dec  8 23:01:54 2011
+@@ -426,7 +426,7 @@ PACKAGE_STRING=
+ PACKAGE_BUGREPORT=
+ 
+ ac_unique_file="src/libnd.h"
+-ac_subdirs_all="$ac_subdirs_all libltdl"
++ac_subdirs_all="$ac_subdirs_all"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+@@ -3116,7 +3116,7 @@ echo "$as_me: error: this package needs a convenience 
+ 
+ 
+ 
+-subdirs="$subdirs libltdl"
++subdirs="$subdirs"
+ 
+ 
+ 

net/libnetdude/libnetdude/patches/patch-src_Makefile_in

@@ -1,6 +1,18 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2007/09/26 20:18:08 rui Exp $
---- src/Makefile.in.orig	Fri Jul 27 15:12:48 2007
-+++ src/Makefile.in	Fri Jul 27 15:13:33 2007
+$OpenBSD: patch-src_Makefile_in,v 1.3 2011/12/08 22:16:28 jasper Exp $
+
+Don't use the bundled libltdl.
+
+--- src/Makefile.in.orig	Sun Jun 24 23:37:52 2007
++++ src/Makefile.in	Thu Dec  8 23:11:46 2011
+@@ -58,7 +58,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libnetdude_la_DEPENDENCIES = $(top_builddir)/libltdl/libltdlc.la
++libnetdude_la_DEPENDENCIES =
+ am_libnetdude_la_OBJECTS = libnd_debug.lo libnd_dumper.lo \
+ 	libnd_filter.lo libnd_filter_factory.lo \
+ 	libnd_filter_registry.lo libnd_globals.lo libnd_init.lo \
 @@ -88,7 +88,7 @@ HEADERS = $(pkginclude_HEADERS)
  ETAGS = etags
  CTAGS = ctags
@@ -10,3 +22,30 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2007/09/26 20:18:08 rui Exp $
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
+@@ -135,7 +135,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lltdl
+ LIBTOOL = @LIBTOOL@
+ LINUX_HOST_FALSE = @LINUX_HOST_FALSE@
+ LINUX_HOST_TRUE = @LINUX_HOST_TRUE@
+@@ -214,7 +214,7 @@ target_alias = @target_alias@
+ td = @td@
+ version_major = @version_major@
+ version_minor = @version_minor@
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libltdl @glib_cflags@ @pcapnav_cflags@ -W -Wall ## -DMEMDEBUG
++INCLUDES = -I$(top_srcdir) @glib_cflags@ @pcapnav_cflags@ -W -Wall ## -DMEMDEBUG
+ lib_LTLIBRARIES = libnetdude.la
+ pkginclude_HEADERS = \
+ 	libnd.h \
+@@ -279,7 +279,7 @@ libnetdude_la_SOURCES = \
+ 	libnd_trace.c libnd_trace.h \
+ 	libnd_timestamp.h
+ 
+-libnetdude_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la @glib_libs@ @pcapnav_libs@
++libnetdude_la_LIBADD = @glib_libs@ @pcapnav_libs@
+ all: all-am
+ 
+ .SUFFIXES:

net/libnetdude/libnetdude/patches/patch-src_libnd_plugin_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_libnd_plugin_c,v 1.1 2011/12/08 22:16:28 jasper Exp $
+
+Don't use the bundled libltdl.
+
+--- src/libnd_plugin.c.orig	Thu Dec  8 23:05:55 2011
++++ src/libnd_plugin.c	Thu Dec  8 23:09:48 2011
+@@ -34,6 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALI
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
++#include <ltdl.h>
+ 
+ #include <libnd_misc.h>
+ #include <libnd_prefs.h>