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
author: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> 2013-07-26 18:42:35 +0800
committer: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> 2013-07-26 18:42:35 +0800
commit: 2772996df5e3c010f5d17d633fca6b117c56eb7a (patch)
tree: 1467d8ed471411133ca91b3695d6e1b3a0a47ddf
parent: 40d38ee86c9312b2a0c98a5387c6e42cb217d2a3 (diff)
download: marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar
marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.gz
marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.bz2
marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.lz
marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.xz
marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.zst
marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.zip
233 files changed, 434 insertions, 670 deletions
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index 839f72a40..db501fc9a 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	at-spi2-core>=2.8.0:${PORTSDIR}/accessibility/at-spi2-core
 PORTSCOUT=	limitw:1,even
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gnomehier intlhack glib20 atk
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index cf85e9c51..bf94786f5 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 
 PORTSCOUT=	limitw:1,even
 
-USES=		pathfix pkgconfig gettext
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehier glib20 intlhack introspection:build
 USE_XORG=	x11 xi xtst xext
 USE_LDCONFIG=	yes
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index fdc08806e..23d1de94f 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -16,10 +16,9 @@ USE_XZ=		yes
 
 .if !defined(REFERENCE_PORT)
 
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix gettext pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomehier glib20 ltverhack referencehack introspection:build
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 48d19801b..6f30fbef6 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/accessibility/caribou/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	caribou
 PORTVERSION=	0.4.10
@@ -20,9 +20,8 @@ LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter \
 RUN_DEPENDS=	py*-atspi>=2.1.91:${PORTSDIR}/accessibility/py-atspi
 
 USE_XZ=		yes
-USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=yes
-USES=		gettext pathfix pkgconfig shebangfix
+USES=		gettext gmake pathfix pkgconfig shebangfix
 SHEBANG_FILES=	tools/fix_gir.py tools/make_schema.py
 USE_PYTHON=	yes
 USE_XORG=	x11 xtst
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 2efe51c8d..acaa65a9e 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/accessibility/mousetweaks/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	mousetweaks
 PORTVERSION=	2.32.1
@@ -16,8 +16,7 @@ CONFLICTS=	mousetweaks-3.[0-9]*
 USE_XORG=	x11 xfixes xcursor xtst
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gnomepanel intlhack
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/mousetweaks3/Makefile b/accessibility/mousetweaks3/Makefile
index bed3fd744..84dab782f 100644
--- a/accessibility/mousetweaks3/Makefile
+++ b/accessibility/mousetweaks3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/accessibility/mousetweaks3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	mousetweaks
 PORTVERSION=	3.6.0
@@ -20,8 +20,7 @@ LATEST_LINK=	mousetweaks3
 USE_XZ=		yes
 USE_XORG=	x11 xfixes xcursor xtst
 USE_GNOME=	gnomeprefix intlhack gtk30
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index ce0270738..01bb71561 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/accessibility/orca/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	orca
 PORTVERSION=	2.32.1
@@ -25,9 +25,8 @@ CONFLICTS=	orca-3.[0-9]* py*-json-py-[0-9]*
 LATEST_LINK=	gnome-orca
 
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_PYTHON=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix libgnomeui gnomespeech pygnome2 pygnomedesktop
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/accessibility/orca3/Makefile b/accessibility/orca3/Makefile
index 466de0b6f..7be965e14 100644
--- a/accessibility/orca3/Makefile
+++ b/accessibility/orca3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/accessibility/orca3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	orca
 PORTVERSION=	3.6.2
@@ -28,9 +28,8 @@ CONFLICTS=	orca-2.[0-9]* py*-json-py-[0-9]*
 LATEST_LINK=	gnome-orca3
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_PYTHON=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtk30 pygobject3
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index 4e705fe5c..bef29481e 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/accessibility/py-atspi/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	atspi
 PORTVERSION=	2.8.0
@@ -19,8 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at
 CONFLICTS=	at-spi-1.[0-9]*
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomehier intlhack pygobject3
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index f91879095..de18399ea 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -20,10 +20,9 @@ CONFLICTS=	file-roller-3.[0-9]*
 
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
-USES=		gettext pathfix desktop-file-utils pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gtk20 gconf2
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
diff --git a/archivers/file-roller3/Makefile b/archivers/file-roller3/Makefile
index e74053515..5776dae9b 100644
--- a/archivers/file-roller3/Makefile
+++ b/archivers/file-roller3/Makefile
@@ -19,9 +19,8 @@ CONFLICTS=	file-roller-2.[0-9]*
 LATEST_LINK=	file-roller3
 USE_LDCONFIG=	yes
 USE_XZ=		yes
-USES=		gettext pathfix desktop-file-utils pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index d3a09f2d9..d565a2c60 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -16,8 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LGPL
 
 LIB_DEPENDS=	vorbisfile:${PORTSDIR}/audio/libvorbis
 
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix gnomehier gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool libltdl
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 7c5bdf48a..0855dc50e 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/audio/pulseaudio/Makefile 18611 2013-06-30 16:33:55Z marcus $
 #
 # !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
 # PORTREVISION bumps of depending ports.
@@ -29,10 +29,9 @@ USE_XZ=		yes
 USE_GNOME=	glib20 intltool ltverhack gnomehier
 USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libltdl libtool
-USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/audio/rhythmbox3/Makefile b/audio/rhythmbox3/Makefile
index 3bba56739..3562b6418 100644
--- a/audio/rhythmbox3/Makefile
+++ b/audio/rhythmbox3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/audio/rhythmbox3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	rhythmbox
 PORTVERSION=	2.90.1.1
@@ -27,10 +27,9 @@ CONFLICTS=	rhythmbox-0.[0-9]*
 
 LATEST_LINK=	rhythmbox3
 USE_BZIP2=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 INSTALLS_OMF=	yes
 USE_XORG=	ice xproto
-USE_GMAKE=	yes
 USE_GNOME=	intlhack gnomeprefix gtk30 introspection:build
 WANT_GNOME=	yes
 USE_GSTREAMER=	flac mp3 jpeg cdparanoia vorbis
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 8c2d5d89c..650864094 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/databases/evolution-data-server/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	2.32.1
@@ -21,8 +21,7 @@ LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		bison pathfix gettext pkgconfig
+USES=		bison gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack ltverhack ltasneededhack gconf2 libxml2
 USE_OPENLDAP=	yes
 USE_SQLITE=	3
diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile
index db457a92a..d545b39ad 100644
--- a/databases/evolution-data-server3/Makefile
+++ b/databases/evolution-data-server3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/databases/evolution-data-server3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	3.6.4
@@ -29,8 +29,7 @@ CONFLICTS=	evolution-data-server-2.[0-9]*
 
 LATEST_LINK=	evolution-data-server3
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		bison pathfix gettext pkgconfig
+USES=		bison gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack ltverhack ltasneededhack gconf2 \
 		libxml2 gtk30 introspection:build
 USE_OPENLDAP=	yes
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index e0171b7df..fcc6cf071 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/databases/glom/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	glom
 PORTVERSION=	1.24.0
@@ -26,8 +26,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 USE_XZ=		yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-USES=		gettext pathfix pkgconfig shared-mime-info desktop-file-utils
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig shared-mime-info \
+		desktop-file-utils
 USE_GNOME=	gnomedocutils gnomeprefix intltool pygobject3 libxml2 \
 		gtksourceviewmm3 libgdamm5
 USE_LDCONFIG=	yes
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index 22f453167..44e287b04 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/databases/libgda5/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgda
 PORTVERSION?=	5.0.3
@@ -26,8 +26,7 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		json-glib-1.0:${PORTSDIR}/devel/json-glib
 
 USE_AUTOTOOLS=	libtool
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix glib20 libxslt intlhack referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/libgdamm5/Makefile b/databases/libgdamm5/Makefile
index e9a1fb516..581eec6dc 100644
--- a/databases/libgdamm5/Makefile
+++ b/databases/libgdamm5/Makefile
@@ -1,6 +1,6 @@
 # Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/databases/libgdamm5/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgdamm
 PORTVERSION=	4.99.6
@@ -15,8 +15,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_AUTOTOOLS=	libtool
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	libgda5 glibmm
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile
index dde710e42..095f176ff 100644
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/baobab/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	baobab
 PORTVERSION=	3.6.2
@@ -18,8 +18,7 @@ LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack libxml2 gtk30
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 3e2a32e0c..84e826995 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#  $MCom$
+#  $MCom: ports/trunk/deskutils/gnome-contacts/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-contacts
 PORTVERSION=	3.6.2
@@ -17,8 +17,7 @@ LIB_DEPENDS=	goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
 
 USE_XZ=		yes
 USE_GNOME=	intlhack gtk30 gnomedesktop3 evolutiondataserver3
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/gnome-dictionary/Makefile b/deskutils/gnome-dictionary/Makefile
index 2273d25b4..9966e3f7d 100644
--- a/deskutils/gnome-dictionary/Makefile
+++ b/deskutils/gnome-dictionary/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gnome-dictionary/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-dictionary
 PORTVERSION=	3.6.0
@@ -17,8 +17,7 @@ BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30
diff --git a/deskutils/gnome-documents/Makefile b/deskutils/gnome-documents/Makefile
index de22f45c0..e105a53ba 100644
--- a/deskutils/gnome-documents/Makefile
+++ b/deskutils/gnome-documents/Makefile
@@ -24,9 +24,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 USE_XZ=		yes
-USES=		pathfix gettext pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack libxml2
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile
index 6e2821459..e9c682cef 100644
--- a/deskutils/gnome-font-viewer/Makefile
+++ b/deskutils/gnome-font-viewer/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gnome-font-viewer/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-font-viewer
 PORTVERSION=	3.6.1
@@ -17,8 +17,7 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30 gnomedesktop3
diff --git a/deskutils/gnome-screenshot/Makefile b/deskutils/gnome-screenshot/Makefile
index e01283288..7c62c1909 100644
--- a/deskutils/gnome-screenshot/Makefile
+++ b/deskutils/gnome-screenshot/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gnome-screenshot/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-screenshot
 PORTVERSION=	3.6.1
@@ -16,8 +16,7 @@ LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gtk30
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/gnome-search-tool/Makefile b/deskutils/gnome-search-tool/Makefile
index e5030bce8..231106d4a 100644
--- a/deskutils/gnome-search-tool/Makefile
+++ b/deskutils/gnome-search-tool/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gnome-search-tool/Makefile 18554 2013-06-17 14:46:47Z kwm $
 
 PORTNAME=	gnome-search-tool
 PORTVERSION=	3.6.0
@@ -16,8 +16,7 @@ BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gtk30 intlhack
diff --git a/deskutils/gnome-system-log/Makefile b/deskutils/gnome-system-log/Makefile
index d74a0c1e6..c7f1139c0 100644
--- a/deskutils/gnome-system-log/Makefile
+++ b/deskutils/gnome-system-log/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gnome-system-log/Makefile 18571 2013-06-18 09:29:00Z kwm $
 
 PORTNAME=	gnome-system-log
 PORTVERSION=	3.6.1
@@ -16,8 +16,7 @@ BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index bedf4be5c..2fc52b699 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gnome-utils/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-utils
 PORTVERSION=	2.32.0
@@ -21,9 +21,8 @@ CONFLICTS=	baobob-3.[0-9]* gnome-dictionary-3.[0-9]* \
 		gnome-search-tool-3.[0-9]* gnome-system-log-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix intlhack gnomepanel ltverhack
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 2a4bd9d6b..49f053910 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gnote/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnote
 PORTVERSION=	0.8.3
