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

34 files changed, 52 insertions, 52 deletions

diff --git a/devel/aros-sdk/Makefile b/devel/aros-sdk/Makefile
index 6ec562fac339..4bee89311563 100644
--- a/devel/aros-sdk/Makefile
+++ b/devel/aros-sdk/Makefile
@@ -46,7 +46,7 @@ do-build:
 	@${REINPLACE_CMD} -e 's|@aros_sdk_path@|${AROS_SDK_PATH}|g; s|@ld@|${LD}|g; s|@nm@|${NM}|g; s|@cc@|${CC}|g; s|@objdump@|${OBJDUMP}|g; s|@cc_cpu@|${ARCH}|g; s|@strip@|${STRIP}|g' ${WRKSRC}/scripts/aros-gcc.in
 	@${REINPLACE_CMD} -e 's|@aros_sdk_path@|${AROS_SDK_PATH}|g; s|@ld@|${LD}|g; s|@nm@|${NM}|g; s|@cc@|${CC}|g; s|@objdump@|${OBJDUMP}|g; s|@cc_cpu@|${ARCH}|g; s|@cc_programs_path@|${CC_PROGRAMS_PATH}|g' ${WRKSRC}/scripts/aros-ld.in
 	@${REINPLACE_CMD} -e 's|@strip@|${STRIP}|g' ${WRKSRC}/scripts/aros-strip.in
-	@cd ${WRKSRC}/tools/collect-aros; ${GMAKE}
+	@cd ${WRKSRC}/tools/collect-aros; ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
 
 do-install:
 	@${MKDIR} ${AROS_SDK_PATH}
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index e5954e040882..43b1c5857324 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -86,7 +86,7 @@ do-install:
 	        @for file in ${PLIST_FILES}; do \
 			${ECHO_CMD} $${file} >> ${TMPPLIST}; \
 	        done
-		(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+		(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} install)
 		${MKDIR} ${DOCSDIR}
 		${INSTALL_DATA} \
 			${WRKDIR}/${DISTNAME}/AUTHORS \
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index 82cb133c93e7..5bbfa573c4ae 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -66,7 +66,7 @@ CONF=		capacity-scheduler.xml configuration.xsl core-site.xml hadoop-env.sh hado
 		hadoop-policy.xml hdfs-site.xml log4j.properties mapred-queue-acls.xml mapred-site.xml taskcontroller.cfg
 
 MAKE_ARGS=	-Dbuild.classes=${WRKSRC}/hadoop-core-${PORTVERSION}.jar -Dversion=${PORTVERSION} -Dcompile.native=true \
-		-Dcompile.c++=true -Dmake.cmd=${GMAKE} -Dlibhdfs=1 -Dlibrecordio=true  -Dskip.record-parser=true
+		-Dcompile.c++=true -Dmake.cmd=${MAKE_CMD} -Dlibhdfs=1 -Dlibrecordio=true  -Dskip.record-parser=true
 ALL_TARGET=	compile-core-native compile-c++ compile-c++-libhdfs compile-c++-pipes compile-c++-utils
 
 .include <bsd.port.options.mk>
diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile
index 7f2476e3f9cd..2b59ef3bc14b 100644
--- a/devel/hgview/Makefile
+++ b/devel/hgview/Makefile
@@ -34,7 +34,7 @@ post-patch:
 		${REINPLACE_CMD} -e 's|share/man|man|'
 	@${REINPLACE_CMD} -e 's|path/to.*hgview.py|${PYTHON_SITELIBDIR}/hgext/hgview.py|' \
 		${WRKSRC}/README
-	@${REINPLACE_CMD} -e 's|'make'|'${GMAKE}'|' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's|'make'|'${MAKE_CMD}'|' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} \
 		-e 's,distutils\.command\.install ,setuptools\.command\.install ,' \
 		${WRKSRC}/setup.py
diff --git a/devel/htable/Makefile b/devel/htable/Makefile
index e0ddb4fb1bac..c6080e9a94c9 100644
--- a/devel/htable/Makefile
+++ b/devel/htable/Makefile
@@ -23,6 +23,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/src/htable.3 ${STAGEDIR}${MAN3PREFIX}/man/man3
 
 regression-test:
