Use USE_GETOPT_LONG.

PR:		51387, 51383, 51380, 51388, 51384, 51372, 51373,
		51381, 51382
Submitted by:	Ports Fury

10 files changed, 11 insertions, 58 deletions

diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index be90a412b785..3b1dcb09f492 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -14,17 +14,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for measuring webserver performance
 
 USE_OPENSSL=	yes
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		httperf.1
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index 32ad7edda654..1c84f4c6b515 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 CONFIGURE_WRKSRC=	${WRKSRC}/mixkit/build
 BUILD_WRKSRC=	${WRKSRC}/mixkit/src
 
+USE_GETOPT_LONG=	yes
 USE_MESA=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
@@ -38,11 +39,6 @@ LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	-DMIX_ANSI_IOSTREAMS -fpermissive
 .endif
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+=	-lgnugetopt
-.endif
-
 post-extract:
 	@${RM} -f ${WRKSRC}/mixkit/src/getopt.h
 
diff --git a/graphics/qtutils/Makefile b/graphics/qtutils/Makefile
index ebdff61c3a84..e388d71a4a8e 100644
--- a/graphics/qtutils/Makefile
+++ b/graphics/qtutils/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_GNOME=	glib12
+USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -31,11 +32,6 @@ MAN1=	qtconv.1 qtsg.1 qtsplit.1
 CPPFLAGS=	-I${LOCALBASE}/include `${GLIB_CONFIG} --cflags gthread`
 LDFLAGS=	-L${LOCALBASE}/lib `${GLIB_CONFIG} --libs gthread`
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+=	-lgnugetopt
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-g -Wall|@CFLAGS@|g ; \
 		 s|-lglib||g ; \
diff --git a/misc/goldstr/Makefile b/misc/goldstr/Makefile
index c70aac454ddc..baa4cde4f568 100644
--- a/misc/goldstr/Makefile
+++ b/misc/goldstr/Makefile
@@ -14,15 +14,9 @@ MASTER_SITES=	http://it.geocities.com/andreamolteni/prog/goldstr/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compute the golden string
 
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=	goldstr.1
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
-.endif
-
 .include <bsd.port.mk>
diff --git a/multimedia/recmpeg/Makefile b/multimedia/recmpeg/Makefile
index 1601368d1972..be1b1712c733 100644
--- a/multimedia/recmpeg/Makefile
+++ b/multimedia/recmpeg/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A simple video encoder
 
 LIB_DEPENDS=	fame-0.9.0:${PORTSDIR}/multimedia/libfame
 
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
@@ -25,9 +26,4 @@ MAN1=	recmpeg.1
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+=	-lgnugetopt
-.endif
-
 .include <bsd.port.mk>
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 2b5f0b048941..a6b0fa65e7d9 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -24,6 +24,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 
 GUILE_CONFIG?=	${LOCALBASE}/bin/guile-config
 
+USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -35,10 +36,4 @@ MAN1=	serveez.1
 CPPFLAGS=	`${GUILE_CONFIG} compile`
 LDFLAGS=	`${GUILE_CONFIG} link`
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
-.endif
-
 .include <bsd.port.mk>
diff --git a/print/catdvi/Makefile b/print/catdvi/Makefile
index 63b251bd7cd5..a5de48882533 100644
--- a/print/catdvi/Makefile
+++ b/print/catdvi/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A DVI to text/plain translator
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX
 
+USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -28,11 +29,6 @@ MAN1=	catdvi.1
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+=	-lgnugetopt
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/catdvi ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/catdvi.1 ${MANPREFIX}/man/man1
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index f307df4608e1..87935e27bfdd 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -17,16 +17,12 @@ COMMENT=	Convert PNM images to PPA for some HP printers
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu \
 		enscript:${PORTSDIR}/print/enscript-letter
 
+USE_GETOPT_LONG=	yes
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"	
+CFLAGS+=	${CPPFLAGS}
 
 MAN1=		pnm2ppa.1
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
-.endif
-
 post-patch:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
 		${WRKSRC}/pnm2ppa.conf > ${WRKSRC}/pnm2ppa.conf.sample
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 82b08cd949c7..69d5182dd2b4 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Commandline client for DAV
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2 \
 		neon.23:${PORTSDIR}/www/neon
 
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -28,11 +29,6 @@ MAN1=	cadaver.1
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+=	-lgnugetopt
-.endif
-
 .if !defined(WITHOUT_OPENSSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-ssl --with-force-ssl
diff --git a/www/httperf/Makefile b/www/httperf/Makefile
index be90a412b785..3b1dcb09f492 100644
--- a/www/httperf/Makefile
+++ b/www/httperf/Makefile
@@ -14,17 +14,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for measuring webserver performance
 
 USE_OPENSSL=	yes
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		httperf.1
 
-.if !exists(/usr/include/getopt.h)
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}