59 files changed, 247 insertions, 226 deletions

diff --git a/MOVED b/MOVED
index d08721e1d570..2f4f54026ea9 100644
--- a/MOVED
+++ b/MOVED
@@ -1945,3 +1945,5 @@ deskutils/gdesklets-sensor-psi_theme||2005-11-11|Deleted; dead and unfetchable
 deskutils/gdesklets-psi_themes||2005-11-11|Deleted; dead and unfetchable
 devel/libidn|dns/libidn|2005-11-12|Moved to a better category
 devel/p5-Net-LibIDN|dns/p5-Net-LibIDN|2005-11-12|Moved to a better category
+net/libnet|net/libnet10|2005-11-14|Moved
+net/libnet-devel/net/libnet|2005-11-14|Moved
diff --git a/dns/dnshijacker/Makefile b/dns/dnshijacker/Makefile
index 25b066a0c254..abfb07968f30 100644
--- a/dns/dnshijacker/Makefile
+++ b/dns/dnshijacker/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	dnshijacker
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns security
 MASTER_SITES=	http://pedram.redhive.com/downloads/
 
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	A tool to hijack DNS requests
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 LDFLAGS+=	-lpcap -lnet
 
diff --git a/graphics/p5-Image-Grab/Makefile b/graphics/p5-Image-Grab/Makefile
index a9851c9c8a24..4b0e41e7b267 100644
--- a/graphics/p5-Image-Grab/Makefile
+++ b/graphics/p5-Image-Grab/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image-Grab
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Image
@@ -20,7 +21,7 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-D
 		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
-		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet \
+		libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10 \
 		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/net-mgmt/angst/Makefile b/net-mgmt/angst/Makefile
index 6060d9bca6b8..a8637e00a37d 100644
--- a/net-mgmt/angst/Makefile
+++ b/net-mgmt/angst/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	angst
 PORTVERSION=	0.4b
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_PACKETSTORM:S:%SUBDIR%:sniffers/angst:}
@@ -16,7 +17,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An active sniffer
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet-config
 
diff --git a/net-mgmt/cdpd/Makefile b/net-mgmt/cdpd/Makefile
index f58588b7fe5f..4ef1dd2e43d3 100644
--- a/net-mgmt/cdpd/Makefile
+++ b/net-mgmt/cdpd/Makefile
@@ -6,13 +6,14 @@
 
 PORTNAME=	cdpd
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.lexa.ru/pub/domestic/snar/
 
 MAINTAINER=	snar@paranoia.ru
 COMMENT=	CDPdaemon - sends Cisco Discovery Protocol announces over ethernet
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 GNU_CONFIGURE=	yes
 
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index edefeb2d3475..e65a4083f800 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=		ettercap
 PORTVERSION=		0.7.3
 DISTVERSIONPREFIX=	NG-
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		1
 CATEGORIES=		net-mgmt security
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_EXTENDED} \
@@ -18,7 +18,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A network sniffer/interceptor/injector/logger for switched LANs
 
-BUILD_DEPENDS=	${LOCALBASE}/include/libnet/libnet-types.h:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 OPTIONS=	GTK	"Build with GTK2+ GUI"	on \
 		ICONV	"Build with support for UTF-8"	on \
diff --git a/net-mgmt/gps/Makefile b/net-mgmt/gps/Makefile
index e9630e183240..75caf6306d40 100644
--- a/net-mgmt/gps/Makefile
+++ b/net-mgmt/gps/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gps
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://gps.sourceforge.net/release/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-FRC
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-FRC
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ghost Port Scan
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/isic/Makefile b/net-mgmt/isic/Makefile
index 53324f3e12bd..16697dd33931 100644
--- a/net-mgmt/isic/Makefile
+++ b/net-mgmt/isic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	isic
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.packetfactory.net/Projects/ISIC/
 EXTRACT_SUFX=	.tgz
@@ -14,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	bradh@uunet.co.za
 COMMENT=	IP Stack Integrity Checker
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 GNU_CONFIGURE=	yes
 
diff --git a/net-mgmt/knowlan/Makefile b/net-mgmt/knowlan/Makefile
index 6f1d49722904..96f932070dde 100644
--- a/net-mgmt/knowlan/Makefile
+++ b/net-mgmt/knowlan/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	knowlan
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.enderunix.org/knowlan/
 
 MAINTAINER=	ofsen@enderunix.org
 COMMENT=	ARP-based LAN IP and MAC Address Extractor
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}"
diff --git a/net-mgmt/packit/Makefile b/net-mgmt/packit/Makefile
index 17a427de7d8e..df114749328a 100644
--- a/net-mgmt/packit/Makefile
+++ b/net-mgmt/packit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	packit
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://packit.sourceforge.net/downloads/
 EXTRACT_SUFX=	.tgz
