33 files changed, 1 insertions, 42 deletions

diff --git a/sysutils/cdargs/Makefile b/sysutils/cdargs/Makefile
index c3f5b5da513c..24fe7687755e 100644
--- a/sysutils/cdargs/Makefile
+++ b/sysutils/cdargs/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://www.skamphausen.de/software/cdargs/ \
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Navigate the filesystem using a menu interface or a bookmark system
 
-USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CFLAGS+=	-DHAVE_DECL_GETOPT
diff --git a/sysutils/dcfldd/Makefile b/sysutils/dcfldd/Makefile
index 9d17daa6fde5..e6b5c60d04ae 100644
--- a/sysutils/dcfldd/Makefile
+++ b/sysutils/dcfldd/Makefile
@@ -14,7 +14,6 @@ MASTER_SITE_SUBDIR=	dcfldd
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	An enhanced dd tool with MD5 hashing capability
 
-USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 MAN1=		dcfldd.1
 
diff --git a/sysutils/dd_rescue/Makefile b/sysutils/dd_rescue/Makefile
index 370e329fd773..316eedb00b6d 100644
--- a/sysutils/dd_rescue/Makefile
+++ b/sysutils/dd_rescue/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	http://www.garloff.de/kurt/linux/ddrescue/
 MAINTAINER=	nobutaka@freebsd.org
 COMMENT=	A dd tool suitable for rescuing data from a medium with errors
 
-USE_GETOPT_LONG=yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	default
 
diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile
index 544db295c193..1ae78be5ed01 100644
--- a/sysutils/dmidecode/Makefile
+++ b/sysutils/dmidecode/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A tool for dumping DMI (SMBIOS) contents in human-readable format
 ONLY_FOR_ARCHS=	i386 amd64 ia64
 
 USE_BZIP2=	yes
-USE_GETOPT_LONG=	yes
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" DOCSDIR="${DOCSDIR}"
 
 PORTDOCS=	AUTHORS CHANGELOG README
diff --git a/sysutils/dvdtape/Makefile b/sysutils/dvdtape/Makefile
index bb311a70d361..8a3190e685aa 100644
--- a/sysutils/dvdtape/Makefile
+++ b/sysutils/dvdtape/Makefile
@@ -15,7 +15,6 @@ MASTER_SITES=	ftp://ftp.Awfulhak.org/pub/dvdtape/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create DVD master filesystems on DLT media
 
-USE_GETOPT_LONG=	yes
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		dvdtape.1
diff --git a/sysutils/ecore-config/Makefile b/sysutils/ecore-config/Makefile
index b45888a8ffca..c959b783e70e 100644
--- a/sysutils/ecore-config/Makefile
+++ b/sysutils/ecore-config/Makefile
@@ -21,7 +21,6 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_LDCONFIG=	yes
-USE_GETOPT_LONG=yes
 USE_EFL=	ecore eet evas
 USE_EFL_ECORE=	ipc con
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_config
diff --git a/sysutils/ghasher/Makefile b/sysutils/ghasher/Makefile
index 216b122ef57b..fb58fdc8fa94 100644
--- a/sysutils/ghasher/Makefile
+++ b/sysutils/ghasher/Makefile
@@ -24,10 +24,4 @@ PLIST_FILES=	bin/ghasher
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ghasher ${PREFIX}/bin
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500040
-USE_GETOPT_LONG=yes
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 6d9ec981b999..c843999e2311 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20 pkgconfig gnomeprefix gnomehack gconf2 intlhack
 GNU_CONFIGURE=	yes
-USE_GETOPT_LONG=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/hoz/Makefile b/sysutils/hoz/Makefile
index 710c0811ff50..f18e69bb8604 100644
--- a/sysutils/hoz/Makefile
+++ b/sysutils/hoz/Makefile
@@ -19,7 +19,6 @@ COMMENT=	File splitter, GTK and CLI versions
 USE_GNOME=	#
 USE_GMAKE=	yes
 
-USE_GETOPT_LONG=yes
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	README
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index e09983c8861b..4443ea38f030 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -20,7 +20,6 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_AUTOTOOLS=	autoconf:261 automake:19 aclocal:19
 USE_GCC=	3.2+
 GNU_CONFIGURE=	yes
-USE_GETOPT_LONG=yes
 USE_RC_SUBR=	LCDd lcdproc
 
 CONFIGURE_ARGS=	--enable-drivers="${LCDPROC_DRIVERS}" \
