buildlink updates and patches to handle the new libnet package structure

bump PKGREVISION

5 files changed, 39 insertions, 23 deletions

diff --git a/net/cdpd/Makefile b/net/cdpd/Makefile
index 52eb092c757..7e1ef5676cc 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 6d7f56618e9..edf4fe19b22 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 5332b9d5308..e9890ae42bf 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 993d525bee3..89392406a81 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 2bb248f7575..0b133a322d4 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"