12 files changed, 17 insertions, 17 deletions

diff --git a/sysutils/busybox-unstable/Makefile b/sysutils/busybox-unstable/Makefile
index b0909efd0df1..f4f85b187ef8 100644
--- a/sysutils/busybox-unstable/Makefile
+++ b/sysutils/busybox-unstable/Makefile
@@ -52,7 +52,7 @@ post-patch:
 
 do-configure:
 	${CP} ${FILESDIR}/data-.config ${WRKSRC}/.config
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} oldconfig
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} oldconfig
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index 336101ea81b9..f54d9cc981b2 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -52,7 +52,7 @@ post-patch:
 
 do-configure:
 	${CP} ${FILESDIR}/data-.config ${WRKSRC}/.config
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} oldconfig
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} oldconfig
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index fa3bfb9ab0ce..30e8372799ea 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -56,6 +56,6 @@ post-install:
 		${STAGEDIR}${PREFIX}/libexec/coreutils/glibstdbuf.so
 
 #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/sysutils/createrepo/Makefile b/sysutils/createrepo/Makefile
index a01ee9651b00..681ed2734e9a 100644
--- a/sysutils/createrepo/Makefile
+++ b/sysutils/createrepo/Makefile
@@ -21,7 +21,7 @@ USES=		gmake
 BUILD_DEPENDS+=	ginstall:${PORTSDIR}/sysutils/coreutils
 GINSTALL=	ginstall
 
-MAKE_ARGS=	MAKE=${GMAKE} INSTALL="${GINSTALL} -p -v" PYTHON=${PYTHON_CMD} \
+MAKE_ARGS=	MAKE=${MAKE_CMD} INSTALL="${GINSTALL} -p -v" PYTHON=${PYTHON_CMD} \
 		prefix=${PREFIX} mandir=${MANPREFIX}/man sysconfdir=${PREFIX}/etc
 
 MAN1=		mergerepo.1 modifyrepo.1
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile
index 7723a93a5858..71d201f02103 100644
--- a/sysutils/deltup/Makefile
+++ b/sysutils/deltup/Makefile
@@ -46,8 +46,8 @@ pre-build:
 	@${REINPLACE_CMD} -e 's|-Wall -Winline -O -g|-Wall -Winline -O2 ${CFLAGS}|' \
 		-e 's|CC=gcc|CC?=gcc|' \
 	${WRKSRC_BZIP2_103}/Makefile
-	@cd ${WRKSRC_BZIP2_102}; ${GMAKE} bzip2; \
-	cd ${WRKSRC_BZIP2_103}; ${GMAKE} bzip2;
+	@cd ${WRKSRC_BZIP2_102}; ${MAKE_CMD} bzip2; \
+	cd ${WRKSRC_BZIP2_103}; ${MAKE_CMD} bzip2;
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/deltup ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 653975a4f798..0c8c46c3ddd0 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -89,7 +89,7 @@ post-build:
 # else we're in trouble if e2fsck is needed for boot:
 # (we don't use e2fsck.static, since we can link libc.so dynamically)
 	cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \
-		&& ${GMAKE} e2fsck \
+		&& ${MAKE_CMD} e2fsck \
 		STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
 		../lib/libblkid.a  ../lib/libuuid.a" \
 		LIBINTL=${libintl}
@@ -106,7 +106,7 @@ post-build:
 	    echo 'FAIL' ; echo '===>  e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi
 # Update translation binary files
 .if ${PORT_OPTIONS:MNLS}
-	cd ${WRKSRC}/po && ${GMAKE} update-gmo
+	cd ${WRKSRC}/po && ${MAKE_CMD} update-gmo
 .endif
 # Build fsck(8) wrapper
 	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \
@@ -119,7 +119,7 @@ post-build:
 # There have been subtle failures induced by Linux-isms in the past.
 # -- Matthias Andree, package maintainer, 2007-09-18
 	@${ECHO_CMD} '===>  Running e2fsprogs self-test suite'
-	cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${GMAKE} -j${MAKE_JOBS_NUMBER} check TMPDIR=${WRKDIR}/tmp \
+	cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} check TMPDIR=${WRKDIR}/tmp \
 	    || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
 
 post-install:
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 653fab6e1ad4..8f6019121b5e 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -55,7 +55,7 @@ CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm/themes\"' \
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gkrellm ${PREFIX}/bin/gkrellm
 	@cd ${WRKSRC}/po && \
