From 5e5f75b24780c8d138fad3b0b36d684944cf1289 Mon Sep 17 00:00:00 2001
From: mjc <mjc@openbsd.org>
Date: Tue, 24 May 2005 00:13:31 +0000
Subject: [PATCH] cope with new libnet port ok pvalchev@ msf@

---
 net/thcrut/Makefile                        |  4 +--
 net/thcrut/patches/patch-configure         | 21 +++++++++++
 net/thcrut/patches/patch-src_Makefile_in   | 14 ++++++++
 security/despoof/Makefile                  |  8 ++---
 security/dsniff/Makefile                   |  4 +--
 security/dsniff/patches/patch-Makefile_in  | 41 +++++++++++++++++-----
 security/dsniff/patches/patch-configure_in | 32 +++++++++++++++--
 security/isic/Makefile                     |  7 ++--
 security/isic/patches/patch-Makefile_in    | 16 +++++++++
 security/rdp/Makefile                      |  8 ++---
 security/scanlogd/Makefile                 |  4 +--
 security/scanlogd/patches/patch-Makefile   | 12 +++++++
 security/sentinel/Makefile                 |  7 ++--
 security/vomit/Makefile                    |  8 +++--
 security/vomit/patches/patch-configure     | 27 ++++++++++++++
 15 files changed, 178 insertions(+), 35 deletions(-)
 create mode 100644 net/thcrut/patches/patch-configure
 create mode 100644 net/thcrut/patches/patch-src_Makefile_in
 create mode 100644 security/isic/patches/patch-Makefile_in
 create mode 100644 security/scanlogd/patches/patch-Makefile
 create mode 100644 security/vomit/patches/patch-configure

diff --git a/net/thcrut/Makefile b/net/thcrut/Makefile
index b7ae377f976..a27152ba429 100644
--- a/net/thcrut/Makefile
+++ b/net/thcrut/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2004/12/16 00:31:26 alek Exp $
+# $OpenBSD: Makefile,v 1.6 2005/05/24 00:13:31 mjc Exp $
 
 COMMENT=	"local network discovery tool"
 
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.thehackerschoice.com/releases/
 
 HOMEPAGE=	http://www.thehackerschoice.com/
 
-LIB_DEPENDS=	net::net/libnet
+LIB_DEPENDS=	lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/net/thcrut/patches/patch-configure b/net/thcrut/patches/patch-configure
new file mode 100644
index 00000000000..b33a1f860f9
--- /dev/null
+++ b/net/thcrut/patches/patch-configure
@@ -0,0 +1,21 @@
+$OpenBSD: patch-configure,v 1.1 2005/05/24 00:13:31 mjc Exp $
+--- configure.orig	Sun May 22 13:27:59 2005
++++ configure	Sun May 22 13:29:04 2005
+@@ -2022,14 +2022,14 @@ if test "${with_libnet+set}" = set; then
+                 echo $ac_n "checking Using libnet in""... $ac_c" 1>&6
+ echo "configure:2024: checking Using libnet in" >&5
+                 echo "$ac_t""$withval" 1>&6
+-                LIBNET_INCLUDES="-I${withval}/include"
+-                LIBNET_LDFLAGS="-L${withval}/lib"
++                LIBNET_INCLUDES="-I${withval}/include/libnet-1.0"
++                LIBNET_LDFLAGS="-L${withval}/lib/libnet-1.0"
+             fi
+ fi
+ 
+ 
+ OCFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS $LIBPCAP_INCLUDES $LIBPCAP_LDFLAGS"
++CFLAGS="$CFLAGS $LIBPCAP_INCLUDES $LIBPCAP_LDFLAGS `libnet-config-1.0 --defines`"
+ echo $ac_n "checking for main in -lpcap""... $ac_c" 1>&6
+ echo "configure:2035: checking for main in -lpcap" >&5
+ ac_lib_var=`echo pcap'_'main | sed 'y%./+-%__p_%'`
diff --git a/net/thcrut/patches/patch-src_Makefile_in b/net/thcrut/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..1b1981b4d1f
--- /dev/null
+++ b/net/thcrut/patches/patch-src_Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2005/05/24 00:13:31 mjc Exp $
+--- src/Makefile.in.orig	Sun May 22 13:33:13 2005
++++ src/Makefile.in	Sun May 22 13:33:25 2005
+@@ -67,8 +67,8 @@ bin_PROGRAMS = thcrut
+ thcrut_SOURCES = arpg.c dhcp.c network_raw.c schedule.c dcd_icmp.c macvendor.c range.c thcrut.c 
+ thcrutdir = $(sysconfdir)
+ thcrut_DATA = manuf
+-INCLUDES = @INCLUDES@ -I../include -I.. `libnet-config --defines`
+-AM_CFLAGS = `libnet-config --cflags`
++INCLUDES = @INCLUDES@ -I../include -I.. `libnet-config-1.0 --defines`
++AM_CFLAGS = `libnet-config-1.0 --cflags`
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/security/despoof/Makefile b/security/despoof/Makefile
index 96754689c88..96620c858f6 100644
--- a/security/despoof/Makefile
+++ b/security/despoof/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2005/03/15 01:37:05 mjc Exp $
+# $OpenBSD: Makefile,v 1.9 2005/05/24 00:14:28 mjc Exp $
 
 COMMENT=	"command-line anti-spoofing detection utility"
 