-	cd ${WRKSRC}/tst && ${GMAKE} test
+	cd ${WRKSRC}/tst && ${MAKE_CMD} test
 
 .include <bsd.port.mk>
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index fc92e9a512d3..65a726154a69 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -58,7 +58,7 @@ post-patch:
 
 iotest cintltst intltest:
 	# Performing the ${.TARGET} test
-	-${GMAKE} -C ${WRKSRC}/test
+	-${MAKE_CMD} -C ${WRKSRC}/test
 	cd ${WRKSRC}/test/${.TARGET} && ${SETENV} \
 	    LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/tools/ctestfw \
 	    ./${.TARGET}
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index d9bdfad339e8..b014ae69f6b1 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -62,7 +62,7 @@ run-autotools:
 do-configure:
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${GMAKE} -f bootstrap.gmk
+	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${MAKE_CMD} -f bootstrap.gmk
 	cd ${WRKSRC} && ${RM} -rf out
 	cd ${WRKSRC} && ./kBuild/env.sh kmk
 	cd ${WRKSRC} && ./kBuild/env.sh kmk NIX_INSTALL_DIR=${PREFIX} BUILD_TYPE=release -C ${WRKSRC}
diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile
index 3a31822e97a2..419ab9758834 100644
--- a/devel/libchipcard/Makefile
+++ b/devel/libchipcard/Makefile
@@ -50,7 +50,7 @@ post-patch:
 
 post-build:
 .if ${PORT_OPTIONS:MDOXYGEN}
-	@cd ${WRKSRC} && ${GMAKE} srcdoc
+	@cd ${WRKSRC} && ${MAKE_CMD} srcdoc
 .endif
 
 post-install:
diff --git a/devel/libreadline-java/Makefile b/devel/libreadline-java/Makefile
index 66132c428d39..2585f7e9a40f 100644
--- a/devel/libreadline-java/Makefile
+++ b/devel/libreadline-java/Makefile
@@ -46,7 +46,7 @@ do-install:
 
 .if !defined(BATCH)
 test:
-	cd ${WRKSRC} && ${MAKE_ENV} ${GMAKE} test  # Now type something!
+	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} test  # Now type something!
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index b62e8703a00b..0c3f0263d93e 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -51,14 +51,14 @@ post-patch:
 
 .if defined(SOUP_SLAVE)
 do-build:
-	cd ${WRKSRC}/libsoup && ${GMAKE} libsoup-gnome-2.4.la
+	cd ${WRKSRC}/libsoup && ${MAKE_CMD} libsoup-gnome-2.4.la
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/
-	cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${GMAKE} install-libsoupgnomeincludeHEADERS
+	cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${MAKE_CMD} install-libsoupgnomeincludeHEADERS
 .endif
 
 post-install:
diff --git a/devel/libuv/Makefile b/devel/libuv/Makefile
index 29861968f89a..5520e0b2c76d 100644
--- a/devel/libuv/Makefile
+++ b/devel/libuv/Makefile
@@ -33,7 +33,7 @@ pre-configure:
 .if defined(MAINTAINER_MODE)
 regression-test:
 	(cd ${WRKSRC} && ./gyp_uv.py -f make &&	\
-	${SETENV} ${MAKE_ENV} ${GMAKE} -C out && \
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C out && \
 	./out/Debug/run-tests)
 .endif
 
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 1fa6191d8c5d..5dcb15d8cdae 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -122,6 +122,6 @@ post-install:
 .endfor
 
 regression-test: build
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.mk>
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index c0dd2e43ebdf..221d317a75d0 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -185,10 +185,10 @@ post-configure:
 
 post-build:
 .if ${PORT_OPTIONS:MMANPAGES}
-	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man
+	@cd ${WRKSRC}/docs && ${MAKE_CMD} -f Makefile.sphinx man
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx html
+	@cd ${WRKSRC}/docs && ${MAKE_CMD} -f Makefile.sphinx html
 .endif
 
 post-install:
@@ -243,7 +243,7 @@ post-install:
 	done
 .endif
 
