Force all current packages using the libnet 1.0.x tree to use a

verision of libnet <= 1.0.1b.  This will prevent the case where the user
has installed the libnet 1.1.x branch and then tries to install an application
that is not compatible with the 1.1.x tree.

Over time the list of these applications that require the 1.0.x branch
will be reduced as they are updated to later versions that support the
libnet 1.1.x branch.

This addresses PR# 29056 opened by diro (at) nixsys.bz, thanks for the PR !

12 files changed, 35 insertions, 12 deletions

diff --git a/net/LaBrea/Makefile b/net/LaBrea/Makefile
index 61db4abac13..27665c6bf1e 100644
--- a/net/LaBrea/Makefile
+++ b/net/LaBrea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:17:48 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/28 23:35:59 adrianp Exp $
 #
 
 DISTNAME=	LaBrea2_3
@@ -13,7 +13,9 @@ HOMEPAGE=	http://www.hackbusters.net/LaBrea/
 COMMENT=	Builds tarpits/honeypots for scanners
 
 WRKSRC=		${WRKDIR}/LaBrea
+
 USE_BUILDLINK3=	YES
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
 
 post-extract:
 	cd ${WRKSRC};							\
diff --git a/net/arping/Makefile b/net/arping/Makefile
index 372b79aa1eb..e02ae916f82 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/28 23:35:59 adrianp Exp $
 #
 
 DISTNAME=		arping-2.01
@@ -13,6 +13,8 @@ COMMENT=		ARP-level ping utility
 USE_BUILDLINK3=		yes
 NO_CONFIGURE=		yes
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
diff --git a/net/cdpd/Makefile b/net/cdpd/Makefile
index 498ee6429cd..debab4c4732 100644
--- a/net/cdpd/Makefile
+++ b/net/cdpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/11/29 23:01:14 explorer Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/28 23:35:59 adrianp Exp $
 #
 
 DISTNAME=	cdpd-1.0.2
@@ -12,6 +12,8 @@ COMMENT=	Simple daemon to send Cisco Discovery Protocol packets
 USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cdpd ${PREFIX}/sbin/cdpd
 	${INSTALL_DATA} ${WRKSRC}/cdpd.8 ${PREFIX}/man/man8/cdpd.8
diff --git a/net/firewalk-gtk/Makefile b/net/firewalk-gtk/Makefile
index 0071ac10e31..f7fb9e0c3d5 100644
--- a/net/firewalk-gtk/Makefile
+++ b/net/firewalk-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/28 23:35:59 adrianp Exp $
 
 DISTNAME=	firewalk-1.0
 PKGNAME=	firewalk-gtk-1.0
@@ -18,6 +18,8 @@ CONFIGURE_ENV+= GTK_CFLAGS="`gtk-config --cflags`"
 
 MAKE_ENV+=	FIREWALK_LOC=${LOCALBASE}
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 pre-install:
 	${MV} ${WRKSRC}/firewalk.1 ${WRKSRC}/firewalk-gtk.1
 
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index f83130c3c79..a92f355b110 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/28 23:35:59 adrianp Exp $
 
 DISTNAME=	firewalk-1.0
 PKGREVISION=	1
@@ -15,6 +15,8 @@ GNU_CONFIGURE=	# defined
 CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include
 CONFIGURE_ARGS+= --with-gtk=no
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 MAKE_ENV+=	FIREWALK_LOC=${LOCALBASE}
 
 .include "../../devel/libnet/buildlink3.mk"
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 63e9e069912..1a9f759a77a 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:17:54 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/28 23:35:59 adrianp Exp $
 # $FreeBSD: ports/net/libnids/Makefile,v 1.5 2000/04/24 07:42:58 kris Exp $
 #
 
@@ -16,6 +16,7 @@ GNU_CONFIGURE=	yes
 
 BUILDLINK_DEPMETHOD.libnet=	build
 BUILDLINK_DEPMETHOD.libpcap=	build
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
 
 .include "../../devel/libnet/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index 8884670a476..728d8c022ec 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:17:55 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/28 23:35:59 adrianp Exp $
 
 DISTNAME=	nemesis-1.32
 PKGREVISION=	1
@@ -12,5 +12,7 @@ COMMENT=	Nemesis is a command-line UNIX network packet injection suite
 USE_BUILDLINK3=	yes
 GNU_CONFIGURE=  # defined
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 .include "../../devel/libnet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/scdp/Makefile b/net/scdp/Makefile
index f0f547ef382..e5954ed8a70 100644
--- a/net/scdp/Makefile
+++ b/net/scdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:17:58 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/28 23:35:59 adrianp Exp $
 #
 
 DISTNAME=	scdp-1.0b
@@ -14,5 +14,7 @@ COMMENT=	Program to send Cisco Discovery Protocol packets
 USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 .include "../../devel/libnet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 858ad782395..0efefbda834 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/28 23:35:59 adrianp Exp $
 #
 
 DISTNAME=		tcptraceroute-1.4
@@ -12,6 +12,8 @@ COMMENT=		Traceroute implementation using TCP packets
 
 USE_BUILDLINK3=		YES
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 BUILD_TARGET=		tcptraceroute
 
 DOCDIR=			${PREFIX}/share/doc/tcptraceroute
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 373cc292b77..1b0a3a354ca 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/04 14:55:59 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/01/28 23:35:59 adrianp Exp $
 #
 
 DISTNAME=	xipdump-1.5.4
@@ -12,6 +12,8 @@ COMMENT=	Displays IP packets using X Window System
 
 USE_BUILDLINK3=	YES
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 LIBNET_CONFIG=	${LOCALBASE}/bin/libnet-config
 
 PLIST_SRC=	${WRKDIR}/PLIST
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index fb005687bf3..62c6aa999a9 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/12/18 19:24:26 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/01/28 23:35:59 adrianp Exp $
 # $OpenBSD: Makefile,v 1.13 2000/06/19 18:38:55 dugsong Exp $
 
 DISTNAME=	dsniff-2.3
@@ -14,6 +14,8 @@ USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 USE_X11=	yes
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../devel/libnet/buildlink3.mk"
 .include "../../net/libnids/buildlink3.mk"
diff --git a/security/pakemon/Makefile b/security/pakemon/Makefile
index d7be3f9b0fc..9a3461a86ba 100644
--- a/security/pakemon/Makefile
+++ b/security/pakemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:18:12 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/28 23:35:59 adrianp Exp $
 
 DISTNAME=	pakemon-0.3.1
 PKGREVISION=	3
@@ -14,6 +14,8 @@ COMMENT=	Packet monster, an Open Source Intrusion Detection System
 USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
+BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+
 post-extract:
 	${CP} ${WRKSRC}/pakemon.h ${WRKSRC}/pakemon.h.in