56 files changed, 56 insertions, 77 deletions

diff --git a/net/appkonference/Makefile b/net/appkonference/Makefile
index 04c1b20fd5bb..829d4e956734 100644
--- a/net/appkonference/Makefile
+++ b/net/appkonference/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 
 USE_CSTD=	gnu89
-USE_GMAKE=	yes
+USES=		gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}/konference
 
 PLIST_FILES=	lib/asterisk/modules/app_konference.so
diff --git a/net/asio/Makefile b/net/asio/Makefile
index d3a9b0873b31..071e1a05b6a1 100644
--- a/net/asio/Makefile
+++ b/net/asio/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Cross-platform C++ library for network and low-level I/O programming
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE}/include
 
diff --git a/net/bcusdk-eibd/Makefile b/net/bcusdk-eibd/Makefile
index 9f7e19cc9aa3..81cb6866039c 100644
--- a/net/bcusdk-eibd/Makefile
+++ b/net/bcusdk-eibd/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	pthsem.20:${PORTSDIR}/devel/pthsem
 BUILD_DEPENDS=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 CONFIGURE_ARGS+=--enable-onlyeibd \
 		--disable-usb \
 		--enable-eibnetip \
diff --git a/net/bittwist/Makefile b/net/bittwist/Makefile
index 878ed339fbf7..b7db20a73348 100644
--- a/net/bittwist/Makefile
+++ b/net/bittwist/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Libpcap-based Ethernet packet generator, with PCAP editor
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE=	yes
+USES=		gmake
 
 MAN1=		bittwist.1 bittwistb.1 bittwiste.1
 PLIST_FILES=	bin/bittwist bin/bittwistb bin/bittwiste
diff --git a/net/c3270/Makefile b/net/c3270/Makefile
index 17b65fb7d28f..639a6e1e0113 100644
--- a/net/c3270/Makefile
+++ b/net/c3270/Makefile
@@ -15,10 +15,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
 # Conflict due to x3270if
 CONFLICTS=	x3270-*
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-
-USES=		iconv readline
+USES=		iconv readline gmake
 USE_OPENSSL=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/click/Makefile b/net/click/Makefile
index 77d5d403a8f6..45f3a6d827d7 100644
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -11,10 +11,9 @@ MASTER_SITES=	http://www.read.cs.ucla.edu/click/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Click Modular Router
 
-USES=		perl5
+USES=		perl5 gmake
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 
 INC_BASE?=	/usr/include
 
diff --git a/net/cnet/Makefile b/net/cnet/Makefile
index c62d978853f8..494efe38d56a 100644
--- a/net/cnet/Makefile
+++ b/net/cnet/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A networking simulator
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 USE_XORG=	xpm
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	# empty
 MAN1=		cnet.1
 
diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index 3f3653abbf01..f64ed6c1e837 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	lwp.2:${PORTSDIR}/devel/lwp \
 		rpc2.9:${PORTSDIR}/devel/rpc2 \
 		rvmlwp.3:${PORTSDIR}/devel/rvm
 
-USES=		pkgconfig
-USE_GMAKE=	yes
+USES=		pkgconfig gmake
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--enable-${CODA_SUITE}
diff --git a/net/cvsync/Makefile b/net/cvsync/Makefile
index 706f17716f3f..2ec3ef013775 100644
--- a/net/cvsync/Makefile
+++ b/net/cvsync/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A portable CVS repository synchronization utility
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/doc/COPYRIGHT
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_RC_SUBR=	cvsyncd
 USE_OPENSSL=	yes
 
diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile
index 907ff56d2db5..8cd464a5755e 100644
--- a/net/freeswitch-core-devel/Makefile
+++ b/net/freeswitch-core-devel/Makefile
@@ -43,9 +43,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 
 USE_PERL5=	build
-USES=		bison:both pkgconfig perl5
+USES=		bison:both pkgconfig perl5 gmake
 USE_GCC=	any
-USE_GMAKE=	yes
 SUB_FILES=	pkg-install
 USE_RC_SUBR=	freeswitch
 HAS_CONFIGURE=	yes
