15 files changed, 15 insertions, 22 deletions

diff --git a/misc/bottlerocket/Makefile b/misc/bottlerocket/Makefile
index 47c3d9a8bfb7..e9365e53d069 100644
--- a/misc/bottlerocket/Makefile
+++ b/misc/bottlerocket/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/futurebsd/futurebsd/${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Home Automation Software for the X10 FireCracker kit
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 ALL_TARGET=	br
 PLIST_FILES=	bin/br
diff --git a/misc/chmlib/Makefile b/misc/chmlib/Makefile
index 87a06a12a830..190a62202236 100644
--- a/misc/chmlib/Makefile
+++ b/misc/chmlib/Makefile
@@ -9,10 +9,9 @@ MASTER_SITES=	http://www.jedrea.com/chmlib/
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	A library for dealing with Microsoft ITSS/CHM format files
 
-USE_BZIP2=	yes
+USES=		gmake bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-io64 --disable-pread --exec-prefix=${PREFIX} --disable-static --enable-examples
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/misc/clex/Makefile b/misc/clex/Makefile
index acd33c175247..d5ed14ee2c64 100644
--- a/misc/clex/Makefile
+++ b/misc/clex/Makefile
@@ -13,8 +13,7 @@ COMMENT=	A command line file manager
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USES=		ncurses
-USE_GMAKE=	yes
+USES=		ncurses gmake
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/misc/detachtty/Makefile b/misc/detachtty/Makefile
index 332c178f5982..24d92fc48b3b 100644
--- a/misc/detachtty/Makefile
+++ b/misc/detachtty/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Run interactive programs non-interactively
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-9
-USE_GMAKE=	yes
+USES=		gmake
 
 MAN1=		detachtty.1
 MLINKS=		detachtty.1 attachtty.1
diff --git a/misc/gman/Makefile b/misc/gman/Makefile
index e88518cc5103..969e7159d9d4 100644
--- a/misc/gman/Makefile
+++ b/misc/gman/Makefile
@@ -23,9 +23,8 @@ RUN_DEPENDS=	ghostview:${PORTSDIR}/print/ghostview	\
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		gettext
+USES=		gettext gmake
 USE_GNOME=	gtk12
-USE_GMAKE=	yes
 
 MAN1=	gman.1x
 
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index f5e861a32fe9..668b3144982c 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -14,9 +14,7 @@ COMMENT=	GNOME 2 users guide
 BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
-USES=		pkgconfig
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		pkgconfig tar:bzip2 gmake
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedocutils
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile
index ed8bd116a697..327fb43bb3a1 100644
--- a/misc/gtkfind/Makefile
+++ b/misc/gtkfind/Makefile
@@ -14,7 +14,7 @@ COMMENT=	The program to use to have to remember all the options to find(1)
 BUILD_DEPENDS=	appres:${PORTSDIR}/x11/appres \
 		xterm:${PORTSDIR}/x11/xterm
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 
diff --git a/misc/latex-mk/Makefile b/misc/latex-mk/Makefile
index 3fe80728515f..f55e15c4e551 100644
--- a/misc/latex-mk/Makefile
+++ b/misc/latex-mk/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo
 RUN_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo
 
 USE_TEX=	latex
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 LICENSE=	BSD
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 5079ef1cc9fd..cde3b5667b9e 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -16,9 +16,8 @@ OPTIONS_DEFINE=	SMB
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-.*//}
 
-USES=		gettext pkgconfig
+USES=		gettext pkgconfig gmake
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-cfgpath="${ETCDIR}"
 MAKE_JOBS_UNSAFE=	yes
diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile
index af2620402f04..1496dbbb678d 100644
--- a/misc/mbuffer/Makefile
+++ b/misc/mbuffer/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Tool for buffering data streams
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	SHELL=${SH}
 
diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index 10d741d34f7d..d5e260e30125 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -19,8 +19,7 @@ OPTIONS_DEFINE=	NLS SUBSHELL MC_IN_MC
 SUBSHELL_DESC=	Build with subshell support (only for bash!)
 MC_IN_MC_DESC=	Allow run mc inside mc (useful for mcedit)
 
-USES=		pkgconfig iconv
-USE_GMAKE=	yes
+USES=		pkgconfig iconv gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-included-slang \
 		--with-gettext \
diff --git a/misc/mtx/Makefile b/misc/mtx/Makefile
index 12a105cc2f19..fdc7eb2cc595 100644
--- a/misc/mtx/Makefile
+++ b/misc/mtx/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Control SCSI media changer devices
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 MAN1=		loaderinfo.1 mtx.1 tapeinfo.1 scsitape.1 scsieject.1
 PLIST_FILES=	sbin/mtx sbin/tapeinfo sbin/loaderinfo sbin/scsitape sbin/scsieject
diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index 75824c6974c8..77d42f342c29 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2 # (or later)
 OPTIONS_DEFINE=	FLTK DOCS
 FLTK_DESC=	Install FLTK GUI
 
-USE_GMAKE=	yes
+USES=		gmake
 
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
diff --git a/misc/rname/Makefile b/misc/rname/Makefile
index b7c67c84c032..146644ba7748 100644
--- a/misc/rname/Makefile
+++ b/misc/rname/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Execute a program with a fake name
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_GMAKE=	yes
+USES=		gmake
 
 NO_STAGE=	yes
 
diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile
index ed117c8c44f5..b9b311af8a27 100644
--- a/misc/wmwork/Makefile
+++ b/misc/wmwork/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A dockapp that keeps track of time you have spent on something
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 USE_XORG=	xpm
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 MAN1=		wmwork.1