-		${GMAKE} install enable_nls=1 LOCALEDIR=${PREFIX}/share/locale
+		${MAKE_CMD} install enable_nls=1 LOCALEDIR=${PREFIX}/share/locale
 
 	@${MKDIR} ${PREFIX}/include/gkrellm
 .for f in ${INCLUDES}
diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile
index 049bef4fd82e..05c63b2b5501 100644
--- a/sysutils/logtool/Makefile
+++ b/sysutils/logtool/Makefile
@@ -19,7 +19,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 DOCS=		CHANGES CREDITS README TODO doc/logtool.txt
 
 do-build:
-	cd ${WRKSRC}/src && ${GMAKE} INCLUDES="${CPPFLAGS}"
+	cd ${WRKSRC}/src && ${MAKE_CMD} INCLUDES="${CPPFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/logtool ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/sdd/Makefile b/sysutils/sdd/Makefile
index 0fd324cdd512..f171bcf689b1 100644
--- a/sysutils/sdd/Makefile
+++ b/sysutils/sdd/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Faster and improved version of dd
 
 USES=		gmake
-MAKE_ENV=	MAKEPROG="${GMAKE}" CCOM="${CC}" COPTX="${CFLAGS}"
+MAKE_ENV=	MAKEPROG="${MAKE_CMD}" CCOM="${CC}" COPTX="${CFLAGS}"
 PLIST_FILES=	bin/sdd man/man1/sdd.1.gz
 
 .include <bsd.port.pre.mk>
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index f7368de4a300..f4f79821d0b7 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -91,7 +91,7 @@ post-build:
 	@(cd ${WRKSRC}/src/tracker-extract && ${MAKE} libextract-msoffice.la)
 .elif defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="gnome"
 . for dir in ${EXTRA_WRKSRC}
-	@(cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+	@(cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 . endfor
 .endif
 
@@ -102,7 +102,7 @@ post-install:
 		${STAGEDIR}${PREFIX}/lib/tracker/extract-modules
 .elif defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="gnome"
 . for dir in ${EXTRA_WRKSRC}
-	@(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 . endfor
 . for man in ${MAN}
 	@(cd ${WRKSRC} && ${INSTALL_DATA} docs/manpages/${man} ${STAGEDIR}${MAN1PREFIX}/man/man1/${man})
diff --git a/sysutils/u-boot-beaglebone-eabi/Makefile b/sysutils/u-boot-beaglebone-eabi/Makefile
index f797b091986a..e7a2063834df 100644
--- a/sysutils/u-boot-beaglebone-eabi/Makefile
+++ b/sysutils/u-boot-beaglebone-eabi/Makefile
@@ -28,10 +28,10 @@ CROSS_PREFIX=	arm-eabi-
 ARCH=		arm
 
 do-configure:
-	(cd ${WRKSRC}; ${GMAKE} CROSS_COMPILE=${CROSS_PREFIX} am335x_evm_config)
+	(cd ${WRKSRC}; ${MAKE_CMD} CROSS_COMPILE=${CROSS_PREFIX} am335x_evm_config)
 
 do-build:
-	(cd ${WRKSRC};${GMAKE} CROSS_COMPILE=${CROSS_PREFIX} )
+	(cd ${WRKSRC};${MAKE_CMD} CROSS_COMPILE=${CROSS_PREFIX} )
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${U_BOOT_DIR}
diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile
index 4d68c5233b07..6d8646c737b4 100644
--- a/sysutils/yum/Makefile
+++ b/sysutils/yum/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/rpm:${PORTSDIR}/archivers/rpm4 \
 USE_PYTHON=	yes
 USES=		gettext gmake
 
-MAKE_ARGS=	MAKE=${GMAKE} PYTHON=${PYTHON_CMD} \
+MAKE_ARGS=	MAKE=${MAKE_CMD} PYTHON=${PYTHON_CMD} \
 		prefix=${PREFIX} mandir=${MANPREFIX}/man sysconfdir=${PREFIX}/etc
 
 RPMDIR?=	/var/lib/rpm