@@ -20,11 +20,11 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c pcap
 
-LIB_DEPENDS=	net::net/libnet
+LIB_DEPENDS=	lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
 
 MAKE_FLAGS+=	CC='${CC}' CFLAGS='${CFLAGS}' \
-		DEFS='-I${LOCALBASE}/include `libnet-config --defines`' \
-		LIBS='-L${LOCALBASE}/lib -lnet -lpcap'
+		DEFS='-I${LOCALBASE}/include/libnet-1.0 `libnet-config-1.0 --defines`' \
+		LIBS='-L${LOCALBASE}/lib/libnet-1.0 -lnet -lpcap'
 
 NO_REGRESS=	Yes
 
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 1f4fabc98bb..a004318a6d7 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2005/03/15 02:40:29 mjc Exp $
+# $OpenBSD: Makefile,v 1.36 2005/05/24 00:15:06 mjc Exp $
 
 COMMENT=	"sniffing tools for penetration testing"
 
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.monkey.org/~dugsong/dsniff/
 
 BUILD_DEPENDS=	::net/libnids
 LIB_DEPENDS=	lib/db/db.=3:db-3.*:databases/db/v3 \
-		net::net/libnet
+		lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/security/dsniff/patches/patch-Makefile_in b/security/dsniff/patches/patch-Makefile_in
index f9ee1276752..d2522416806 100644
--- a/security/dsniff/patches/patch-Makefile_in
+++ b/security/dsniff/patches/patch-Makefile_in
@@ -1,17 +1,32 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2004/01/10 08:33:12 sturm Exp $
---- Makefile.in.orig	2004-01-10 00:53:22.000000000 +0100
-+++ Makefile.in	2004-01-10 00:53:58.000000000 +0100
+$OpenBSD: patch-Makefile_in,v 1.2 2005/05/24 00:15:06 mjc Exp $
+--- Makefile.in.orig	Fri Dec 15 12:03:26 2000
++++ Makefile.in	Sun May 22 12:50:27 2005
 @@ -94,7 +94,7 @@ libmissing.a: $(LIBOBJS)
  	$(RANLIB) $@
  
  dsniff: $(HDRS) $(SRCS) $(OBJS)
 -	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(SSLLIB)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(LNETLIB) $(NIDSLIB) $(PCAPLIB) $(SSLLIB)
  
  arpspoof: arpspoof.o arp.o
  	$(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
-@@ -115,7 +115,7 @@ msgsnarf: msgsnarf.o buf.o pcaputil.o
- 	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+@@ -103,19 +103,19 @@ dnsspoof: dnsspoof.o pcaputil.o
+ 	$(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+ filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o
+-	$(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
++	$(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(LNETLIB) $(NIDSLIB) $(PCAPLIB)
+ 
+ macof: macof.o
+ 	$(CC) $(LDFLAGS) -o $@ macof.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+ mailsnarf: mailsnarf.o buf.o pcaputil.o
+-	$(CC) $(LDFLAGS) -o $@ mailsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
++	$(CC) $(LDFLAGS) -o $@ mailsnarf.o buf.o pcaputil.o $(LIBS) $(LNETLIB) $(NIDSLIB) $(PCAPLIB)
+ 
+ msgsnarf: msgsnarf.o buf.o pcaputil.o
+-	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
++	$(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(LNETLIB) $(NIDSLIB) $(PCAPLIB)
  
  sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
 -	$(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
@@ -19,12 +34,20 @@ $OpenBSD: patch-Makefile_in,v 1.1 2004/01/10 08:33:12 sturm Exp $
  
  tcpkill: tcpkill.o pcaputil.o
  	$(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
-@@ -130,7 +130,7 @@ urlsnarf: urlsnarf.o base64.o buf.o pcap
- 	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
+@@ -127,13 +127,13 @@ tcphijack: tcphijack.o pcaputil.o
+ 	$(CC) $(LDFLAGS) -o $@ tcphijack.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
+ 
+ urlsnarf: urlsnarf.o base64.o buf.o pcaputil.o
+-	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
++	$(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(LNETLIB) $(NIDSLIB) $(PCAPLIB)
  
  webmitm: webmitm.o base64.o buf.o decode_http.o record.o
 -	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
 +	$(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
  
  webspy: webspy.o base64.o buf.o remote.o
- 	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
+-	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
++	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(LNETLIB) $(NIDSLIB) $(PCAPLIB) $(X11LIB)
+ 
+ install:
+ 	test -d $(install_prefix)$(sbindir) || \
diff --git a/security/dsniff/patches/patch-configure_in b/security/dsniff/patches/patch-configure_in
index a9ca5c6763f..f8eeec8ca39 100644
--- a/security/dsniff/patches/patch-configure_in
+++ b/security/dsniff/patches/patch-configure_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_in,v 1.2 2003/12/08 17:42:34 sturm Exp $
---- configure.in.orig	2000-12-03 06:16:50.000000000 +0100
-+++ configure.in	2003-12-03 23:11:27.000000000 +0100
+$OpenBSD: patch-configure_in,v 1.3 2005/05/24 00:15:06 mjc Exp $
+--- configure.in.orig	Sat Dec  2 21:16:50 2000
++++ configure.in	Sun May 22 12:31:54 2005
 @@ -109,13 +109,13 @@ AC_ARG_WITH(db,
  	AC_DEFINE(HAVE_DB_185_H)
  	DBINC="-I$withval/dist"
@@ -19,6 +19,32 @@ $OpenBSD: patch-configure_in,v 1.2 2003/12/08 17:42:34 sturm Exp $
       else
          AC_ERROR(db_185.h or libdb.a not found in $withval or not configured with --enable-compat185)
       fi
+@@ -212,8 +212,8 @@ AC_ARG_WITH(libnet,
+      if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+-	if test -f $withval/bin/libnet-config; then
+-	   CFLAGS="$CFLAGS `$withval/bin/libnet-config --defines`"
++	if test -f $withval/bin/libnet-config-1.0; then
++	   CFLAGS="$CFLAGS `$withval/bin/libnet-config-1.0 --defines`"
+ 	elif test -f $withval/libnet-config; then
+ 	   CFLAGS="$CFLAGS `$withval/libnet-config --defines`"
+ 	else
+@@ -226,10 +226,10 @@ AC_ARG_WITH(libnet,
+      fi
+      ;;
+   esac ],
+-[ if test -f ${prefix}/include/libnet.h; then
+-     CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`"
+-     LNETINC="-I${prefix}/include"
+-     LNETLIB="-L${prefix}/lib -lnet"
++[ if test -f ${prefix}/include/libnet-1.0/libnet.h; then
++     CFLAGS="$CFLAGS `${prefix}/bin/libnet-config-1.0 --defines`"
++     LNETINC="-I${prefix}/include/libnet-1.0"
++     LNETLIB="-L${prefix}/lib/libnet-1.0 -lnet"
+   elif test -f /usr/include/libnet.h; then
+      CFLAGS="$CFLAGS `libnet-config --defines`"
+      LNETLIB="-lnet"
 @@ -307,7 +307,7 @@ AC_ARG_WITH(openssl,
  	owd=`pwd`
  	if cd $withval; then withval=`pwd`; cd $owd; fi
diff --git a/security/isic/Makefile b/security/isic/Makefile
index 37e4e58348a..aa2fb39b8d1 100644
--- a/security/isic/Makefile
+++ b/security/isic/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2004/12/27 13:28:34 alek Exp $
+# $OpenBSD: Makefile,v 1.22 2005/05/24 00:16:28 mjc Exp $
 
 COMMENT=	"IP stack integrity checker"
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.packetfactory.net/projects/ISIC/
 
 EXTRACT_SUFX=	.tgz
 
-LIB_DEPENDS=	net::net/libnet
+LIB_DEPENDS=	lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -20,7 +20,8 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c
 
 CONFIGURE_STYLE=	gnu
-
+CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libnet-1.0 `libnet-config-1.0 --defines`" \
+			LIBS="-L${LOCALBASE}/lib/libnet-1.0 -lnet"
 NO_REGRESS=	Yes
 
 post-install:
diff --git a/security/isic/patches/patch-Makefile_in b/security/isic/patches/patch-Makefile_in
new file mode 100644
index 00000000000..f922fbe39c2
--- /dev/null
+++ b/security/isic/patches/patch-Makefile_in
@@ -0,0 +1,16 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2005/05/24 00:16:28 mjc Exp $
+--- Makefile.in.orig	Sat May 21 22:26:05 2005
++++ Makefile.in	Sat May 21 22:26:17 2005
+@@ -5,9 +5,9 @@
+ PREFIX ?= /usr/local
+ 
+ CC	= @CC@
+-DEFS	= @DEFS@ `libnet-config --defines`
+-CFLAGS	= @CFLAGS@ `libnet-config --cflags`
+-LIBS	= @LIBS@ `libnet-config --libs`
++DEFS	= @DEFS@
++CFLAGS	= @CFLAGS@
++LIBS	= @LIBS@
+ LDFLAGS	= @LDFLAGS@
+ 
+ INSTALL	= @INSTALL@
diff --git a/security/rdp/Makefile b/security/rdp/Makefile
index c705ce92d60..5c5bae71c61 100644
--- a/security/rdp/Makefile
+++ b/security/rdp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2004/12/27 13:28:35 alek Exp $
+# $OpenBSD: Makefile,v 1.19 2005/05/24 00:17:50 mjc Exp $
 
 COMMENT=	"ICMP router discovery protocol spoofer"
 
@@ -7,7 +7,7 @@ PKGNAME=	rdp-1.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.atstake.com/research/tools/
 
-LIB_DEPENDS=	net::net/libnet
+LIB_DEPENDS=	lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
 
 PERMIT_PACKAGE_CDROM=	"no license"
 PERMIT_PACKAGE_FTP=	Yes
@@ -18,8 +18,8 @@ WANTLIB=		c pcap
 WRKDIST=	${WRKDIR}
 
 do-build:
-	cd ${WRKSRC} && ${CC} ${CFLAGS} -I${PREFIX}/include -o rdp \
-		icmp_rdp.c -L${PREFIX}/lib -lnet -lpcap
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -I${PREFIX}/include/libnet-1.0 -o rdp \
+		icmp_rdp.c -L${PREFIX}/lib/libnet-1.0 -lnet -lpcap
 
 NO_REGRESS=	Yes
 
diff --git a/security/scanlogd/Makefile b/security/scanlogd/Makefile
index b3799ae7bec..1f3b5fdf938 100644
--- a/security/scanlogd/Makefile
+++ b/security/scanlogd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2005/03/13 19:42:40 couderc Exp $
+# $OpenBSD: Makefile,v 1.16 2005/05/24 00:21:10 mjc Exp $
 
 DISTNAME=	scanlogd-2.2.5
 CATEGORIES=	security
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c pcap
 
 BUILD_DEPENDS=	::net/libnids
-LIB_DEPENDS=	net::net/libnet
+LIB_DEPENDS=	lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
 
 ALL_TARGET=	libnids
 NO_REGRESS=	Yes
diff --git a/security/scanlogd/patches/patch-Makefile b/security/scanlogd/patches/patch-Makefile
new file mode 100644
index 00000000000..5e657bedaf0
--- /dev/null
+++ b/security/scanlogd/patches/patch-Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile,v 1.3 2005/05/24 00:21:10 mjc Exp $
+--- Makefile.orig	Mon May 23 13:43:02 2005
++++ Makefile	Mon May 23 13:43:44 2005
+@@ -8,7 +8,7 @@ PCAP_H = -I/usr/include/pcap
+ PCAP_L = -lpcap
+ 
+ NIDS_H = -I/usr/local/include
+-NIDS_L = -L/usr/local/lib -lnids -lnet -lpcap
++NIDS_L = -L${LOCALBASE}/lib/libnet-1.0 -L${LOCALBASE}/lib -lnids -lnet -lpcap
+ 
+ PROJ = scanlogd
+ 
diff --git a/security/sentinel/Makefile b/security/sentinel/Makefile
index c8a2d887ac4..546817e58a1 100644
--- a/security/sentinel/Makefile
+++ b/security/sentinel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2004/12/27 13:28:35 alek Exp $
+# $OpenBSD: Makefile,v 1.14 2005/05/24 00:22:37 mjc Exp $
 
 COMMENT=		"remote promiscous mode detection tool"
 
@@ -18,13 +18,14 @@ WANTLIB=		c pcap pthread
 MASTER_SITES=		http://www.packetfactory.net/projects/sentinel/ \
 			${MASTER_SITE_PACKETSTORM:=UNIX/IDS/sentinel/}
 
-LIB_DEPENDS=		net::net/libnet
+LIB_DEPENDS=		lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
 
 WRKDIST=		${WRKDIR}/sentinel
 
 ALL_TARGET=		sentinel
 MAKE_FLAGS=		CC="${CC}" CFLAGS='${CFLAGS} -Wall -I. \
-			 -I${LOCALBASE}/include `libnet-config --defines`'
+			 -I${LOCALBASE}/include/libnet-1.0 `libnet-config-1.0 --defines`' \
+			LIBS="-lnet -L${LOCALBASE}/lib/libnet-1.0 -lpcap -pthread"
 
 NO_REGRESS=		Yes
 
diff --git a/security/vomit/Makefile b/security/vomit/Makefile
index f8da4cc4407..af901cc3886 100644
--- a/security/vomit/Makefile
+++ b/security/vomit/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2004/12/27 13:28:36 alek Exp $
+# $OpenBSD: Makefile,v 1.10 2005/05/24 00:23:35 mjc Exp $
 
 COMMENT=		"voice over misconfigured internet telephones"
 
 DISTNAME=		vomit-0.2
+PKGNAME=		${DISTNAME}p0
+
 CATEGORIES=		security
 
 HOMEPAGE=		http://vomit.xtdnet.nl/
@@ -20,11 +22,11 @@ WRKDIST=		${WRKDIR}/vomit-lite
 
 MASTER_SITES=		${HOMEPAGE}
 
-LIB_DEPENDS=		net::net/libnet
+LIB_DEPENDS=		lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
 
 SEPARATE_BUILD=		concurrent
 CONFIGURE_STYLE=	gnu
-
+CONFIGURE_ARGS+=	--with-libnet=${LOCALBASE}
 NO_REGRESS=		Yes
 
 .include <bsd.port.mk>
diff --git a/security/vomit/patches/patch-configure b/security/vomit/patches/patch-configure
new file mode 100644
index 00000000000..40946023e72
--- /dev/null
+++ b/security/vomit/patches/patch-configure
@@ -0,0 +1,27 @@
+$OpenBSD: patch-configure,v 1.1 2005/05/24 00:23:35 mjc Exp $
+--- configure.orig	Sat May 21 20:28:55 2005
++++ configure	Sat May 21 20:30:40 2005
+@@ -892,18 +892,18 @@ if test "${with_libnet+set}" = set; then
+      ;;
+   *)
+      echo "$ac_t""$withval" 1>&6
+-     if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a; then
++     if test -f $withval/include/libnet-1.0/libnet.h -a -f $withval/lib/libnet-1.0/libnet.a; then
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+-	if test -f $withval/bin/libnet-config; then
+-	   CFLAGS="$CFLAGS `$withval/bin/libnet-config --defines`"
++	if test -f $withval/bin/libnet-config-1.0; then
++	   CFLAGS="$CFLAGS `$withval/bin/libnet-config-1.0 --defines`"
+ 	elif test -f $withval/libnet-config; then
+ 	   CFLAGS="$CFLAGS `$withval/libnet-config --defines`"
+ 	else
+ 	   CFLAGS="$CFLAGS `libnet-config --defines`"
+ 	fi
+-	LNETINC="-I$withval/include"
+-	LNETLIB="-L$withval/lib -lnet"
++	LNETINC="-I$withval/include/libnet-1.0"
++	LNETLIB="-L$withval/lib/libnet-1.0 -lnet"
+      else
+         { echo "configure: error: libnet.h or libnet.a not found in $withval" 1>&2; exit 1; }
+      fi