diff --git a/net/gogoc/Makefile b/net/gogoc/Makefile
index 33f4fb911809..bb7dd01643ae 100644
--- a/net/gogoc/Makefile
+++ b/net/gogoc/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	gogoc-1_2-RELEASE
 MAINTAINER=	kami@k5-storitve.net
 COMMENT=	GogoCLIENT, connect to Freenet6 tunnel
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_RC_SUBR=	gogoc
 USE_OPENSSL=	yes
 
diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index 72ff2883bcbe..90c311b9e6ef 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	Gopher client for access to a distributed document service
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index 12983077286d..33c6eb07d9aa 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Console/GTK+ TCP/IP Packets Forger
 LIB_DEPENDS=	net:${PORTSDIR}/net/libnet
 
 USE_GNOME=	gtk20
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USES=		gmake
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 
diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile
index 48b6ee5fb557..ae4702eb09ce 100644
--- a/net/gutenfetch/Makefile
+++ b/net/gutenfetch/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS=	gutenfetch:${PORTSDIR}/devel/libgutenfetch
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-USE_GMAKE=	yes
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 
 MAN1=		gutenfetch.1
 PLIST_FILES=	bin/gutenfetch
diff --git a/net/hping-devel/Makefile b/net/hping-devel/Makefile
index d221835c64fd..85c69c6c5074 100644
--- a/net/hping-devel/Makefile
+++ b/net/hping-devel/Makefile
@@ -17,7 +17,7 @@ NO_LATEST_LINK=	yes
 CONFLICTS=	hping-[0-9]*
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 PLIST_DIRS+=	lib/hping
 PLIST_FILES=	sbin/hping lib/hping/hpingstdlib.htcl
diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile
index 1adec84a731e..e320d49fc571 100644
--- a/net/igmpproxy/Makefile
+++ b/net/igmpproxy/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Multicast forwarding IGMP proxy
 HOMEPAGE=	http://igmpproxy.sourceforge.net/
 
 USE_RC_SUBR=	igmpproxy
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 18a55667eb79..764b636f0fd4 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/ojnk/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	TCP/IP traffic logging tool
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index fe184bec3031..b4f9957aff51 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -13,8 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=An improved WHOIS client capable of selecting server to query
 
 GNU_CONFIGURE=	yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake
 CPPFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/var/jwhois
diff --git a/net/l4ip/Makefile b/net/l4ip/Makefile
index 4da7c1731c60..aec859c491d9 100644
--- a/net/l4ip/Makefile
+++ b/net/l4ip/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	L4 health check daemon for IPFILTER
 
-USE_GMAKE=	yes
+USES=		gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
 NO_STAGE=	yes
diff --git a/net/libopennet/Makefile b/net/libopennet/Makefile
index 2c79d73b1f76..a5976a48a303 100644
--- a/net/libopennet/Makefile
+++ b/net/libopennet/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A library for opening files over a network
 
 GNU_CONFIGURE=	yes
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 
 MAN3=		fopen_net.3 \
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index eaca38fcd5a0..38d41bcd9738 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -10,8 +10,7 @@ MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Ubiquitous network traffic capture library
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		bison
+USES=		bison gmake
 USE_LDCONFIG=	yes
 
 .if defined(LIBPCAP_OVERWRITE_BASE)
diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index 30224ef882b2..c4fa92c3935e 100644
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Linux UPnP Internet Gateway Device
 LIB_DEPENDS=	upnp.9:${PORTSDIR}/devel/upnp
 
 USE_RC_SUBR=	linuxigd
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 
 MAN8=		upnpd.8
diff --git a/net/mgen/Makefile b/net/mgen/Makefile
index d7016efecf96..eed92640c8e3 100644
--- a/net/mgen/Makefile
+++ b/net/mgen/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An IP network performance tests and measurements
 ONLY_FOR_ARCHS=	i386
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_GMAKE=	yes
+USES=		gmake
 
 PLIST_FILES=	bin/mgen
 PORTDOCS=	README.TXT VERSION.TXT mgen.html example.mgn