-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${GMAKE} check-local-lit)'
+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 regression-test: ${BUILD_COOKIE}
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
diff --git a/devel/llvm32/Makefile b/devel/llvm32/Makefile
index 4cd4b693ee55..573b27d9fc79 100644
--- a/devel/llvm32/Makefile
+++ b/devel/llvm32/Makefile
@@ -180,10 +180,10 @@ post-configure:
 
 post-build:
 .if ${PORT_OPTIONS:MMANPAGES}
-	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man
+	@cd ${WRKSRC}/docs && ${MAKE_CMD} -f Makefile.sphinx man
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx html
+	@cd ${WRKSRC}/docs && ${MAKE_CMD} -f Makefile.sphinx html
 .endif
 
 post-install:
@@ -233,7 +233,7 @@ post-install:
 	done
 .endif
 
-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${GMAKE} check-local-lit)'
+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 regression-test: ${BUILD_COOKIE}
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index 79348533e1f2..89b410518fa3 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -174,10 +174,10 @@ post-configure:
 
 post-build:
 .if ${PORT_OPTIONS:MMANPAGES}
-	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man
+	@cd ${WRKSRC}/docs && ${MAKE_CMD} -f Makefile.sphinx man
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx html
+	@cd ${WRKSRC}/docs && ${MAKE_CMD} -f Makefile.sphinx html
 .endif
 
 post-install:
@@ -227,7 +227,7 @@ post-install:
 	done
 .endif
 
-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${GMAKE} check-local-lit)'
+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 regression-test: ${BUILD_COOKIE}
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile
index b90ef6aba4e1..ea1959d517af 100644
--- a/devel/llvm34/Makefile
+++ b/devel/llvm34/Makefile
@@ -170,10 +170,10 @@ post-configure:
 
 post-build:
 .if ${PORT_OPTIONS:MMANPAGES}
-	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man
+	@cd ${WRKSRC}/docs && ${MAKE_CMD} -f Makefile.sphinx man
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx html
+	@cd ${WRKSRC}/docs && ${MAKE_CMD} -f Makefile.sphinx html
 .endif
 
 post-install:
@@ -226,7 +226,7 @@ post-install:
 	done
 .endif
 
-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${GMAKE} check-local-lit)'
+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 regression-test: ${BUILD_COOKIE}
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
diff --git a/devel/lm4tools/Makefile b/devel/lm4tools/Makefile
index 84233fbc2f19..bba99637a450 100644
--- a/devel/lm4tools/Makefile
+++ b/devel/lm4tools/Makefile
@@ -26,8 +26,8 @@ PORTDOCS=	README.md lmicdiusb \
 PLIST_FILES=	bin/lm4flash bin/lmicdi
 
 do-build:
-	@${GMAKE} -C ${WRKSRC}/lm4flash all
-	@${GMAKE} -C ${WRKSRC}/lmicdiusb all
+	@${MAKE_CMD} -C ${WRKSRC}/lm4flash all
+	@${MAKE_CMD} -C ${WRKSRC}/lmicdiusb all
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lm4flash/lm4flash ${STAGEDIR}${PREFIX}/bin/
diff --git a/devel/meta-cvs/Makefile b/devel/meta-cvs/Makefile
index ed7834bfeae1..95f82f928b36 100644
--- a/devel/meta-cvs/Makefile
+++ b/devel/meta-cvs/Makefile
@@ -39,7 +39,7 @@ post-patch:
 #	http://svnweb.freebsd.org/base/head/lib/libc/libc.ldscript?revision=251668&view=markup
 	rep=$$(${BASENAME} $$(${LDCONFIG} -r | ${AWK} '/libc.so/ { print $$3 }')); \
 	    ${REINPLACE_CMD} -e "s|libc.so.6|$$rep|" ${WRKSRC}/code/clisp-ffi.lisp
-	${REINPLACE_CMD} -e '232s|make|${GMAKE}|g' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e '232s|make|${MAKE_CMD}|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|type -P|which|g;s|$$(prefix)/lib|${DATADIR}|g' ${WRKSRC}/Makefile
 
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/devel/mingw32-pthreads/Makefile b/devel/mingw32-pthreads/Makefile
index 9480409318e0..bd44fce1635e 100644
--- a/devel/mingw32-pthreads/Makefile
+++ b/devel/mingw32-pthreads/Makefile
@@ -18,7 +18,7 @@ USES=		gmake
 
 NO_STAGE=	yes
 do-build:
-	@${GMAKE} -C ${WRKSRC} CROSS=${PKGNAMEPREFIX} GC
+	@${MAKE_CMD} -C ${WRKSRC} CROSS=${PKGNAMEPREFIX} GC
 
 do-install:
 .for f in pthread.h sched.h semaphore.h
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index e139e24e4cf0..1e1015c99a65 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -53,12 +53,12 @@ do-install:
 .endfor
 
 prtests:
-	${GMAKE} -C ${WRKSRC}/pr/tests
+	${MAKE_CMD} -C ${WRKSRC}/pr/tests
 	${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so
 	cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh
 
 libtests:
-	${GMAKE} -C ${WRKSRC}/lib/tests
+	${MAKE_CMD} -C ${WRKSRC}/lib/tests
 	${WRKSRC}/lib/tests/string
 	${WRKSRC}/lib/tests/base64t
 	# The test below is commented out, because arena requires
diff --git a/devel/ocaml-event/Makefile b/devel/ocaml-event/Makefile
index f99e6b8b42b4..66792ef0f2a1 100644
--- a/devel/ocaml-event/Makefile
+++ b/devel/ocaml-event/Makefile
@@ -64,7 +64,7 @@ post-configure:
 
 pre-build:
 .for file in liboevent.cmi
-	@cd ${WRKSRC} && ${GMAKE} ${file}
+	@cd ${WRKSRC} && ${MAKE_CMD} ${file}
 .endfor
 
 do-install:
diff --git a/devel/ode-devel/Makefile b/devel/ode-devel/Makefile
index dd06885adfc9..7ea8b36bf0e6 100644
--- a/devel/ode-devel/Makefile
+++ b/devel/ode-devel/Makefile
@@ -47,7 +47,7 @@ post-patch:
 .endif
 
 do-configure:
-	cd ${WRKSRC} ; ${GMAKE} configure
+	cd ${WRKSRC} ; ${MAKE_CMD} configure
 	@${REINPLACE_CMD} -e '/include.*values.h/d' ${WRKSRC}/include/ode/config.h
 
 do-install:
diff --git a/devel/pire/Makefile b/devel/pire/Makefile
index c918e168ecbc..b29b9947700f 100644
--- a/devel/pire/Makefile
+++ b/devel/pire/Makefile
@@ -40,7 +40,7 @@ BUILD_DEPENDS+=	cppunit-config:${PORTSDIR}/devel/cppunit
 CONFIGURE_ARGS=	--with-cppunit-prefix=${LOCALBASE}
 
 regression-test: build
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check || \
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check || \
 		(${CAT} ${WRKSRC}/tests/test-suite.log; false)
 .endif
 
diff --git a/devel/py-aspects/Makefile b/devel/py-aspects/Makefile
index e0043acff987..41791e57343a 100644
--- a/devel/py-aspects/Makefile
+++ b/devel/py-aspects/Makefile
@@ -28,7 +28,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 OPTIONS_DEFINE=	EXAMPLES
 
 #regression-test: extract
-#	@PYTHON="${PYTHON_CMD}" ${GMAKE} -C ${WRKSRC} check
+#	@PYTHON="${PYTHON_CMD}" ${MAKE_CMD} -C ${WRKSRC} check
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index fe21bbfc4b87..e2d1ba75f67a 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -48,7 +48,7 @@ post-patch:
 #.endif
 
 pre-build:
-	cd ${WRKSRC}/extensions && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+	cd ${WRKSRC}/extensions && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 	    	${MAKE_FLAGS} Makefile ${MAKE_ARGS} all
 	${CP} ${WRKSRC}/extensions/Seed.js ${WRKSRC}/extensions/Seed.js.sav
 	${CP} ${FILESDIR}/Seed.js ${WRKSRC}/extensions/Seed.js
diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile
index 7d54f5de8fcd..0fa4b3e92bb5 100644
--- a/devel/seed3/Makefile
+++ b/devel/seed3/Makefile
@@ -43,7 +43,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in
 
 pre-build:
-	cd ${WRKSRC}/extensions && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+	cd ${WRKSRC}/extensions && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 	    	${MAKE_FLAGS} Makefile ${MAKE_ARGS} all
 	${CP} ${WRKSRC}/extensions/Seed.js ${WRKSRC}/extensions/Seed.js.sav
 	${CP} ${FILESDIR}/Seed.js ${WRKSRC}/extensions/Seed.js
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 610d2e646130..0b2f95dd1005 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -88,7 +88,7 @@ do-install:
 regression-test:
 	(cd ${WRKSRC}/../test/unit &&	\
 	${SETENV} STLPORT_LIB_DIR="${PATCH_WRKSRC}/lib"	\
-	${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} && \
+	${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} && \
 	(../../../bin/stl_unit_test || ${TRUE}) &&	\
 	(../../../bin-g/stl_unit_test  || ${TRUE}) )
 .endif
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index db83a01da4ce..9225a184c646 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -65,6 +65,6 @@ post-install:
 .endif
 
 regression-test: build
-	cd ${WRKSRC} && ${GMAKE} check
+	cd ${WRKSRC} && ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/devel/tigcc/Makefile b/devel/tigcc/Makefile
index 27a226aadbff..94ff035bfb59 100644
--- a/devel/tigcc/Makefile
+++ b/devel/tigcc/Makefile
@@ -39,32 +39,32 @@ do-build:
 	@${MKDIR} ${WRKSRC}/gnu/binutils_build
 	@cd ${WRKSRC}/gnu/binutils_build; \
 	 ${WRKSRC}/gnu/binutils-2.16.1/configure --disable-serial-configure --target=m68k-coff --disable-shared --enable-static --disable-multilib --disable-nls --disable-win32-registry
-	@cd ${WRKSRC}/gnu/binutils_build; ${GMAKE}
+	@cd ${WRKSRC}/gnu/binutils_build; ${MAKE_CMD}
 
 	@${ECHO} Building the GNU C COMPILER
 	@${MKDIR} ${WRKSRC}/gnu/gcc_build
 	@cd ${WRKSRC}/gnu/gcc_build; \
 	 ${WRKSRC}/gnu/gcc-4.1-20060728/configure --target=m68k-coff --with-gnu-as --disable-nls --disable-multilib --disable-shared --enable-static --disable-threads --disable-win32-registry --disable-checking --disable-werror --disable-pch --disable-mudflap --disable-libssp
-	@cd ${WRKSRC}/gnu/gcc_build; ${GMAKE}
+	@cd ${WRKSRC}/gnu/gcc_build; ${MAKE_CMD}
 
 	@${ECHO} Building A68K
-	@cd ${WRKSRC}/tigcc/sources/a68k; ${GMAKE}
+	@cd ${WRKSRC}/tigcc/sources/a68k; ${MAKE_CMD}
 
 	@${ECHO} Building LD-TIGCC
-	@cd ${WRKSRC}/tigcc/sources/ld-tigcc; ${GMAKE}
+	@cd ${WRKSRC}/tigcc/sources/ld-tigcc; ${MAKE_CMD}
 
 	@${ECHO} Building PATCHER
-	@cd ${WRKSRC}/tigcc/sources/patcher/src; ${GMAKE}
+	@cd ${WRKSRC}/tigcc/sources/patcher/src; ${MAKE_CMD}
 
 	@${ECHO} Building the ExePack support from the TIGCC Tools Suite
 	@cd ${WRKSRC}/tigcc/sources/ttpack; ${CC} ${CFLAGS} -o ttpack ttpack.c
 	@cd ${WRKSRC}/tigcc/sources/ttpack; ${CC} ${CFLAGS} -o ttbin2oth ttbin2oth.c
 
 	@${ECHO} Building TIGCC
-	@cd ${WRKSRC}/tigcc/sources/tigcc/src; ${GMAKE}
+	@cd ${WRKSRC}/tigcc/sources/tigcc/src; ${MAKE_CMD}
 
 	@${ECHO} Building TPRBUILDER
-	@cd ${WRKSRC}/tigcc/sources/tprbuilder/src; ${GMAKE}
+	@cd ${WRKSRC}/tigcc/sources/tprbuilder/src; ${MAKE_CMD}
 
 do-install:
 	@${MKDIR} ${PREFIX}/tigcc
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index c9dd2c3e0b57..f85b918ee21b 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -37,7 +37,7 @@ pre-patch:
 	${MKDIR} ${WRKSRC}
 
 test:
-	cd ${WRKSRC} ; ${GMAKE} test
+	cd ${WRKSRC} ; ${MAKE_CMD} test
 
 pre-install:
 	${RM} -rf ${ORIGWRKSRC}/docs-tla/PLUGIN \
diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
index be2eab3f574e..700f3d5c40b7 100644
--- a/devel/valgrind-devel/Makefile
+++ b/devel/valgrind-devel/Makefile
@@ -79,9 +79,9 @@ post-patch:
 do-build: do-man-pages
 
 do-man-pages:
-	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${GMAKE} man-pages
+	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
 .if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${GMAKE} html-docs
+	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/xsd/Makefile b/devel/xsd/Makefile
index a1b761a5b692..d0452489dd23 100644
--- a/devel/xsd/Makefile
+++ b/devel/xsd/Makefile
@@ -38,7 +38,7 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/xsd/documentation/xsd.1 ${STAGEDIR}${MANPREFIX}/man/man1/xsdcxx.1
 
 .if ${PORT_OPTIONS:MDOCS}
-	(cd ${WRKSRC}/xsd/documentation && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	(cd ${WRKSRC}/xsd/documentation && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 	${INSTALL_DATA} ${WRKSRC}/xsd/FLOSSE ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/xsd/NEWS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/xsd/README ${STAGEDIR}${DOCSDIR}
diff --git a/devel/zpu-binutils/Makefile b/devel/zpu-binutils/Makefile
index e896686f8810..5480f2f6c22e 100644
--- a/devel/zpu-binutils/Makefile
+++ b/devel/zpu-binutils/Makefile
@@ -22,7 +22,7 @@ INFO=		zpu/as zpu/bfd zpu/binutils zpu/configure zpu/ld zpu/standards
 post-patch:
 	@${REINPLACE_CMD} -e 's/%%CC%%/${CC}/' ${WRKSRC}/build.sh
 	@${CP}  ${FILESDIR}/install.sh ${WRKSRC}
-	@${REINPLACE_CMD} -e 's|%%GMAKE%%|${GMAKE}|g' ${WRKSRC}/build.sh \
+	@${REINPLACE_CMD} -e 's|%%MAKE_CMD%%|${MAKE_CMD}|g' ${WRKSRC}/build.sh \
 		${WRKSRC}/install.sh
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/build.sh
 	@${REINPLACE_CMD} -e 's|%%DESTDIR%%|${STAGEDIR}|g' ${WRKSRC}/binutils/Makefile.in
diff --git a/devel/zpu-gcc/Makefile b/devel/zpu-gcc/Makefile
index 2220cb758c86..57422cf93afd 100644
--- a/devel/zpu-gcc/Makefile
+++ b/devel/zpu-gcc/Makefile
@@ -25,7 +25,7 @@ INFO=		zpuc/cpp zpuc/cppinternals zpuc/dir zpuc/gcc zpuc/gccinstal \
 post-patch:
 	@${REINPLACE_CMD} -e 's/%%CC%%/${CC}/' ${WRKSRC}/build.sh
 	${CP}	${FILESDIR}/install.sh ${WRKSRC}
-	@${REINPLACE_CMD} -e 's/%%GMAKE%%/${GMAKE}/' ${WRKSRC}/build.sh \
+	@${REINPLACE_CMD} -e 's/%%MAKE_CMD%%/${MAKE_CMD}/' ${WRKSRC}/build.sh \
 		${WRKSRC}/install.sh
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/build.sh
 	@${REINPLACE_CMD} -e 's|%%DESTDIR%%|${STAGEDIR}|g' ${WRKSRC}/gcc/Makefile.in