@@ -14,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network auditing tool
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet-config
 MAN8=		packit.8
@@ -36,7 +37,7 @@ pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} ""#######################################################
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You need ${PORTSDIR}/net/libnet-devel to build this port
+	@${ECHO_MSG} "You need ${PORTSDIR}/net/libnet to build this port
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} ""#######################################################
 	@${ECHO_MSG} ""
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index 528cdbae4a99..d2960e01692d 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	pixilate
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	winfingerprint
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	winfingerprint
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates packets to match a list of Cisco PIX access lists
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 WRKSRC=		${WRKDIR}/pixilate
 
diff --git a/net-mgmt/scdp/Makefile b/net-mgmt/scdp/Makefile
index 184b20150fe2..e4e2c7d89011 100644
--- a/net-mgmt/scdp/Makefile
+++ b/net-mgmt/scdp/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	scdp
 PORTVERSION=	1.0.b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scdp
@@ -15,7 +15,7 @@ DISTNAME=	scdp-${PORTVERSION:S/.b/b/}
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	"Tool that sends CDP (CISCO Discovery Protocol) Packets"
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 PLIST_FILES=	bin/scdp
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/sing/Makefile b/net-mgmt/sing/Makefile
index cec1da350134..40f633a9e96d 100644
--- a/net-mgmt/sing/Makefile
+++ b/net-mgmt/sing/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sing
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for sending customized ICMP packets
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet \
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--with-libnet-prefix=${LOCALBASE} --with-libpcap-prefix=/usr
diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile
index 461889498e40..37c194ddd444 100644
--- a/net-mgmt/tcpreplay/Makefile
+++ b/net-mgmt/tcpreplay/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tcpreplay
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool to replay saved packet capture files
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel \
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet \
 		${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
 
 GNU_CONFIGURE=	yes
diff --git a/net/4g8/Makefile b/net/4g8/Makefile
index 17661777f894..32152628b774 100644
--- a/net/4g8/Makefile
+++ b/net/4g8/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	4g8
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://forgate.sourceforge.net/downloads/
 EXTRACT_SUFX=	.tgz
@@ -17,7 +18,7 @@ COMMENT=	4g8 is a tool that allows you to capture traffic
 DEPRECATED=	"no longer actively maintained, author suggests ettercap instead"
 EXPIRATION_DATE=	2006-01-12
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/net/Makefile b/net/Makefile
index a4535cf3098f..411c2484ea28 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -276,6 +276,7 @@
     SUBDIR += libmms
     SUBDIR += libnet
     SUBDIR += libnet-devel
+    SUBDIR += libnet10
     SUBDIR += libnetdude
     SUBDIR += libnids
     SUBDIR += libnss-mysql
diff --git a/net/arp-sk/Makefile b/net/arp-sk/Makefile
index cd93c38ef5e2..3b7e8b9bd3bd 100644
--- a/net/arp-sk/Makefile
+++ b/net/arp-sk/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	arp-sk
 PORTVERSION=	0.0.16
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.arp-sk.org/files/
 EXTRACT_SUFX=	.tgz
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool designed to manipulate ARP tables of all kinds of equipment
 
-BUILD_DEPENDS=	${LOCALBASE}/include/libnet/libnet-types.h:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 USE_REINPLACE=	yes
 #USE_GETOPT_LONG=	yes
diff --git a/net/arping/Makefile b/net/arping/Makefile
index 2e0b6d802133..dfc20583f51d 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	arping
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.habets.pp.se/pub/synscan/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ARP level "ping" utility
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 LDFLAGS+=	-lpcap
 
diff --git a/net/arprelease/Makefile b/net/arprelease/Makefile
index e33adbb4050f..71fa99e54495 100644
--- a/net/arprelease/Makefile
+++ b/net/arprelease/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	arprelease
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libnet tool to flush arp cache entries from devices (eg. routers)
 
-BUILD_DEPENDS=	libnet-config:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net/despoof/Makefile b/net/despoof/Makefile
index 3567a48c4983..71be627edc9f 100644
--- a/net/despoof/Makefile
+++ b/net/despoof/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	despoof
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net security
 MASTER_SITES=	http://razor.bindview.com/tools/files/ \
 		${MASTER_SITE_PACKETSTORM}
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Command-line anti-spoofing detection utility
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/despoof ${PREFIX}/bin
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index 0fb6e621ad9e..2193981bc026 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gspoof
 PORTVERSION=	3.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console/GTK+ TCP/IP Packets Forger
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 USE_GNOME=	gnometarget gtk20
 USE_REINPLACE=	yes
diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile
index 118cfb4162ca..99282bfaad90 100644
--- a/net/libnet-devel/Makefile
+++ b/net/libnet-devel/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	libnet
-PORTVERSION=	1.1.2.1
+PORTVERSION=	1.1.3.r1
 CATEGORIES=	net
-MASTER_SITES=	http://voodoo.bawue.com/download/
+MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
 PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r1$//}-RC-01
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C library for creating IP packets (development version)
 
-CONFLICTS=	libnet-1.*
+CONFLICTS=	libnet*-1.*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -23,7 +24,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DOCS=		README doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING \
 		doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \
-		doc/RAWSOCKET_NON_SEQUITUR doc/TODO doc/html/*
+		doc/RAWSOCKET_NON_SEQUITUR doc/TODO
 EXAMPLES=	sample/*.c
 
 post-install:
diff --git a/net/libnet-devel/distinfo b/net/libnet-devel/distinfo
index 10bbe3fca2cd..330babe0b222 100644
--- a/net/libnet-devel/distinfo
+++ b/net/libnet-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (libnet-1.1.2.1.tar.gz) = be845c41170d72c7db524f3411b50256
-SIZE (libnet-1.1.2.1.tar.gz) = 1021236
+MD5 (libnet-1.1.3-RC-01.tar.gz) = 5212616485265e33564bbbb12ab5ccd0
+SIZE (libnet-1.1.3-RC-01.tar.gz) = 1156984
diff --git a/net/libnet-devel/pkg-plist b/net/libnet-devel/pkg-plist
index d34cc252a33a..6fb0e60ec242 100644
--- a/net/libnet-devel/pkg-plist
+++ b/net/libnet-devel/pkg-plist
@@ -7,6 +7,9 @@ include/libnet/libnet-macros.h
 include/libnet/libnet-structures.h
 include/libnet/libnet-types.h
 lib/libnet.a
+lib/libnet.la
+lib/libnet.so
+lib/libnet.so.1
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIB
@@ -18,39 +21,6 @@ lib/libnet.a
 %%PORTDOCS%%%%DOCSDIR%%/RAWSOCKET_NON_SEQUITUR
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/acconfig_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/bpf_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/config_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/files.html
-%%PORTDOCS%%%%DOCSDIR%%/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/getopt_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/gnuc_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/graph_legend.dot
-%%PORTDOCS%%%%DOCSDIR%%/graph_legend.html
-%%PORTDOCS%%%%DOCSDIR%%/ifaddrlist_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/in__systm_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet-asn1_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet-functions_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet-functions_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet-headers_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet-headers_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet-macros_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet-macros_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet-structures_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet-types_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/libnet_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/structlibnet__802__1q__hdr.html
-%%PORTDOCS%%%%DOCSDIR%%/structlibnet__802__1x__hdr.html
-%%EXAMPLESDIR%%/arp-new.c
 %%EXAMPLESDIR%%/arp.c
 %%EXAMPLESDIR%%/bgp4_hdr.c
 %%EXAMPLESDIR%%/bgp4_notification.c
@@ -64,6 +34,7 @@ lib/libnet.a
 %%EXAMPLESDIR%%/fddi_tcp2.c
 %%EXAMPLESDIR%%/get_addr.c
 %%EXAMPLESDIR%%/gre.c
+%%EXAMPLESDIR%%/hsrp.c
 %%EXAMPLESDIR%%/icmp6_echoreq.c
 %%EXAMPLESDIR%%/icmp_echo_cq.c
 %%EXAMPLESDIR%%/icmp_redirect.c
diff --git a/net/libnet/Makefile b/net/libnet/Makefile
index 1e2c60b510bb..f6e2b4fd96bd 100644
--- a/net/libnet/Makefile
+++ b/net/libnet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libnet
-PORTVERSION=	1.0.2a
+PORTVERSION=	1.1.2.1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
@@ -14,28 +14,26 @@ MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
 MAINTAINER=	shipley@dis.org
 COMMENT=	A C library for creating IP packets
 
-CONFLICTS=	libnet-devel-1.1.*
+CONFLICTS=	libnet-devel-1.1.*\
+		libnet10-1.0.*
 
-USE_AUTOCONF_VER=	213
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-WRKSRC=		${WRKDIR}/Libnet-${PORTVERSION}
-MAN3=		libnet.3
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+DOCS=		README doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING \
+		doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \
+		doc/RAWSOCKET_NON_SEQUITUR doc/TODO doc/html/*
+EXAMPLES=	sample/*.c
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3
+	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${PREFIX}/bin
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/libnet
-	@${MKDIR} ${PREFIX}/share/doc/libnet/examples
-	@${MKDIR} ${PREFIX}/share/doc/libnet/ancillary
-.for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README TODO-1.0 TODO-1.1
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet
-.endfor
-.for i in README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets
-	${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${PREFIX}/share/doc/libnet/ancillary
-.endfor
-.for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c
-	${INSTALL_DATA} ${WRKSRC}/example/${i} ${PREFIX}/share/doc/libnet/examples
-.endfor
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/libnet/distinfo b/net/libnet/distinfo
index 9b65812d77a9..10bbe3fca2cd 100644
--- a/net/libnet/distinfo
+++ b/net/libnet/distinfo
@@ -1,2 +1,2 @@
-MD5 (libnet-1.0.2a.tar.gz) = ddf53f0f484184390e8c2a1bd0853667
-SIZE (libnet-1.0.2a.tar.gz) = 140191
+MD5 (libnet-1.1.2.1.tar.gz) = be845c41170d72c7db524f3411b50256
+SIZE (libnet-1.1.2.1.tar.gz) = 1021236
diff --git a/net/libnet/files/patch-aa b/net/libnet/files/patch-aa
deleted file mode 100644
index 57137897cbc7..000000000000
--- a/net/libnet/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in.orig	Wed Jan 17 12:59:30 2001
-+++ configure.in	Mon Jul  2 19:18:50 2001
-@@ -50,10 +50,10 @@
- dnl Use these compiler flags if we have gcc.
- dnl
- if test $ac_cv_prog_gcc = yes; then
--dnl if test -z $CFLAGS; then 
--    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
--    CFLAGS="$CCOPTS"
--dnl fi
-+    if test -z "$CFLAGS"; then 
-+        CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
-+        CFLAGS="$CCOPTS"
-+    fi
- fi
- 
- dnl
-@@ -163,8 +163,9 @@
-     LIB_PREFIX="$prefix/lib/aout"
-     INC_PREFIX="$prefix/include/"
-     BIN_PREFIX="$prefix/bin/"
--    AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \
--required to spoof ethernet frames)
-+dnl etherspoof lkm is horrible and only necesary on < RELENG_4
-+dnl     AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \
-+dnl required to spoof ethernet frames)
-     ln -sf FreeBSD support/bpf-lkm/etherspoof
-     ;;
- 
diff --git a/net/libnet/files/patch-ab b/net/libnet/files/patch-ab
deleted file mode 100644
index 9106f9921b2a..000000000000
--- a/net/libnet/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Mon Feb  5 09:51:41 2001
-+++ Makefile.in	Mon Jul  2 19:41:27 2001
-@@ -96,7 +96,7 @@
- 	$(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
- 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
- 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
--	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
-+#	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
- 	$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
- 	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
- 	rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
-@@ -108,7 +108,7 @@
- 	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
-+#	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
- 	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
- 
- 
diff --git a/net/libnet/files/patch-ac b/net/libnet/files/patch-ac
deleted file mode 100644
index f46b75aa79ca..000000000000
--- a/net/libnet/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/libnet/libnet-functions.h.orig	Fri Jun  7 00:31:29 2002
-+++ include/libnet/libnet-functions.h	Fri Jun  7 00:31:41 2002
-@@ -74,7 +74,7 @@
-     int,                /* severity */
-     char *,             /* error message */
-     ...                 /* varargs */
--    );
-+    ) __printflike(2, 3);
- 
- 
- /*
diff --git a/net/libnet/files/patch-include::libnet.h b/net/libnet/files/patch-include::libnet.h
deleted file mode 100644
index e33a86fa3ecc..000000000000
--- a/net/libnet/files/patch-include::libnet.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/libnet.h.orig	Fri Jul 18 15:11:05 2003
-+++ include/libnet.h	Fri Jul 18 15:12:16 2003
-@@ -84,9 +84,9 @@
- #define LIBNET_VERSION  "1.0.2a"
- 
- #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
--#error "byte order has not been specified, you'll
--need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
--documentation regarding the libnet-config script."
-+#error "byte order has not been specified, you'll"
-+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the"
-+"documentation regarding the libnet-config script."
- #endif
- 
- #endif  /* __LIBNET_H */
diff --git a/net/libnet/pkg-descr b/net/libnet/pkg-descr
index 8d5811f3c0fe..abe227681c3d 100644
--- a/net/libnet/pkg-descr
+++ b/net/libnet/pkg-descr
@@ -1,17 +1,20 @@
-Libnet  A C library for portable packet creation 
+Libnet is a high-level API (toolkit) allowing the application programmer to
+construct and inject network packets. It provides a portable and simplified
+interface for low-level network packet shaping, handling and injection.
 