diff --git a/sysutils/logtool-devel/Makefile b/sysutils/logtool-devel/Makefile
index e04c2a547b04..1619aa5660cf 100644
--- a/sysutils/logtool-devel/Makefile
+++ b/sysutils/logtool-devel/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Parse ASCII logfiles into ANSI, CSV, HTML formats
 CONFLICTS=	logtool-1.2*
 
 USE_GMAKE=	yes
-USE_GETOPT_LONG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile
index 8888fd4ea479..8e9ada1cbcd4 100644
--- a/sysutils/logtool/Makefile
+++ b/sysutils/logtool/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Parse ASCII logfiles into ANSI, CSV, HTML formats
 
 USE_GMAKE=	yes
-USE_GETOPT_LONG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
diff --git a/sysutils/memfetch/Makefile b/sysutils/memfetch/Makefile
index c83b7e226fcc..e0517feb07fb 100644
--- a/sysutils/memfetch/Makefile
+++ b/sysutils/memfetch/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Utility to dump process memory
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PERL5_RUN=	yes
 
-USE_GETOPT_LONG=yes
 CFLAGS+=	${CPPFLAGS}
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
diff --git a/sysutils/npadmin/Makefile b/sysutils/npadmin/Makefile
index 29bf1a96eeb9..2577d8fc9aea 100644
--- a/sysutils/npadmin/Makefile
+++ b/sysutils/npadmin/Makefile
@@ -18,7 +18,6 @@ COMMENT=	An SNMP based command line network printer management tool
 MAN1=		npadmin.1
 PLIST_FILES=	bin/npadmin
 
-USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 
 pre-patch:
diff --git a/sysutils/pax-utils/Makefile b/sysutils/pax-utils/Makefile
index f217f91fefce..f9e1def7f7b1 100644
--- a/sysutils/pax-utils/Makefile
+++ b/sysutils/pax-utils/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Various ELF related utils for ELF32, ELF64 binaries
 
 USE_BZIP2=	true
 USE_GMAKE=	true
-USE_GETOPT_LONG=true
 USE_GCC=	3.4+
 
 PLIST_FILES=	bin/dumpelf bin/pspax bin/scanelf
diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index d033b8615fef..63a63033abcc 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -16,7 +16,6 @@ COMMENT=	PowerMan is a tool for doing remote power control
 
 USE_BISON=	build
 USE_GMAKE=	yes
-USE_GETOPT_LONG=yes
 USE_RC_SUBR=	yes
 
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile
index 4db0e399d0d3..6d11963d8e10 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/sysutils/progsreiserfs/Makefile
@@ -15,7 +15,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities and library to manipulate ReiserFS partitions
 
-USE_GETOPT_LONG=yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 7258657f2d86..983fd265a45a 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-nls
 USE_GMAKE=	yes
-USE_GETOPT_LONG=yes
 
 CONFLICTS=	pstree-2.* \
 		pidof-*
diff --git a/sysutils/pwgen/Makefile b/sysutils/pwgen/Makefile
index d39d8e0c05c2..14859675eb2b 100644
--- a/sysutils/pwgen/Makefile
+++ b/sysutils/pwgen/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES=	http://www.tricknology.org/ports/
 MAINTAINER=	oddbjorn@tricknology.org
 COMMENT=	A simple password generator
 
-USE_GETOPT_LONG=yes
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-1
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
diff --git a/sysutils/pwgen2/Makefile b/sysutils/pwgen2/Makefile
index 4c34b302d5c4..6a7a22cb91dd 100644
--- a/sysutils/pwgen2/Makefile
+++ b/sysutils/pwgen2/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	andrey@hm.perm.ru
 COMMENT=	A small, powerful, GPL'ed password generator
 
 GNU_CONFIGURE=	yes
-USE_GETOPT_LONG=yes
 USE_PERL5_BUILD=yes
 
 CONFLICTS=	pwgen-1*
diff --git a/sysutils/radeontool/Makefile b/sysutils/radeontool/Makefile
index 4c20df0fb043..4f2d900dbdbb 100644
--- a/sysutils/radeontool/Makefile
+++ b/sysutils/radeontool/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	http://fdd.com/software/radeon/
 MAINTAINER=	takawata@jp.freebsd.org
 COMMENT=	ATI Radeon video card contoroling tool useful for laptops
 
