41 files changed, 42 insertions, 66 deletions

diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index 968a89d01d25..6b2d544e1a43 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -29,7 +29,7 @@ USERS=	${AOLSERVERUSER}
 GROUPS=	${AOLSERVERGROUP}
 
 MANPREFIX=	${PREFIX}/${AOLSERVERBASE}
-USE_GMAKE=	yes
+USES=		gmake
 HAS_CONFIGURE=	yes
 
 USE_RC_SUBR=	${PORTNAME}
diff --git a/www/aria/Makefile b/www/aria/Makefile
index 738505dfcd0f..a104b4c06d35 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -14,10 +14,9 @@ LICENSE=	GPLv2 # (or later)
 
 OPTIONS_DEFINE=	NLS DOCS
 
-USE_BZIP2=	yes
 USE_GNOME=	gtk12
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 NO_PACKAGE=	hangs on pointyhat
diff --git a/www/blastbeat/Makefile b/www/blastbeat/Makefile
index e0a0f8996b5d..e026d36aeb4a 100644
--- a/www/blastbeat/Makefile
+++ b/www/blastbeat/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	ev:${PORTSDIR}/devel/libev \
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		zmq:${PORTSDIR}/net/libzmq2
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	zloidemon
 GH_COMMIT=	cdac9a9
diff --git a/www/bluefish-devel/Makefile b/www/bluefish-devel/Makefile
index 58f628fa89d2..d3f5b7fd9737 100644
--- a/www/bluefish-devel/Makefile
+++ b/www/bluefish-devel/Makefile
@@ -21,8 +21,7 @@ INSTALLS_ICONS=	yes
 
 DATADIR=	share/${PORTNAME}-unstable
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 USE_GNOME=	gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/boa/Makefile b/www/boa/Makefile
index 60730a872e3f..54ec83da08a8 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	High performance single-tasking web server
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
 
 INFO=		boa
diff --git a/www/caudium14/Makefile b/www/caudium14/Makefile
index 9263e6deceb6..98dabea9a0bc 100644
--- a/www/caudium14/Makefile
+++ b/www/caudium14/Makefile
@@ -14,8 +14,7 @@ BUILD_DEPENDS=	pike76:${PORTSDIR}/lang/pike76
 LIB_DEPENDS=	sablot:${PORTSDIR}/textproc/sablotron
 RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 
 PIKEVERSION=	7.6.112
 SUB_LIST+=	PIKEVERSION="${PIKEVERSION}"
diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index cfb138c43900..e4d1fc20eca6 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -12,8 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source search engine for Internet and Intranet sites
 
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/dataparksearch
diff --git a/www/elog/Makefile b/www/elog/Makefile
index 914c23e3860c..546db2b10a30 100644
--- a/www/elog/Makefile
+++ b/www/elog/Makefile
@@ -22,7 +22,7 @@ SUB_LIST=		LOGBOOKDIR=${LOGBOOKDIR}
 LOGBOOKDIR?=	www/elog
 PLIST_SUB+=	LOGBOOKDIR=${LOGBOOKDIR}
 
-USE_GMAKE=	yes
+USES=		gmake
 WRKSRC=		${WRKDIR}/elog-2.9.2
 MAKE_ENV=	LOGBOOKDIR=${LOGBOOKDIR}
 
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 84f18d8dab82..b21b015e8c0f 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -11,9 +11,8 @@ DISTNAME=	erwin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple GTK+-2 HTML editor
 
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gmake
 USE_GNOME=	gnomeprefix gtksourceview gtkhtml3
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		erwin.1
diff --git a/www/fnord/Makefile b/www/fnord/Makefile
index b6e494d09d84..a9d4c6db77de 100644
--- a/www/fnord/Makefile
+++ b/www/fnord/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES=	http://www.fefe.de/fnord/
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Small and fast webserver with CGI-capability
 
-USE_GMAKE=	yes
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 
 PLIST_FILES=	bin/fnord \
 		bin/fnord-conf \