-domains of sockets and protocols.
-
-A C library for portable packet creation 
-
-Included are also simple example test programs
-
-Libnet is a collection of routines to help with the construction
-and handling of network packets. It provides a portable framework
-for low-level network packet writing and handling.
+Libnet hides much of the tedium of packet creation from the application
+programmer such as multiplexing, buffer management, arcane packet header
+information, byte-ordering, OS-dependent issues, and much more.
 
 Libnet features portable packet creation interfaces at the IP layer
 and link layer, as well as a host of supplementary and complementary
 functionality.
 
-WWW: http://www.packetfactory.net/projects/libnet/
+Using libnet, quick and simple packet assembly applications can be whipped up
+with little effort.  With a bit more time, more complex programs can be written
+(Traceroute and ping were easily rewritten using libnet and libpcap).
+
+Libnet is distrubuted under the BSD license.
+
+Author:	Mike D. Schiffman <mike at infonexus dot com>
+WWW:	http://www.packetfactory.net/projects/libnet/
diff --git a/net/libnet/pkg-plist b/net/libnet/pkg-plist
index 212baac7b536..d34cc252a33a 100644
--- a/net/libnet/pkg-plist
+++ b/net/libnet/pkg-plist
@@ -4,27 +4,96 @@ include/libnet/libnet-asn1.h
 include/libnet/libnet-functions.h
 include/libnet/libnet-headers.h
 include/libnet/libnet-macros.h
