get rid of libgnugetopt dependency for -CURRENT,

use USE_GETOPT_LONG instead.

5 files changed, 36 insertions, 30 deletions

diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index f427cd1dfd07..05ebe1bb238e 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/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-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile
index f427cd1dfd07..05ebe1bb238e 100644
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/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-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index f427cd1dfd07..05ebe1bb238e 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/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-mgmt/netmask/Makefile b/net-mgmt/netmask/Makefile
index 928a39217f46..dc317c750ae9 100644
--- a/net-mgmt/netmask/Makefile
+++ b/net-mgmt/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-mgmt/netsaint/Makefile b/net-mgmt/netsaint/Makefile
index 026e6f2b8433..9a042d807eae 100644
--- a/net-mgmt/netsaint/Makefile
+++ b/net-mgmt/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 \