From 095b509459e33feaea8906852efd0e7de033f440 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Fri, 26 Nov 2010 14:56:14 +0000
Subject: [PATCH] libnet PGKSPEC

---
 net/angst/Makefile          | 4 ++--
 net/arping/Makefile         | 4 ++--
 net/ettercap/Makefile       | 4 ++--
 net/firewalk/Makefile       | 4 ++--
 net/libnet/1.0/Makefile     | 3 ++-
 net/libnet/1.1/Makefile     | 3 ++-
 net/libnids/Makefile        | 4 ++--
 net/nemesis/Makefile        | 4 ++--
 net/packit/Makefile         | 4 ++--
 net/sing/Makefile           | 4 ++--
 net/tcptraceroute/Makefile  | 4 ++--
 net/thcrut/Makefile         | 4 ++--
 net/yersinia/Makefile       | 6 +++---
 security/despoof/Makefile   | 4 ++--
 security/dsniff/Makefile    | 4 ++--
 security/isic/Makefile      | 4 ++--
 security/rdp/Makefile       | 4 ++--
 security/scanlogd/Makefile  | 4 ++--
 security/sentinel/Makefile  | 4 ++--
 security/vomit/Makefile     | 4 ++--
 sysutils/heartbeat/Makefile | 4 ++--
 21 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/net/angst/Makefile b/net/angst/Makefile
index e6389f7c1ec..33e24724e40 100644
--- a/net/angst/Makefile
+++ b/net/angst/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/11/19 22:31:32 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/26 14:56:14 espie Exp $
 
 COMMENT=	active packet sniffer
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB =	c pcap lib/libnet-1.0/net=0
-LIB_DEPENDS=	libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=	net/libnet/1.0
 
 ALL_TARGET=	angst
 
diff --git a/net/arping/Makefile b/net/arping/Makefile
index 95dcd5f291b..020f09e4bf4 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2010/11/19 22:31:32 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2010/11/26 14:56:14 espie Exp $
 
 COMMENT =	ARP level ping utility
 
@@ -20,7 +20,7 @@ WANTLIB =	c pcap lib/libnet-1.1/net=11
 MASTER_SITES =	http://www.habets.pp.se/synscan/files/ \
 		http://www.arcane-labs.net/download/OpenBSD/
 
-LIB_DEPENDS =	libnet->=1.1,<1.2:net/libnet/1.1
+LIB_DEPENDS =	net/libnet/1.1
 
 CONFIGURE_STYLE = gnu
 CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libnet-1.1 \
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 5e40203e272..33b7a19960e 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2010/11/22 09:30:38 espie Exp $
+# $OpenBSD: Makefile,v 1.52 2010/11/26 14:56:14 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -22,7 +22,7 @@ PERMIT_DISTFILES_FTP=   Yes
 WANTLIB += c crypto form menu ncurses panel pcap pthread ssl z
 WANTLIB += lib/libnet-1.1/net=11 ltdl pcre
 
-LIB_DEPENDS=	libnet->=1.1,<1.2:net/libnet/1.1 \
+LIB_DEPENDS=	net/libnet/1.1 \
 		devel/libtool,-ltdl \
 		devel/pcre
 
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index 831c84564f7..92b7b5b1c5b 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2010/11/19 22:31:33 espie Exp $
+# $OpenBSD: Makefile,v 1.34 2010/11/26 14:56:14 espie Exp $
 
 COMMENT=	gateway acl scanner (via static-source port traceroute)
 
@@ -11,7 +11,7 @@ MASTER_SITES=	http://spacehopper.org/mirrors/
 
 #HOMEPAGE=	http://www.packetfactory.net/projects/firewalk/
 
-LIB_DEPENDS=	libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=	net/libnet/1.0
 WANTLIB=	c pcap lib/libnet-1.0/net=0
 
 # BSD
diff --git a/net/libnet/1.0/Makefile b/net/libnet/1.0/Makefile
index 9ebc9682d38..1ecf483c026 100644
--- a/net/libnet/1.0/Makefile
+++ b/net/libnet/1.0/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/18 18:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/26 14:56:15 espie Exp $
 
 REV=		1.0
 VERSION=	${REV}.2a
 REVISION=	2
 SHARED_LIBS=	net	0.0
+PKGSPEC =	libnet->=1.0,<1.1
 
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/deprecated/
 
