Catch up with ports infra changes.

USE_GMAKE= => USES=gmake
Sort Uses
Remove MAKE_JOBS_SAFE as it is default now.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18634 df743ca5-7f9a-e211-a948-0013205c9059

29 files changed, 48 insertions, 81 deletions

diff --git a/devel/anjuta-extras3/Makefile b/devel/anjuta-extras3/Makefile
index 3408b6d5f..3328d36f5 100644
--- a/devel/anjuta-extras3/Makefile
+++ b/devel/anjuta-extras3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/anjuta-extras3/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	anjuta-extras
 PORTVERSION=	3.4.0
@@ -13,10 +13,9 @@ COMMENT=	Extra anjuta 3 plugins
 LIB_DEPENDS=	anjuta-3:${PORTSDIR}/devel/anjuta3
 		
 USE_XZ=		yes
-USES=		gettext pkgconfig
+USES=		gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	intltool libxml2 gtk30
 CPPFLAGS+=	-I${LOCALBASE}/include 
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/anjuta3/Makefile b/devel/anjuta3/Makefile
index 700fc88fe..4405cb59c 100644
--- a/devel/anjuta3/Makefile
+++ b/devel/anjuta3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/anjuta3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	anjuta
 PORTVERSION=	3.4.3
@@ -28,8 +28,7 @@ CONFLICTS=	anjuta-2.[0-9]*
 
 LATEST_LINK=	anjuta3
 USE_XZ=		yes
-USES=		bison pathfix gettext pkgconfig shared-mime-info
-USE_GMAKE=	yes
+USES=		bison gettext gmake pathfix pkgconfig shared-mime-info
 INSTALLS_ICONS=	yes
 USE_PERL5=	yes
 USE_PYTHON=	yes
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 1e2cf1063..114a7d52d 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -19,8 +19,7 @@ BUILD_DEPENDS=	vala>=0.18.1:${PORTSDIR}/lang/vala \
 LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	glib20 gnomehier intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index e396dbc7d..7065c6e16 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/devhelp/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	devhelp
 PORTVERSION=	2.32.0
@@ -20,8 +20,7 @@ CONFLICTS=	devhelp-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_XORG=	x11
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack gnomeprefix libgnomeui libwnck
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/devhelp3/Makefile b/devel/devhelp3/Makefile
index 0a946bd7d..2f62b3a9f 100644
--- a/devel/devhelp3/Makefile
+++ b/devel/devhelp3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/devhelp3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	devhelp
 PORTVERSION=	3.6.1
@@ -18,8 +18,7 @@ CONFLICTS=	devhelp-2.[0-9]*
 LATEST_LINK=	devhelp3
 USE_XZ=		yes
 USE_XORG=	x11
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gconf2 gnomeprefix gtk30 intlhack
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index e580327e4..74bb7f01e 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -12,8 +12,7 @@ MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A file and directory monitoring system
 
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME?=	glib20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 651f31de8..e86271a14 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -1,6 +1,6 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/gconf2/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gconf2
 PORTVERSION=	3.2.6
@@ -24,8 +24,7 @@ USE_XZ=		yes
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomehier orbit2 gtk20 libxml2 ltverhack \
 		referencehack intlhack dconf introspection:build
 USE_LDCONFIG=	yes
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 14fe495ac..ff58700df 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/glade/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	glade
 PORTVERSION=	3.12.2
@@ -15,9 +15,8 @@ CONFLICTS=	glade3-3.*
 
 INSTALLS_ICONS=	yes
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk30 gnomeprefix ltverhack gnomedocutils introspection:build
-USES=		gettext pathfix pkgconfig desktop-file-utils
+USES=		desktop-file-utilsgettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 921776dd8..176d6c4bb 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -23,12 +23,10 @@ PORTSCOUT=	limitw:1,even
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
 		ffi:${PORTSDIR}/devel/libffi
 
-USES=		gettext iconv pathfix pkgconfig shebangfix
+USES=		gettext gmake iconv pathfix pkgconfig shebangfix
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	ltverhack
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 USE_PYTHON=	2.5+
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index b86687a92..89798b440 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -21,8 +21,7 @@ PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	glib20 ltverhack libsigc++20
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index b2e5ba6af..104e529af 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -13,8 +13,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Common automake macros for GNOME 2 and GNOME 3
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		pkgconfig
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index dd5eb30f3..415d8fc3d 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -16,10 +16,9 @@ COMMENT=	Generate interface introspection data for GObject libraries
 BUILD_DEPENDS=	cairo-trace:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi
 
-USES=		bison pathfix pkgconfig gettext
+USES=		bison gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehier glib20 ltverhack
 USE_PYTHON=	-2.7
 USE_AUTOTOOLS=	libtool
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index cafaa1ee6..18d11614b 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/gsettings-desktop-schemas/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gsettings-desktop-schemas
 PORTVERSION=	3.6.1
