17 files changed, 38 insertions, 37 deletions

diff --git a/net/arp-sk/Makefile b/net/arp-sk/Makefile
index 57bb930aa827..4d8b0277bb8e 100644
--- a/net/arp-sk/Makefile
+++ b/net/arp-sk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	arp-sk
 PORTVERSION=	0.0.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://sid.rstack.org/arp-sk/files/
 EXTRACT_SUFX=	.tgz
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool designed to manipulate ARP tables of all kinds of equipment
 
-LIB_DEPENDS=	net:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 GNU_CONFIGURE=	yes
 
diff --git a/net/arping/Makefile b/net/arping/Makefile
index feea9734064c..672f36010465 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	arping
 PORTVERSION=	2.14
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.habets.pp.se/synscan/files/
 
@@ -11,7 +12,7 @@ COMMENT=	ARP level "ping" utility
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	net:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include \
diff --git a/net/arprelease/Makefile b/net/arprelease/Makefile
index c0bb2e5d0c4f..3613cbe27927 100644
--- a/net/arprelease/Makefile
+++ b/net/arprelease/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	arprelease
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libnet tool to flush arp cache entries from devices (eg. routers)
 
-LIB_DEPENDS=	net:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net/fonulator/Makefile b/net/fonulator/Makefile
index 7cd6f1dffe0b..01f00d9c99b7 100644
--- a/net/fonulator/Makefile
+++ b/net/fonulator/Makefile
@@ -3,21 +3,22 @@
 
 PORTNAME=	fonulator
 PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net net-mgmt
 MASTER_SITES=	http://support.red-fone.com/fonulator/
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	FoneBRIDGE configuration utility
 
+BUILD_DEPENDS=	${LOCALBASE}/lib/libargtable2.a:${PORTSDIR}/devel/argtable\
+		${LOCALBASE}/lib/libfb.a:${PORTSDIR}/net/libfb
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${LIBNET_CPPFLAGS}
 LDFLAGS+=	${LIBNET_LIBS:N-l*}
 CONFIGURE_ARGS=	--disable-shared
 
-BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet\
-		${LOCALBASE}/lib/libargtable2.a:${PORTSDIR}/devel/argtable\
-		${LOCALBASE}/lib/libfb.a:${PORTSDIR}/net/libfb
 LIBNET_CONFIG=	${LOCALBASE}/bin/libnet11-config
 
 PLIST_FILES=	bin/fonulator \
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index dbde341f3168..fe107c493b86 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gspoof
 PORTVERSION=	3.2
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Gspoof-3/${PORTVERSION}
 
diff --git a/net/libfb/Makefile b/net/libfb/Makefile
index bbf5b716189d..762583cb19dd 100644
--- a/net/libfb/Makefile
+++ b/net/libfb/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	libfb
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net net-mgmt
 MASTER_SITES=	http://support.red-fone.com/downloads/fonulator/
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	FoneBRIDGE configuration library
 
-BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-shared
diff --git a/net/libnet/Makefile b/net/libnet/Makefile
index a940f2243ccd..e97c7669458c 100644
--- a/net/libnet/Makefile
+++ b/net/libnet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libnet
 PORTVERSION=	1.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/libnet-dev
@@ -12,14 +12,12 @@ MASTER_SITE_SUBDIR=	distfiles
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library for creating IP packets
 
-LATEST_LINK=	${PORTNAME}${SHORT_VER}
-
-USE_AUTOTOOLS=	libtool
+USES=		libtool
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CFLAGS+=	-fPIC
 USE_CSTD=	gnu89
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-link-layer=${LIBNET_LINK}
+INSTALL_TARGET=	install-strip
 
 SHORT_VER=	11
 SHORT_NAME=	${PORTNAME}${SHORT_VER}
@@ -60,8 +58,7 @@ post-patch:
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${STAGEDIR}${PREFIX}/bin/${SHORT_NAME}-config
 	@cd ${STAGEDIR}${PREFIX}/lib && \
-		${LN} -sf ${SHORT_NAME}/libnet.so libnet-${PORTVERSION}.so.8 && \
-		${LN} -sf libnet-${PORTVERSION}.so.8 libnet-${PORTVERSION}.so
+		${LN} -sf ${SHORT_NAME}/libnet-${PORTVERSION}.so.1
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
diff --git a/net/libnet/pkg-plist b/net/libnet/pkg-plist
index 1cf0189bd2ea..c0a5480442c3 100644
--- a/net/libnet/pkg-plist
+++ b/net/libnet/pkg-plist
@@ -7,11 +7,10 @@ include/%%SNAME%%/libnet/libnet-macros.h
 include/%%SNAME%%/libnet/libnet-structures.h
 include/%%SNAME%%/libnet/libnet-types.h
 lib/%%SNAME%%/libnet.a
