get rid of libgnugetopt dependency for -CURRENT,

use USE_GETOPT_LONG instead.

7 files changed, 36 insertions, 38 deletions

diff --git a/net/nagios/Makefile b/net/nagios/Makefile
index f427cd1dfd07..05ebe1bb238e 100644
--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -15,17 +16,20 @@ MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
 .if defined(WITH_GD2)
-LIB_DEPENDS=    gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 .else
 LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
 .endif
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
+USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${INCGD} -I${LOCALBASE}/include" \
-		CFLAGS="${CFLAGS} ${INCGD} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${LIBGD} -lgnugetopt"
+
+CPPFLAGS=	${INCGD} -I${LOCALBASE}/include
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CFLAGS="${CFLAGS} ${INCGD}" \
+		LIBS="-L${LOCALBASE}/lib ${LIBGD}"
 CONFIGURE_ARGS=	--with-command-user=nagios \
 		--with-command-grp=www \
 		--with-nagios-user=nagios \
diff --git a/net/nc/Makefile b/net/nc/Makefile
index d34731024eb8..d0b7b47fa517 100644
--- a/net/nc/Makefile
+++ b/net/nc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nc
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/file
@@ -15,11 +16,8 @@ DISTNAME=	ncat-${PORTVERSION}
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	Network aware cat
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 MAN1=		ncat.1
 
 .include <bsd.port.mk>
diff --git a/net/netmask/Makefile b/net/netmask/Makefile
index 928a39217f46..dc317c750ae9 100644
--- a/net/netmask/Makefile
+++ b/net/netmask/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	netmask
 PORTVERSION=	2.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	dists/potato/main/source/net
@@ -15,17 +15,10 @@ MAINTAINER=	mike@urgle.com
 COMMENT=	Tool for generating terse netmasks in several common formats
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
+USE_GETOPT_LONG=yes
 USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
 
 MAN1=		netmask.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/netsaint/Makefile b/net/netsaint/Makefile
index 026e6f2b8433..9a042d807eae 100644
--- a/net/netsaint/Makefile
+++ b/net/netsaint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netsaint
 PORTVERSION=	0.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
@@ -18,15 +18,16 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins
 
+USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgd -lgnugetopt"
+		LIBS="-L${LOCALBASE}/lib -lgd"
 CONFIGURE_ARGS=	--with-command-user=netsaint \
 		--with-command-grp=www \
 		--with-netsaint-user=netsaint \
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 738934c3f02e..4024b30bd63e 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ntop
 PORTVERSION=	2.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,8 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgdc.a:${PORTSDIR}/graphics/gdchart
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt \
-		gdbm:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	yes
@@ -27,13 +26,14 @@ IS_INTERACTIVE=	yes
 DBDIR?=		/var/db
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
+USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	DBDIR=${DBDIR}
-CONFIGURE_ENV=	LIBS="-lcrypto -L${LOCALBASE}/lib -lgnugetopt"
+CONFIGURE_ENV=	LIBS="-lcrypto -L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=${DBDIR} \
 		--with-ossl-root=${OPENSSLBASE} \
diff --git a/net/pptpclient/Makefile b/net/pptpclient/Makefile
index 528089639a09..cd21d9023f68 100644
--- a/net/pptpclient/Makefile
+++ b/net/pptpclient/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		pptpclient
 PORTVERSION=		1.1.0
+PORTREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pptpclient
@@ -16,12 +17,15 @@ DISTFILES=		pptp-linux-1.1.0-1.tar.gz
 MAINTAINER=	thomas@cuivre.fr.eu.org
 COMMENT=	PPTP client for establishing a VPN link with an NT server
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
 
-MAKE_ARGS=	DEBUG="" \
-		INCLUDE="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgnugetopt" \
-		all
+.include <bsd.port.pre.mk>
+
+MAKE_ARGS=	DEBUG=""
+.if ${OSVERSION} < 500041
+MAKE_ARGS+=	INCLUDE="${CPPFLAGS}" \
+		LIBS="${LDFLAGS}"
+.endif
 
 GUNZIP_CMD=		${GZIP_CMD} ${EXTRACT_BEFORE_ARGS}
 
@@ -39,4 +43,4 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/pptpclient
 	${INSTALL_DATA} ${FILESDIR}/ppp.conf ${PREFIX}/share/examples/pptpclient
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/rfbproxy/Makefile b/net/rfbproxy/Makefile
index 4cc0cb01c4aa..b869456e5ca4 100644
--- a/net/rfbproxy/Makefile
+++ b/net/rfbproxy/Makefile
@@ -8,18 +8,16 @@
 
 PORTNAME=	rfbproxy
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://cyberelk.net/tim/data/rfbproxy/stable/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple tool for recording VNC sessions
 
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
 
 MAN1=	rfbproxy.1