diff --git a/net/cdpd/Makefile b/net/cdpd/Makefile
index 52eb092c7574..7e1ef5676cce 100644
--- a/net/cdpd/Makefile
+++ b/net/cdpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:02 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/18 18:57:33 adrianp Exp $
 #
 
 DISTNAME=	cdpd-1.0.2
-#PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.lexa.ru/pub/domestic/snar/
 
@@ -11,13 +11,17 @@ COMMENT=	Simple daemon to send Cisco Discovery Protocol packets
 
 GNU_CONFIGURE=	YES
 
-BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
-
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=       pre-configure
+SUBST_FILES.conf=       configure
+SUBST_SED.conf=         -e "s|libnet-config|libnet10-config|g"
+SUBST_MESSAGE.conf=     Fixing configuration script.
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cdpd ${PREFIX}/sbin/cdpd
 	${INSTALL_DATA} ${WRKSRC}/cdpd.8 ${PREFIX}/${PKGMANDIR}/man8/cdpd.8
 
-.include "../../devel/libnet/buildlink3.mk"
+.include "../../devel/libnet10/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index 6d7f56618e92..edf4fe19b22e 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:33 reed Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/18 18:58:13 adrianp Exp $
 
 DISTNAME=	nemesis-1.4
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nemesis/}
 
@@ -9,9 +10,15 @@ HOMEPAGE=	http://jeff.wwti.com/nemesis/
 COMMENT=	Nemesis is a command-line UNIX network packet injection suite
 
 GNU_CONFIGURE=  yes
+CONFIGURE_ARGS+=	--with-libnet-includes=${BUILDLINK_PREFIX.libnet10}/include/libnet10
+CONFIGURE_ARGS+=	--with-libnet-libs=${BUILDLINK_PREFIX.libnet10}/lib/libnet10
 
-BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.2a
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-configure
+SUBST_FILES.conf=	configure
+SUBST_SED.conf=		-e "s|libnet-config|libnet10-config|g"
+SUBST_MESSAGE.conf=	Fixing configuration script.
 
 .include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/libnet/buildlink3.mk"
+.include "../../devel/libnet10/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/scdp/Makefile b/net/scdp/Makefile
index 5332b9d5308a..e9890ae42bf5 100644
--- a/net/scdp/Makefile
+++ b/net/scdp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/18 18:54:23 adrianp Exp $
 #
 
 DISTNAME=	scdp-1.0b
 PKGNAME=        scdp-1.0.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scdp/}
 
@@ -13,7 +13,11 @@ COMMENT=	Program to send Cisco Discovery Protocol packets
 
 GNU_CONFIGURE=	yes
 
-BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-configure
+SUBST_FILES.conf=	configure
+SUBST_SED.conf=		-e "s|libnet-config|libnet10-config|g"
+SUBST_MESSAGE.conf=	Fixing configuration script.
 
-.include "../../devel/libnet/buildlink3.mk"
+.include "../../devel/libnet10/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 993d525bee3e..89392406a811 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:07 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/18 18:58:55 adrianp Exp $
 #
 
 DISTNAME=		tcptraceroute-1.4
@@ -10,9 +10,6 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://michael.toren.net/code/tcptraceroute/
 COMMENT=		Traceroute implementation using TCP packets
 
-
-BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
-
 BUILD_TARGET=		tcptraceroute
 
 DOCDIR=			${PREFIX}/share/doc/tcptraceroute
@@ -20,6 +17,12 @@ BINMODE=		4711
 
 .include "../../mk/bsd.prefs.mk"
 
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-build
+SUBST_FILES.conf=	Makefile
+SUBST_SED.conf=		-e "s|libnet-config|libnet10-config|g"
+SUBST_MESSAGE.conf=	Fixing configuration script.
+
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 do-install:
@@ -28,7 +31,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples.txt ${DOCDIR}
 
-.include "../../devel/libnet/buildlink3.mk"
+.include "../../devel/libnet10/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 2bb248f7575d..0b133a322d44 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2006/09/03 00:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/18 18:55:17 adrianp Exp $
 #
 
 DISTNAME=	xipdump-1.5.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.lse.epita.fr/twiki/pub/Projects/XipDump/
 EXTRACT_SUFX=	.tgz
@@ -11,8 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.lse.epita.fr/twiki/bin/view/Projects/XipDump
 COMMENT=	Displays IP packets using X Window System
 
-BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
-
 PLIST_SRC=	${WRKDIR}/PLIST
 
 USE_X11BASE=	yes
@@ -20,7 +18,7 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-I${PREFIX}/include ${LIBNET_CFLAGS_CMD:sh}
 LIBS+=		-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lnet
 
-LIBNET_CFLAGS_CMD= ${BUILDLINK_PREFIX.libnet}/bin/libnet-config --defines
+LIBNET_CFLAGS_CMD= ${BUILDLINK_PREFIX.libnet10}/bin/libnet10-config --defines
 
 post-build:
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
@@ -30,6 +28,6 @@ post-build:
 	@${ECHO} "@dirrm share/xipdump/pkc" >> ${PLIST_SRC}
 	@${ECHO} "@dirrm share/xipdump" >> ${PLIST_SRC}
 
-.include "../../devel/libnet/buildlink3.mk"
+.include "../../devel/libnet10/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/dsniff/Makefile.common b/security/dsniff/Makefile.common
index 8bc7953e9cdb..db78675c9ce1 100644
--- a/security/dsniff/Makefile.common
+++ b/security/dsniff/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2006/05/11 15:39:20 joerg Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/02/18 18:56:13 adrianp Exp $
 
 DISTNAME=	dsniff-${VERS}
+PKGREVISION=	1
 VERS=		2.3
 CATEGORIES=	security
 MASTER_SITES+=	http://monkey.org/~dugsong/dsniff/
@@ -10,11 +11,17 @@ HOMEPAGE=	http://monkey.org/~dugsong/dsniff/
 
 GNU_CONFIGURE=	yes
 
-BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
-
 PATCHDIR=	${.CURDIR}/../../security/dsniff/patches
 DISTINFO_FILE=	${.CURDIR}/../../security/dsniff/distinfo
 
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-configure
+SUBST_FILES.conf=	configure
+SUBST_SED.conf=		-e "s|libnet-config|libnet10-config|g"
+SUBST_SED.conf+=	-e "s|@@LN_INC@@|${BUILDLINK_PREFIX.libnet10}/include/libnet10|g"
+SUBST_SED.conf+=	-e "s|@@LN_LIB@@|${BUILDLINK_PREFIX.libnet10}/lib/libnet10|g"
+SUBST_MESSAGE.conf=	Fixing configuration script.
+
 .include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/libnet/buildlink3.mk"
+.include "../../devel/libnet10/buildlink3.mk"
 .include "../../net/libnids/buildlink3.mk"
diff --git a/security/dsniff/distinfo b/security/dsniff/distinfo
index 04f6e36dd3d9..e6c33341a777 100644
--- a/security/dsniff/distinfo
+++ b/security/dsniff/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/05/11 15:39:20 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/02/18 18:56:13 adrianp Exp $
 
 SHA1 (dsniff-2.3.tar.gz) = 671a1df823ab0657fc95e79112924a57281e9c3b
 RMD160 (dsniff-2.3.tar.gz) = 89dad0259e90acef30a7aa5f3471de3aaeb06147
@@ -6,3 +6,4 @@ Size (dsniff-2.3.tar.gz) = 126797 bytes
 SHA1 (patch-aa) = b50347c772c13abd6b62a80315c7bfecc139ba60
 SHA1 (patch-ab) = 6385da7139dcb11ea29ffba468e7fac260b61b44
 SHA1 (patch-ac) = 55ad4f73e53578857bc5ad7a445c8e6125c39215