diff --git a/www/gatling/Makefile b/www/gatling/Makefile
index efb609888ebd..c1c4b71516da 100644
--- a/www/gatling/Makefile
+++ b/www/gatling/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A high performance webserver with scalability benchmark tools
 BUILD_DEPENDS=	libowfat>=0.29:${PORTSDIR}/devel/libowfat
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_OPENSSL=	yes
 USE_RC_SUBR=	gatling
 
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 31a10b1e22f0..f7e1086b3ef7 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -21,10 +21,8 @@ LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup \
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
-USES=		gettext pkgconfig
-USE_BZIP2=	yes
+USES=		gettext pkgconfig gmake tar:bzip2
 USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/www/larbin/Makefile b/www/larbin/Makefile
index 6232bc858afc..a384470bf6d9 100644
--- a/www/larbin/Makefile
+++ b/www/larbin/Makefile
@@ -15,9 +15,8 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		shebangfix
+USES=		shebangfix gmake
 SHEBANG_FILES=	configure
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index e8f7088bf9be..a733670905b6 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Generic Apache2 Request Library
 LICENSE=	APACHE20
 
 USE_APACHE=	22+
-USE_GMAKE=	yes
+USES=		gmake
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf libtool
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index ff8c6a185e94..f501afe022a8 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -14,9 +14,8 @@ COMMENT=	The W3C Reference Library
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static --with-zlib --with-ssl=${OPENSSLBASE}
-USES=		perl5
+USES=		perl5 gmake
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
diff --git a/www/llgal/Makefile b/www/llgal/Makefile
index f65b9fb91478..d67a27c3c7a3 100644
--- a/www/llgal/Makefile
+++ b/www/llgal/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
 		p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
 		convert:${PORTSDIR}/graphics/ImageMagick
 
-USE_BZIP2=	yes
-USES=		gettext perl5
-USE_GMAKE=	yes
+USES=		gettext perl5 gmake tar:bzip2
 
 MAN1=		llgal.1
 MAN5=		llgalrc.5
diff --git a/www/luakit/Makefile b/www/luakit/Makefile
index bcc101330038..d8567aba6a1b 100644
--- a/www/luakit/Makefile
+++ b/www/luakit/Makefile
@@ -23,8 +23,7 @@ GH_PROGECT=	${PORTNAME}
 GH_TAGNAME=	${PORTVERSION:C/r/-r/}
 GH_COMMIT=	0d5f4ab
 
-USE_GMAKE=	yes
-USES=		pkgconfig
+USES=		pkgconfig gmake
 USE_GNOME=	glib20 gtk20
 USE_LUA=	5.1
 MAKE_ARGS+=	USE_UNIQUE=1 NO_JAVASCRIPTCORE=1
diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile
index cccc9d44dc38..16a96592dc60 100644
--- a/www/mod_encoding/Makefile
+++ b/www/mod_encoding/Makefile
@@ -17,9 +17,8 @@ COMMENT=	Apache module for non-ASCII filename interoperability
 #APACHE_VERSION=	1.3.6
 
 USE_APACHE=	22+
-USES=		iconv
+USES=		iconv gmake
 HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--bindir=${PREFIX}/bin \
diff --git a/www/mod_gzip2/Makefile b/www/mod_gzip2/Makefile
index 1413d30d9f2d..40cd65c012ce 100644
--- a/www/mod_gzip2/Makefile
+++ b/www/mod_gzip2/Makefile
@@ -17,7 +17,7 @@ USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 MAKE_ENV+=	"APXS=${APXS}"
-USE_GMAKE=	yes
+USES=		gmake
 
 PORTDOCS=	commands.txt samples.txt
 PORTEXAMPLES=	mod_gzip2.conf.sample
diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index 4397f13c183c..ed9315e098f3 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Allows Apache to log to a MySQL database
 
 LATEST_LINK=	mod_log_sql2
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 SSL_PLIST=	""
 APACHE2X=	""
diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile
index 8dbbddec994f..963da3728163 100644
--- a/www/mod_spdy/Makefile
+++ b/www/mod_spdy/Makefile
@@ -24,11 +24,10 @@ BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 		bash:${PORTSDIR}/shells/bash
 
 ONLY_FOR_ARCHS=	amd64 i386
