- move away from bundled libltdl

net/netdude/netdude/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2011/09/21 17:20:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.16 2011/12/09 14:45:06 jasper Exp $
 
 COMMENT=	network traffic visualization and editing tool
 
 DISTNAME=	netdude-0.4.8a
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netdude/}
 
@@ -20,14 +20,20 @@ MODULES=	devel/gettext
 LIB_DEPENDS=	net/libnetdude/libnetdude \
 		net/libpcapnav \
 		devel/glib \
+		devel/libtool,-ltdl \
 		x11/gtk+
 
-WANTLIB=	X11 Xau Xdmcp Xext Xi c m pcap pthread-stubs xcb netdude \
-		pcapnav glib>=1 gmodule>=1 gdk gtk
+WANTLIB += X11 Xext Xi c gdk glib gmodule gtk ltdl m netdude pcap
+WANTLIB += pcapnav xcb
 
 USE_LIBTOOL=		Yes
 USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/netdude \
-			--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/netdude/netdude/patches/patch-Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2011/12/09 14:45:06 jasper Exp $
+--- Makefile.in.orig	Fri Dec  9 15:40:13 2011
++++ Makefile.in	Fri Dec  9 15:40:32 2011
+@@ -197,7 +197,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ version_major = @version_major@
+ version_minor = @version_minor@
+-SUBDIRS = libltdl src plugins protocols pixmaps doc
++SUBDIRS = src plugins protocols pixmaps doc
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
+                        config.h.in config.sub configure install-sh \
+ 		       ltconfig ltmain.sh missing mkinstalldirs \

net/netdude/netdude/patches/patch-configure

@@ -0,0 +1,21 @@
+$OpenBSD: patch-configure,v 1.1 2011/12/09 14:45:06 jasper Exp $
+--- configure.orig	Fri Dec  9 15:40:08 2011
++++ configure	Fri Dec  9 15:40:27 2011
+@@ -426,7 +426,7 @@ PACKAGE_STRING=
+ PACKAGE_BUGREPORT=
+ 
+ ac_unique_file="src/nd.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>
+@@ -3113,7 +3113,7 @@ echo "$as_me: error: this package needs a convenience 
+ 
+ 
+ 
+-subdirs="$subdirs libltdl"
++subdirs="$subdirs"
+ 
+ 
+ 

net/netdude/netdude/patches/patch-src_Makefile_in

@@ -1,6 +1,15 @@
-$OpenBSD: patch-src_Makefile_in,v 1.3 2007/09/26 20:21:06 rui Exp $
---- src/Makefile.in.orig	Fri Jul 27 17:12:06 2007
-+++ src/Makefile.in	Fri Jul 27 17:13:45 2007
+$OpenBSD: patch-src_Makefile_in,v 1.4 2011/12/09 14:45:06 jasper Exp $
+--- src/Makefile.in.orig	Sun Jun 24 23:38:12 2007
++++ src/Makefile.in	Fri Dec  9 15:42:13 2011
+@@ -65,7 +65,7 @@ am_netdude_OBJECTS = nd_debug.$(OBJEXT) nd_clipboard.$
+ 	callbacks.$(OBJEXT) interface.$(OBJEXT) support.$(OBJEXT) \
+ 	gtkhex.$(OBJEXT)
+ netdude_OBJECTS = $(am_netdude_OBJECTS)
+-netdude_DEPENDENCIES = $(top_builddir)/libltdl/libltdlc.la
++netdude_DEPENDENCIES =
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
 @@ -90,7 +90,7 @@ HEADERS = $(pkginclude_HEADERS)
  ETAGS = etags
  CTAGS = ctags
@@ -10,6 +19,24 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2007/09/26 20:21:06 rui Exp $
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
+@@ -212,7 +212,7 @@ target_alias = @target_alias@
+ version_major = @version_major@
+ version_minor = @version_minor@
+ INCLUDES = \
+-	-I$(top_srcdir) -I$(top_srcdir)/libltdl \
++	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/src @gtk_cflags@ \
+ 	-DLIBNETDUDE_CFLAGS="\"@LIBNETDUDE_CFLAGS@\"" \
+ 	-DGTK_CFLAGS="\"@gtk_cflags@\"" \
+@@ -282,7 +282,7 @@ netdude_SOURCES = \
+ 	gtkhex.c gtkhex.h
+ 
+ netdude_LDADD = \
+-	$(top_builddir)/libltdl/libltdlc.la @gtk_libs@ @LIBNETDUDE_LIBS@
++	@gtk_libs@ @LIBNETDUDE_LIBS@
+ 
+ all: all-am
+ 
 @@ -537,7 +537,7 @@ info-am:
  
  install-data-am: install-pkgincludeHEADERS