@@ -16,8 +16,7 @@ LICENSE=	LGPL21
 RUN_DEPENDS=	${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11-fonts/cantarell-fonts
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_PERL5_BUILD=	yes
 USE_GNOME=	intltool glib20 introspection:build
 GNU_CONFIGURE=	yes
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index f41fab259..cbeacfd7d 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/gtranslator/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gtranslator
 PORTVERSION=	2.91.5
@@ -23,8 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 USE_XZ=		yes
 USE_GNOME=	intlhack gnomeprefix gtk30 libgda4 gtksourceview3 libxml2 \
 		introspection:build
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 1b95125c7..7705dc715 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/libgdata/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgdata
 PORTVERSION=	0.12.0
@@ -19,9 +19,7 @@ CONFLICTS=	libgdata-0.6.*
 
 USE_XZ=		yes
 USE_LDCONFIG=	yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intltool ltverhack glib20 introspection:build
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libgdata06/Makefile b/devel/libgdata06/Makefile
index 9323ece72..33971a548 100644
--- a/devel/libgdata06/Makefile
+++ b/devel/libgdata06/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/libgdata06/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgdata
 PORTVERSION=	0.6.6
@@ -18,9 +18,7 @@ CONFLICTS=	libgdata-0.10.*
 LATEST_LINK=	libgdata06
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	intltool ltverhack glib20 introspection:build
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 644bf156b..22fe15645 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -1,6 +1,6 @@
 # Created by: Frank Steinborn <steinex@nognu.de>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/devel/libgee/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgee
 PORTVERSION=	0.8.6
@@ -12,9 +12,8 @@ COMMENT=	GObject collection library
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection=yes
-USE_GMAKE=	yes
 USE_XZ=		yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 gnomehier introspection:build
 USE_LDCONFIG=	yes
 
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 1892d1f06..ee7106b64 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -12,8 +12,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Extensible I/O abstraction for dealing with structured file formats
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix glib20 libxml2 ltverhack intlhack \
 		introspection:build
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 034dc2ef5..a71311502 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/libgtop/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgtop
 PORTVERSION=	2.28.4
@@ -14,8 +14,7 @@ COMMENT=	GNOME 2 top library
 USE_XZ=		yes
 USE_PERL5_BUILD=yes
 USE_XORG=	xau
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix glib20 ltverhack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index a82c1d982..968e7014e 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -1,6 +1,6 @@
 # Created by: Andreas Kohn <andreas@syndrom23.de>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/libnotify/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libnotify
 PORTVERSION=	0.7.5
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XZ=		yes
 USE_GNOME=	intlhack glib20 gtk20 ltverhack introspection
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 87480affb..8c98e8f69 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/liboobs/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	liboobs
 PORTVERSION=	3.0.0
@@ -17,9 +17,8 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 RUN_DEPENDS=	${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	gnomeprefix glib20
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-hal
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 80883f881..55f1e315b 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/libpeas/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libpeas
 PORTVERSION=	1.6.1
@@ -16,9 +16,8 @@ BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 USE_XZ=		yes
 USE_PYTHON=	2.5+
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix gettext pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gtk30 ltverhack introspection:build
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 9b19b98f9..00f6d7f55 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -14,11 +14,10 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_AUTOTOOLS=	libtool
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 LATEST_LINK=	libsigc++20
 USE_LDCONFIG=	yes
-USES=	pathfix
+USES=		gmake pathfix
 GNU_CONFIGURE=	yes
 
 PLIST_SUB=	VERSION="2.0" API_VERSION="2.0"
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index a847a636d..cd29da694 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -20,13 +20,11 @@ USE_XZ=		yes
 
 .if !defined(REFERENCE_PORT)
 
-USES=		pathfix gettext
+USES=		gettext gmake pathfix
 USE_GNOME=	gnomehier glib20 libxml2 ltverhack referencehack intltool
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 USE_PYTHON_BUILD=	-2.7
 CONFIGURE_ARGS=	--disable-more-warnings
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile
index 2de9596a1..0a98f0026 100644
--- a/devel/mm-common/Makefile
+++ b/devel/mm-common/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/mm-common/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	mm-common
 PORTVERSION=	0.9.5
@@ -12,9 +12,8 @@ COMMENT=	Common build infrastructure for the GNOME C++ binding libraries
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-USES=		pathfix
+USES=		gmake pathfix
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		mm-common-prepare.1
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index d52500142..21a089d86 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/py-gobject/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gobject
 PORTVERSION=	2.28.6
@@ -23,8 +23,7 @@ LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 introspection:build
 USE_PYTHON=	2.5+
 GNU_CONFIGURE=	yes
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index 8c7c4c493..e63126f6f 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/py-gobject3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gobject
 PORTVERSION=	3.8.1
@@ -23,8 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-c
 
 LATEST_LINK=	${PYTHON_PKGNAMEPREFIX}${PORTNAME}3
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 introspection
 USE_PYTHON=	2.6+
 GNU_CONFIGURE=	yes
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index e2766f869..b970b6c2e 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -9,10 +9,9 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	An interactive tool for performing search and replace operations
 
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intltool intlhack gtkmm30 gtksourceviewmm3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile
index 9c3083a6a..22c1c39a6 100644
--- a/devel/seed3/Makefile
+++ b/devel/seed3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/devel/seed3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release.
 # To do that, just replace imports.searchPaths with "." and ".." elements.
 
@@ -24,12 +24,11 @@ CONFLICTS=	seed-2.[0-9]*
 LATEST_LINK=	seed3
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gtk30 intltool libxml2 introspection
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_SQLITE=	yes
-USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=3.0