-include/libnet/libnet-ospf.h
 include/libnet/libnet-structures.h
+include/libnet/libnet-types.h
 lib/libnet.a
-lib/libpwrite.a
-share/doc/libnet/CHANGELOG
-share/doc/libnet/CHANGELOG-NEWFUNCTIONS
-share/doc/libnet/COPYING
-share/doc/libnet/README
-share/doc/libnet/TODO-1.0
-share/doc/libnet/TODO-1.1
-share/doc/libnet/examples/libnet-example-1.c
-share/doc/libnet/examples/libnet-example-2.c
-share/doc/libnet/examples/libnet-example-3.c
-share/doc/libnet/examples/libnet-example-4.c
-share/doc/libnet/ancillary/README.asn.1
-share/doc/libnet/ancillary/README.bpf
-share/doc/libnet/ancillary/README.legacy-applications
-share/doc/libnet/ancillary/README.libnet-config
-share/doc/libnet/ancillary/README.linux
-share/doc/libnet/ancillary/README.rawsockets
-@dirrm share/doc/libnet/ancillary
-@dirrm share/doc/libnet/examples
-@dirrm share/doc/libnet
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIB
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/DESIGN_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/MIGRATION
+%%PORTDOCS%%%%DOCSDIR%%/PACKET_BUILDING
+%%PORTDOCS%%%%DOCSDIR%%/PORTED
+%%PORTDOCS%%%%DOCSDIR%%/RAWSOCKET_NON_SEQUITUR
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/acconfig_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/bpf_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/config_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/files.html
+%%PORTDOCS%%%%DOCSDIR%%/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/getopt_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/gnuc_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/graph_legend.dot
+%%PORTDOCS%%%%DOCSDIR%%/graph_legend.html
+%%PORTDOCS%%%%DOCSDIR%%/ifaddrlist_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/in__systm_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-asn1_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-functions_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-functions_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-headers_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-headers_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-macros_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-macros_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-structures_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet-types_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/libnet_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/structlibnet__802__1q__hdr.html
+%%PORTDOCS%%%%DOCSDIR%%/structlibnet__802__1x__hdr.html
+%%EXAMPLESDIR%%/arp-new.c
+%%EXAMPLESDIR%%/arp.c
+%%EXAMPLESDIR%%/bgp4_hdr.c
+%%EXAMPLESDIR%%/bgp4_notification.c
+%%EXAMPLESDIR%%/bgp4_open.c
+%%EXAMPLESDIR%%/bgp4_update.c
+%%EXAMPLESDIR%%/cdp.c
+%%EXAMPLESDIR%%/dhcp_discover.c
+%%EXAMPLESDIR%%/dns.c
+%%EXAMPLESDIR%%/dot1x.c
+%%EXAMPLESDIR%%/fddi_tcp1.c
+%%EXAMPLESDIR%%/fddi_tcp2.c
+%%EXAMPLESDIR%%/get_addr.c
+%%EXAMPLESDIR%%/gre.c
+%%EXAMPLESDIR%%/icmp6_echoreq.c
+%%EXAMPLESDIR%%/icmp_echo_cq.c
+%%EXAMPLESDIR%%/icmp_redirect.c
+%%EXAMPLESDIR%%/icmp_timeexceed.c
+%%EXAMPLESDIR%%/icmp_timestamp.c
+%%EXAMPLESDIR%%/icmp_unreach.c
+%%EXAMPLESDIR%%/ieee.c
+%%EXAMPLESDIR%%/ip_link.c
+%%EXAMPLESDIR%%/ip_raw.c
+%%EXAMPLESDIR%%/isl.c
+%%EXAMPLESDIR%%/mpls.c
+%%EXAMPLESDIR%%/ntp.c
+%%EXAMPLESDIR%%/ospf_hello.c
+%%EXAMPLESDIR%%/ospf_lsa.c
+%%EXAMPLESDIR%%/ping_of_death.c
+%%EXAMPLESDIR%%/rpc_tcp.c
+%%EXAMPLESDIR%%/rpc_udp.c
+%%EXAMPLESDIR%%/sebek.c
+%%EXAMPLESDIR%%/smurf.c
+%%EXAMPLESDIR%%/stp.c
+%%EXAMPLESDIR%%/synflood.c
+%%EXAMPLESDIR%%/synflood6.c
+%%EXAMPLESDIR%%/synflood6_frag.c
+%%EXAMPLESDIR%%/tcp1.c
+%%EXAMPLESDIR%%/tcp2.c
+%%EXAMPLESDIR%%/tftp.c
+%%EXAMPLESDIR%%/tring_tcp1.c
+%%EXAMPLESDIR%%/tring_tcp2.c
+%%EXAMPLESDIR%%/udp1.c
+%%EXAMPLESDIR%%/udp2.c
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/libnet
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 1e2c60b510bb..155dd6cfaa68 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -7,14 +7,17 @@
 
 PORTNAME=	libnet
 PORTVERSION=	1.0.2a
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
+PKGNAMESUFFIX=	10
 
 MAINTAINER=	shipley@dis.org
 COMMENT=	A C library for creating IP packets
 