-USE_XZ=		yes
 USE_OPENSSL=	yes
 USE_APACHE=	22
 USE_PYTHON=	2
-USE_GMAKE=	yes
+USES=		gmake tar:xz
 REINPLACE_ARGS=	-i ""
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_spdy/src
diff --git a/www/netrik/Makefile b/www/netrik/Makefile
index 49df86d76fcc..377ec27178f0 100644
--- a/www/netrik/Makefile
+++ b/www/netrik/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Text web browser, ambitious, in active development
 
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/netrik \
diff --git a/www/ocaml-net/Makefile b/www/ocaml-net/Makefile
index 0ce6ed5b4256..92deb1835578 100644
--- a/www/ocaml-net/Makefile
+++ b/www/ocaml-net/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	ocaml-equeue-2* ocaml-netclient-0*
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile
index 4e2c5e5f313b..bbc8490bc4b7 100644
--- a/www/ocsigen/Makefile
+++ b/www/ocsigen/Makefile
@@ -32,7 +32,7 @@ OPTIONS_DEFINE=	SQLITE CAMLZIP
 OPTIONS_DEFAULT=	CAMLZIP
 CAMLZIP_DESC=	Use camlzip for compression
 
-USE_GMAKE=	yes
+USES=		gmake
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--name ${PORTNAME} \
 		--disable-nativecode \
