3 files changed, 53 insertions, 21 deletions

diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index f1aec322ad1c..4ad97b3de80f 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -7,31 +7,60 @@
 
 PORTNAME=	dsniff
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://naughty.monkey.org/~dugsong/dsniff/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Various sniffing utilities for penetration testing
 
-BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10 \
+BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 \
 		${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
 
-BROKEN=		Depends on incompatible versions of libnet
-
 GNU_CONFIGURE=	yes
+WANT_GNOME=	yes
+
+OPTIONS=	X11 "Enable X11 support" on
+
+MAN8=		arpspoof.8 dsniff.8 macof.8 mailsnarf.8 tcpkill.8 \
+		tcpnice.8 urlsnarf.8 filesnarf.8 dnsspoof.8 msgsnarf.8 \
+		sshmitm.8 webmitm.8
 
-MAN8=	arpspoof.8 dsniff.8 macof.8 mailsnarf.8 tcpkill.8 \
-	tcpnice.8 urlsnarf.8 filesnarf.8 dnsspoof.8 msgsnarf.8 \
-	sshmitm.8 webmitm.8
+LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet10-config
+
+.include <bsd.port.pre.mk>
+
+# If net/libnids has been compiled with the GLIB2 option then this port needs
+# the corresponding library and additional linker flags.
+.if exists(${LOCALBASE}/lib/libnids.a)
+LIBNIDS_GLIB2!=	nm -u ${LOCALBASE}/lib/libnids.a | ${GREP} g_thread_init
+.endif
+
+.if !empty(LIBNIDS_GLIB2)
+USE_GNOME+=	glib20
+.endif
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 PLIST_SUB+=	X11=''
-MAN8+=	webspy.8
+MAN8+=		webspy.8
 .else
-CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS+=--without-x
 PLIST_SUB+=	X11='@comment '
 .endif
 
-.include <bsd.port.mk>
+post-patch:
+	@${REINPLACE_CMD} -Ee \
+		's|libnet-config|${LIBNET_CONFIG:T}|; \
+		 s|test -f \$${prefix}/include/libnet.h|${TRUE}|; \
+		 s|(LNETINC=).*|\1"`${LIBNET_CONFIG} --cflags`"|; \
+		 s|(LNETLIB=).*|\1"`${LIBNET_CONFIG} --libs`"|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
+.if !empty(LIBNIDS_GLIB2)
+pre-configure:
+	@${REINPLACE_CMD} -e 's|@NIDSLIB@|& `pkg-config --libs gthread-2.0`|' \
+		${WRKSRC}/Makefile.in
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/security/dsniff/files/patch-aa b/security/dsniff/files/patch-aa
deleted file mode 100644
index a992259189b1..000000000000
--- a/security/dsniff/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Dec 22 16:30:32 2000
-+++ Makefile.in	Fri Dec 22 16:30:50 2000
-@@ -37,7 +37,7 @@
- X11INC	= @X_CFLAGS@
- X11LIB	= @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
- 
--INCS	= -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
-+INCS	= -I. -I/usr/include $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
- 	  -I$(srcdir)/missing
- LIBS	= @LIBS@ -L$(srcdir) -lmissing
- 
diff --git a/security/dsniff/files/patch-pcaputil.c b/security/dsniff/files/patch-pcaputil.c
new file mode 100644
index 000000000000..c8cc52011716
--- /dev/null
+++ b/security/dsniff/files/patch-pcaputil.c
@@ -0,0 +1,14 @@
+--- ./pcaputil.c.orig	Tue Nov 14 12:51:08 2000
++++ ./pcaputil.c	Mon Sep 25 16:26:13 2006
+@@ -13,9 +13,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <err.h>
+-#include <pcap.h>
++#include </usr/include/pcap.h>
+ #ifdef BSD
+-#include <pcap-int.h>
++#include </usr/include/pcap-int.h>
+ #endif
+ #include "pcaputil.h"
+