-CONFLICTS=	libnet-devel-1.1.*
+CONFLICTS=	libnet-devel-1.1.*\
+		libnet-1.1.*
 
 USE_AUTOCONF_VER=	213
 
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 174af0c5b456..f4531dc17985 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libnids
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +16,9 @@ MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Network monitoring library with TCP/IP reassembly
 
 .if defined(WITH_LIBNET_DEVEL)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 .else
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 .endif
 
 GNU_CONFIGURE=	yes
diff --git a/net/nast/Makefile b/net/nast/Makefile
index ad9b20a43f16..7196d8774f89 100644
--- a/net/nast/Makefile
+++ b/net/nast/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nast
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.berlios.de/${PORTNAME}/ \
 		http://voodoo.bawue.com/download/
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nast is a packet sniffer
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet-config
 
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index 1919d73230ce..30d67a8cda47 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nemesis
 PORTVERSION=	1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	molter@tin.it
 COMMENT=	Command-line network packet creation and injection suite
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libnet-includes="${LOCALBASE}/include" \
diff --git a/net/netwib/Makefile b/net/netwib/Makefile
index 3ec3a47263f4..2a7d5a4dce8f 100644
--- a/net/netwib/Makefile
+++ b/net/netwib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netwib
 PORTVERSION=	5.30.0