diff --git a/www/privoxy+ipv6/Makefile b/www/privoxy+ipv6/Makefile
index 7f8188b56325..a9342a533da6 100644
--- a/www/privoxy+ipv6/Makefile
+++ b/www/privoxy+ipv6/Makefile
@@ -21,8 +21,7 @@ USER=		nobody
 GROUP=		nobody
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/+ipv6//}
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 USE_AUTOTOOLS=	autoheader213
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
diff --git a/www/samidare/Makefile b/www/samidare/Makefile
index dd26c84c28ad..ed8d8b45eb97 100644
--- a/www/samidare/Makefile
+++ b/www/samidare/Makefile
@@ -14,7 +14,7 @@ COMMENT=	A web page update checker written in Ruby
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/htree.rb:${PORTSDIR}/textproc/ruby-htree \
 		${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_RUBY=	yes
 
 RUBY_REQUIRE=	Ruby >= 181
diff --git a/www/sams/Makefile b/www/sams/Makefile
index 4e8aa2ac896c..3942bf3b646d 100644
--- a/www/sams/Makefile
+++ b/www/sams/Makefile
@@ -30,9 +30,8 @@ NO_STAGE=	yes
 USE_APACHE=	22+
 .endif
 
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
 USE_PHP=	ctype curl gettext hash iconv json mysql \
 		pcre pdo pdo_sqlite posix session \
 		simplexml spl sqlite tokenizer \
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 45046201793a..bff5e993b4d4 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -15,11 +15,10 @@ EXPIRATION_DATE=2014-04-10
 
 LIB_DEPENDS=	croco-0.6.3:${PORTSDIR}/textproc/libcroco
 
-USES=		pathfix pkgconfig gettext
+USES=		pathfix pkgconfig gettext gmake
 USE_GNOME=	desktopfileutils gnomemenus gnomeprefix \
 		gtksourceview intlhack libgnomeprintui libgnomeui libgtkhtml
 USE_XORG=	xpm
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index a9d354e308a5..b3be6b65cf63 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" \
 LIBS=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-neon --with-libxml2
 USE_GNOME=	libxml2
-USE_GMAKE=	yes
+USES=		gmake
 
 OPTIONS_DEFINE=	NLS
 
diff --git a/www/squidpurge/Makefile b/www/squidpurge/Makefile
index 8969b27a84ee..a81dee1aa249 100644
--- a/www/squidpurge/Makefile
+++ b/www/squidpurge/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	purge-20040201-src
 MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	Powerful object purging utility for the Squid web proxy cache
 
-USE_GMAKE=	yes
+USES=		gmake
 WRKSRC=		${WRKDIR}/purge
 
 PLIST_FILES=	sbin/purge
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 538254839082..0505fa82a3a3 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple web indexing for humans - enhanced
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 		pkgdatadir="${DATADIR}"
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index aa236d6b518f..db824594ce4d 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -17,7 +17,7 @@ COMMENT?=	Utility to clean up and pretty print HTML/XHTML/XML
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 NO_STAGE=	yes
 
 SLAVEDIRS=	www/tidy-lib
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_JOBS_UNSAFE=	yes
 
 .if !defined(WITH_SHLIB)
-USE_GMAKE=	yes
+USES+=		gmake
 PLIST_SUB=	SHLIB="@comment " NSHLIB=""
 CONFLICTS=	tidy-20000804* tidy-lib-[0-9]*
 .else
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 315b04a56912..11343343fb15 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_RC_SUBR=	tinyproxy
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin \
 		--program-transform-name="" \
 		--disable-silent-rules \
diff --git a/www/tokyopromenade/Makefile b/www/tokyopromenade/Makefile
index a73ca899a851..e6178935412f 100644
--- a/www/tokyopromenade/Makefile
+++ b/www/tokyopromenade/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	LUA
 
 CONFIGURE_ARGS=	--enable-fcgi
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 SUB_FILES=	pkg-message
 
diff --git a/www/ttf2eot/Makefile b/www/ttf2eot/Makefile
index 2f4b8ad9e116..742275b5dae8 100644
--- a/www/ttf2eot/Makefile
+++ b/www/ttf2eot/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	stb@lassitu.de
 COMMENT=	Convert TTF font file to EOT web embeddable file
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	ttf2eot
 
 PLIST_FILES=	bin/ttf2eot
diff --git a/www/webfs/Makefile b/www/webfs/Makefile
index ba4255a9b43c..758711a20240 100644
--- a/www/webfs/Makefile
+++ b/www/webfs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A simple http server for static content
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
-USE_GMAKE=	yes
+USES=		gmake
 MAKEFILE=	GNUmakefile
 .if !defined(WITHOUT_OPENSSL)
 MAKE_ENV=	USE_SSL=no
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 893fed192ace..53faff86f899 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -25,8 +25,7 @@ BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx \
 		${RUN_DEPENDS}
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		gettext perl5
+USES=		gettext perl5 gmake
 USE_PERL5=	run build patch
 CONFIGURE_ARGS=	--with-perl=${PERL5} --with-catdir=man \
 		--prefix=${PREFIX}
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index 390e19a9a470..f16ad01ab27f 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Access counter, clock and date for WWW pages
 
 GNU_CONFIGURE=	yes
 IS_INTERACTIVE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 MAN1=		mkstrip.1
 
 NO_STAGE=	yes
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index f55e6629900b..8b6554bf9707 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -14,8 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
 
-USES=		perl5
-USE_GMAKE=	yes
+USES=		perl5 gmake
 
 USE_RC_SUBR=	${PORTNAME}d
 
diff --git a/www/xsp/Makefile b/www/xsp/Makefile
index 680ac4c8d625..1cfcce758d19 100644
--- a/www/xsp/Makefile
+++ b/www/xsp/Makefile
@@ -15,10 +15,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/mono:${PORTSDIR}/lang/mono
 MAKE_JOBS_UNSAFE=	yes
 
 USE_SQLITE=	3
-USE_BZIP2=	yes
-USES=	pathfix pkgconfig
+USES=		pathfix pkgconfig gmake tar:bzip2
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 
 MAN1=		asp-state.1 dbsessmgr.1 mod-mono-server.1 xsp.1 \
 		fastcgi-mono-server.1
diff --git a/www/zerowait-httpd/Makefile b/www/zerowait-httpd/Makefile
index 0b06473e88b6..d2a17970e253 100644
--- a/www/zerowait-httpd/Makefile
+++ b/www/zerowait-httpd/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	0W-httpd-${PORTVERSION}
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Lightweight and fast http server
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_OPENSSL=	yes
 USE_RC_SUBR=	0W-httpd
 ALL_TARGET=	#none