diff --git a/net/mknbi/Makefile b/net/mknbi/Makefile
index 20046c0d0a57..2db113dba926 100644
--- a/net/mknbi/Makefile
+++ b/net/mknbi/Makefile
@@ -20,8 +20,7 @@ MLINKS+=	mknbi.1 ${i}
 
 PORTDOCS=	COPYING README LOG spec.txt
 
-USES=		perl5
-USE_GMAKE=	yes
+USES=		perl5 gmake
 ONLY_FOR_ARCHS=	i386
 
 NO_STAGE=	yes
diff --git a/net/mmucl/Makefile b/net/mmucl/Makefile
index 67154660db27..082aaab932b3 100644
--- a/net/mmucl/Makefile
+++ b/net/mmucl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Powerful GUI MUD client written in TCL
 LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ARGS=	BASE_DIR=${PREFIX} TCLSH=tclsh8.4 INFO_DIR=${PREFIX}/info \
 		INSTALL_INFO=/usr/bin/install-info
 INFO=		mmucl
diff --git a/net/mrouted/Makefile b/net/mrouted/Makefile
index ad22d1bf492c..6e862ab92b68 100644
--- a/net/mrouted/Makefile
+++ b/net/mrouted/Makefile
@@ -14,8 +14,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_RC_SUBR=	mrouted
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 MAKE_ARGS=	sysconfdir=${PREFIX}/etc \
 		mandir=${MAN8PREFIX}/man/man8
 PORTDOCS=	README AUTHORS ChangeLog
diff --git a/net/nepim/Makefile b/net/nepim/Makefile
index eef738158cff..7cc1347cfb3e 100644
--- a/net/nepim/Makefile
+++ b/net/nepim/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool for measuring available bandwidth between hosts
 
 LIB_DEPENDS=	oop.4:${PORTSDIR}/devel/liboop
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	default
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index d58d44b4c123..c3ae6bde85e0 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -21,10 +21,10 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 
 DBDIR?=		/var/db
 
+USES=		gmake
 USE_AUTOTOOLS=	libtool automake autoconf
 USE_GNOME=	libxml2
 USE_PYTHON=	yes
-USE_GMAKE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index d9071c003013..58982e50077a 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -16,10 +16,7 @@ BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 BUILD_DEPENDS+=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
 .endif
 
-USE_BZIP2=	yes
-USES=		bison
-USE_GMAKE=	yes
-
+USES=		bison gmake tar:bzip2
 USE_RC_SUBR=	olsrd
 MAN8=		olsrd.8
 MAN5=		olsrd.conf.5
diff --git a/net/openam/Makefile b/net/openam/Makefile
index 1ebdafd7ced9..9a2cf54573f7 100644
--- a/net/openam/Makefile
+++ b/net/openam/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	optshared
 MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
diff --git a/net/openmcu/Makefile b/net/openmcu/Makefile
index 235b34fb61a3..afc4a3b60aa5 100644
--- a/net/openmcu/Makefile
+++ b/net/openmcu/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
-USES=		bison
-USE_GMAKE=	yes
+USES=		bison gmake
 ALL_TARGET=	optshared
 MAKE_ENV=	PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
diff --git a/net/opennx/Makefile b/net/opennx/Makefile
index 6880b36c0434..fae550b2390f 100644
--- a/net/opennx/Makefile
+++ b/net/opennx/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.16
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_XORG=	xmu
 USE_WX=		2.8+
 WX_UNICODE=	yes
diff --git a/net/openser/Makefile b/net/openser/Makefile
index 11f8a431f368..8846a1e5de4a 100644
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	radiusclient-ng.2:${PORTSDIR}/net/radiusclient
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-tls
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_GNOME=	libxml2
 MAKE_ENV=	CC_EXTRA_OPTS="${CFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