-USE_GETOPT_LONG=YES
-
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/sysutils/rename/Makefile b/sysutils/rename/Makefile
index 57f8f5187783..849554dfc85f 100644
--- a/sysutils/rename/Makefile
+++ b/sysutils/rename/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Rename multiple files using regular expressions
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GETOPT_LONG=yes
 
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		rename.1
diff --git a/sysutils/scanbuttond/Makefile b/sysutils/scanbuttond/Makefile
index 8b9be58d418a..01e91c9ecae2 100644
--- a/sysutils/scanbuttond/Makefile
+++ b/sysutils/scanbuttond/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A daemon to monitor and configure modern scanner's buttons
 LIB_DEPENDS=	usb-0.1.8:${PORTSDIR}/devel/libusb
 
 USE_GCC=	3.3+
-USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index 6408afc4345f..07e00d3fd540 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -19,7 +19,6 @@ COMMENT=	S-Lang System Monitor
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		slang.1:${PORTSDIR}/devel/libslang
 
-USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/tmpwatch/Makefile b/sysutils/tmpwatch/Makefile
index 15d160d6368a..2f83c67e6a39 100644
--- a/sysutils/tmpwatch/Makefile
+++ b/sysutils/tmpwatch/Makefile
@@ -17,8 +17,6 @@ COMMENT=	A utility for removing files based on when they were last accessed
 
 EXTRACT_DEPENDS=rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
-USE_GETOPT_LONG=yes
-
 CFLAGS+=	${CPPFLAGS} -DVERSION=\"${PORTVERSION}\"
 MAN8=		tmpwatch.8
 PLIST_FILES=	sbin/tmpwatch
diff --git a/sysutils/tss/Makefile b/sysutils/tss/Makefile
index a8f9e9557327..5d2f7a571e18 100644
--- a/sysutils/tss/Makefile
+++ b/sysutils/tss/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	http://www.pulia.nu/tss/src/
 MAINTAINER=	peter@pean.org
 COMMENT=	Terminal ScreenSaver that allows you to lock you terminal
 
-USE_GETOPT_LONG=yes
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index c591a29c7ec8..ba9dca94d4da 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Decrypts and copies DVD .vob files
 LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 USE_BZIP2=	yes
-USE_GETOPT_LONG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.sh
 CONFIGURE_ARGS=	--with-lfs
diff --git a/sysutils/wmfsm/Makefile b/sysutils/wmfsm/Makefile
index 6fcec7af9679..5ad949c7f535 100644
--- a/sysutils/wmfsm/Makefile
+++ b/sysutils/wmfsm/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Displays filesystem usage of mountpoints in a nice WindowMaker dockapp
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/sysutils/wmmount/Makefile b/sysutils/wmmount/Makefile
index d493fe294601..fef9d9ada9f1 100644
--- a/sysutils/wmmount/Makefile
+++ b/sysutils/wmmount/Makefile
@@ -16,7 +16,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The freespace for Window Maker
 
-USE_GETOPT_LONG=yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/sysutils/xin/Makefile b/sysutils/xin/Makefile
index 49d5a86b0050..1d93b59b43c6 100644
--- a/sysutils/xin/Makefile
+++ b/sysutils/xin/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	utils/file
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Splits standard input and pipes into a command
 
-USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 MAN1=		xin.1
 PLIST_FILES=	bin/xin
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 826e8eb1151c..22608e45b333 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Quick & easy monitoring of logfiles and devices
 
 USE_GCC=	3.4+
 USE_GNOME=	gtk12 gnometarget
-USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 47db010b8c49..551e60ae13f2 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -32,7 +32,6 @@ CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
 			MAKE="${GMAKE}"
 CONFIGURE_ARGS=		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib	\
 			-with-forced-embedded-ffmpeg	# To be removed after ffmpeg-devel's upgrade
-USE_GETOPT_LONG=	yes
 
 USE_GMAKE=		yes	# To be removed after ffmpeg-devel's upgrade
 USE_GNOME=		glib20 libglade2
diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile
index c0ce879e20df..55ff5204dc8f 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -18,7 +18,6 @@ PORTDOCS=	CHANGES COPYING INSTALL MRULES README
 USE_AUTOTOOLS=	autoconf:261
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 
 MAKE_ARGS+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"