Convert GMAKE to MAKE_CMD

Please note that lots of invocation of MAKE_CMD here are wrong as they do not
properly respect MAKE_ENV and friends

With hat:	portmgr

23 files changed, 30 insertions, 30 deletions

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index b8b1513bee06..c091a595b892 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -272,7 +272,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
 
 post-configure:
-	@cd ${WRKSRC} && ${GMAKE} menuselect.makeopts
+	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts
 .if ${PORT_OPTIONS:MMYSQL}
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index 8090f482ccba..974488709c0b 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -256,7 +256,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
 
 post-configure:
-	@cd ${WRKSRC} && ${GMAKE} menuselect.makeopts
+	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts
 .if ${PORT_OPTIONS:MMYSQL}
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index b5dbc4abff91..b3382ddd4976 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -27,11 +27,11 @@ USE_GNOME+=	libglade2
 
 post-build:
 	@(cd ${WRKSRC}/avahi-discover-standalone; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 post-install:
 	@(cd ${WRKSRC}/avahi-discover-standalone; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 	${LN} -sf man/man1/bssh.1 ${STAGEDIR}${PREFIX}/man/man1/bvnc.1
 	${LN} -sf man/man1/bssh.1 ${STAGEDIR}${PREFIX}/man/man1/bshell.1
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui.so.0
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
index ca3428ff4fe9..c7c38af42fb4 100644
--- a/net/avahi-gtk3/Makefile
+++ b/net/avahi-gtk3/Makefile
@@ -23,9 +23,9 @@ AVAHI_PKGCONFIG=avahi-ui-gtk3.pc
 USE_GNOME+=	gtk30
 
 do-build:
-	@(cd ${WRKSRC}/avahi-ui; ${GMAKE} libavahi-ui-gtk3.la)
+	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} libavahi-ui-gtk3.la)
 
 do-install:
-	@(cd ${WRKSRC}/avahi-ui; ${GMAKE} ${MAKE_ARGS} install-libLTLIBRARIES)
+	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/beanstalkd/Makefile b/net/beanstalkd/Makefile
index 0e40f4a9486f..c078eeb03c1a 100644
--- a/net/beanstalkd/Makefile
+++ b/net/beanstalkd/Makefile
@@ -37,7 +37,7 @@ do-install:
 .endfor
 
 test: configure
-	@cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} check
+	@cd ${WRKSRC} && ${MAKE_CMD} ${MAKE_ARGS} check
 
 regression-test: test
 
diff --git a/net/c3270/Makefile b/net/c3270/Makefile
index 76c7ab896e9b..9a6621a3b857 100644
--- a/net/c3270/Makefile
+++ b/net/c3270/Makefile
@@ -103,7 +103,7 @@ CONFIGURE_ARGS+=	--disable-trace
 .endif
 
 post-install:
-	@( cd ${WRKSRC} && ${GMAKE} ${MAKE_FLAGS} Makefile install.man )
+	@( cd ${WRKSRC} && ${MAKE_CMD} ${MAKE_FLAGS} Makefile install.man )
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/html
diff --git a/net/erlang_xmlrpc/Makefile b/net/erlang_xmlrpc/Makefile
index 558372bf7bbd..c4116b19b870 100644
--- a/net/erlang_xmlrpc/Makefile
+++ b/net/erlang_xmlrpc/Makefile
@@ -29,7 +29,7 @@ post-patch:
 	@${RM} ${WRKSRC}/src/Makefile.bak ${WRKSRC}/src/*.orig
 
 do-build:
-	@cd ${WRKSRC}/src && ${GMAKE}
+	@cd ${WRKSRC}/src && ${MAKE_CMD}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/net/gogoc/Makefile b/net/gogoc/Makefile
index bb7dd01643ae..bd51eb906a29 100644
--- a/net/gogoc/Makefile
+++ b/net/gogoc/Makefile
@@ -27,7 +27,7 @@ SUB_LIST=	LOCALBASE=${LOCALBASE}
 NO_STAGE=	yes
 do-install:
 	cd ${WRKSRC}/gogoc-tsp/ && \
-	    ${GMAKE} platform=freebsd installdir=${PREFIX} install
+	    ${MAKE_CMD} platform=freebsd installdir=${PREFIX} install
 	${RM} ${PREFIX}/bin/gogoc.conf*
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile
index fa0b2231a0a2..24d95e9852fb 100644
--- a/net/hawknl-devel/Makefile
+++ b/net/hawknl-devel/Makefile
@@ -37,7 +37,7 @@ CFLAGS+=	-funroll-all-loops -ffast-math -fomit-frame-pointer -D_GNU_SOURCE -D_RE
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|make -f|${GMAKE} -f|g' ${WRKSRC}/${MAKEFILE}
+	${REINPLACE_CMD} -e 's|make -f|${MAKE_CMD} -f|g' ${WRKSRC}/${MAKEFILE}
 	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/nlinternal.h ${WRKSRC}/src/htinternal.h
 
 post-install:
diff --git a/net/hawknl/Makefile b/net/hawknl/Makefile
index 152b78f46ac4..b63cb7b265c8 100644
--- a/net/hawknl/Makefile
+++ b/net/hawknl/Makefile
@@ -34,7 +34,7 @@ CFLAGS+=	-funroll-all-loops -ffast-math -fomit-frame-pointer -D_GNU_SOURCE -D_RE
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|make -f|${GMAKE} -f|g' ${WRKSRC}/${MAKEFILE}
+	${REINPLACE_CMD} -e 's|make -f|${MAKE_CMD} -f|g' ${WRKSRC}/${MAKEFILE}
 	${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/src/nlinternal.h
 
 post-install:
diff --git a/net/mgen/Makefile b/net/mgen/Makefile
index eed92640c8e3..52d91f17758a 100644
--- a/net/mgen/Makefile
+++ b/net/mgen/Makefile
@@ -32,7 +32,7 @@ post-patch:
 	                ${WRKSRC}/protolib/unix/Makefile.freebsd
 
 do-build:
-	cd ${WRKSRC}/unix && ${GMAKE} -f Makefile.freebsd ${PORTNAME}
+	cd ${WRKSRC}/unix && ${MAKE_CMD} -f Makefile.freebsd ${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM}	${WRKSRC}/unix/mgen ${PREFIX}/bin
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index a0bb1f79559b..ef34f68ef2a0 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -83,6 +83,6 @@ pre-configure:
 	@cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ${SH} autogen.sh --noconfig
 
 pre-install:
-	@cd ${WRKSRC} && ${GMAKE} dnetter
+	@cd ${WRKSRC} && ${MAKE_CMD} dnetter
 
 .include <bsd.port.mk>
diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index cff37bc8475e..53dcdc82464e 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -78,8 +78,8 @@ pre-build:
 	--disable-libdbi --disable-libwrap --disable-rrdcgi --disable-libtool-lock \
 	--disable-nls --disable-rpath --disable-perl --disable-ruby --disable-lua \
 	--disable-tcl --disable-python --disable-dependency-tracking && \
-	cd src && ${GMAKE} librrd_th.la
-	cd ${WRKSRC}/third-party/credis-0.2.3 && ${GMAKE} clean && ${GMAKE}
+	cd src && ${MAKE_CMD} librrd_th.la
+	cd ${WRKSRC}/third-party/credis-0.2.3 && ${MAKE_CMD} clean && ${MAKE_CMD}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 5bcb830cc46a..d960fffa0800 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -51,6 +51,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${PREFIX}/share/openvswitch/
 
 #regression-test: build
-#	@cd ${WRKSRC} && ${GMAKE} check
+#	@cd ${WRKSRC} && ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 4c28a4865191..9c8d24197796 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -33,15 +33,15 @@ post-patch:
 	    	${WRKSRC}/avahi-python/avahi/ServiceTypeDatabase.py.in
 
 pre-build:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 	    	Makefile ${MAKE_ARGS} clean
 
 post-build:
-	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET}
 
 post-install:
-	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} Makefile ${MAKE_ARGS} install
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index c662f80c9a5c..41cf8e461cbd 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -539,7 +539,7 @@ post-install:
 
 .if ${PORT_OPTIONS:MMAX_DEBUG}
 test:
-	(cd ${WRKSRC} && ${GMAKE} test_nss_modules test_pam_modules && ${GMAKE} test)
+	(cd ${WRKSRC} && ${MAKE_CMD} test_nss_modules test_pam_modules && ${MAKE_CMD} test)
 .endif
 # !SAMBA_SUBPORT
 .endif
diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile
index 26adb1c98360..4f19a12aea70 100644
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@@ -47,7 +47,7 @@ post-patch:
 		-e 's|^CC =|CC ?=|' ${WRKSRC}/vncstorepw/Makefile
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} config
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 17436f4dc730..9d1504627deb 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -146,9 +146,9 @@ post-configure:
 	@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
 
 post-build:
-	@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} SHELL=${LOCALBASE}/bin/bash
+	@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} SHELL=${LOCALBASE}/bin/bash
 
 post-install:
-	@cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install
+	@cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
 
 .include <bsd.port.post.mk>
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index 094943b9012d..33dcda70d68c 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -40,13 +40,13 @@ PLIST_SUB+=	EMACS20_ONLY="@comment "
 
 pre-build:
 .if ${EMACS_PORT_NAME} == emacs20
-	(cd ${WRKSRC}/contrib; ${GMAKE})
+	(cd ${WRKSRC}/contrib; ${MAKE_CMD})
 .endif
 	${LN} -sf ../contrib/password.el ${WRKSRC}/lisp
 
 post-install:
 .if ${EMACS_PORT_NAME} == emacs20
-	(cd ${WRKSRC}/contrib; ${GMAKE} install)
+	(cd ${WRKSRC}/contrib; ${MAKE_CMD} install)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 5d351353cc34..4ee2f2e553e5 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -61,7 +61,7 @@ post-patch:
 post-build:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
-	@${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=unison-text
+	@${MAKE_CMD} -C ${WRKSRC} UISTYLE=text NAME=unison-text
 	@cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico
 .endif
 
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 5f36204852f7..8e69ecac27c5 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -60,7 +60,7 @@ post-patch:
 post-build:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
-	@${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=unison-text
+	@${MAKE_CMD} -C ${WRKSRC} UISTYLE=text NAME=unison-text
 	@cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico
 .endif
 
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index 1f0a8274003f..5727dd3c6f91 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -60,7 +60,7 @@ post-patch:
 post-build:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
-	${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=${PORTNAME}-text
+	${MAKE_CMD} -C ${WRKSRC} UISTYLE=text NAME=${PORTNAME}-text
 	@cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico
 .endif
 
diff --git a/net/wire/Makefile b/net/wire/Makefile
index 2517456597d4..64f2b6e3f356 100644
--- a/net/wire/Makefile
+++ b/net/wire/Makefile
@@ -35,6 +35,6 @@ LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
 #TODO this is fucking dirty :(
 NO_STAGE=	yes
 do-build:
-	cd ${WRKSRC} ;${GMAKE}
+	cd ${WRKSRC} ;${MAKE_CMD}
 
 .include <bsd.port.mk>