index 86592a5b48f3..248925c2c41a 100644
--- a/net/proxy-suite/Makefile
+++ b/net/proxy-suite/Makefile
@@ -12,8 +12,7 @@ COMMENT=	The SuSE Proxy-Suite, a set of programs to enhance firewall security
 LICENSE=	GPLv2
 
 USE_AUTOTOOLS=	autoconf
-USE_GMAKE=	yes
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 
 #
 # basic configure args
diff --git a/net/proxychains/Makefile b/net/proxychains/Makefile
index f0929ba674be..e9184cb4a428 100644
--- a/net/proxychains/Makefile
+++ b/net/proxychains/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Redirect connection through proxy servers
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 
 NO_STAGE=	yes
diff --git a/net/ptunnel/Makefile b/net/ptunnel/Makefile
index 727c60a26f0e..56efb93a20d3 100644
--- a/net/ptunnel/Makefile
+++ b/net/ptunnel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tunneling TCP connections over ICMP echo request and reply
 LICENSE=	BSD3CLAUSE
 
 WRKSRC=		${WRKDIR}/PingTunnel
-USE_GMAKE=	yes
+USES=		gmake
 
 PLIST_FILES=	bin/ptunnel man/man8/ptunnel.8.gz
 
diff --git a/net/quoted/Makefile b/net/quoted/Makefile
index 90ce3e9546d3..906a2d2299e2 100644
--- a/net/quoted/Makefile
+++ b/net/quoted/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Easily configured QOTD daemon with over 130 good quality quotes
 MAN1=		quoted.1
 MANCOMPRESSED=	no
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 USE_RC_SUBR=	 ${PORTNAME}
 
diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index 66e5f063e031..fd501cbc6753 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -24,8 +24,7 @@ BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 
 CONFLICTS=	rabbitmq-c-[0-9]*
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile
index 93c6ce674302..656f49cccc77 100644
--- a/net/rabbitmq-c/Makefile
+++ b/net/rabbitmq-c/Makefile
@@ -23,8 +23,7 @@ BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 
 CONFLICTS=	rabbitmq-c-devel-[0-9]*
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/rexx-sock/Makefile b/net/rexx-sock/Makefile
index fc4beeb663d5..1a7fa57452d5 100644
--- a/net/rexx-sock/Makefile
+++ b/net/rexx-sock/Makefile
@@ -14,7 +14,7 @@ COMMENT=	A function package for Rexx programmers to create sockets
 BUILD_DEPENDS=	rexx-regina>=3.3_1:${PORTSDIR}/lang/rexx-regina
 RUN_DEPENDS=	rexx-regina>=3.3_1:${PORTSDIR}/lang/rexx-regina
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
diff --git a/net/ser/Makefile b/net/ser/Makefile
index 754555304a23..03bd3025b16c 100644
--- a/net/ser/Makefile
+++ b/net/ser/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Fast and configurable SIP proxy
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_GNOME=	# empty
 USE_RC_SUBR=	ser
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index 0d1b346a67f1..d0ffd81fb602 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	silc-1.1:${PORTSDIR}/devel/silc-toolkit
 
 SUB_FILES=	pkg-message pkg-deinstall
 USE_RC_SUBR=	silcd
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \
diff --git a/net/skstream/Makefile b/net/skstream/Makefile
index c1cede5e041f..f827f6c632c6 100644
--- a/net/skstream/Makefile
+++ b/net/skstream/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28network%20lib%29/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	An iostream based C++ socket library
 
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig compiler:c++11-lib
+USES=		pathfix pkgconfig compiler:c++11-lib gmake
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/net/spread4/Makefile b/net/spread4/Makefile
index 4bcbb8b4f914..5e3c17c8fea8 100644
--- a/net/spread4/Makefile
+++ b/net/spread4/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Spread Group Communication System, a network toolkit
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_RC_SUBR=	spread
 USE_LDCONFIG=	yes
 ALL_TARGET=	all