+SHA1 (patch-ad) = cab09e1b1a61fd6a3fa96c24fff3cd1519146a3e
diff --git a/security/dsniff/patches/patch-ad b/security/dsniff/patches/patch-ad
new file mode 100644
index 000000000000..6224a1f5868c
--- /dev/null
+++ b/security/dsniff/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2007/02/18 18:56:13 adrianp Exp $
+
+--- configure.orig	2000-12-03 04:35:46.000000000 +0000
++++ configure
+@@ -3083,10 +3083,10 @@ if test "${with_libnet+set}" = set; then
+      ;;
+   esac 
+ else
+-   if test -f ${prefix}/include/libnet.h; then
++   if test -f @@LN_INC@@/libnet.h; then
+      CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`"
+-     LNETINC="-I${prefix}/include"
+-     LNETLIB="-L${prefix}/lib -lnet"
++     LNETINC="-I@@LN_INC@@"
++     LNETLIB="-L@@LN_LIB@@ -lnet"
+   elif test -f /usr/include/libnet.h; then
+      CFLAGS="$CFLAGS `libnet-config --defines`"
+      LNETLIB="-lnet"
diff --git a/security/pakemon/Makefile b/security/pakemon/Makefile
index a72e66b0a2fa..b0625509ffd2 100644
--- a/security/pakemon/Makefile
+++ b/security/pakemon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2006/10/04 21:58:14 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/18 18:56:46 adrianp Exp $
 
 DISTNAME=	pakemon-0.3.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://www.binarii.com/files/security/ \
 		http://www.mirrors.wiretapped.net/security/network-intrusion-detection/pakemon/
@@ -12,12 +12,18 @@ COMMENT=	Packet monster, an Open Source Intrusion Detection System
 
 GNU_CONFIGURE=	yes
 
-BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-configure
+SUBST_FILES.conf=	configure
+SUBST_SED.conf=		-e "s|libnet-config|libnet10-config|g"
+SUBST_SED.conf+=	-e "s|@@LN_INC@@|${BUILDLINK_PREFIX.libnet10}/include/libnet10|g"
+SUBST_SED.conf+=	-e "s|@@LN_LIB@@|${BUILDLINK_PREFIX.libnet10}/lib/libnet10|g"
+SUBST_MESSAGE.conf=	Fixing configuration script.
 
 post-extract:
 	${CP} ${WRKSRC}/pakemon.h ${WRKSRC}/pakemon.h.in
 
 .include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/libnet/buildlink3.mk"
+.include "../../devel/libnet10/buildlink3.mk"
 .include "../../net/libnids/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pakemon/distinfo b/security/pakemon/distinfo
index 3da0b970efd1..b66771841db8 100644
--- a/security/pakemon/distinfo
+++ b/security/pakemon/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:10:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2007/02/18 18:56:47 adrianp Exp $
 
 SHA1 (pakemon-0.3.1.tar.gz) = 27708ac303a58432222b53b71b6ca13e71502f7e
 RMD160 (pakemon-0.3.1.tar.gz) = 156c1829630e2e59a5797882d6309cc423217fee
 Size (pakemon-0.3.1.tar.gz) = 110065 bytes
 SHA1 (patch-aa) = 22155e703130a28ba4bf34922b3926411cb917b8
 SHA1 (patch-ab) = d35a76ae3ef96d51526f20d9973d1743c038cf81
-SHA1 (patch-ac) = 2f259e12f54742789e8ac36f8a1eead4afcfac14
+SHA1 (patch-ac) = 98766fc5c20fba4c7750b9744bfa59fbf9ad22d2
diff --git a/security/pakemon/patches/patch-ac b/security/pakemon/patches/patch-ac
index efa6213ffd10..08273b0e1993 100644
--- a/security/pakemon/patches/patch-ac
+++ b/security/pakemon/patches/patch-ac
@@ -1,7 +1,23 @@
-$NetBSD: patch-ac,v 1.1 2002/10/02 19:12:00 dillo Exp $
+$NetBSD: patch-ac,v 1.2 2007/02/18 18:56:47 adrianp Exp $
 
---- configure.orig	Sun Jan  7 07:06:39 2001
+--- configure.orig	2001-01-07 06:06:39.000000000 +0000
 +++ configure
+@@ -1651,11 +1651,11 @@ if test "${with_libnet+set}" = set; then
+      ;;
+   esac 
+ else
+-   if test -f ${prefix}/include/libnet.h; then
++   if test -f @@LN_INC@@/libnet.h; then
+      CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`"
+-     LNETINC="-I${prefix}/include"
+-     LNETLIB="-L${prefix}/lib -lnet"
+-     LDFLAGS="$LDFLAGS -L${prefix}/lib"
++     LNETINC="-I@@LN_INC@@"
++     LNETLIB="-L@@LN_LIB@@ -lnet"
++     LDFLAGS="$LDFLAGS -L@@LN_LIB@@"
+   elif test -f /usr/include/libnet.h; then
+      CFLAGS="$CFLAGS `libnet-config --defines`"
+      LNETLIB="-lnet"
 @@ -1908,7 +1908,7 @@ EOF
  
  cat >> $CONFIG_STATUS <<EOF