+PORTREVISION=	1
 CATEGORIES=	net devel ipv6
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/netwib/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/netwib/download/v5/ \
@@ -16,7 +17,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_htm
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Netwib network programming library
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index a7e27df9391f..d97aadba8b54 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	olsrd
 PORTVERSION=	0.4.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.olsr.org/releases/0.4/
 
@@ -17,7 +17,7 @@ COMMENT=	OLSR routing daemon
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 .if defined(WITH_MULTI_IF)
-BUILD_DEPENDS+=	libnet-config:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS+=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 .endif
 
 USE_BISON=	yes
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index f296e22cf611..c9498089b520 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libnet
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pylibnet
@@ -19,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module for the libnet packet construction library
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig1.1:${PORTSDIR}/devel/swig11 \
-		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+		libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
diff --git a/net/pynids/Makefile b/net/pynids/Makefile
index 91d505aa6fd1..84ff78016213 100644
--- a/net/pynids/Makefile
+++ b/net/pynids/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pynids
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	http://pilcrow.madison.wi.us/pynids/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ DIST_SUBDIR=	python
 MAINTAINER=	corsmith@gmail.com
 COMMENT=	Python interface to libnids
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile
index 1dd866ec28c5..754d6cca4589 100644
--- a/net/tcptraceroute-devel/Makefile
+++ b/net/tcptraceroute-devel/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	tcptraceroute
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://michael.toren.net/code/tcptraceroute/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A traceroute implementation using TCP packets
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libpwrite.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 MAN8=	tcptraceroute.8
 
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 1dd866ec28c5..754d6cca4589 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	tcptraceroute
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://michael.toren.net/code/tcptraceroute/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A traceroute implementation using TCP packets
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libpwrite.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 MAN8=	tcptraceroute.8
 
