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

15 files changed, 27 insertions, 45 deletions

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 \