15 files changed, 24 insertions, 65 deletions

diff --git a/accessibility/at-poke/Makefile b/accessibility/at-poke/Makefile
index 28d4f723d853..9207bd1c3346 100644
--- a/accessibility/at-poke/Makefile
+++ b/accessibility/at-poke/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	at-poke
-# Date created:				24 Oct 2006
-# Whom:					Marcus von Appen <mva@sysfault.org>
-#
+# Created by: Marcus von Appen <mva@sysfault.org>
 # $FreeBSD$
-#
 
 PORTNAME=	at-poke
 PORTVERSION=	0.2.3
@@ -15,7 +11,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Accessibility testing and poking tool
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_GNOME=	gnomeprefix libglade2 libgailgnome
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index a12d62223386..65ca115ac718 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -18,8 +18,7 @@ USE_BZIP2=	yes
 
 RUN_DEPENDS=	at-spi2-atk>2.6.0:${PORTSDIR}/accessibility/at-spi2-atk
 
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gmake gettext
 USE_GNOME=	gnomehack gnomehier intlhack gtk20 gconf2 libbonobo
 USE_XORG=	x11 xtst
 USE_PYTHON=	yes
diff --git a/accessibility/atkmm/Makefile b/accessibility/atkmm/Makefile
index f29648208408..4318d77b81f1 100644
--- a/accessibility/atkmm/Makefile
+++ b/accessibility/atkmm/Makefile
@@ -10,10 +10,9 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for ATK API library
 
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 USE_GNOME=	atk glibmm
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 692c11159d45..0e48ecfd0b0c 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_BZIP2=	yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
 		libwnck gnomedocutils
 WANT_GNOME=	yes
diff --git a/accessibility/eflite/Makefile b/accessibility/eflite/Makefile
index 59d4aaa03ba8..f48d7a9276e9 100644
--- a/accessibility/eflite/Makefile
+++ b/accessibility/eflite/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for: 	eflite
-# Date created:				Thu Jul 21 2005
-# Whom:					David K. Gerry
-#
+# Created by: David K. Gerry
 # $FreeBSD$
-#
 
 PORTNAME=	eflite
 PORTVERSION=	0.4.1
@@ -16,8 +12,8 @@ COMMENT=	Speech server for Festival Lite used by yasr and Emacspeak
 BUILD_DEPENDS=	flite:${PORTSDIR}/audio/flite
 RUN_DEPENDS=	flite:${PORTSDIR}/audio/flite
 
+USES=		gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 ALL_TARGET=	eflite
 
 CONFIGURE_ARGS+=	--with-audio=freebsd
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 2499f5feb225..a7e2fcf97142 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomemag
-# Date created:			12 April 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.54 2010/10/31 11:01:52 kwm Exp $
-#
 
 PORTNAME=	gnome-mag
 PORTVERSION=	0.16.3
@@ -19,8 +15,7 @@ COMMENT=	GNOME screen magnifier
 USE_BZIP2=	yes
 USE_XORG=	xfixes xdamage ice xcomposite sm
 USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gmake gettext
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 5d5452fa877c..21ce968a06ed 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -12,9 +12,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME text-to-speech API
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix libbonobo
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 122303b916ce..a58ebf41eae5 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnopernicus
-# Date created:				11 May 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/accessibility/gnopernicus/Makefile,v 1.85 2007/07/23 19:03:49 mezz Exp $
-#
 
 PORTNAME=	gnopernicus
 PORTVERSION=	1.1.2
@@ -19,11 +15,10 @@ COMMENT=	Collection of accessibility apps for GNOME 2
 LIB_DEPENDS=	gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
 
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext gmake
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index ac7fc0f812f4..75a6eab5a223 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gok
-# Date created:			12 April 2003
-# Whom:				Adam Weinberger <adamw@freebsd.org>
-#
+# Created by: Adam Weinberger <adamw@freebsd.org>
 # $FreeBSD$
 #    $MCom: ports/accessibility/gok/Makefile,v 1.112 2010/09/29 07:37:57 kwm Exp $
-#
 
 PORTNAME=	gok
 PORTVERSION=	2.30.1
@@ -21,11 +17,10 @@ LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
     		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gmake gettext
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
 		gnomespeech libxml2
-USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/java-access-bridge/Makefile b/accessibility/java-access-bridge/Makefile
index 6dbfbcbc821a..db3f71ff80e4 100644
--- a/accessibility/java-access-bridge/Makefile
+++ b/accessibility/java-access-bridge/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Gnome Java Accessibility Bridge
 BUILD_DEPENDS=	xprop:${PORTSDIR}/x11/xprop
 RUN_DEPENDS=	xprop:${PORTSDIR}/x11/xprop
 
+USES=		gmake
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	atspi gnomehack
 USE_JAVA=	yes
 JAVA_OS=	native
-USE_GMAKE=	yes
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 9d0d2524d1c9..28894f06c2a2 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -1,10 +1,6 @@
-# Ports collection makefile for:	mousetweaks
-# Date created:			2008 01 10
-# Whom:				Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/accessibility/mousetweaks/Makefile,v 1.53 2010/11/15 21:25:36 kwm Exp $
-#
 
 PORTNAME=	mousetweaks
 PORTVERSION=	2.32.1
@@ -19,8 +15,7 @@ COMMENT=	Mouse accessibility enhancements for the GNOME desktop
 USE_XORG=	x11 xfixes xcursor xtst
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gmake gettext
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index cc2d570a19b5..2759643e3a72 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	orca
-# Date created:				25 Jul 2006
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/accessibility/orca/Makefile,v 1.90 2010/11/16 12:00:48 avl Exp $
-#
 
 PORTNAME=	orca
 PORTVERSION=	2.32.1
@@ -27,9 +23,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \
 LATEST_LINK=	gnome-orca
 
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gmake gettext
 USE_PYTHON=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \
 		pygnomedesktop
 INSTALLS_ICONS=	yes
diff --git a/accessibility/redshift/Makefile b/accessibility/redshift/Makefile
index 2dbe0da1928f..edc5a4c2861f 100644
--- a/accessibility/redshift/Makefile
+++ b/accessibility/redshift/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   redshift
-# Date created:        Wed Nov 24 12:35:17 CST 2010
-# Whom:                Mark Felder <feld@FreeBSD.org>
-#
+# Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	redshift
 PORTVERSION=	1.7
@@ -15,7 +11,7 @@ MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Adjusts the color temperature of your screen
 
 FETCH_ARGS=	"-pRr"
-USE_GMAKE=	yes
+USES=		gmake
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index e82c942cab6f..d46e7bcc69d8 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -16,11 +16,11 @@ LIB_DEPENDS=	dotconf:${PORTSDIR}/devel/dotconf \
 		sndfile:${PORTSDIR}/audio/libsndfile
 
 # gnomehier is required because of share/sounds directory.
-USE_GNOME=	glib20 gnomehier pkgconfig
+USES=		gmake pkgconfig
+USE_GNOME=	glib20 gnomehier
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
 
 ETCFILES=	clients/emacs.conf clients/gnome-speech.conf \
diff --git a/accessibility/yasr/Makefile b/accessibility/yasr/Makefile
index 89a5852c22a2..eeaa28d30842 100644
--- a/accessibility/yasr/Makefile
+++ b/accessibility/yasr/Makefile
@@ -12,8 +12,8 @@ COMMENT=	General-purpose console screen reader
 
 LICENSE=	LGPL20
 
+USES=		gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 MAN1=		yasr.1
 PORTDOCS=	AUTHORS BUGS CREDITS ChangeLog NEWS README TODO \
 		README-br README-de README-es README-fr README-ru