@@ -16,11 +16,10 @@ LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
 		boost_filesystem:${PORTSDIR}/devel/boost-libs \
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
 
-USE_GMAKE=	yes
 USE_XZ=		yes
 USE_GNOME=	gnomeprefix gtk30 intltool libxml2 libxslt \
 		ltverhack gnomedocutils gtkmm30
-USES=		gettext pathfix pkgconfig desktop-file-utils
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 GLIB_SCHEMAS=	org.gnome.gnote.gschema.xml
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 5f6ad8208..c1e16f788 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gucharmap/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gucharmap
 PORTVERSION=	2.32.1
@@ -17,8 +17,7 @@ LIB_DEPENDS=	rarian:${PORTSDIR}/textproc/rarian
 CONFLICTS=	gucharmap-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gtk20 gnomedocutils gconf2
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
diff --git a/deskutils/gucharmap3/Makefile b/deskutils/gucharmap3/Makefile
index 53e1ae897..78771d21f 100644
--- a/deskutils/gucharmap3/Makefile
+++ b/deskutils/gucharmap3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/gucharmap3/Makefile 18553 2013-06-17 14:39:34Z kwm $
 
 PORTNAME=	gucharmap
 PORTVERSION=	3.6.1
@@ -17,8 +17,7 @@ CONFLICTS=	gucharmap-2.[0-9]*
 
 LATEST_LINK=	gucharmap3
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 45036ef10..5644fc6a9 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -1,6 +1,6 @@
 # Created by: Andreas Kohn <andreas@syndrom23.de>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/deskutils/notification-daemon/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	notification-daemon
 PORTVERSION=	0.7.6
@@ -18,8 +18,7 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 
 USE_XZ=		yes
 USE_GNOME=	gnomeprefix intlhack gtk30
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
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
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 0bc14f866..16a7bbed4 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/editors/gedit-plugins/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	2.32.0
@@ -21,8 +21,7 @@ CONFLICTS=	gedit-plugins-3.[0-9]*
 
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack gnomevfs2
 WANT_GNOME=	yes
diff --git a/editors/gedit-plugins3/Makefile b/editors/gedit-plugins3/Makefile
index e227c4966..ec6a9017a 100644
--- a/editors/gedit-plugins3/Makefile
+++ b/editors/gedit-plugins3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/editors/gedit-plugins3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	3.6.1
@@ -21,8 +21,7 @@ GEDITVER=	3.6.0
 LATEST_LINK=	gedit-plugins3
 USE_LDCONFIG=	yes
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack gtk30 gtksourceview3
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index b45b8ff67..86a08138c 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/editors/gedit/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gedit
 PORTVERSION=	2.30.4
@@ -21,10 +21,9 @@ CONFLICTS=	gedit-3.[0-9]*
 
 USE_XORG=	sm
 USE_BZIP2=	yes
-USES=		gettext pathfix desktop-file-utils
+USES=		desktop-file-utils gettext gmake pathfix
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack gconf2 gtksourceview2 \
 		gnomedocutils ltasneededhack
diff --git a/editors/gedit3/Makefile b/editors/gedit3/Makefile
index e38049b5b..0145c55f8 100644
--- a/editors/gedit3/Makefile
+++ b/editors/gedit3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/editors/gedit3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gedit
 PORTVERSION=	3.6.2
@@ -25,10 +25,9 @@ CONFLICTS=	gedit-2.[0-9]*
 LATEST_LINK=	gedit3
 USE_XORG=	sm
 USE_XZ=		yes
-USES=		gettext pathfix desktop-file-utils pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack gtksourceview3 libxml2 \
 		gnomedocutils pygobject3
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 18d28a4f5..d29922f51 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/editors/ghex/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	ghex
 PORTVERSION=	2.24.0
@@ -15,9 +15,8 @@ COMMENT=	GNOME 2 hex editor
 CONFLICT=	ghex-3.\*
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack libgnomeprintui libgnomeui gnomedocutils
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
diff --git a/editors/ghex3/Makefile b/editors/ghex3/Makefile
index 24a8ee879..9c6ee7f50 100644
--- a/editors/ghex3/Makefile
+++ b/editors/ghex3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/editors/ghex3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	ghex
 PORTVERSION=	3.8.1
@@ -16,9 +16,8 @@ BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 CONFLICT=	ghex-2.\*
 
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtk30 intlhack libxml2:build
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index f8d42590a..1409809ef 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/games/gnome-games/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-games
 PORTVERSION=	2.32.1
@@ -21,10 +21,9 @@ CONFLICTS=	sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USES=		gettext pathfix desktop-file-utils
+USES=		desktop-file-utils gettext gmake pathfix
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GL=		gl
 USE_GNOME=	gnomeprefix intlhack librsvg2 pygnomedesktop gnomedocutils \
 		introspection:build
diff --git a/games/gnome-games3/Makefile b/games/gnome-games3/Makefile
index 04d5f7287..95e5b183c 100644
--- a/games/gnome-games3/Makefile
+++ b/games/gnome-games3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/games/gnome-games3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-games
 PORTVERSION=	3.4.2
@@ -26,7 +26,7 @@ CONFLICTS=	sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* gnome-games-2.[0-9]*
 LATEST_LINK=	gnome-games3
 USE_XZ=		yes
 USE_PYTHON=	yes
-USES=		gettext pathfix desktop-file-utils pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 INSTALLS_ICONS=	yes
 USE_GL=		gl glu
 USE_XORG=	ice x11
diff --git a/graphics/clutter-gtk3/Makefile b/graphics/clutter-gtk3/Makefile
index dddfa95e8..733f8c756 100644
--- a/graphics/clutter-gtk3/Makefile
+++ b/graphics/clutter-gtk3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/graphics/clutter-gtk3/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	clutter-gtk
 PORTVERSION=	1.2.2
@@ -15,8 +15,7 @@ LIB_DEPENDS=	clutter-1.0:${PORTSDIR}/graphics/clutter
 
 LATEST_LINK=	clutter-gtk3
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk30 ltverhack gnomeprefix
 USE_XORG=	xp x11
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 867db5ae3..c03c92d85 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -1,6 +1,6 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#  $MCom$
+#  $MCom: ports/trunk/graphics/clutter/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	clutter
 PORTVERSION=	1.12.2
@@ -16,8 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	json-glib-1.0:${PORTSDIR}/devel/json-glib \
 		cogl:${PORTSDIR}/graphics/cogl
 
-USES=		pkgconfig gettext pathfix
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gdkpixbuf2 ltverhack gnomeprefix atk pango \
diff --git a/graphics/cogl/Makefile b/graphics/cogl/Makefile
index be19ffec2..f58169b85 100644
--- a/graphics/cogl/Makefile
+++ b/graphics/cogl/Makefile
@@ -1,6 +1,6 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#  $MCom$
+#  $MCom: ports/trunk/graphics/cogl/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	cogl
 PORTVERSION=	1.12.2
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	clutter-1.6.[0-9]*
 
-USES=		pkgconfig gettext pathfix
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gdkpixbuf2 ltverhack gnomeprefix atk pango introspection:build
diff --git a/graphics/colord-gtk/Makefile b/graphics/colord-gtk/Makefile
index c4c95d518..c173beef2 100644
--- a/graphics/colord-gtk/Makefile
+++ b/graphics/colord-gtk/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/graphics/colord-gtk/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	colord-gtk
 PORTVERSION=	0.1.25
@@ -17,12 +17,10 @@ LIB_DEPENDS=	colord:${PORTSDIR}/graphics/colord \
 
 USE_XZ=		yes
 USE_GNOME=	gnomehier gtk30 intlhack introspection:build
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_SQLITE=	3
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-MAKE_JOBS_SAFE=yes
 CONFIGURE_ARGS=	--enable-gtk-doc-html=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 91c042c98..1789595b9 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/graphics/colord/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	colord
 PORTVERSION=	1.0.1
@@ -19,8 +19,7 @@ GROUPS=		colord
 
 USE_XZ=		yes
 USE_GNOME=	gnomehier glib20 intlhack introspection:build
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_SQLITE=	3
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index cf25f62dc..0cca8f56a 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/graphics/eog-plugins/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	eog-plugins
 PORTVERSION=	2.30.1
@@ -19,10 +19,9 @@ RUN_DEPENDS=	eog:${PORTSDIR}/graphics/eog
 CONFLICTS=	eog-plugins-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gtk20
 WANT_GNOME=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/eog-plugins3/Makefile b/graphics/eog-plugins3/Makefile
index 806623d96..a3bc61d20 100644
--- a/graphics/eog-plugins3/Makefile
+++ b/graphics/eog-plugins3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/graphics/eog-plugins3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	eog-plugins
 PORTVERSION=	3.6.1
@@ -21,9 +21,8 @@ CONFLICTS=	eog-plugins-2.[0-9]*
 
 LATEST_LINK=	eog-plugins3
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 572de2cbf..eea3a9551 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/graphics/eog/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	eog
 PORTVERSION=	2.32.1
@@ -19,10 +19,10 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-i
 CONFLICTS=	eog-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack librsvg2 gconf2 gnomedesktop
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix desktop-file-utils shared-mime-info pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/eog3/Makefile b/graphics/eog3/Makefile
index 37bf0cfe3..ad2729f26 100644
--- a/graphics/eog3/Makefile
+++ b/graphics/eog3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/graphics/eog3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	eog
 PORTVERSION=	3.6.2
@@ -23,11 +23,11 @@ CONFLICTS=	eog-2.[0-9]*
 
 LATEST_LINK=	eog3
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack librsvg2 gtk30 gnomedesktop3 \
 		introspection:build
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix desktop-file-utils pkgconfig shared-mime-info
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/evince3/Makefile b/graphics/evince3/Makefile
index 7cb02132a..901bc49f2 100644
--- a/graphics/evince3/Makefile
+++ b/graphics/evince3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/graphics/evince3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evince
 PORTVERSION=	3.6.1
@@ -27,9 +27,8 @@ USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_XORG=	ice
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-USES=		pathfix gettext pkgconfig desktop-file-utils
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack gnomeprefix ltasneededhack introspection:build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 7b4e5e7cd..0b2f6e659 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -14,10 +14,9 @@ COMMENT=	A graphic library for GTK+
 
 LATEST_LINK=	gdk-pixbuf2
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_XORG=	xt xi x11
 USE_AUTOTOOLS=	libtool
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME+=	gnomehier glib20 ltverhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile
index c56718ee8..32d9ece2a 100644
--- a/graphics/gnome-color-manager/Makefile
+++ b/graphics/gnome-color-manager/Makefile
@@ -1,6 +1,6 @@
 # Created by: FreeBSD GNOME Team <gnome@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/graphics/gnome-color-manager/Makefile 18575 2013-06-18 16:28:35Z kwm $
 
 PORTNAME=	gnome-color-manager
 PORTVERSION=	3.6.1
@@ -23,8 +23,7 @@ LIB_DEPENDS=	lcms2:${PORTSDIR}/graphics/lcms2 \
 USE_XZ=		yes
 USE_XORG=	xrandr
 USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack vte3
-USE_GMAKE=	yes
-USES=		desktop-file-utils gettext pathfix pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/gnome-video-effects/Makefile b/graphics/gnome-video-effects/Makefile
index 66add6da0..192d51188 100644
--- a/graphics/gnome-video-effects/Makefile
+++ b/graphics/gnome-video-effects/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/graphics/gnome-video-effects/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	gnome-video-effects
 PORTVERSION=	0.3.0