diff --git a/net/libnet/1.1/Makefile b/net/libnet/1.1/Makefile
index 531862f081b..2d464b27ed8 100644
--- a/net/libnet/1.1/Makefile
+++ b/net/libnet/1.1/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2010/07/13 21:08:00 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/26 14:56:15 espie Exp $
 
 REV=		1.1
 VERSION=	${REV}.2.1
 REVISION=	0
 SHARED_LIBS=	net	11.0
+PKGSPEC =	libnet->=1.1,<1.2
 
 WRKDIST=	${WRKDIR}/libnet
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index e9b6ea38b09..d7f8020813f 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2010/11/19 22:31:34 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=	network monitoring library with TCP/IP reassembly
 
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libnids/}
 
 HOMEPAGE=	http://www.packetfactory.net/projects/libnids/
 
-BUILD_DEPENDS=	libnet->=1.0,<1.1:net/libnet/1.0
+BUILD_DEPENDS=	net/libnet/1.0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=   Yes
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index e8fc3aaf6ca..ab3d6c0bc2c 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2010/11/19 22:31:35 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=	command line arbitrary packet builder
 
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nemesis/}
 
 HOMEPAGE=	http://nemesis.sourceforge.net/
 
-LIB_DEPENDS=	libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=	net/libnet/1.0
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/net/packit/Makefile b/net/packit/Makefile
index 11402ad55ab..da3d7b70e4f 100644
--- a/net/packit/Makefile
+++ b/net/packit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/11/19 22:31:37 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=		packet generation tool
 DISTNAME=		packit-1.0
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS=		libnet->=1.1,<1.2:net/libnet/1.1
+LIB_DEPENDS=		net/libnet/1.1
 WANTLIB=		c pcap lib/libnet-1.1/net=11
 
 CONFIGURE_STYLE=	gnu
diff --git a/net/sing/Makefile b/net/sing/Makefile
index 6a9855f7794..d5b7486c0e2 100644
--- a/net/sing/Makefile
+++ b/net/sing/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2010/11/19 22:31:38 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=	send ICMP nasty garbage
 
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 
 HOMEPAGE=	http://sourceforge.net/projects/sing/
 
-LIB_DEPENDS=	libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=	net/libnet/1.0
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 5c402258206..28c06598851 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2010/11/19 22:31:38 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=		traceroute implementation using TCP packets
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=		--with-libnet=${PREFIX} \
 
 MASTER_SITES=		http://michael.toren.net/code/tcptraceroute/
 
-LIB_DEPENDS=		libnet->=1.1,<1.2:net/libnet/1.1
+LIB_DEPENDS=		net/libnet/1.1
 
 MAKE_FLAGS=		CC="${CC}" \
 			CFLAGS="${CFLAGS}"
diff --git a/net/thcrut/Makefile b/net/thcrut/Makefile
index 4cc0cd837e5..7fddb38aad4 100644
--- a/net/thcrut/Makefile
+++ b/net/thcrut/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:39 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=	local network discovery tool
 
@@ -9,7 +9,7 @@ MASTER_SITES=	${HOMEPAGE}/releases/
 
 HOMEPAGE=	http://www.thehackerschoice.com/
 
-LIB_DEPENDS=	libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=	net/libnet/1.0
 
 PERMIT_PACKAGE_CDROM=	no license
 PERMIT_PACKAGE_FTP=	no license
diff --git a/net/yersinia/Makefile b/net/yersinia/Makefile
index 0148084fb19..f0b5bba398a 100644
--- a/net/yersinia/Makefile
+++ b/net/yersinia/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2010/11/19 22:31:39 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/26 14:56:15 espie Exp $
 
 COMMENT =	framework for analysis of layer 2 network protocols
 
 DISTNAME =	yersinia-0.7.1
 CATEGORIES =	net security
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://www.yersinia.net/
 
@@ -20,7 +20,7 @@ MASTER_SITES =	http://www.yersinia.net/download/
 
 WANTLIB =	c ncurses panel pcap pthread net
 
-LIB_DEPENDS =	net/libnet/1.1>=1.1
+LIB_DEPENDS =	net/libnet/1.1
 
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS =	--disable-gtk \
diff --git a/security/despoof/Makefile b/security/despoof/Makefile
index a3566a85038..4d31f7281fa 100644
--- a/security/despoof/Makefile
+++ b/security/despoof/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/11/20 17:22:43 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=	command-line anti-spoofing detection utility
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c pcap lib/libnet-1.0/net=0
 