diff --git a/net/ttlscan/Makefile b/net/ttlscan/Makefile
index c705bf2fa5b7..3b192bcc0744 100644
--- a/net/ttlscan/Makefile
+++ b/net/ttlscan/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ttlscan
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.wormulon.net/files/ttlscan/
 
@@ -15,7 +16,7 @@ MAINTAINER=	mich@FreeBSD.org
 COMMENT=	A tcp based scanner, showing ttl responses
 
 BUILD_DEPENDS=	${LOCALBASE}/include/dnet.h:${PORTSDIR}/net/libdnet \
-		${LOCALBASE}/include/libnet.h:${PORTSDIR}/net/libnet
+		libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 LDFLAGS+=	-lpcap -ldnet
 
diff --git a/net/xboxproxy/Makefile b/net/xboxproxy/Makefile
index b263b6bc6ad6..a93ef509d8cb 100644
--- a/net/xboxproxy/Makefile
+++ b/net/xboxproxy/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xboxproxy
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.csh.rit.edu/~psionic/projects/xboxproxy/
 DISTNAME=	proxy-${PORTVERSION}
@@ -13,7 +14,7 @@ DISTNAME=	proxy-${PORTVERSION}
 MAINTAINER=	ports@mawer.org
 COMMENT=	A proxy for the XBox system link protocol
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=xbox
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 28f9c03f9a9e..1781c589fe59 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xipdump
 PORTVERSION=	1.5.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.lse.epita.fr/twiki/pub/Projects/XipDump/
 EXTRACT_SUFX=	.tgz