@@ -12,8 +12,7 @@ COMMENT=	A collection of Gstreamer effects
 
 USE_BZIP2=	yes
 USE_GNOME=	intlhack
-USE_GMAKE=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index f22411aa2..4aa68212b 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/graphics/libchamplain/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libchamplain
 PORTVERSION=	0.12.4
@@ -14,11 +14,10 @@ LIB_DEPENDS=	clutter-gtk-1.0:${PORTSDIR}/graphics/clutter-gtk3 \
 		soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome
 
 USE_XZ=		yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gtk30 ltverhack gnomehier introspection:build
 USE_AUTOTOOLS=	libtool
 USE_GL=		gl
-USE_GMAKE=	yes
 USE_SQLITE=	3
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/libchamplain08/Makefile b/graphics/libchamplain08/Makefile
index 295d8f374..753f8bafb 100644
--- a/graphics/libchamplain08/Makefile
+++ b/graphics/libchamplain08/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/graphics/libchamplain08/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libchamplain
 PORTVERSION=	0.8.3
@@ -15,11 +15,10 @@ LIB_DEPENDS=	clutter-gtk-0.10:${PORTSDIR}/graphics/clutter-gtk \
 
 LATEST_LINK=	libchamplain08
 USE_BZIP2=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gtk20 ltverhack:1 gnomehier
 USE_GL=		gl
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_SQLITE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index cc4fed7f7..60366e0ed 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,6 +1,6 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/graphics/librsvg2/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	librsvg
 PORTVERSION=	2.36.4
@@ -17,8 +17,7 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehier gnomeprefix libgsf ltverhack gtk20 \
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index a568bee3a..ab4d0c9e4 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 CONFLICTS_BUILD=spidermonkey17-1.7.*
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig shebangfix
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig shebangfix
 USE_PYTHON_BUILD=yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index e4cb70c48..6dd03a86f 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Programming language and compiler that converts Vala code into C code
 
 LICENSE=	LGPL21
 
-USES=		bison pathfix gettext pkgconfig
+USES=		bison gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomeprefix libxslt
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index f05e0c1ca..ac9885c51 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution-ews/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-ews
 PORTVERSION=	3.6.4