-LIB_DEPENDS=	libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=	net/libnet/1.0
 
 MAKE_FLAGS+=	CC='${CC}' CFLAGS='${CFLAGS}' \
 		DEFS='-I${LOCALBASE}/include/libnet-1.0 `libnet-config-1.0 --defines`' \
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index d389f571ed0..56652519ef6 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2010/11/26 14:23:31 espie Exp $
+# $OpenBSD: Makefile,v 1.55 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=	sniffing tools for penetration testing
 
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.monkey.org/~dugsong/dsniff/
 
 BUILD_DEPENDS=	net/libnids
 LIB_DEPENDS=	databases/db/v3 \
-		libnet->=1.0,<1.1:net/libnet/1.0
+		net/libnet/1.0
 WANTLIB=	c crypto pcap ssl rpcsvc lib/db/db=3 lib/libnet-1.0/net=0
 
 # BSD
diff --git a/security/isic/Makefile b/security/isic/Makefile
index 702fc5255ae..de5aaa41de8 100644
--- a/security/isic/Makefile
+++ b/security/isic/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2010/11/20 17:22:43 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=	IP stack integrity checker
 
@@ -18,7 +18,7 @@ WANTLIB=		c lib/libnet-1.1/net=11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isic/}
 EXTRACT_SUFX=	.tgz
 
-LIB_DEPENDS=	libnet->=1.1,<1.2:net/libnet/1.1
+LIB_DEPENDS=	net/libnet/1.1
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libnet-1.1 \
diff --git a/security/rdp/Makefile b/security/rdp/Makefile
index 9c9a1bab3c2..719aef93050 100644
--- a/security/rdp/Makefile
+++ b/security/rdp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/11/20 17:22:45 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=	ICMP router discovery protocol spoofer
 
@@ -8,7 +8,7 @@ REVISION =	0
 CATEGORIES=	security
 MASTER_SITES=	http://www.atstake.com/research/tools/
 
-LIB_DEPENDS=	libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=	net/libnet/1.0
 
 PERMIT_PACKAGE_CDROM=	no license
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/security/scanlogd/Makefile b/security/scanlogd/Makefile
index da8c143572b..e662265cb61 100644
--- a/security/scanlogd/Makefile
+++ b/security/scanlogd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2010/11/20 17:22:45 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2010/11/26 14:56:15 espie Exp $
 
 DISTNAME=	scanlogd-2.2.6
 REVISION =	4
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c pcap lib/libnet-1.0/net=0
 
 BUILD_DEPENDS=	net/libnids
-LIB_DEPENDS=	libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=	net/libnet/1.0
 
 MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
diff --git a/security/sentinel/Makefile b/security/sentinel/Makefile
index 1d05bf7dabc..055b0898ad1 100644
--- a/security/sentinel/Makefile
+++ b/security/sentinel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2010/11/20 17:22:45 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=		remote promiscous mode detection tool
 
@@ -19,7 +19,7 @@ WANTLIB=		c pcap pthread lib/libnet-1.0/net=0
 MASTER_SITES=		http://www.packetfactory.net/projects/sentinel/ \
 			${MASTER_SITE_PACKETSTORM:=UNIX/IDS/sentinel/}
 
-LIB_DEPENDS=		libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=		net/libnet/1.0
 
 WRKDIST=		${WRKDIR}/sentinel
 
diff --git a/security/vomit/Makefile b/security/vomit/Makefile
index 5a99c204e63..c9212aec09e 100644
--- a/security/vomit/Makefile
+++ b/security/vomit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/11/20 17:22:45 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/26 14:56:15 espie Exp $
 
 COMMENT=		voice over misconfigured internet telephones
 
@@ -22,7 +22,7 @@ WRKDIST=		${WRKDIR}/vomit-lite
 
 MASTER_SITES=		${HOMEPAGE}
 
-LIB_DEPENDS=		libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=		net/libnet/1.0
 
 SEPARATE_BUILD=		concurrent
 CONFIGURE_STYLE=	gnu
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index d45f307f30b..7e1b0ec59e4 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/11/20 17:22:41 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/26 14:56:15 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -54,7 +54,7 @@ WANTLIB-main=	${WANTLIB} crypto gcrypt gpg-error idn ncurses ssl tasn1 \
 LIB_DEPENDS-main=${LIB_DEPENDS} \
 		sysutils/e2fsprogs \
 		security/gnutls \
-		libnet->=1.0,<1.1:net/libnet/1.0 \
+		net/libnet/1.0 \
 		archivers/bzip2 \
 		textproc/libxml \
 		devel/libtool,-ltdl \