-lib/%%SNAME%%/libnet.la
 lib/%%SNAME%%/libnet.so
-lib/%%SNAME%%/libnet.so.8
-lib/libnet-%%VERSION%%.so
-lib/libnet-%%VERSION%%.so.8
+lib/%%SNAME%%/libnet.so.1
+lib/%%SNAME%%/libnet.so.1.7.0
+lib/libnet-%%VERSION%%.so.1
 man/man3/libnet-functions.h.3.gz
 man/man3/libnet-macros.h.3.gz
 man/man3/libnet.h.3.gz
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 31aaa95ed67e..65a454a1d419 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	libnids
 PORTVERSION=	1.24
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net security
 MASTER_SITES=	SF
 
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT?=	Network monitoring library with TCP/IP reassembly
 
-BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 LICENSE=	GPLv2
 
diff --git a/net/nast/Makefile b/net/nast/Makefile
index d387230f618b..c44c98cec7e4 100644
--- a/net/nast/Makefile
+++ b/net/nast/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nast
 PORTVERSION=	0.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	BERLIOS
 
@@ -13,7 +13,7 @@ COMMENT=	Packet sniffer
 LICENSE=	GPLv2 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	net:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/net/netwib/Makefile b/net/netwib/Makefile
index 4c0e8e7ffce3..2d9c5c4185fd 100644
--- a/net/netwib/Makefile
+++ b/net/netwib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	netwib
 PORTVERSION=	5.38.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/ \
@@ -12,8 +13,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_htm
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwib network programming library
 
-BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 08f9711f6d71..e859231890d8 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	olsrd
 DISTVERSION=	0.6.6.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.olsr.org/releases/0.6/ \
 		http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/
@@ -13,7 +14,7 @@ COMMENT=	OLSR routing daemon
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 .if defined(WITH_MULTI_IF)
-BUILD_DEPENDS+=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+LIB_DEPENDS+=	libnet.so:${PORTSDIR}/net/libnet
 .endif
 
 USES=		bison gmake tar:bzip2
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index bc424a94abe1..589cb2dee275 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libnet
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/net/pynids/Makefile b/net/pynids/Makefile
index c2781772f813..fb48198aa286 100644
--- a/net/pynids/Makefile
+++ b/net/pynids/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pynids
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net python
 MASTER_SITES=	http://jon.oberheide.org/pynids/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/rtpbreak/Makefile b/net/rtpbreak/Makefile
index 6218ac640478..e75245e6faf0 100644
--- a/net/rtpbreak/Makefile
+++ b/net/rtpbreak/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rtpbreak
 PORTVERSION=	1.3a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://dallachiesa.com/code/rtpbreak/
 EXTRACT_SUFX=	.tgz
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	prudhvi-krishna-bsd@surapaneni.in
 COMMENT=	Detects, reconstructs, and analyzes any RTP session
 
-LIB_DEPENDS=	net:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 CFLAGS+=	-I${LOCALBASE}/include/libnet11
 LIBS+=		-L${LOCALBASE}/lib/libnet11 -lpcap -lnet
diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile
index 6b7fd25c4898..164ccd1ed8bd 100644
--- a/net/tcptraceroute-devel/Makefile
+++ b/net/tcptraceroute-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tcptraceroute
 DISTVERSION=	1.5beta7
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://michael.toren.net/code/tcptraceroute/ \
 		http://pflog.net/tcptraceroute/
@@ -11,7 +12,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	josh.carroll@gmail.com
 COMMENT=	Traceroute implementation using TCP packets
 
-BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 CONFLICTS=	tcptraceroute-1.4*
 
diff --git a/net/vortex/Makefile b/net/vortex/Makefile
index ba421eda8ecd..ce0a0e133ac4 100644
--- a/net/vortex/Makefile
+++ b/net/vortex/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	vortex
 DISTVERSION=	2.9.0-59
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	SF/${PORTNAME}-ids/${PORTNAME}/2.9.0/
 EXTRACT_SUFX=	.tgz
@@ -12,7 +13,7 @@ COMMENT=	Network surveillance engine
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids-libnet11 \
-		${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
 
 LIBNET_CONFIG=	${LOCALBASE}/bin/libnet11-config