diff --git a/net/spserver/Makefile b/net/spserver/Makefile
index b33242d62247..06d2c0c9542e 100644
--- a/net/spserver/Makefile
+++ b/net/spserver/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	all build_openssl
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 1921768b1b69..c9e30103547a 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ubiquitous network traffic analysis tool
 LIB_DEPENDS=	pcap:${PORTSDIR}/net/libpcap
 
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USES=		gmake
 
 UNPRIV_USER?=	nobody
 CHROOTDIR?=	/var/run/tcpdump
diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile
index 6bfa96e9187c..2f347874d8b5 100644
--- a/net/tcptraceroute-devel/Makefile
+++ b/net/tcptraceroute-devel/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
 
 CONFLICTS=	tcptraceroute-1.4*
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 MAN1=	tcptraceroute.1
diff --git a/net/throttled/Makefile b/net/throttled/Makefile
index 7df28f3a0c76..423db8dca90e 100644
--- a/net/throttled/Makefile
+++ b/net/throttled/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bandwidth shaping and QoS solution
 
 LICENSE=	GPLv3
 
-USE_GMAKE=	yes
+USES=		gmake
 
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index 146e82bd4a1c..7b4f119df91a 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 USE_AUTOTOOLS=	libtool aclocal autoconf libtoolize
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 
 MAN1=		torsocks.1 usewithtor.1
diff --git a/net/traff/Makefile b/net/traff/Makefile
index 0b1f28fe0219..87964d41b194 100644
--- a/net/traff/Makefile
+++ b/net/traff/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Libpcab based fast traffic accounting program
 BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
 
 USE_RC_SUBR=	traff
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	${PTHREAD_CFLAGS} -L${LOCALBASE}/lib
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index cd0e658e0ce5..133ce32ae23f 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Transparent remote file access tool for emacsen
 
 USE_EMACS=	yes
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_AUTOTOOLS=	autoconf
 
 TRAMP_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
diff --git a/net/wire/Makefile b/net/wire/Makefile
index 60cfac180e3e..2713ed2c24f0 100644
--- a/net/wire/Makefile
+++ b/net/wire/Makefile
@@ -17,9 +17,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
 
-USE_GMAKE=	yes
 USE_OPENSSL=	yes
-USES=		iconv
+USES=		iconv gmake
 
 PLIST_FILES=	bin/wire
 
diff --git a/net/wired-tracker/Makefile b/net/wired-tracker/Makefile
index f89fb0065278..d18f5e6d34ce 100644
--- a/net/wired-tracker/Makefile
+++ b/net/wired-tracker/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/wired:${PORTSDIR}/net/wired
 WRKSRC=		${WRKDIR}/wired-tracker-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
-USE_GMAKE=	yes
+USES=		gmake
 USE_RC_SUBR=	trackerd
 
 MAN1=		trackerdctl.1
diff --git a/net/wired/Makefile b/net/wired/Makefile
index 2f16a2ad70b4..0b7b37bf7030 100644
--- a/net/wired/Makefile
+++ b/net/wired/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Wired server
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
-USE_GMAKE=	yes
+USES=		gmake
 USE_RC_SUBR=	wired
 
 MAN1=		wiredctl.1
diff --git a/net/wmping/Makefile b/net/wmping/Makefile
index b161d16c8102..99d9596c35c4 100644
--- a/net/wmping/Makefile
+++ b/net/wmping/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	serg@cad.kiev.ua
 COMMENT=	Windowmaker dock app to display network hosts status
 
 USE_XORG=	xpm
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 MAN1=		wmping.1
diff --git a/net/xbone/Makefile b/net/xbone/Makefile
index b9b78b394e94..3909ca8fb093 100644
--- a/net/xbone/Makefile
+++ b/net/xbone/Makefile
@@ -35,10 +35,9 @@ BUILD_DEPENDS=	p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig \
 		p5-Tk-Getopt>=0:${PORTSDIR}/x11-toolkits/p5-Tk-Getopt \
 		p5-Tk-TableMatrix>=0:${PORTSDIR}/x11-toolkits/p5-Tk-TableMatrix
 
-USE_GMAKE=	yes
 #IS_INTERACTIVE=	yes
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 gmake
 USE_OPENLDAP=	yes
 
 INSTALL_TARGET=	node