@@ -14,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	Displays ip packets using X window
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 USE_X_PREFIX=	yes
 LIBNET_CONFIG=	${LOCALBASE}/bin/libnet-config
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index fe1f92c6f6b3..118d195e18a8 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	dsniff
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://naughty.monkey.org/~dugsong/dsniff/
 
 MAINTAINER=	kris@FreeBSD.org
 COMMENT=	Various sniffing utilities for penetration testing
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet \
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10 \
 		${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
 
 GNU_CONFIGURE=	yes
diff --git a/security/firewalk/Makefile b/security/firewalk/Makefile
index 39dff95283ea..dd8e73049871 100644
--- a/security/firewalk/Makefile
+++ b/security/firewalk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firewalk
 PORTVERSION=	5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.packetfactory.net/firewalk/dist/
 EXTRACT_SUFX=	.tgz
@@ -16,7 +16,7 @@ MAINTAINER=	onatan@gmail.com
 COMMENT=	A remote firewall auditing tool
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet	\
-		${LOCALBASE}/include/libnet/libnet-types.h:${PORTSDIR}/net/libnet-devel
+ 		libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/Firewalk
diff --git a/security/ipguard/Makefile b/security/ipguard/Makefile
index 82057ab281ba..fa681c7543de 100644
--- a/security/ipguard/Makefile
+++ b/security/ipguard/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	ipguard
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://ipguard.deep.perm.ru/files/
 
 MAINTAINER=	sead@mail.ru
 COMMENT=	Tool designed to protect LAN IP adress space by ARP spoofing
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 MAN8=		ipguard.8
 
diff --git a/security/labrea/Makefile b/security/labrea/Makefile
index dacca6687a0a..883d3e05dab7 100644
--- a/security/labrea/Makefile
+++ b/security/labrea/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	LaBrea
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://freebsd.rogness.net/ports/labrea/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/g}
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	nick@rogness.net
 COMMENT=	Security tarpit defense tool
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/LaBrea ${PREFIX}/bin
diff --git a/security/sasp/Makefile b/security/sasp/Makefile
index 0b32a3e72f29..ebe373c6e3bc 100644
--- a/security/sasp/Makefile
+++ b/security/sasp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sasp
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~ahze/distfiles/
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR=	ahze
 MAINTAINER=	sviat@OpenGEEKS.it
 COMMENT=	A tool that permits to use a gateway whatever IP we have
 
-BUILD_DEPENDS=	 ${LOCALBASE}/include/libnet/libnet-types.h:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	sbin/sasp
diff --git a/security/snort/Makefile b/security/snort/Makefile
index e03ff8c14033..c6197fc24f99 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snort
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.snort.org/dl/current/
 
@@ -41,7 +42,7 @@ DOCS=		RELEASE.NOTES doc/AUTHORS doc/BUGS doc/CREDITS \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FLEXRESP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS+=		libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 CONFIGURE_ARGS+=	--enable-flexresp \
 			--with-libnet-includes=${LOCALBASE}/include \
 			--with-libnet-libraries=${LOCALBASE}/lib
diff --git a/security/snort_inline/Makefile b/security/snort_inline/Makefile
index 5df25f5e2bde..fed2c388280b 100644
--- a/security/snort_inline/Makefile
+++ b/security/snort_inline/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snort_inline
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://freebsd.rogness.net/ports/snort_inline/
 DISTNAME=	snort_inline-2.3.0-RC1
@@ -26,7 +27,7 @@ CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--enable-inline --enable-ipfw
 
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS+=		libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 CONFIGURE_ARGS+=	--with-libnet-includes=${LOCALBASE}/include \
 			--with-libnet-libraries=${LOCALBASE}/lib
 
diff --git a/security/unicornscan/Makefile b/security/unicornscan/Makefile
index 548ef0e817ea..066540de552d 100644
--- a/security/unicornscan/Makefile
+++ b/security/unicornscan/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	unicornscan
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.dyadsecurity.com/unicornscan/
 
 MAINTAINER=	cykyc@yahoo.com
 COMMENT=	Next-generation of udpscan plus a high-speed TCP scanner
 
-BUILD_DEPENDS=	${LOCALBASE}/include/libnet/libnet-types.h:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/security/vida/Makefile b/security/vida/Makefile
index 1d409130bfc9..3e8635cd9308 100644
--- a/security/vida/Makefile
+++ b/security/vida/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	vida
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://vidatapipe.sourceforge.net/
 
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Vida is a multi-datapipe handler
 
-BUILD_DEPENDS=	${LOCALBASE}/include/libnet.h:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
 
 LDFLAGS+=	-pthread -lncurses -lpcap -lnet
 
diff --git a/security/yersinia/Makefile b/security/yersinia/Makefile
index 0414c9b833b5..e41b627832c9 100644
--- a/security/yersinia/Makefile
+++ b/security/yersinia/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yersinia
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,10 +15,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Layer 2 vulnerability scanner (switches, spanning tree, 802.1q ...)
 
+USE_GETOPT_LONG=	yes
+
 .include <bsd.port.pre.mk>
 
-# Dependency on file that is not also installed by libnet (1.0.2) port!
-BUILD_DEPENDS=	${LOCALBASE}/share/examples/libnet/ip_raw.c:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 .if ${OSVERSION} < 500000
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
diff --git a/security/yersinia/files/patch-src-ncurses-gui.c b/security/yersinia/files/patch-src-ncurses-gui.c
new file mode 100644
index 000000000000..0fc407a9964d
--- /dev/null
+++ b/security/yersinia/files/patch-src-ncurses-gui.c
@@ -0,0 +1,15 @@
+--- src/ncurses-gui.c.orig	Mon Nov 14 17:49:42 2005
++++ src/ncurses-gui.c	Mon Nov 14 18:01:48 2005
+@@ -87,6 +87,12 @@
+ #include "ncurses-gui.h"
+ 
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#if __FreeBSD_version < 500037
++#define resize_term resizeterm
++#endif
++#endif
+ 
+ /*
+  * Initialization routines for the GUI
diff --git a/security/zombiezapper/Makefile b/security/zombiezapper/Makefile
index 571ff771e9b1..f0fac0011c24 100644
--- a/security/zombiezapper/Makefile
+++ b/security/zombiezapper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zombiezapper
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://razor.bindview.com/tools/files/
 DISTNAME=	zombie-${PORTVERSION}
@@ -15,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Send a terminate command to Trinoo/TFN/Stacheldracht DDoS agents
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/libnet-config:${PORTSDIR}/net/libnet/
+BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10/
 
 LIBNETCONF=	${LOCALBASE}/bin/libnet-config
 
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 53c306e9de88..d78260cffe2e 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	heartbeat
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://linux-ha.org/download/
 
 MAINTAINER=	scott-ports@tummy.com
 COMMENT=	Subsystem for High-Availability Clustering
 
-BUILD_DEPENDS=	${LOCALBASE}/include/libnet.h:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/heartbeat2/Makefile b/sysutils/heartbeat2/Makefile
index 53c306e9de88..d78260cffe2e 100644
--- a/sysutils/heartbeat2/Makefile
+++ b/sysutils/heartbeat2/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	heartbeat
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://linux-ha.org/download/
 
 MAINTAINER=	scott-ports@tummy.com
 COMMENT=	Subsystem for High-Availability Clustering
 
-BUILD_DEPENDS=	${LOCALBASE}/include/libnet.h:${PORTSDIR}/net/libnet-devel
+BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 
 USE_PERL5=	yes
 USE_GMAKE=	yes