@@ -18,10 +18,9 @@ RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
 
 EVO_VER=	3.6.0
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_SQLITE=	yes
-USE_GMAKE=	yes
 USE_BDB=	5
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack ltasneededhack
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 7f8a6db9d..9898f55dc 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger, based off kiesel's ximian-exchange port
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution-exchange/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.32.1
@@ -19,9 +19,8 @@ RUN_DEPENDS=	${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
 CONFLICTS=	evolution-exchange-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_BDB=	41+
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack ltasneededhack
diff --git a/mail/evolution-exchange3/Makefile b/mail/evolution-exchange3/Makefile
index 9d854d961..496eca602 100644
--- a/mail/evolution-exchange3/Makefile
+++ b/mail/evolution-exchange3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger, based off kiesel's ximian-exchange port
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution-exchange3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	3.4.4
@@ -19,9 +19,8 @@ CONFLICTS=	evolution-exchange-2.[0-9]*
 EVO_VER=	3.4.3
 LATEST_LINK=	evolution-exchange3
 USE_XZ=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_BDB=	5
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack ltasneededhack
diff --git a/mail/evolution-groupwise/Makefile b/mail/evolution-groupwise/Makefile
index 72ee9f951..790816500 100644
--- a/mail/evolution-groupwise/Makefile
+++ b/mail/evolution-groupwise/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution-groupwise/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-groupwise
 PORTVERSION=	3.4.2
@@ -16,9 +16,8 @@ RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
 
 EVO_VER=	3.4.1
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_BDB=	5
 USE_GNOME=	gnomeprefix intlhack ltasneededhack libxml2 gconf2
 CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
diff --git a/mail/evolution-kolab/Makefile b/mail/evolution-kolab/Makefile
index aa1493587..134bd7334 100644
--- a/mail/evolution-kolab/Makefile
+++ b/mail/evolution-kolab/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution-kolab/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-kolab
 PORTVERSION=	3.4.4
@@ -18,9 +18,8 @@ RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution3
 
 EVO_VER=	3.4.1
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_SQLITE=	yes
 MAKE_JOBS_UNSAFE=yes
 USE_GNOME=	gnomeprefix intlhack ltasneededhack libxml2 gconf2 
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index a8699dc88..2339484a9 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution-mapi/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-mapi
 PORTVERSION=	0.32.2
@@ -21,8 +21,7 @@ CONFLICTS=	evolution-mapi-3.[0-9]*
 PKGFILES=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc
 
 USE_BZIP2=	yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake
 USE_GNOME=	evolutiondataserver
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/evolution-mapi3/Makefile b/mail/evolution-mapi3/Makefile
index d58d190eb..1adeeac92 100644
--- a/mail/evolution-mapi3/Makefile
+++ b/mail/evolution-mapi3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution-mapi3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution-mapi
 PORTVERSION=	3.4.4
@@ -22,8 +22,7 @@ BROKEN=		needs newer libmapi which needs samba4 update.
 EVO_VER=	3.4.3
 LATEST_LINK=	evolution-mapi3
 USE_XZ=		yes
-USES=		gettext pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pkgconfig
 USE_GNOME=	gconf2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/evolution3/Makefile b/mail/evolution3/Makefile
index a9bf3cd59..ddebf1173 100644
--- a/mail/evolution3/Makefile
+++ b/mail/evolution3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/mail/evolution3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	evolution
 PORTVERSION=	3.6.4
@@ -23,8 +23,7 @@ CONFLICTS=	evolution-2.[0-9]*
 
 LATEST_LINK=	evolution3
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		bison gettext pathfix desktop-file-utils
+USES=		desktop-file-utils bison gettext gmake pathfix
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver3 gtkhtml4 \
 		gnomedocutils ltasneededhack gnomedesktop3
 USE_AUTOTOOLS=	libtool
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 2cef03820..05fca1f9c 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/math/gcalctool/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gcalctool
 PORTVERSION=	5.32.2
@@ -16,8 +16,7 @@ COMMENT=	A GNOME 2 calculator tool based on the old calctool for OpenWindows
 CONFLICTS=	gcalctool-6.[0-9]*
 
 USE_BZIP2=	yes
-USES=		bison gettext pathfix
-USE_GMAKE=	yes
+USES=		bison gettext gmake pathfix
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack gconf2 gnomedocutils gtk20
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/math/gcalctool3/Makefile b/math/gcalctool3/Makefile
index d06254a34..755de8106 100644
--- a/math/gcalctool3/Makefile
+++ b/math/gcalctool3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/math/gcalctool3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gcalctool
 PORTVERSION=	6.4.2.1
@@ -18,8 +18,7 @@ BUILD_DEPENDS=	yelp-build:${PORTSDIR}/textproc/yelp-tools \
 
 LATEST_LINK=	gcalctool3
 USE_XZ=	yes
-USES=		bison gettext pathfix
-USE_GMAKE=	yes
+USES=		bison gettext gmake pathfix
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix intlhack gconf2 gtk30 libxml2
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index 526f97c66..db653868a 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/misc/gnome-devel-docs/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-devel-docs
 PORTVERSION=	2.32.0
@@ -19,7 +19,7 @@ CONFLICTS=	gnome-devel-docs-3.[0-9]*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_GNOME=	gnomehier
 INSTALLS_OMF=	yes
 
diff --git a/misc/gnome-devel-docs3/Makefile b/misc/gnome-devel-docs3/Makefile
index 47252550b..a03543c8d 100644
--- a/misc/gnome-devel-docs3/Makefile
+++ b/misc/gnome-devel-docs3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/misc/gnome-devel-docs3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-devel-docs
 PORTVERSION=	3.6.2
@@ -16,7 +16,7 @@ CONFLICTS=	gnome-devel-docs-2.[0-9]*
 LATEST_LINK=	gnome-devel-docs3
 USE_XZ=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_GNOME=	gnomehier gnomedocutils
 INSTALLS_OMF=	yes
 
diff --git a/misc/gnome-icon-theme-extras/Makefile b/misc/gnome-icon-theme-extras/Makefile
index 427a34117..fb236b594 100644
--- a/misc/gnome-icon-theme-extras/Makefile
+++ b/misc/gnome-icon-theme-extras/Makefile
@@ -1,6 +1,6 @@
 # Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/misc/gnome-icon-theme-extras/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-icon-theme-extras
 PORTVERSION=	3.6.2
@@ -16,9 +16,8 @@ BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hic
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_XZ=		yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	intlhack gtk-update-icon-cache
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-icon-mapping
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index a564687e5..6842a382c 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/misc/gnome-icon-theme/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-icon-theme
 PORTVERSION=	3.6.2
@@ -16,9 +16,8 @@ BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hic
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_XZ=		yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	intlhack
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-icon-mapping
diff --git a/misc/gnome-user-docs3/Makefile b/misc/gnome-user-docs3/Makefile
index 0787774f0..e1006ed05 100644
--- a/misc/gnome-user-docs3/Makefile
+++ b/misc/gnome-user-docs3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/misc/gnome-user-docs3/Makefile 18566 2013-06-18 07:35:39Z kwm $
 
 PORTNAME=	gnome-user-docs
 PORTVERSION=	3.6.2
@@ -15,10 +15,9 @@ BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
 LATEST_LINK=	gnome-user-docs3
 USE_XZ=		yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	gnomeprefix gnomehier libxml2:build
 
 .include <bsd.port.mk>
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index f108de191..ee73dcd18 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -1,6 +1,6 @@
 # Created by: FreeBSD GNOME Team <gnome@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/multimedia/cheese/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	cheese
 PORTVERSION=	2.32.0
@@ -20,10 +20,9 @@ CONFLICTS=	cheese-3.[0-9]*
 
 USE_XORG=	xxf86vm
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver librsvg2 \
 		gnomedocutils gnomedesktop
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GSTREAMER=	gconf good ogg theora v4l2 vorbis
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/multimedia/cheese3/Makefile b/multimedia/cheese3/Makefile
index 99f872ef5..b486526aa 100644
--- a/multimedia/cheese3/Makefile
+++ b/multimedia/cheese3/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/multimedia/cheese3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	cheese
 PORTVERSION=	3.6.0
@@ -26,10 +26,9 @@ CONFLICTS=	cheese-2.[0-9]*
 LATEST_LINK=	cheese3
 USE_XORG=	xxf86vm x11
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver3 librsvg2 \
 		gnomedesktop3 libxml2:build introspection:build
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 # USE_GSTREAMER= bad gconf good jpeg ogg theora v4l2 vorbis
 USE_GSTREAMER1=	bad good jpeg ogg theora v4l2
 INSTALLS_OMF=	yes
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index d0349b6ae..34ce75ad5 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -1,6 +1,6 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/multimedia/clutter-gst/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	clutter-gst
 PORTVERSION=	2.0.2
@@ -12,11 +12,10 @@ COMMENT=	Clutter GStreamer integration
 
 LIB_DEPENDS=	clutter-1.0:${PORTSDIR}/graphics/clutter
 
-USE_GMAKE=	yes
 USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_GL=		gl
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	ltverhack gnomeprefix gnomehier introspection:build
 USE_GSTREAMER1=	yes
 USE_XORG=	xp x11
diff --git a/multimedia/libgnome-media-profiles/Makefile b/multimedia/libgnome-media-profiles/Makefile
index 959ab8fbe..f88411bd1 100644
--- a/multimedia/libgnome-media-profiles/Makefile
+++ b/multimedia/libgnome-media-profiles/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/multimedia/libgnome-media-profiles/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	libgnome-media-profiles
 PORTVERSION=	3.0.0
@@ -13,12 +13,11 @@ COMMENT=	Library that contains code to manage media profiles
 CONFLICTS=	gnome-media-2.[0-9]*
 
 USE_GNOME=	gtk30 gconf2 intlhack gnomedocutils
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GSTREAMER=	yes
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 
 GCONF_SCHEMAS=	gnome-media-profiles.schemas
 
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 34ea76c2a..f55585cbd 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/multimedia/totem-pl-parser/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	totem-pl-parser
 PORTVERSION=	3.4.5
@@ -15,8 +15,7 @@ LIB_DEPENDS=	gmime-2.6:${PORTSDIR}/mail/gmime26 \
 		soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		gettext gmake pathfix
 USE_GNOME=	gnomeprefix glib20 libxml2 intlhack ltverhack gnomehier \
 		introspection:build
 USE_LDCONFIG=	yes
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index e1d0d23fe..3def9bc43 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,6 +1,6 @@
 # Created by: Hendrik Scholz <hendrik@scholz.net>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/multimedia/totem/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	totem
 PORTVERSION=	2.32.0
@@ -24,11 +24,10 @@ CONFLICTS=	totem-3.[0-9]*
 
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-USES=		pathfix gettext pkgconfig desktop-file-utils
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack nautilus2 ltverhack pygtk2 gnomehier
 USE_GSTREAMER=	core gconf hal good mpeg2dec soup ugly python gio
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
diff --git a/multimedia/totem3/Makefile b/multimedia/totem3/Makefile
index bf255e55a..a1a3b59be 100644
--- a/multimedia/totem3/Makefile
+++ b/multimedia/totem3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Hendrik Scholz <hendrik@scholz.net>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/multimedia/totem3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	totem
 PORTVERSION=	3.6.3
@@ -30,12 +30,11 @@ LATEST_LINK=	totem3
 USE_PYTHON=	yes
 USE_XORG=	x11 xproto xtst ice sm
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig desktop-file-utils
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gtk30 libxml2 nautilus3 ltverhack \
 		pygobject3 gnomedocutils gnomehier introspection:build
 USE_GSTREAMER1=	core good bad soup ugly
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index c72b36a1b..4320e1bc7 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/empathy/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	empathy
 PORTVERSION=	2.34.0
@@ -30,9 +30,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 
 CONFLICTS=	empathy-3.[0-9]*
 
-USE_GMAKE=	yes
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	evolutiondataserver gnomeprefix pygtk2 ltverhack
 USE_GSTREAMER=	yes
diff --git a/net-im/empathy3/Makefile b/net-im/empathy3/Makefile
index 23f318b24..b2186e1ec 100644
--- a/net-im/empathy3/Makefile
+++ b/net-im/empathy3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/empathy3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	empathy
 PORTVERSION=	3.6.2
@@ -38,9 +38,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 CONFLICTS=	empathy-2.[0-9]*
 
 LATEST_LINK=	empathy3
-USE_GMAKE=	yes
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	evolutiondataserver3 gnomeprefix ltverhack
 USE_GSTREAMER1=	yes
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index 32f79fb8f..a22630935 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/farsight2/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	farsight2
 PORTVERSION=	0.0.31
@@ -16,8 +16,7 @@ RUN_DEPENDS=	libnice-gst010>=0:${PORTSDIR}/net-im/libnice-gst010
 CONFLICTS=	farstream-[0-9]*
 
 FETCH_ARGS=	-Fpr
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_GNOME=	glib20 ltverhack
diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile
index 16ec7e585..da5f25091 100644
--- a/net-im/farstream/Makefile
+++ b/net-im/farstream/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net-im/farstream/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	farstream
 PORTVERSION=	0.2.3
@@ -15,10 +15,9 @@ RUN_DEPENDS=	libnice-gst1>=0:${PORTSDIR}/net-im/libnice-gst1
 
 CONFLICTS=	farsight2-[0-9]*
 
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	glib20 ltverhack
 USE_GSTREAMER1=	good bad
 USE_AUTOTOOLS=	libtool
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index c30b03369..993174458 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net-im/folks/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	folks
 PORTVERSION=	0.8.0
@@ -21,8 +21,7 @@ CONFLICTS=	folks-0.4.[0-9]*
 USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	evolutiondataserver3 gnomehier intlhack \
 		introspection:build ltverhack
 GNU_CONFIGURE=	yes
diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile
index 174b67ad8..4c14d3403 100644
--- a/net-im/folks04/Makefile
+++ b/net-im/folks04/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net-im/folks04/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	folks
 PORTVERSION=	0.4.3
@@ -19,8 +19,7 @@ CONFLICTS=	folks-0.[6-9].[0-9]*
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext gmake
 USE_GNOME=	intlhack gnomehier introspection:build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index 9cdee83d2..e621c87b8 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Lightweight Jabber client library
 LIB_DEPENDS=	idn:${PORTSDIR}/dns/libidn
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 ltverhack
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index 1fe9ea3fb..74163ccc1 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net-im/telepathy-farsight/Makefile 18394 2013-04-26 21:29:28Z kwm $
 
 PORTNAME=	telepathy-farsight
 PORTVERSION=	0.0.19
@@ -15,11 +15,10 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gstfarsight-0.10:${PORTSDIR}/net-im/farsight2
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 ltverhack libxslt:build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile
index e178435bc..eb47497de 100644
--- a/net-im/telepathy-farstream/Makefile
+++ b/net-im/telepathy-farstream/Makefile
@@ -16,11 +16,10 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		farstream-0.2:${PORTSDIR}/net-im/farstream
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 libxslt:build ltverhack
 CONFIGURE_ENV=	LIBS="-pthread"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 484cb1e17..a6b4763f1 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/telepathy-gabble/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	telepathy-gabble
 PORTVERSION=	0.16.6
@@ -22,8 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 PORTSCOUT=	limitw:1,even
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 libxslt:build
 USE_SQLITE=	yes
 USE_OPENSSL=	yes
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index d4fdb9918..14bfa0cd6 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/telepathy-glib/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	telepathy-glib
 PORTVERSION=	0.20.2
@@ -16,9 +16,8 @@ RUN_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen
 PORTSCOUT=	limitw:1,even
 
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 gnomehier introspection:build libxslt:build ltverhack
 USE_PYTHON_BUILD=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile
index 7f16e4ada..e85b29ecb 100644
--- a/net-im/telepathy-haze/Makefile
+++ b/net-im/telepathy-haze/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net-im/telepathy-haze/Makefile 17271 2013-04-01 15:16:27Z kwm $
 
 PORTNAME=	telepathy-haze
 PORTVERSION=	0.6.0
@@ -14,12 +14,11 @@ LIB_DEPENDS=	purple:${PORTSDIR}/net-im/libpurple \
 		idn:${PORTSDIR}/dns/libidn \
 		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
 
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	libxslt:build
 CPPFLAGS+=	-I${LOCALBASE}/include
 WRKSRC=		${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION}
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 
 MAN8=		telepathy-haze.8
 
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 8871351b3..898f39045 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -1,6 +1,6 @@
 # Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/telepathy-idle/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	telepathy-idle
 PORTVERSION=	0.1.11
@@ -16,8 +16,7 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 libxslt:build
 
 MAN8=		telepathy-idle.8
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index 684ea0569..a828677af 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/telepathy-logger/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	telepathy-logger
 PORTVERSION=	0.4.0
@@ -17,9 +17,8 @@ LICENSE=	LGPL21
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 intltool gnomedocutils ltverhack libxml2 libxslt:build \
 		introspection:build
 USE_SQLITE=	yes
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 5fcac2200..37d97d90f 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net-im/telepathy-mission-control/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	telepathy-mission-control
 PORTVERSION=	5.12.0
@@ -13,12 +13,11 @@ COMMENT=	Telepathy component to apps to abstract details of connection managers
 LIB_DEPENDS=	telepathy:${PORTSDIR}/net-im/libtelepathy \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix gconf2 libxslt ltverhack
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GLIB_SCHEMAS=	im.telepathy.MissionControl.FromEmpathy.gschema.xml
 
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index b416b46e2..d696c9d81 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -1,6 +1,6 @@
 # Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net-im/telepathy-salut/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	telepathy-salut
 PORTVERSION=	0.8.0
@@ -15,8 +15,7 @@ LIB_DEPENDS=	avahi-glib:${PORTSDIR}/net/avahi-app \
 		soup-2.4:${PORTSDIR}/devel/libsoup
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 libxslt:build
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 5556f7dfc..aef88ebd1 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,6 +1,6 @@
 # Created by: roger@FreeBSD.org
 # $FreeBSD$
-#  $MCom$
+#  $MCom: ports/trunk/net/ekiga/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	ekiga
 PORTVERSION=	2.0.11
@@ -16,8 +16,7 @@ LIB_DEPENDS=	opal_r:${PORTSDIR}/net/opal
 CONFLICTS=	ekiga3-3.*
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_SDL=	sdl
 INSTALLS_OMF=	yes
 USE_GNOME=	libgnomeui gnomeprefix gnomedocutils \
@@ -28,7 +27,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 CONFIGURE_ARGS=	--with-pwlib-dir=${LOCALBASE} \
 		--with-opal-dir=${LOCALBASE}
-MAKE_JOBS_SAFE=	yes
 
 GCONF_SCHEMAS=	ekiga.schemas
 MAN1=		ekiga.1
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index e44d471a7..54a6ad745 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -22,14 +22,12 @@ CONFLICTS=	ekiga-2.*
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_XORG=	xv
 USE_GNOME=	gtk20
 DIST_SUBDIR=	gnome2
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-MAKE_JOBS_SAFE=	yes
 
 MAN1=		ekiga.1
 
diff --git a/net/geocode-glib/Makefile b/net/geocode-glib/Makefile
index 5e32d4b08..93ab3dbb7 100644
--- a/net/geocode-glib/Makefile
+++ b/net/geocode-glib/Makefile
@@ -12,11 +12,10 @@ COMMENT=	a convenience library for the Yahoo! Place Finder APIs
 LIB_DEPENDS=	json-glib-1.0:${PORTSDIR}/devel/json-glib \
 		soup-2.4:${PORTSDIR}/devel/libsoup
 
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 USE_GNOME=	evolutiondataserver3 gnomedocutils gnomehier intlhack ltverhack
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index b1348d958..6b0a5cef4 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net/glib-networking/Makefile 18537 2013-06-16 20:08:30Z kwm $
 
 PORTNAME=	glib-networking
 PORTVERSION=	2.36.2
@@ -23,9 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack glib20 intltool
-USES=		gettext
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
+USES=		gettext gmake
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 616890c8e..1085014f7 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net/gnome-nettool/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-nettool
 PORTVERSION=	2.32.0
@@ -19,8 +19,7 @@ CONFLICTS=	gnome-nettool-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_GNOME=	intlhack gnomeprefix libglade2 gconf2 gnomedocutils
-USE_GMAKE=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gnome-nettool3/Makefile b/net/gnome-nettool3/Makefile
index b032a4519..e129fa894 100644
--- a/net/gnome-nettool3/Makefile
+++ b/net/gnome-nettool3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net/gnome-nettool3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-nettool
 PORTVERSION=	3.2.0
@@ -19,8 +19,7 @@ LATEST_LINK=	gnome-nettool3
 
 USE_XZ=		yes
 USE_GNOME=	intlhack gnomeprefix gtk30 gnomedocutils
-USE_GMAKE=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index 55d8c76e8..114b3ad6d 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/net/gnome-online-accounts/Makefile 18594 2013-06-25 09:01:00Z kwm $
 
 PORTNAME=	gnome-online-accounts
 PORTVERSION=	3.6.2
@@ -20,8 +20,7 @@ LIB_DEPENDS=	webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \
 
 USE_XZ=		yes
 USE_GNOME=	gtk30 intlhack introspection:build
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index f2c008c04..d59cbc057 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 CONFLICTS=	gtk-vnc-0.4.[0-9]*
 
 USE_GNOME=	pygtk2
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gtk-vnc3/Makefile b/net/gtk-vnc3/Makefile
index 69ab9f9fa..52eab8beb 100644
--- a/net/gtk-vnc3/Makefile
+++ b/net/gtk-vnc3/Makefile
@@ -22,8 +22,7 @@ CONFLICTS=	gtk-vnc-0.3.[0-9]*
 LATEST_LINK=	gtk-vnc3
 USE_XZ=		yes
 USE_GNOME=	gtk30
-USE_GMAKE=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/libgweather3/Makefile b/net/libgweather3/Makefile
index d4c6add34..36f9e03a2 100644
--- a/net/libgweather3/Makefile
+++ b/net/libgweather3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net/libgweather3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgweather
 PORTVERSION=	3.6.2
@@ -17,10 +17,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
 CONFLICTS=	libgweather-2.[0-9]*
 
 LATEST_LINK=	libgweather3
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomehier gnomeprefix intlhack gconf2 ltverhack gtk30
 USE_LDCONFIG=	yes
diff --git a/net/libzapojit/Makefile b/net/libzapojit/Makefile
index e2f4b2258..169dd3760 100644
--- a/net/libzapojit/Makefile
+++ b/net/libzapojit/Makefile
@@ -1,6 +1,6 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net/libzapojit/Makefile 18583 2013-06-23 11:12:45Z kwm $
 
 PORTNAME=	libzapojit
 PORTVERSION=	0.0.2
@@ -17,9 +17,8 @@ LIB_DEPENDS=	goa-1:${PORTSDIR}/net/gnome-online-accounts \
 		rest-0.7:${PORTSDIR}/devel/librest
 
 USE_XZ=		yes
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	gnomeprefix intlhack
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index f28349fe0..d15981977 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net/vinagre/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	vinagre
 PORTVERSION=	2.30.3
@@ -21,9 +21,8 @@ LIB_DEPENDS=	gtk-vnc-1.0:${PORTSDIR}/net/gtk-vnc \
 CONFLICTS=	vinagre-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext pathfix desktop-file-utils shared-mime-info
+USES=		desktop-file-utils gettext gmake pathfix shared-mime-info
 USE_GNOME=	gnomeprefix intlhack vte gconf2 gnomedocutils gnomepanel
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/net/vinagre3/Makefile b/net/vinagre3/Makefile
index 332d773e9..3625f0e5e 100644
--- a/net/vinagre3/Makefile
+++ b/net/vinagre3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#  $MCom$
+#  $MCom: ports/trunk/net/vinagre3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	vinagre
 PORTVERSION=	3.6.2
@@ -24,9 +24,9 @@ CONFLICTS=	vinagre-2.[0-9]*
 
 LATEST_LINK=	vinagre3
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig desktop-file-utils shared-mime-info
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
 USE_GNOME=	gnomeprefix gtk30 intlhack libxml2 vte3
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-spice --enable-ssh
diff --git a/net/vino/Makefile b/net/vino/Makefile
index ae878cc74..56b33f697 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,6 +1,6 @@
 # Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net/vino/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	vino
 PORTVERSION=	2.32.2
@@ -19,10 +19,9 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 CONFLICTS=	vino-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomepanel
 USE_XORG=	xtst
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net/vino3/Makefile b/net/vino3/Makefile
index 53f510f6d..36e4732e7 100644
--- a/net/vino3/Makefile
+++ b/net/vino3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/net/vino3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	vino
 PORTVERSION=	3.6.2
@@ -22,10 +22,9 @@ CONFLICTS=	vino-2.[0-9]*
 
 LATEST_LINK=	vino3
 USE_XZ=		yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_GNOME=	gnomeprefix gtk30 intlhack
 USE_XORG=	xdamage xfixes xtst
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--without-network-manager \
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index cb53c5256..69d5d7ded 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -1,6 +1,6 @@
 # Created by: Anders F Bjorklund <afb@users.sourceforge.net>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/ports-mgmt/packagekit/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	packagekit
 PORTVERSION=	0.8.9
@@ -16,9 +16,8 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
 
-USE_GMAKE=	yes
 USE_XZ=		yes
-USES=		gettext iconv pathfix shared-mime-info
+USES=		gettext gmake iconv pathfix shared-mime-info
 USE_GNOME=	glib20 intltool introspection
 USE_LDCONFIG=	yes
 USE_SQLITE=	3
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index 77b0f60a7..3c1906eae 100644
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/print/cups-pk-helper/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	cups-pk-helper
 PORTVERSION=	0.2.0
@@ -15,9 +15,8 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	intlhack glib20
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/libs
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 076acff8a..09f7a7755 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Support library for gnome cups administration
 LIB_DEPENDS=	cups:${PORTSDIR}/print/cups-client
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	intlhack ltverhack glib20
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=  libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index ef19868dc..939dcf2b3 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -24,8 +24,7 @@ PORTSCOUT=	limitw:1,even
 USE_XZ=		yes
 USE_XORG=	x11
 USE_GNOME=	intlhack gnomedocutils gtk30 libgsf libxml2
-USE_GMAKE=	yes
-USES=		gettext pathfix shared-mime-info
+USES=		gettext gmake pathfix shared-mime-info
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index 2a15a4132..a7e1fecdb 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/security/gcr/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gcr
 PORTVERSION=	3.6.2
@@ -20,8 +20,7 @@ CONFLICTS=	gnome-keyring-2.[0-9]*
 
 USE_XZ=		yes
 USE_GNOME=	gtk30 intlhack introspection:build
-USES=		gettext pathfix pkgconfig shared-mime-info
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig shared-mime-info
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 81ebcc000..d6e72a268 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/gnome-keyring/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	2.32.1
@@ -20,8 +20,7 @@ CONFLICTS=	gnome-keyring-3.[0-9]* gcr-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gtk20 ltverhack intlhack
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib" \
diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile
index 08d70e98b..6ba0403c0 100644
--- a/security/gnome-keyring3/Makefile
+++ b/security/gnome-keyring3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/gnome-keyring3/Makefile 18410 2013-05-01 15:20:45Z kwm $
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	3.6.2
@@ -26,8 +26,7 @@ CONFLICTS=	gnome-keyring-2.[0-9]*
 LATEST_LINK=	gnome-keyring3
 USE_XZ=		yes
 USE_GNOME=	gnomeprefix gtk30 ltverhack intlhack
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/security/libcryptui/Makefile b/security/libcryptui/Makefile
index 39f97af54..40b0e867d 100644
--- a/security/libcryptui/Makefile
+++ b/security/libcryptui/Makefile
@@ -1,6 +1,6 @@
 # Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/libcryptui/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libcryptui
 PORTVERSION=	3.6.0
@@ -21,8 +21,7 @@ CONFLICTS=	seahorse-2.[0-9]* seahorse-3.0.[0-9]*
 
 USE_LDCONFIG=	yes
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack gnomeprefix gnomedocutils gtk30
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index d722ecf22..5fcc5cf57 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/libgnome-keyring/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgnome-keyring
 PORTVERSION=	3.6.0
@@ -16,8 +16,7 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomehier gnomeprefix intlhack \
 		introspection:build ltverhack
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/security/libpwquality/Makefile b/security/libpwquality/Makefile
index 5713879da..ca464b609 100644
--- a/security/libpwquality/Makefile
+++ b/security/libpwquality/Makefile
@@ -11,10 +11,9 @@ COMMENT=	Library for generating random passwords and quality checking
 
 LIB_DEPENDS=	crack:${PORTSDIR}/security/cracklib
 
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index f128468fc..dcfe1f5e2 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/libsecret/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libsecret
 PORTVERSION=	0.15
@@ -15,8 +15,7 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_XZ=		yes
 USE_GNOME=	gnomehier glib20 libxslt:build intltool introspection:build
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-introspection
diff --git a/security/seahorse-sharing/Makefile b/security/seahorse-sharing/Makefile
index b4ea68978..17fa3359b 100644
--- a/security/seahorse-sharing/Makefile
+++ b/security/seahorse-sharing/Makefile
@@ -1,6 +1,6 @@
 # Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/seahorse-sharing/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	seahorse-sharing
 PORTVERSION=	3.2.1
@@ -19,8 +19,7 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		seahorse>=3.2.1:${PORTSDIR}/security/seahorse3
 
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack gnomeprefix
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 99ea6e879..d0337441a 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,6 +1,6 @@
 # Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/seahorse/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	seahorse
 PORTVERSION=	2.32.0
@@ -25,8 +25,7 @@ CONFLICTS=	libcryptui-3.[0-9]* seahorse-3.[0-9]*
 USE_XORG=	sm
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
diff --git a/security/seahorse3/Makefile b/security/seahorse3/Makefile
index 7605b3b75..32e8f2f36 100644
--- a/security/seahorse3/Makefile
+++ b/security/seahorse3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/seahorse3/Makefile 18480 2013-05-17 20:20:19Z kwm $
 
 PORTNAME=	seahorse
 PORTVERSION=	3.6.3
@@ -29,8 +29,7 @@ LATEST_LINK=	seahorse3
 USE_XORG=	sm
 USE_LDCONFIG=	yes
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack gnomeprefix gtk30
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index 6d6f13fc1..021fc6598 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/sysutils/accountsservice/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	accountsservice
 PORTVERSION=	0.6.24
@@ -17,8 +17,7 @@ LIB_DEPENDS=	xslt:${PORTSDIR}/textproc/libxslt \
 
 USE_XZ=		yes
 USE_GNOME=	glib20 intlhack gnomehier introspection:build
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-systemd --localstatedir=/var/
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 1c9046705..b10837a1e 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/sysutils/brasero/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	brasero
 PORTVERSION=	2.32.1
@@ -24,9 +24,9 @@ CONFLICTS=	brasero-3.[0-9]*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_XORG=	sm
-USES=		desktop-file-utils gettext pathfix pkgconfig shared-mime-info
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
 USE_GNOME=	intlhack gnomeprefix gnomedocutils
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	gconf core
diff --git a/sysutils/brasero3/Makefile b/sysutils/brasero3/Makefile
index 25ec32e38..56a52b107 100644
--- a/sysutils/brasero3/Makefile
+++ b/sysutils/brasero3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/sysutils/brasero3/Makefile 18503 2013-05-27 13:37:42Z kwm $
 
 PORTNAME=	brasero
 PORTVERSION=	3.6.1
@@ -21,10 +21,10 @@ RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 CONFLICTS=	brasero-2.[0-9]*
 
 LATEST_LINK=	brasero3
-USES=		gettext pathfix pkgconfig desktop-file-utils shared-mime-info
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_XORG=	sm ice
 USE_GNOME=	gconf2 gnomeprefix gtk30 intlhack libxml2
 USE_LDCONFIG=	yes
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index ff8f72c80..62e3cd8bd 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -39,8 +39,7 @@ GH_TAGNAME=	1.7.1
 GH_COMMIT=	a3883df
 
 USE_XORG=	x11 xfixes sm
-USES=		gettext pathfix
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
 		gnomedesktop3 evolutiondataserver3
 USE_LDCONFIG=	yes
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index b1b991e57..e5555f504 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/sysutils/consolekit/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	consolekit
 PORTVERSION=	0.4.5
@@ -15,9 +15,8 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 
 WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XORG=	x11
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/drwright/Makefile b/sysutils/drwright/Makefile
index 6be52ffc1..5ab0817f8 100644
--- a/sysutils/drwright/Makefile
+++ b/sysutils/drwright/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#  $MCom$
+#  $MCom: ports/trunk/sysutils/drwright/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	drwright
 PORTVERSION=	3.2.5
@@ -16,8 +16,7 @@ LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
 USE_XZ=		yes
 USE_GNOME=	intlhack gtk30 gnomecontrolcenter3
 USE_XORG=	x11 xscrnsaver
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 79a660bd3..6752c3d97 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/gconf-editor/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gconf-editor
 PORTVERSION=	2.32.0
@@ -16,10 +16,9 @@ COMMENT=	A gconf database editor for the GNOME 2 environment
 CONFLICTS=	gconf-editor-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack libgnomeui gnomedocutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/gconf-editor3/Makefile b/sysutils/gconf-editor3/Makefile
index d13d4a2cf..f1457976a 100644
--- a/sysutils/gconf-editor3/Makefile
+++ b/sysutils/gconf-editor3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/gconf-editor3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gconf-editor
 PORTVERSION=	3.0.1
@@ -15,10 +15,9 @@ CONFLICTS=	gconf-editor-2.[0-9]*
 
 LATEST_LINK=	gconf-editor3
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 2e582408d..1f0df0916 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/gnome-control-center/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	2.32.1
@@ -23,8 +23,8 @@ RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 CONFLICTS=	gnome-control-center-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig desktop-file-utils shared-mime-info
-USE_GMAKE=	yes
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
 USE_GSTREAMER=	good
 WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix intlhack metacity gnomemenus \
diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index ba097a782..fbfd8f596 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/gnome-control-center3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.6.3
@@ -37,8 +37,8 @@ CONFLICTS=	gnome-control-center-2.[0-9]* gnome-media-2.[0-9]*
 
 LATEST_LINK=	gnome-control-center3
 USE_XZ=		yes
-USES=		desktop-file-utils gettext pathfix pkgconfig shared-mime-info
-USE_GMAKE=	yes
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
 USE_GNOME=	gnomeprefix gnomehier intlhack libxml2 gnomemenus3 \
 		libgnomekbd3 gnomedesktop3 gconf2
 USE_XORG=	xscrnsaver x11 xxf86misc kbproto xi
diff --git a/sysutils/gnome-power-manager3/Makefile b/sysutils/gnome-power-manager3/Makefile
index 4271259c0..fa7b1382f 100644
--- a/sysutils/gnome-power-manager3/Makefile
+++ b/sysutils/gnome-power-manager3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/gnome-power-manager3/Makefile 18545 2013-06-17 11:34:52Z kwm $
 
 PORTNAME=	gnome-power-manager
 PORTVERSION=	3.6.0
@@ -16,9 +16,8 @@ LIB_DEPENDS=	upower-glib:${PORTSDIR}/sysutils/upower \
 CONFLICTS=	gnome-power-manager-2.[0-9]*
 
 LATEST_LINK=	gnome-power-manager3
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
-USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gtk30 intlhack
 MAKE_JOBS_UNSAFE=yes
diff --git a/sysutils/gnome-settings-daemon3/Makefile b/sysutils/gnome-settings-daemon3/Makefile
index cbc9682b3..7c7dde055 100644
--- a/sysutils/gnome-settings-daemon3/Makefile
+++ b/sysutils/gnome-settings-daemon3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/gnome-settings-daemon3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-settings-daemon
 PORTVERSION=	3.6.3
@@ -30,9 +30,8 @@ CONFLICTS=	gnome-settings-daemon-2.[0-9]*
 LATEST_LINK=	gnome-settings-daemon3
 USE_XORG=	xxf86misc
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libgnomekbd3 gnomehier
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-gudev \
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 3da9309be..64b456ca3 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/gnome-system-monitor/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	2.28.2
@@ -20,9 +20,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
 CONFLICTS=	gnome-system-monitor-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack libwnck gnomevfs2 gnomedocutils librsvg2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DGLIB_COMPILATION
diff --git a/sysutils/gnome-system-monitor3/Makefile b/sysutils/gnome-system-monitor3/Makefile
index 9ed9a9f91..320f2c5e0 100644
--- a/sysutils/gnome-system-monitor3/Makefile
+++ b/sysutils/gnome-system-monitor3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/gnome-system-monitor3/Makefile 18579 2013-06-23 08:34:44Z kwm $
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	3.6.1
@@ -20,9 +20,8 @@ CONFLICTS=	gnome-system-monitor-2.[0-9]*
 
 LATEST_LINK=	gnome-system-monitor3
 USE_XZ=		yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 INSTALLS_OMF=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtkmm30 intlhack librsvg2 libwnck3
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 78a410e18..af5498be7 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast<kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/polkit-gnome/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	polkit-gnome
 PORTVERSION=	0.102
@@ -13,8 +13,7 @@ COMMENT=	GNOME frontend to the PolicyKit framework
 LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_GNOME=	gnomeprefix gtk20 intlhack introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 9612f13f6..e65991a44 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast<kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/polkit/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	polkit
 PORTVERSION=	0.105
@@ -15,8 +15,7 @@ LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	dbus-launch:${PORTSDIR}/devel/dbus
 
 USE_GNOME=	glib20 intlhack gnomehier introspection
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 3df18b633..727b37de3 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/system-tools-backends/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	system-tools-backends
 PORTVERSION=	2.10.2
@@ -17,9 +17,8 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 RUN_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_PERL5=	yes
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	intlhack glib20
 GNU_CONFIGURE=	yes
 USE_GNOME_SUBR=	yes
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 9cced54c5..56ba38691 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/upower/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	upower
 PORTVERSION=	0.9.18
@@ -16,9 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
     		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	intlhack ltverhack glib20 introspection
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 6241802cd..4e2984f4a 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,6 +1,6 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/textproc/gnome-doc-utils/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-doc-utils
 PORTVERSION=	0.20.10
@@ -19,9 +19,8 @@ RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian \
 		${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml-440
 
 USE_XZ=		yes
-USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomehier libxslt intlhack
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 8337158ea..dc71c115a 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,6 +1,6 @@
 # Created by: fenner
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/textproc/gtk-doc/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gtk-doc
 PORTVERSION=	1.18
@@ -27,9 +27,8 @@ CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 USE_XZ=		yes
 USE_PERL5=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix libxslt gnomedocutils
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 1b410a68c..09fa4a941 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 USE_PYTHON=	yes
 
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 GLIB_SCHEMAS=	org.freedesktop.ibus.gschema.xml
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=	--disable-iso-codes-check
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USES=		gettext
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 0847435b8..4fcd7e3ec 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,6 @@
 # Created by: Yukihiro Nakai <Nakai@technologist.com>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/textproc/libxml2/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libxml2
 PORTVERSION=	2.8.0
@@ -16,10 +16,8 @@ COMMENT?=	XML parser library for GNOME
 
 .if !defined(REFERENCE_PORT)
 
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
-USES=		iconv pathfix pkgconfig
+USES=		gmake iconv pathfix pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \
 		--with-html-dir=${PREFIX}/share/doc \
diff --git a/textproc/yelp-tools/Makefile b/textproc/yelp-tools/Makefile
index 9629a0620..cc9c42879 100644
--- a/textproc/yelp-tools/Makefile
+++ b/textproc/yelp-tools/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/textproc/yelp-tools/Makefile 18487 2013-05-17 21:30:13Z kwm $
 
 PORTNAME=	yelp-tools
 PORTVERSION=	3.6.1
@@ -14,9 +14,8 @@ COMMENT=	Utilities to help manage documentation for Yelp and the web
 BUILD_DEPENDS=	yelp-xsl>=3.1.5:${PORTSDIR}/textproc/yelp-xsl \
 		itstool:${PORTSDIR}/textproc/itstool
 
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack libxml2 libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile
index 083325e76..461aca264 100644
--- a/textproc/yelp-xsl/Makefile
+++ b/textproc/yelp-xsl/Makefile
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/textproc/yelp-xsl/Makefile 18500 2013-05-26 22:35:07Z kwm $
 
 PORTNAME=	yelp-xsl
 PORTVERSION=	3.6.1
@@ -14,8 +14,7 @@ COMMENT=	DocBook XSLT stylesheets for yelp
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack libxml2 libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 76cad0bf9..3cc61b09d 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/www/epiphany-extensions/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	epiphany-extensions
 PORTVERSION=	2.30.2
@@ -19,12 +19,11 @@ RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
 
 CONFLICTS=	epiphany-extensions-3.[0-9]*
 
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix intlhack
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
diff --git a/www/epiphany-extensions3/Makefile b/www/epiphany-extensions3/Makefile
index ac954d686..578dbc712 100644
--- a/www/epiphany-extensions3/Makefile
+++ b/www/epiphany-extensions3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/www/epiphany-extensions3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	epiphany-extensions
 PORTVERSION=	3.4.0
@@ -20,12 +20,11 @@ RUN_DEPENDS=	epiphany>=3.4.0:${PORTSDIR}/www/epiphany3
 CONFLICTS=	epiphany-extensions-2.[0-9]*
 
 LATEST_LINK=	epiphany-extensions3
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_GNOME=	gnomeprefix intlhack
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	LIBS="${PTHREAD_LIBS}"
diff --git a/www/epiphany3/Makefile b/www/epiphany3/Makefile
index bb520f0ad..c4845c9cd 100644
--- a/www/epiphany3/Makefile
+++ b/www/epiphany3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/www/epiphany3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	epiphany
 PORTVERSION=	3.4.3
@@ -34,11 +34,10 @@ INSTALLS_ICONS=	yes
 USE_XZ=		yes
 USE_PYTHON=	yes
 USE_SQLITE=	3
-USES=		desktop-file-utils gettext pathfix pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomedocutils libxml2
 USE_XORG=	ice x11 sm
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS+=--enable-introspection \
 		--with-distributor-name="FreeBSD GNOME Project"
diff --git a/www/gtkhtml4/Makefile b/www/gtkhtml4/Makefile
index f1292a184..daced0460 100644
--- a/www/gtkhtml4/Makefile
+++ b/www/gtkhtml4/Makefile
@@ -19,10 +19,9 @@ 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 pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage xproto
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index 7c5707a96..6936fd18a 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/www/libepc/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	libepc
 PORTVERSION=	0.4.4
@@ -16,8 +16,7 @@ LIB_DEPENDS=	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		avahi-ui-gtk3:${PORTSDIR}/net/avahi-gtk3
 
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk30
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/libsocialweb/Makefile b/www/libsocialweb/Makefile
index 83eb3751c..88468568f 100644
--- a/www/libsocialweb/Makefile
+++ b/www/libsocialweb/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/www/libsocialweb/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libsocialweb
 PORTVERSION=	0.25.20
@@ -18,10 +18,9 @@ LIB_DEPENDS=	rest-0.7:${PORTSDIR}/devel/librest \
 
 USE_GNOME=	glib20 intlhack gconf2 introspection:build gnomehier
 USE_XZ=		yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 CONFIGURE_ARGS=	--enable-vala-bindings
 # review if we want all the services enabled, because of not completely
 # safe public API security wise?
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 0d65b48ef..e6c108ff0 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -22,10 +22,8 @@ LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
 
 USE_XZ=		yes
 USE_GSTREAMER=	yes
-MAKE_JOBS_SAFE=	yes
 USE_XORG=	xt
-USES=		bison gettext pkgconfig
-USE_GMAKE=	yes
+USES=		bison gettext gmake pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 libxslt ltverhack introspection:build
 USE_SQLITE=	yes
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 88d4946c8..276a809c8 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/www/webkit-gtk3/Makefile 18629 2013-07-19 20:42:52Z kwm $
 
 PORTNAME=	webkit
 PORTVERSION=	2.0.3
@@ -27,12 +27,10 @@ LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 USE_XZ=		yes
 USE_GSTREAMER1=	yes
-MAKE_JOBS_SAFE=	yes
 USE_XORG=	xt xdamage xcomposite
-USES=		bison gettext pkgconfig shebangfix
+USES=		bison gettext gmake pkgconfig shebangfix
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=yes
-USE_GMAKE=	yes
 USE_GNOME=	cairo gnomehier gtk20 gtk30 introspection:build \
 		libxslt:build
 USE_SQLITE=	3
diff --git a/x11-fm/nautilus3/Makefile b/x11-fm/nautilus3/Makefile
index 31d656d3a..020db4595 100644
--- a/x11-fm/nautilus3/Makefile
+++ b/x11-fm/nautilus3/Makefile
@@ -1,6 +1,6 @@
 # Created by: ade, archie
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-fm/nautilus3/Makefile 18474 2013-05-17 19:07:22Z kwm $
 
 PORTNAME=	nautilus
 PORTVERSION=	3.6.3
@@ -23,8 +23,7 @@ CONFLICTS=	nautilus-2.[0-9]*
 
 LATEST_LINK=	nautilus3
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext pathfix desktop-file-utils shared-mime-info
+USES=		desktop-file-utils gettext gmake pathfix shared-mime-info
 USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libxml2 \
 		ltverhack gvfs ltasneededhack introspection:build
 USE_LDCONFIG=	yes
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 1aefa7657..7ebee9e19 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -25,8 +25,7 @@ GH_TAGNAME=	1.7.1
 GH_COMMIT=	63f7b44
 
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
-USES=		gettext pathfix desktop-file-utils
+USES=		desktop-file-utils gettext gmake pathfix
 USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libxml2 introspection:build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool autoconf automake
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index f5eb193da..0fd2504f9 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	ltverhack
 CONFIGURE_ARGS=	--with-configdir=${PREFIX}/etc/fonts/conf.d \
 		--with-templatedir=${PREFIX}/etc/fonts/conf.avail \
@@ -34,7 +33,6 @@ CONFIGURE_ARGS=	--with-configdir=${PREFIX}/etc/fonts/conf.d \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--disable-docs
 MAKE_ENV=	LC_ALL=C
-MAKE_JOBS_SAFE=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 MAN1=		fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index d6f8127f4..68bbbbb12 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-themes/gnome-backgrounds/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-backgrounds
 PORTVERSION=	3.6.1
@@ -12,9 +12,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A collection of backgrounds for GNOME
 
 USE_XZ=		yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-themes/gnome-icon-theme-symbolic/Makefile b/x11-themes/gnome-icon-theme-symbolic/Makefile
index 19c577d33..973268a27 100644
--- a/x11-themes/gnome-icon-theme-symbolic/Makefile
+++ b/x11-themes/gnome-icon-theme-symbolic/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-themes/gnome-icon-theme-symbolic/Makefile 18433 2013-05-06 21:03:32Z kwm $
 
 PORTNAME=	gnome-icon-theme-symbolic
 PORTVERSION=	3.6.2
@@ -14,8 +14,7 @@ BUILD_DEPENDS=	icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
 
 USE_XZ=		yes
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GIT="" \
diff --git a/x11-themes/gnome-themes-standard/Makefile b/x11-themes/gnome-themes-standard/Makefile
index 2e633052e..9d5dd09e4 100644
--- a/x11-themes/gnome-themes-standard/Makefile
+++ b/x11-themes/gnome-themes-standard/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-themes/gnome-themes-standard/Makefile 18572 2013-06-18 10:03:30Z kwm $
 
 PORTNAME=	gnome-themes-standard
 PORTVERSION=	3.6.2
@@ -14,9 +14,8 @@ COMMENT=	Standard themes for GNOME
 CONFLICTS=	gnome-themes-2.[0-9]*
 
 USE_XZ=		yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtk30 intlhack librsvg2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 73588b9a7..ed9e27a6a 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-themes/gnome-themes/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-themes
 PORTVERSION=	2.32.1
@@ -18,10 +18,9 @@ RUN_DEPENDS=	gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2
 CONFLICTS=	clearlooks-metacity-0.* gnome-themes-standard-3.[0-9]*
 
 USE_BZIP2=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack metacity gtk20
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-themes/gtk-theme-engine-clearlooks/Makefile b/x11-themes/gtk-theme-engine-clearlooks/Makefile
index aa6fb592e..f4c420859 100644
--- a/x11-themes/gtk-theme-engine-clearlooks/Makefile
+++ b/x11-themes/gtk-theme-engine-clearlooks/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-themes/gtk-theme-engine-clearlooks/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	gtk-theme-engine-clearlooks
 PORTVERSION=	2.91.5
@@ -15,10 +15,9 @@ COMMENT=	Clearlooks theme engine
 
 LICENSE=	LGPL21
 
-USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk30 intlhack 
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-toolkits/gdl3/Makefile b/x11-toolkits/gdl3/Makefile
index 73f6acbaf..0b8fbf08e 100644
--- a/x11-toolkits/gdl3/Makefile
+++ b/x11-toolkits/gdl3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-toolkits/gdl3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gdl
 PORTVERSION=	3.6.2
@@ -16,9 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LATEST_LINK=	gdl3
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtk30 intltool
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index e1e38f834..61f384863 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,6 +1,6 @@
 # Created by: Vanilla I. Shu <vanilla@MinJe.com.TW>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-toolkits/gtk30/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gtk
 PORTVERSION=	3.8.2
@@ -26,14 +26,13 @@ BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
 
-USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
 #		introspection:build
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-gtk2-dependency --disable-packagekit
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index cb45e2f5b..a88c92c15 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -1,6 +1,6 @@
 # Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-toolkits/gtkmm30/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gtkmm
 PORTVERSION=	3.8.1
@@ -19,8 +19,7 @@ LATEST_LINK=	gtkmm30
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index 11b9cee68..feb58bd83 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -17,10 +17,9 @@ USE_XZ=		yes
 
 .if !defined(REFERENCE_PORT)
 
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_GNOME=	gnomeprefix gtk30 intlhack libxml2 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-compile-warnings=no --enable-glade-catalog=no \
 		--enable-introspection
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index c08e91355..3eeaf274f 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-toolkits/libwnck/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libwnck
 PORTVERSION=	2.30.7
@@ -21,9 +21,8 @@ LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
 CONFLICTS=	libwnck-3.[0-9]*
 
 USE_XORG=	xres x11
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 ltverhack referencehack intlhack introspection
-USES=		bison gettext pathfix
+USES=		bison gettext gmake pathfix
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile
index febf346d0..a2b599866 100644
--- a/x11-toolkits/libwnck3/Makefile
+++ b/x11-toolkits/libwnck3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-toolkits/libwnck3/Makefile 18569 2013-06-18 07:58:41Z kwm $
 
 PORTNAME=	libwnck
 PORTVERSION=	3.4.5
@@ -22,9 +22,8 @@ CONFLICTS=	libwnck-2.[0-9]*
 
 LATEST_LINK=	libwnck3
 USE_XORG=	xres x11
-USE_GMAKE=	yes
 USE_GNOME=	gtk30 intlhack introspection ltverhack referencehack
-USES=		bison gettext pathfix
+USES=		bison gettext gmake pathfix
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/mx/Makefile b/x11-toolkits/mx/Makefile
index 2150c4cd6..8709a4fe1 100644
--- a/x11-toolkits/mx/Makefile
+++ b/x11-toolkits/mx/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#  $MCom$
+#  $MCom: ports/trunk/x11-toolkits/mx/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	mx
 PORTVERSION=	1.2.1
@@ -16,8 +16,7 @@ LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter \
 		startup-notification-1:${PORTSDIR}/x11/startup-notification \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-USE_GMAKE=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20 gtk20 intlhack ltverhack
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 64709bcb6..f26f1847e 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -24,9 +24,7 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
 
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20 ltverhack referencehack introspection:build
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index 9ff950d3e..429480d65 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-toolkits/pangomm/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	pangomm
 PORTVERSION=	2.28.4
@@ -18,10 +18,9 @@ USE_XZ=		yes
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	pango glibmm cairomm
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-toolkits/pangox-compat/Makefile b/x11-toolkits/pangox-compat/Makefile
index ad5e7cb0b..05d41cfed 100644
--- a/x11-toolkits/pangox-compat/Makefile
+++ b/x11-toolkits/pangox-compat/Makefile
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-toolkits/pangox-compat/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	pangox-compat
 PORTVERSION=	0.0.2
@@ -15,11 +15,9 @@ BUILD_DEPENDS=	pango>=1.34.0:${PORTSDIR}/x11-toolkits/pango
 
 USE_XZ=		yes
 USE_XORG=	x11 ice
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 USE_GNOME=	glib20 pango
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index fd565d0c2..1de411396 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-toolkits/vte/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	vte
 PORTVERSION=	0.26.2
@@ -18,8 +18,7 @@ USE_BZIP2=	yes
 
 RUN_DEPENDS+=	${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper
 
-USE_GMAKE=	yes
-USES=		bison gettext pathfix
+USES=		bison gettext gmake pathfix
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME?=	gnomeprefix gtk20 ltverhack referencehack
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index 88db43349..03c1f35ab 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gno
 .endif
 
 LATEST_LINK?=	vte3
-USE_GMAKE=	yes
-USES=		bison gettext pathfix
+USES=		bison gettext gmake pathfix
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME?=	gnomeprefix gtk30 ltverhack referencehack introspection:build
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 8537304f0..44ea4f50c 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -1,6 +1,6 @@
 # Created by: Garrett Rooney <rooneg@electricjellyfish.net>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-wm/metacity/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	metacity
 PORTVERSION=	2.30.3
@@ -21,8 +21,7 @@ CONFLICTS=	metacity-2.3[4-9]*
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xcomposite xdamage
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack gconf2 ltverhack gtk20
 USE_LDCONFIG=	yes
diff --git a/x11-wm/metacity3/Makefile b/x11-wm/metacity3/Makefile
index 82270c81e..38791b310 100644
--- a/x11-wm/metacity3/Makefile
+++ b/x11-wm/metacity3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Garrett Rooney <rooneg@electricjellyfish.net>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-wm/metacity3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	metacity
 PORTVERSION=	2.34.13
@@ -26,8 +26,7 @@ CONFLICTS=	metacity-2.30.[0-9]*
 LATEST_LINK=	metacity3
 USE_XZ=		yes
 USE_XORG=	x11 xcomposite xdamage xrender xcursor xinerama xext xrandr
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack ltverhack gtk20
 USE_LDCONFIG=	yes
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 5a4508200..462cc7579 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -25,8 +25,7 @@ GH_COMMIT=	4b36a9a
 
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm
 USE_PYTHON=	2.5+
-USES=		gettext pathfix
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix
 USE_AUTOTOOLS=	libtool autoconf automake
 USE_GNOME=	gnomehier gnomeprefix intlhack gtk30 gconf2 introspection:build
 USE_LDCONFIG=	yes
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index 0b1008dbf..b7075df72 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -1,6 +1,6 @@
 # Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11-wm/mutter/Makefile 18577 2013-06-21 18:20:24Z kwm $
 
 PORTNAME=	mutter
 PORTVERSION=	3.6.2
@@ -23,8 +23,7 @@ USE_XZ=		yes
 USE_XORG=	x11 xext xrandr xcomposite xcursor xinerama ice sm xfixes \
 		xrender xdamage
 USE_PYTHON=	2.5+
-USES=		gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehier gnomeprefix gtk30 intlhack introspection:build \
 		ltverhack
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 16033a75c..576cd5916 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -37,8 +37,7 @@ GH_COMMIT=	941456a
 WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-Cinnamon-${GH_COMMIT}
 
 USE_XORG=	x11 xfixes sm
-USES=		gettext pathfix
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix
 USE_AUTOTOOLS=	libtool autoconf automake
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
 		gnomedesktop3 evolutiondataserver3 pygnome2
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index ff4bc3a76..dd199ceab 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gdm/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gdm
 PORTVERSION=	2.30.7
@@ -36,8 +36,7 @@ USE_XORG=	dmx dmxproto
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack gnomehier gconf2 librsvg2 \
 		gnomedocutils gnomeprefix gnomepanel
 GCONF_SCHEMAS=	gdm-simple-greeter.schemas
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile
index 7ebb2bce3..525091332 100644
--- a/x11/gdm3/Makefile
+++ b/x11/gdm3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gdm3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gdm
 PORTVERSION=	3.4.1
@@ -45,8 +45,7 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack gnomehier librsvg2 gnomeprefix gnomepanel3 dconf
 GNU_CONFIGURE=	yes
 GLIB_SCHEMAS=	org.gnome.login-screen.gschema.xml
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index edc118f65..e82910743 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-desktop/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	2.32.1
@@ -19,10 +19,9 @@ USE_BZIP2=	yes
 LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
 
 USE_XORG=	xpm
-USES=		bison gettext pathfix pkgconfig
+USES=		bison gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \
 		ltverhack referencehack
-USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile
index b90dfc5e1..59893abd4 100644
--- a/x11/gnome-desktop3/Makefile
+++ b/x11/gnome-desktop3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-desktop3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	3.6.2
@@ -27,10 +27,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTS
 
 LATEST_LINK=	gnome-desktop3
 USE_XORG=	x11 xrandr xext
-USES=		bison pathfix gettext
+USES=		bison gettext gmake pathfix
 USE_GNOME=	gnomeprefix intlhack gtk30 ltverhack referencehack \
 		introspection:build
-USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 163dd7753..bc0ccbfff 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-menus/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-menus
 PORTVERSION=	2.30.5
@@ -14,9 +14,8 @@ COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
 
 CONFLICTS=	gnome-menus-3.[0-9]*
 
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehier gnomeprefix intlhack glib20 ltverhack \
 		introspection:build
 USE_AUTOTOOLS=	libtool
diff --git a/x11/gnome-menus3/Makefile b/x11/gnome-menus3/Makefile
index b0b33b8a8..678b0267f 100644
--- a/x11/gnome-menus3/Makefile
+++ b/x11/gnome-menus3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-menus3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-menus
 PORTVERSION=	3.6.2
@@ -14,9 +14,8 @@ COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
 CONFLICTS=	gnome-menus-2.[0-9]*
 
 LATEST_LINK=	gnome-menus3
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehier gnomeprefix intlhack introspection:build \
 		ltverhack
 USE_AUTOTOOLS=	libtool
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index bd30ec093..42ba738a1 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-panel/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.32.1
@@ -27,10 +27,9 @@ USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_GNOME=	gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
 		gnomedocutils ltverhack referencehack librsvg2
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-network-manager
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/gnome-panel3/Makefile b/x11/gnome-panel3/Makefile
index a1112bc1d..19fe4c41c 100644
--- a/x11/gnome-panel3/Makefile
+++ b/x11/gnome-panel3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-panel3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-panel
 PORTVERSION=	3.6.2
@@ -25,13 +25,12 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/noti
 CONFLICTS=	gnome-panel-2.[0-9]*
 
 LATEST_LINK=	gnome-panel3
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XORG=	ice sm x11 xau xrandr
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix intlhack gnomedesktop3 librsvg2 libwnck3 \
 		gnomemenus3 ltverhack referencehack
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-network-manager
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index bae0b0957..a342295ba 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-screensaver/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	2.30.2
@@ -18,10 +18,9 @@ RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 CONFLICTS=	gnome-screensaver-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	xtst xxf86vm
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
diff --git a/x11/gnome-screensaver3/Makefile b/x11/gnome-screensaver3/Makefile
index 2b7929a49..e12bbd46c 100644
--- a/x11/gnome-screensaver3/Makefile
+++ b/x11/gnome-screensaver3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-screensaver3/Makefile 18580 2013-06-23 08:40:31Z kwm $
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	3.6.1
@@ -22,8 +22,7 @@ CONFLICTS=	gnome-screensaver-2.[0-9]*
 
 LATEST_LINK=	gnome-screensaver3
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack libgnomekbd3
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 004afba7e..4b73273cd 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-session/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-session
 PORTVERSION=	2.32.1
@@ -25,11 +25,10 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gno
 		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_BZIP2=	yes
 USE_XORG=	ice sm xau xrandr
 USE_GNOME=	gnomeprefix intlhack gconf2
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docbook-docs
 # us gconftool-2 instead of sanity-check because that got removed from gconf2.
diff --git a/x11/gnome-session3/Makefile b/x11/gnome-session3/Makefile
index 0c228a948..2c6d75b35 100644
--- a/x11/gnome-session3/Makefile
+++ b/x11/gnome-session3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-session3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-session
 PORTVERSION=	3.6.2
@@ -22,12 +22,11 @@ CONFLICTS=	gnome-session-2.[0-9]*
 
 LATEST_LINK=	gnome-session3
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
 USE_GL=		gl
 USE_GNOME=	gnomeprefix intlhack gconf2 intltool gtk30
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docbook-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile
index 5483d3737..0ab927b97 100644
--- a/x11/gnome-shell-extensions/Makefile
+++ b/x11/gnome-shell-extensions/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-shell-extensions/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	gnome-shell-extensions
 PORTVERSION=	3.2.0
@@ -15,9 +15,8 @@ LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 RUN_DEPENDS=	gnome-shell>=3.2.0:${PORTSDIR}/x11/gnome-shell
 
 USE_XZ=		yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_GNOME=	intltool glib20 gnomedesktop3
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-extensions=all
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 9edb0398c..ae89710b6 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -1,6 +1,6 @@
 # Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-shell/Makefile 18582 2013-06-23 10:52:15Z kwm $
 
 PORTNAME=	gnome-shell
 PORTVERSION=	3.6.2
@@ -31,8 +31,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
 
 USE_XZ=		yes
 USE_XORG=	x11 xfixes sm
-USES=		gettext pathfix
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	evolutiondataserver3 gnomedesktop3 gnomemenus3 gnomeprefix \
 		gtk30 intlhack ltverhack
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index cebf0a8b7..d2284e084 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-terminal/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gnome-terminal
 PORTVERSION=	2.32.1
@@ -16,10 +16,9 @@ LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
 
 CONFLICTS=	gnome-terminal-3.[0-9]*
 
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_BZIP2=	yes
 INSTALLS_OMF=	yes
-USE_GMAKE=	yes
 USE_XORG=	sm
 USE_GNOME=	gnomeprefix intlhack gconf2 vte gnomedocutils libgnome
 GNU_CONFIGURE=	yes
diff --git a/x11/gnome-terminal3/Makefile b/x11/gnome-terminal3/Makefile
index 988cd0a15..3effde5bd 100644
--- a/x11/gnome-terminal3/Makefile
+++ b/x11/gnome-terminal3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gnome-terminal3/Makefile 18559 2013-06-17 20:56:34Z kwm $
 
 PORTNAME=	gnome-terminal
 PORTVERSION=	3.6.2
@@ -19,10 +19,9 @@ LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 LATEST_LINK=	gnome-terminal3
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 INSTALLS_OMF=	yes
-USE_GMAKE=	yes
 USE_XORG=	sm ice
 USE_GNOME=	gconf2 gnomeprefix intlhack vte3 gnomedocutils
 GNU_CONFIGURE=	yes
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 3f1e9ab68..2a235e1df 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/libgnomekbd/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgnomekbd
 PORTVERSION=	2.32.0
@@ -20,9 +20,8 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix ltverhack gconf2
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix
+USES=		gettext gmake pathfix
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/x11/libgnomekbd3/Makefile b/x11/libgnomekbd3/Makefile
index db6e58b42..ec7c0b48b 100644
--- a/x11/libgnomekbd3/Makefile
+++ b/x11/libgnomekbd3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/libgnomekbd3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libgnomekbd
 PORTVERSION=	3.6.0
@@ -23,9 +23,8 @@ USE_GNOME=	gnomeprefix ltverhack intltool gtk30 introspection:build
 USE_AUTOTOOLS=	libtool
 USE_XORG=	ice
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 18e5a3962..12361a9df 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/libxklavier/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	libxklavier
 PORTVERSION=	5.2.1
@@ -17,8 +17,7 @@ RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
 
 USE_XORG=	x11 xkbfile
 USE_XZ=		yes
-USE_GMAKE=	yes
-USES=		pathfix
+USES=		gmake pathfix
 USE_GNOME=	libxml2 glib20 ltverhack:12 introspection:build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/x11/yelp3/Makefile b/x11/yelp3/Makefile
index aa580bcd2..0280a45a0 100644
--- a/x11/yelp3/Makefile
+++ b/x11/yelp3/Makefile
@@ -22,10 +22,9 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/yelp-xsl.pc:${PORTSDIR}/textproc/yel
 CONFLICTS=	yelp-2.[0-9]*
 
 LATEST_LINK=	yelp3
-USES=		desktop-file-utils gettext pathfix pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_XORG=	x11 ice
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30 libxslt libxml2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 8f666d3ea..3883eeb01 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,6 +1,6 @@
 # Created by: Franz Klammer <klammer@webonaut.com>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/zenity/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	zenity
 PORTVERSION=	2.32.1
@@ -15,10 +15,9 @@ COMMENT=	Display GNOME dialogs from the command line
 BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gtk20 gnomedocutils intlhack
 USE_BZIP2=	yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/x11/zenity3/Makefile b/x11/zenity3/Makefile
index 5ec39c1ae..da1b439bd 100644
--- a/x11/zenity3/Makefile
+++ b/x11/zenity3/Makefile
@@ -1,6 +1,6 @@
 # Created by: Franz Klammer <klammer@webonaut.com>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/zenity3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	zenity
 PORTVERSION=	3.6.0
@@ -16,8 +16,7 @@ LICENSE=	LGPL20
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
 LATEST_LINK=	zenity3
-USES=		gettext pathfix
-USE_GMAKE=	yes
+USES=		gettext gmake pathfix
 USE_GNOME=	gnomeprefix gtk30 intlhack
 USE_XORG=	x11
 USE_XZ=		yes
author	kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>	2013-07-26 18:42:35 +0800
committer	kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>	2013-07-26 18:42:35 +0800
commit	2772996df5e3c010f5d17d633fca6b117c56eb7a (patch)
tree	1467d8ed471411133ca91b3695d6e1b3a0a47ddf
parent	40d38ee86c9312b2a0c98a5387c6e42cb217d2a3 (diff)
download	marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.gz marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.bz2 marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.lz marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.xz marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.tar.zst marcuscom-ports-2772996df5e3c010f5d17d633fca6b117c56eb7a.zip