diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-06-25 05:35:31 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-06-25 05:35:31 +0000 |
| commit | a33191366c083aad8ab7cd37d06db2d4790f3e39 (patch) | |
| tree | 6379d84ceeca72bc6c80702dd60bd714b378b04a | |
| parent | 4bde157247a8dd613e16048a7701a02ea240e8a9 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=359185
304 files changed, 587 insertions, 587 deletions
diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile index eac3ece6e634..0e333f1da80d 100644 --- a/audio/libcanberra-gtk3/Makefile +++ b/audio/libcanberra-gtk3/Makefile @@ -33,7 +33,7 @@ do-install: ${STAGEDIR}${PREFIX}/lib/ .endfor cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \ - ${GMAKE} install-gtk3moduleLTLIBRARIES + ${MAKE_CMD} install-gtk3moduleLTLIBRARIES cd ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules && \ ${LN} -sf libcanberra-gtk3-module.so libcanberra-gtk-module.so diff --git a/audio/liquidsoap/Makefile b/audio/liquidsoap/Makefile index cf8f63aca73a..9612de5c64b5 100644 --- a/audio/liquidsoap/Makefile +++ b/audio/liquidsoap/Makefile @@ -189,6 +189,6 @@ post-patch: ${SED} ${_DISABLE_SED_ARGS} ${WRKSRC}/PACKAGES.default > ${WRKSRC}/PACKAGES pre-configure: - (cd ${WRKSRC} && ${GMAKE} bootstrap && ${SED} -i '' -e 's/^RUNNING_USER="$$USER"/RUNNING_USER=liquidsoap/' */configure) + (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} bootstrap && ${SED} -i '' -e 's/^RUNNING_USER="$$USER"/RUNNING_USER=liquidsoap/' */configure) .include <bsd.port.mk> diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile index 927f56b99466..9db1277b287f 100644 --- a/cad/freehdl/Makefile +++ b/cad/freehdl/Makefile @@ -33,7 +33,7 @@ plist: build @${ECHO} "===> Rebuilding PLIST." @${TOUCH} ${PLIST} @${RM} ${PLIST} - @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \ prefix=${PLIST_TMP} \ mandir=${PLIST_TMP}/man \ diff --git a/databases/libgda5-ui/Makefile b/databases/libgda5-ui/Makefile index 2fc326fd2f9e..0801eab4fefb 100644 --- a/databases/libgda5-ui/Makefile +++ b/databases/libgda5-ui/Makefile @@ -17,13 +17,13 @@ PLIST= ${.CURDIR}/pkg-plist LIBGDA5_SLAVE= ui do-build: - @cd ${WRKSRC}/libgda-ui && ${GMAKE} - @cd ${WRKSRC}/control-center && ${GMAKE} - @cd ${WRKSRC}/tools/browser && ${GMAKE} + @cd ${WRKSRC}/libgda-ui && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} + @cd ${WRKSRC}/control-center && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} + @cd ${WRKSRC}/tools/browser && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} do-install: - @cd ${WRKSRC}/libgda-ui && DESTDIR=${STAGEDIR} ${GMAKE} install - @cd ${WRKSRC}/control-center && DESTDIR=${STAGEDIR} ${GMAKE} install - @cd ${WRKSRC}/tools/browser && DESTDIR=${STAGEDIR} ${GMAKE} install + @cd ${WRKSRC}/libgda-ui && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${MAKE_CMD} install + @cd ${WRKSRC}/control-center && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${MAKE_CMD} install + @cd ${WRKSRC}/tools/browser && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${MAKE_CMD} install .include "${MASTERDIR}/Makefile" diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile index 3af3d0b70ac9..976c27157c7a 100644 --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -116,15 +116,15 @@ post-patch: pre-build: .if ${LIBGDA5_SLAVE}==postgresql - cd ${WRKSRC}/providers/reuseable/postgres && ${GMAKE} libgda-postgres.la + cd ${WRKSRC}/providers/reuseable/postgres && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} libgda-postgres.la .endif .if ${LIBGDA5_SLAVE}==mysql - cd ${WRKSRC}/providers/reuseable/mysql && ${GMAKE} libgda-mysql.la + cd ${WRKSRC}/providers/reuseable/mysql && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} libgda-mysql.la .endif .if ${LIBGDA5_SLAVE}==ui - cd ${WRKSRC}/libgda && ${GMAKE} gda-enum-types.h + cd ${WRKSRC}/libgda && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} gda-enum-types.h .endif .if ${LIBGDA5_SLAVE}==no diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile index 80b3143c683c..fff220682cce 100644 --- a/databases/pgpool-II/Makefile +++ b/databases/pgpool-II/Makefile @@ -53,12 +53,12 @@ post-patch: post-build: .for f in ${FUNCTIONS} - @cd ${WRKSRC}/sql/${f} && ${GMAKE} + @cd ${WRKSRC}/sql/${f} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} .endfor post-install: .for f in ${FUNCTIONS} - @cd ${WRKSRC}/sql/${f} && ${GMAKE} DESTDIR=${STAGEDIR} ${INSTALL_TARGET} + @cd ${WRKSRC}/sql/${f} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} ${INSTALL_TARGET} .endfor ${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${STAGEDIR}${DATADIR} diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile index c9cfb21c2c1f..17212693aab2 100644 --- a/databases/postgresql91-docs/Makefile +++ b/databases/postgresql91-docs/Makefile @@ -30,7 +30,7 @@ BUILD_DEPENDS+= onsgmls:${PORTSDIR}/textproc/opensp \ ${dbdir}/4.2:${PORTSDIR}/textproc/docbook-sgml do-build: - ${GMAKE} -C ${WRKSRC} html + ${MAKE_CMD} -C ${WRKSRC} html do-install: @ $(MKDIR) ${STAGEDIR}${PGDOCSDIR} 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 diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile index ccf3b2a68c37..4e5254dd67e0 100644 --- a/dns/ldns/Makefile +++ b/dns/ldns/Makefile @@ -120,18 +120,18 @@ post-configure: post-build: .if ${PORT_OPTIONS:MEXAMPLES} - @(cd ${WRKSRC}/examples; ${GMAKE}) + @(cd ${WRKSRC}/examples; ${MAKE_CMD}) .endif .if ${PORT_OPTIONS:MDRILL} - @(cd ${WRKSRC}/drill; ${GMAKE}) + @(cd ${WRKSRC}/drill; ${MAKE_CMD}) .endif post-install: .if ${PORT_OPTIONS:MEXAMPLES} - @(cd ${WRKSRC}/examples; ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/examples; ${MAKE_CMD} ${MAKE_ARGS} install) .endif .if ${PORT_OPTIONS:MDRILL} - @(cd ${WRKSRC}/drill; ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/drill; ${MAKE_CMD} ${MAKE_ARGS} install) .endif ${INSTALL_DATA} ${WRKSRC}/packaging/libldns.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile index 45228816934a..d2375a965ead 100644 --- a/dns/nss_mdns/Makefile +++ b/dns/nss_mdns/Makefile @@ -48,7 +48,7 @@ CONFIGURE_ARGS+= --enable-search-domains # problems if we are later packaged. # do-install: - @( cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} ) + @( cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} ) .for INSTALLED_MODULE in ${INSTALLED_MODULES} ( cd ${STAGEDIR}${PREFIX}/lib ; ${LN} -s ${INSTALLED_MODULE}.so.1 ${INSTALLED_MODULE}.so ) ${RM} ${STAGEDIR}${PREFIX}/lib/${INSTALLED_MODULE}.a ${STAGEDIR}${PREFIX}/lib/${INSTALLED_MODULE}.la diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile index e2e24c451f51..c62118475798 100644 --- a/editors/emacs21/Makefile +++ b/editors/emacs21/Makefile @@ -81,10 +81,10 @@ post-patch: post-build: (cd ${WRKSRC}/lisp ; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} recompile ; \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} recompile ; \ ${RM} ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${PORTVERSION}.1 ; \ cd ${WRKSRC}/src ; \ - ${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: @${CAT} ${PKGMESSAGE} diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index a709e8699775..27ba1bf3affa 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -115,9 +115,9 @@ pre-build: do-build: @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM} @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} tools LCL_PLATFORM=${LCL_PLATFORM} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} tools LCL_PLATFORM=${LCL_PLATFORM} post-build: @cd ${WRKSRC} && \ diff --git a/editors/lazarus/Makefile.common b/editors/lazarus/Makefile.common index 9e42fe771fc2..5af195fbd030 100644 --- a/editors/lazarus/Makefile.common +++ b/editors/lazarus/Makefile.common @@ -33,17 +33,17 @@ pre-build: do-build: @cd ${WRKDIR}/${PORTNAME}/packager/registration && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} @cd ${WRKDIR}/${PORTNAME}/components/lazutils && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} @cd ${WRKDIR}/${PORTNAME}/components/ideintf && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} @cd ${WRKDIR}/${PORTNAME}/components/synedit && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} @cd ${BUILDSRC} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} pre-install: @${RM} -f ${PLIST} diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile index b194020a2001..64ad149f2d0b 100644 --- a/emulators/fmsx/Makefile +++ b/emulators/fmsx/Makefile @@ -52,7 +52,7 @@ post-patch: .endif do-build: - cd ${WRKSRC}/fMSX/Unix && ${GMAKE} DEBUG_FLAGS=${DEBUG_FLAGS} + cd ${WRKSRC}/fMSX/Unix && ${MAKE_CMD} DEBUG_FLAGS=${DEBUG_FLAGS} do-install: ${INSTALL_SCRIPT} ${FILESDIR}/fmsx ${STAGEDIR}${PREFIX}/bin diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile index cb10bfca2e98..fd8faf60c938 100644 --- a/emulators/higan/Makefile +++ b/emulators/higan/Makefile @@ -132,7 +132,7 @@ do-build: (cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp) .endif .for d in . ananke - (cd ${WRKSRC}/${d} && ${GMAKE} ${MAKE_ENV}) + (cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ENV}) .endfor do-install: diff --git a/emulators/kqemu-kmod-devel/Makefile b/emulators/kqemu-kmod-devel/Makefile index 6a2e35281ded..e740c15b3617 100644 --- a/emulators/kqemu-kmod-devel/Makefile +++ b/emulators/kqemu-kmod-devel/Makefile @@ -43,7 +43,7 @@ MAKEFILE= Makefile.freebsd MAKE_ARGS+= LDFLAGS="${LDFLAGS:S/^-Wl,//}" .if ${ARCH} == "amd64" -GMAKE_ARGS+= ARCH=x86_64 +MAKE_CMD_ARGS+= ARCH=x86_64 .endif CFLAGS+= ${DEBUG_FLAGS} @@ -67,7 +67,7 @@ post-patch: do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} beforedepend && ${LN} -sfh @/sys sys) - @(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${GMAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_CMD_ARGS} ${ALL_TARGET}) @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) do-install: diff --git a/emulators/kqemu-kmod/Makefile b/emulators/kqemu-kmod/Makefile index fdba6911b98a..2dc1aaf80bbf 100644 --- a/emulators/kqemu-kmod/Makefile +++ b/emulators/kqemu-kmod/Makefile @@ -43,7 +43,7 @@ MAKEFILE= Makefile.freebsd MAKE_ARGS+= LDFLAGS="${LDFLAGS:S/^-Wl,//}" .if ${ARCH} == "amd64" -GMAKE_ARGS+= ARCH=x86_64 +MAKE_CMD_ARGS+= ARCH=x86_64 .endif CFLAGS+= ${DEBUG_FLAGS} @@ -58,7 +58,7 @@ post-patch: do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} beforedepend && ${LN} -sfh @/sys sys) - @(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${GMAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_CMD_ARGS} ${ALL_TARGET}) @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) do-install: diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index bcd776a73238..0e0727832a12 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -92,7 +92,7 @@ PORTDATA= l_intl.nls wine.inf .include <bsd.port.options.mk> pre-build: - cd ${WRKSRC} && ${GMAKE} depend + cd ${WRKSRC} && ${MAKE_CMD} depend post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 9ff55d2763b1..3c277c472e87 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -132,7 +132,7 @@ IGNORE= lacks required sound support on FreeBSD before 8.0 .endif pre-build: - cd ${WRKSRC} && ${GMAKE} depend + cd ${WRKSRC} && ${MAKE_CMD} depend post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ diff --git a/emulators/x49gp/Makefile b/emulators/x49gp/Makefile index 5b7a926c894a..1ddcbf1b98fb 100644 --- a/emulators/x49gp/Makefile +++ b/emulators/x49gp/Makefile @@ -70,7 +70,7 @@ do-configure: cd ${WRKSRC}/qemu/qemu-git && ./configure-small --extra-cflags=-DX49GP --cc="${CC}" do-build: - cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} + cd ${WRKSRC} && ${MAKE_CMD} ${MAKE_ARGS} do-install: @${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile index c54fee2348fd..2c0b6b09feda 100644 --- a/finance/aqbanking/Makefile +++ b/finance/aqbanking/Makefile @@ -54,7 +54,7 @@ LIB_DEPENDS+= libktoblzcheck.so:${PORTSDIR}/finance/ktoblzcheck post-build: .if ${PORT_OPTIONS:MDOXYGEN} - @cd ${WRKSRC} && ${GMAKE} srcdoc + @cd ${WRKSRC} && ${MAKE_CMD} srcdoc .endif post-install: diff --git a/ftp/bbftp/Makefile b/ftp/bbftp/Makefile index 5164ba454109..983e786f3b78 100644 --- a/ftp/bbftp/Makefile +++ b/ftp/bbftp/Makefile @@ -24,8 +24,8 @@ do-configure: cd ${WRKSRC}/bbftpd && ./configure --prefix=${PREFIX} ${CONFIGURE_ARGS} do-build: - cd ${WRKSRC}/bbftpc && ${GMAKE} - cd ${WRKSRC}/bbftpd && ${GMAKE} + cd ${WRKSRC}/bbftpc && ${MAKE_CMD} + cd ${WRKSRC}/bbftpd && ${MAKE_CMD} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bbftpc/bbftp ${STAGEDIR}${PREFIX}/bin diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile index 20fef5eef558..7e42573c5231 100644 --- a/games/adonthell/Makefile +++ b/games/adonthell/Makefile @@ -54,7 +54,7 @@ post-install: && ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} \ --with-adonthell-binary=${PREFIX}/bin/${PORTNAME} \ ${CONFIGURE_TARGET} - cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${GMAKE} - cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${GMAKE} install + cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${MAKE_CMD} + cd ${WRKDIR}/wastesedge-${WEDGE_VERSION} && ${MAKE_CMD} install .include <bsd.port.post.mk> diff --git a/games/airstrike/Makefile b/games/airstrike/Makefile index c380df99ea6f..267b046297d1 100644 --- a/games/airstrike/Makefile +++ b/games/airstrike/Makefile @@ -44,7 +44,7 @@ post-patch: ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' do-build: - @(cd ${WRKSRC} && ${GMAKE} airstrike-sound) + @(cd ${WRKSRC} && ${MAKE_CMD} airstrike-sound) do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ diff --git a/games/alienblaster/Makefile b/games/alienblaster/Makefile index 28ae2b436273..bd85425a5a50 100644 --- a/games/alienblaster/Makefile +++ b/games/alienblaster/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} post-patch: # Fix make command - @${REINPLACE_CMD} -e 's|make|${GMAKE}|g' ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|g' ${WRKSRC}/${MAKEFILE} # Fix Makefile @${REINPLACE_CMD} -e 's|alienBlaster|${PORTNAME}|g ; \ diff --git a/games/blockout/Makefile b/games/blockout/Makefile index 8866eb0e530f..c64d8b23e0e9 100644 --- a/games/blockout/Makefile +++ b/games/blockout/Makefile @@ -25,7 +25,7 @@ SUB_FILES= pkg-message NO_STAGE= yes pre-build: - cd ${WRKSRC}/ImageLib/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} + cd ${WRKSRC}/ImageLib/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/BlockOut/blockout ${PREFIX}/bin diff --git a/games/fgkicker/Makefile b/games/fgkicker/Makefile index 8f948a5985a5..f5fe1bc29078 100644 --- a/games/fgkicker/Makefile +++ b/games/fgkicker/Makefile @@ -20,7 +20,7 @@ post-patch: @${REINPLACE_CMD} "s|-fmessage-length=0|| ; s|-O0|${CFLAGS}|" ${WRKSRC}/fgkicker.mak do-build: - (cd ${WRKSRC} && ${GMAKE} -f ${PORTNAME}.mak ${PORTNAME}) + (cd ${WRKSRC} && ${MAKE_CMD} -f ${PORTNAME}.mak ${PORTNAME}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/games/fxsudoku/Makefile b/games/fxsudoku/Makefile index ff3bf2de4a3c..ba47cf9d5cd5 100644 --- a/games/fxsudoku/Makefile +++ b/games/fxsudoku/Makefile @@ -19,9 +19,9 @@ post-extract: ${CP} ${FILESDIR}/config.freebsd ${WRKSRC}/build do-build: - cd ${WRKSRC} && MAKE=${GMAKE} ./gb + cd ${WRKSRC} && MAKE=${MAKE_CMD} ./gb do-install: - cd ${WRKSRC} && MAKE=${GMAKE} ./gb install --prefix=${STAGEDIR}${PREFIX} + cd ${WRKSRC} && MAKE=${MAKE_CMD} ./gb install --prefix=${STAGEDIR}${PREFIX} .include <bsd.port.mk> diff --git a/games/glbsp/Makefile b/games/glbsp/Makefile index fc5b253dc6d2..5a121014ffae 100644 --- a/games/glbsp/Makefile +++ b/games/glbsp/Makefile @@ -31,10 +31,10 @@ post-patch: post-build: .if ${PORT_OPTIONS:MGUI} - ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} -f GUI_unx.mak all + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} -f GUI_unx.mak all .endif .if ${PORT_OPTIONS:MPLUGIN} - ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} -f Plugin_unx.mak all + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} -f Plugin_unx.mak all .endif do-install: diff --git a/games/kiki/Makefile b/games/kiki/Makefile index ed2d7c2416c6..c965475776cb 100644 --- a/games/kiki/Makefile +++ b/games/kiki/Makefile @@ -46,8 +46,8 @@ post-patch: do-build: cd ${WRKSRC}/SWIG && swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i - cd ${WRKSRC}/kodilib/linux && ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} - cd ${WRKSRC}/linux && ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} + cd ${WRKSRC}/kodilib/linux && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} + cd ${WRKSRC}/linux && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/linux/kiki ${STAGEDIR}${PREFIX}/bin/ diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index ee82a4669326..319bbb509cf5 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -14,7 +14,7 @@ COMMENT= Arcade style game with stereo sound for X Window System LICENSE= GPLv2 USES= gmake -MAKE_ARGS= CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \ +MAKE_ARGS= CC="${CC}" MAKE="${MAKE_CMD}" OPTIONS="${CFLAGS}" \ RO_GAME_DIR="${DATADIR}" RW_GAME_DIR="${DATADIR}/scores" \ X11_PATH="${LOCALBASE}" USE_GCC= any # doesn't start otherwise (UB?) diff --git a/games/nimuh/Makefile b/games/nimuh/Makefile index 22e2c095f5b9..baa7fa63560c 100644 --- a/games/nimuh/Makefile +++ b/games/nimuh/Makefile @@ -33,6 +33,6 @@ post-configure: @cd ${DATA_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} post-install: - @cd ${DATA_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} + @cd ${DATA_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} .include <bsd.port.mk> diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile index 4714144f10d8..73b3cf7ecf7c 100644 --- a/games/poker-engine/Makefile +++ b/games/poker-engine/Makefile @@ -33,6 +33,6 @@ post-patch: ${WRKSRC}/Makefile.in test: - @cd ${WRKSRC} && ${GMAKE} check + @cd ${WRKSRC} && ${MAKE_CMD} check .include <bsd.port.mk> diff --git a/games/poker-eval/Makefile b/games/poker-eval/Makefile index 315d7f9661c8..5058a02de120 100644 --- a/games/poker-eval/Makefile +++ b/games/poker-eval/Makefile @@ -23,6 +23,6 @@ post-patch: ${WRKSRC}/Makefile.in test: - @cd ${WRKSRC} && ${GMAKE} check + @cd ${WRKSRC} && ${MAKE_CMD} check .include <bsd.port.mk> diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile index 73fd484ced4d..bf839e1beb39 100644 --- a/games/pykawari/Makefile +++ b/games/pykawari/Makefile @@ -36,7 +36,7 @@ post-patch: ${WRKSRC}/build/src/gcc.mak do-build: - (cd ${WRKSRC}/build/src; CFLAGS="${CFLAGS}" ${GMAKE} -f gcc.mak PYTHONBASE=${PYTHONBASE} PYTHON_VERSION=${PYTHON_VERSION} PTHREAD_LIBS=${PTHREAD_LIBS} CXX=${CXX}) + (cd ${WRKSRC}/build/src; CFLAGS="${CFLAGS}" ${MAKE_CMD} -f gcc.mak PYTHONBASE=${PYTHONBASE} PYTHON_VERSION=${PYTHON_VERSION} PTHREAD_LIBS=${PTHREAD_LIBS} CXX=${CXX}) do-install: ${MKDIR} ${PREFIX}/share/kawari diff --git a/games/quackle/Makefile b/games/quackle/Makefile index 098aae1dc356..ba17f991c537 100644 --- a/games/quackle/Makefile +++ b/games/quackle/Makefile @@ -42,7 +42,7 @@ post-configure: pre-build: .for dir in . quackleio - @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) .endfor diff --git a/games/rnd_jue/Makefile b/games/rnd_jue/Makefile index bf3effda86c0..e1eccfc3a392 100644 --- a/games/rnd_jue/Makefile +++ b/games/rnd_jue/Makefile @@ -27,7 +27,7 @@ EXTRACT_DEPENDS+=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip USES= gmake USE_SDL= image mixer net sdl -MAKE_ARGS= CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \ +MAKE_ARGS= CC="${CC}" MAKE="${MAKE_CMD}" OPTIONS="${CFLAGS}" \ RO_GAME_DIR="${DATADIR}" \ X11_PATH="${LOCALBASE}" ALL_TARGET= sdl diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index d2c15cba232c..43a043901649 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -29,7 +29,7 @@ EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip USES= gmake iconv USE_SDL= image mixer net sdl -MAKE_ARGS= CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \ +MAKE_ARGS= CC="${CC}" MAKE="${MAKE_CMD}" OPTIONS="${CFLAGS}" \ RO_GAME_DIR="${DATADIR}" \ X11_PATH="${LOCALBASE}" ALL_TARGET= sdl diff --git a/games/sol/Makefile b/games/sol/Makefile index 93dc4eb78176..00df7b3ccf0e 100644 --- a/games/sol/Makefile +++ b/games/sol/Makefile @@ -23,7 +23,7 @@ USE_XORG= xpm x11 xaw .include <bsd.port.pre.mk> pre-build: - cd ${WRKSRC} && ${GMAKE} readme.var + cd ${WRKSRC} && ${MAKE_CMD} readme.var do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sol ${STAGEDIR}${PREFIX}/bin diff --git a/games/tbe/Makefile b/games/tbe/Makefile index 98a643927990..ace279ddb0d3 100644 --- a/games/tbe/Makefile +++ b/games/tbe/Makefile @@ -25,7 +25,7 @@ DESKTOP_ENTRIES="The Butterfly Effect" "Inspired by The Incredible Machine" \ "${PREFIX}/bin/tbe" "LogicGame;Game;" false post-patch: - @${REINPLACE_CMD} 's/ make/ ${GMAKE}/' \ + @${REINPLACE_CMD} 's/ make/ ${MAKE_CMD}/' \ ${WRKSRC}/3rdParty/Makefile @${REINPLACE_CMD} 's/debug/release link_prl/' ${WRKSRC}/tbe.pro @${SED} 's:%%DATADIR:QString("${DATADIR}"):' \ @@ -35,7 +35,7 @@ post-patch: pre-configure: # This is supposedly done by the ./configure script - @cd ${WRKSRC}/3rdParty && ${GMAKE} + @cd ${WRKSRC}/3rdParty && ${MAKE_CMD} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${DATADIR} diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile index ce094527fd9b..e828ce65b21b 100644 --- a/games/tuxmath/Makefile +++ b/games/tuxmath/Makefile @@ -66,7 +66,7 @@ pre-configure: CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}") pre-build: - @(cd ${T4K_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @(cd ${T4K_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${_make_jobs} ${ALL_TARGET}) post-install: diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile index 7c1aa8f8b26e..4ddae9cbcb85 100644 --- a/games/ufoai/Makefile +++ b/games/ufoai/Makefile @@ -90,9 +90,9 @@ post-patch: ${WRKSRC}/src/client/renderer/r_image.c post-build: - @cd ${WRKSRC} && ${GMAKE} lang + @cd ${WRKSRC} && ${MAKE_CMD} lang . if defined(WITH_UFORADIANT) - @cd ${WRKSRC} && ${GMAKE} uforadiant + @cd ${WRKSRC} && ${MAKE_CMD} uforadiant . endif do-install: diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile index 574b9b1c2ba4..d1765263c5ac 100644 --- a/games/volleyball/Makefile +++ b/games/volleyball/Makefile @@ -39,7 +39,7 @@ post-configure: post-install: cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ diff --git a/games/vultures-eye/Makefile b/games/vultures-eye/Makefile index e3465547596e..8141110e357c 100644 --- a/games/vultures-eye/Makefile +++ b/games/vultures-eye/Makefile @@ -25,7 +25,7 @@ CONFIGURE_WRKSRC= ${WRKSRC}/sys/unix CONFIGURE_SCRIPT= setup.sh DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} CFLAGS+= -I${LOCALBASE}/include/libpng15 -MAKE_ENV+= DATADIR="${DATADIR}" MAKE="${GMAKE}" BASECFLAGS="${CFLAGS}" +MAKE_ENV+= DATADIR="${DATADIR}" MAKE="${MAKE_CMD}" BASECFLAGS="${CFLAGS}" MAKE_JOBS_UNSAFE= yes NO_STAGE= yes diff --git a/games/wop/Makefile b/games/wop/Makefile index 7aecc8cca184..9e0c96a6ac37 100644 --- a/games/wop/Makefile +++ b/games/wop/Makefile @@ -33,7 +33,7 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|__va_copy|va_copy|g' ${WRKSRC}/src/string.cpp - @${REINPLACE_CMD} -e 's|; make|; ${GMAKE}|g' ${WRKSRC}/Makefile ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's|; make|; ${MAKE_CMD}|g' ${WRKSRC}/Makefile ${WRKSRC}/src/Makefile @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/sdlwidgets/Makefile ${WRKSRC}/src/Makefile @${REINPLACE_CMD} -e 's|= g++|?= g++|g' ${WRKSRC}/sdlwidgets/Makefile ${WRKSRC}/src/Makefile @${REINPLACE_CMD} -e 's|/etc/woprc|${PREFIX}/etc/woprc|' ${WRKSRC}/src/wopsettings.cpp diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile index 2c4118efb904..34658cb48efb 100644 --- a/graphics/ayam/Makefile +++ b/graphics/ayam/Makefile @@ -50,7 +50,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/../scn/shaders/Makefile post-build: - cd ${WRKSRC}/../scn/shaders && ${GMAKE} slx + cd ${WRKSRC}/../scn/shaders && ${MAKE_CMD} slx do-install: # binary and wrapper diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile index a8269a8e1430..6023bd43bd9f 100644 --- a/graphics/epstool/Makefile +++ b/graphics/epstool/Makefile @@ -16,7 +16,7 @@ USE_GHOSTSCRIPT_RUN= yes USES= gmake MAKEFILE= makefile -MAKE_ARGS= MAKE="${GMAKE}" GSCDEBUG="" CC="${CC}" CCAUX="${CC}" \ +MAKE_ARGS= MAKE="${MAKE_CMD}" GSCDEBUG="" CC="${CC}" CCAUX="${CC}" \ CLINK="${CC} ${LDFLAGS}" LINK="${CC} ${LDFLAGS}" EPSLIB="" \ GTKCFLAGS="" GTKLIBS="" LIBPNGCFLAGS="" LIBPNGLIBS="" ALL_TARGET= ${PORTNAME} diff --git a/graphics/evas-engine-opengl/Makefile b/graphics/evas-engine-opengl/Makefile index 59507f74e875..13f912e2fa5c 100644 --- a/graphics/evas-engine-opengl/Makefile +++ b/graphics/evas-engine-opengl/Makefile @@ -40,7 +40,7 @@ post-patch: pre-build: @(cd ${WRKSRC}/src/modules/engines/gl_common; ${SETENV} ${MAKE_ENV} \ - ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) post-install: ${INSTALL_DATA} ${WRKSRC}/evas-opengl-x11.pc \ diff --git a/graphics/evas-loader-bmp/Makefile b/graphics/evas-loader-bmp/Makefile index 940ec7d0fece..e997d2f666d3 100644 --- a/graphics/evas-loader-bmp/Makefile +++ b/graphics/evas-loader-bmp/Makefile @@ -33,11 +33,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-eet/Makefile b/graphics/evas-loader-eet/Makefile index ce25ef8a80f3..7425a49490a4 100644 --- a/graphics/evas-loader-eet/Makefile +++ b/graphics/evas-loader-eet/Makefile @@ -37,11 +37,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-generic/Makefile b/graphics/evas-loader-generic/Makefile index d7eaeb2c89c9..4e19feb56351 100644 --- a/graphics/evas-loader-generic/Makefile +++ b/graphics/evas-loader-generic/Makefile @@ -49,11 +49,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-gif/Makefile b/graphics/evas-loader-gif/Makefile index accd5ee50b42..b0927fe494b3 100644 --- a/graphics/evas-loader-gif/Makefile +++ b/graphics/evas-loader-gif/Makefile @@ -37,11 +37,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-ico/Makefile b/graphics/evas-loader-ico/Makefile index 3446f7757880..dc3d0e5a3d2b 100644 --- a/graphics/evas-loader-ico/Makefile +++ b/graphics/evas-loader-ico/Makefile @@ -33,11 +33,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-jpeg/Makefile b/graphics/evas-loader-jpeg/Makefile index d77fc2cba317..6c004d4cf2a8 100644 --- a/graphics/evas-loader-jpeg/Makefile +++ b/graphics/evas-loader-jpeg/Makefile @@ -38,11 +38,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-pmaps/Makefile b/graphics/evas-loader-pmaps/Makefile index 96f008c181db..de0811a7b3ba 100644 --- a/graphics/evas-loader-pmaps/Makefile +++ b/graphics/evas-loader-pmaps/Makefile @@ -33,11 +33,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-png/Makefile b/graphics/evas-loader-png/Makefile index 1dc4b10c8e3e..375a73a73427 100644 --- a/graphics/evas-loader-png/Makefile +++ b/graphics/evas-loader-png/Makefile @@ -38,11 +38,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-psd/Makefile b/graphics/evas-loader-psd/Makefile index 67f7f366da53..7b09036ab9c5 100644 --- a/graphics/evas-loader-psd/Makefile +++ b/graphics/evas-loader-psd/Makefile @@ -33,11 +33,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-svg/Makefile b/graphics/evas-loader-svg/Makefile index dc290f3ccb70..e455a915cca2 100644 --- a/graphics/evas-loader-svg/Makefile +++ b/graphics/evas-loader-svg/Makefile @@ -36,11 +36,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-tga/Makefile b/graphics/evas-loader-tga/Makefile index 484b01a7198d..754d4f68ee55 100644 --- a/graphics/evas-loader-tga/Makefile +++ b/graphics/evas-loader-tga/Makefile @@ -33,11 +33,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-tiff/Makefile b/graphics/evas-loader-tiff/Makefile index 706e5e1ecbd7..e8ba66c8aae7 100644 --- a/graphics/evas-loader-tiff/Makefile +++ b/graphics/evas-loader-tiff/Makefile @@ -38,11 +38,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-wbmp/Makefile b/graphics/evas-loader-wbmp/Makefile index e7f67fc73bd0..94b2b676adc0 100644 --- a/graphics/evas-loader-wbmp/Makefile +++ b/graphics/evas-loader-wbmp/Makefile @@ -33,11 +33,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/evas-loader-xpm/Makefile b/graphics/evas-loader-xpm/Makefile index 6229b38d42d1..4a5ea1bd9dc6 100644 --- a/graphics/evas-loader-xpm/Makefile +++ b/graphics/evas-loader-xpm/Makefile @@ -37,11 +37,11 @@ post-patch: ${MAKEDIRS:S,$,/Makefile.in,} do-build: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done) do-install: - @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done) .include <bsd.port.mk> diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 9bf14b285eea..379e335e624e 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -68,7 +68,7 @@ PLIST_SUB+= TIFF="@comment " .endif post-install: - @cd ${WRKSRC}/docs/reference/gdk-pixbuf && env DESTDIR=${STAGEDIR} ${GMAKE} install-man1 + @cd ${WRKSRC}/docs/reference/gdk-pixbuf && env DESTDIR=${STAGEDIR} ${MAKE_CMD} install-man1 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdk_pixbuf*-2.0.so.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gdk-pixbuf-2.0/${GTK2_VERSION}/loaders/lib*.so diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index 8753e9302613..eec0c47dd740 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -220,8 +220,8 @@ pre-configure: post-build: .if ${PORT_OPTIONS:MDOCS} - cd ${WRKSRC}/docs && ${GMAKE} index.html - cd ${WRKSRC}/docs/gallery && ${GMAKE} index.html + cd ${WRKSRC}/docs && ${MAKE_CMD} index.html + cd ${WRKSRC}/docs/gallery && ${MAKE_CMD} index.html .endif post-install: diff --git a/graphics/gimp-refocus-plugin/Makefile b/graphics/gimp-refocus-plugin/Makefile index 8469f3918907..5f37a711e78f 100644 --- a/graphics/gimp-refocus-plugin/Makefile +++ b/graphics/gimp-refocus-plugin/Makefile @@ -43,7 +43,7 @@ PLIST_DIRSTRY= libexec/gimp/2.2/plug-ins \ post-patch: @${FIND} ${WRKSRC} -name Makefile.am \ - -exec ${REINPLACE_CMD} -e "s|; make|; ${GMAKE}|" {} \; + -exec ${REINPLACE_CMD} -e "s|; make|; ${MAKE_CMD}|" {} \; @${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" \ ${WRKSRC}/configure.in diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 1392fba7a05e..be07affa6a17 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -237,11 +237,11 @@ post-install: .if ${PORT_OPTIONS:MPLUGIN} .if ${PORT_OPTIONS:MGTK2} cd ${INSTALL_WRKSRC}/plugin && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-plugin .endif .if ${PORT_OPTIONS:MKDE4} cd ${INSTALL_WRKSRC}/plugin/klash4 && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-plugin .endif .endif diff --git a/graphics/libetonyek/Makefile b/graphics/libetonyek/Makefile index 0ae851adbd3c..9f8c1dae8f2c 100644 --- a/graphics/libetonyek/Makefile +++ b/graphics/libetonyek/Makefile @@ -36,7 +36,7 @@ TEST_CONFIGURE_OFF= --disable-tests .if ${PORT_OPTIONS:MTEST} post-build: - @cd ${WRKSRC}/src/test && ${GMAKE} check + @cd ${WRKSRC}/src/test && ${MAKE_CMD} check .endif .include <bsd.port.mk> diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile index 62fbf8c757ad..380341683295 100644 --- a/graphics/megapov/Makefile +++ b/graphics/megapov/Makefile @@ -48,7 +48,7 @@ pre-build: .endif do-install: - @(cd ${WRKSRC}/unix ; ${GMAKE} install) + @(cd ${WRKSRC}/unix ; ${MAKE_CMD} install) .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} @${TAR} -C ${WRKSRC}/doc -cf - . | \ diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index e870ff996ef2..85ab108cfae6 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -124,7 +124,7 @@ pre-configure: # This snippet is all it takes to make the port as of 10.35.80 MAKE_JOBS_SAFE: pre-build: - (cd ${BUILD_WRKSRC}/lib/util; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE2} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ + (cd ${BUILD_WRKSRC}/lib/util; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE2} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile index b8586c9cb853..0391f2dadadb 100644 --- a/graphics/poppler-glib/Makefile +++ b/graphics/poppler-glib/Makefile @@ -13,7 +13,7 @@ SLAVEPORT= glib PLIST= ${.CURDIR}/pkg-plist pre-build: - @cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} libpoppler-cairo.la .include "${MASTERDIR}/Makefile" diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile index eede2b83a6cd..57e3d56dfae7 100644 --- a/graphics/povray36/Makefile +++ b/graphics/povray36/Makefile @@ -69,7 +69,7 @@ post-patch: .endif do-install: - @(cd ${WRKSRC} ; ${GMAKE} install) + @(cd ${WRKSRC} ; ${MAKE_CMD} install) post-install: @${SED} -e 's,/usr/local,${PREFIX},g' ${DESCR} diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile index 9f7fac2a563f..8ac81618c826 100644 --- a/graphics/quesa/Makefile +++ b/graphics/quesa/Makefile @@ -61,11 +61,11 @@ post-configure: post-build: cd ${WRKSRC_EXAMPLES} && \ - ${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_EXAMPLES} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} .endif .include <bsd.port.post.mk> diff --git a/graphics/sane-epkowa/Makefile b/graphics/sane-epkowa/Makefile index 1c4726cc1407..31525fd3d6b3 100644 --- a/graphics/sane-epkowa/Makefile +++ b/graphics/sane-epkowa/Makefile @@ -82,10 +82,10 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} LDFLAGS="-L${PREFIX}/lib -lgetline" CPPFLAGS= do-patch: # nothing to do do-build: - ( cd ${WRKSRC}/libltdl ; ${GMAKE} ) - ( cd ${WRKSRC}/sanei ; ${GMAKE} ) - ( cd ${WRKSRC}/backend ; ${GMAKE} ) - ( cd ${WRKSRC}/doc ; ${GMAKE} ) + ( cd ${WRKSRC}/libltdl ; ${MAKE_CMD} ) + ( cd ${WRKSRC}/sanei ; ${MAKE_CMD} ) + ( cd ${WRKSRC}/backend ; ${MAKE_CMD} ) + ( cd ${WRKSRC}/doc ; ${MAKE_CMD} ) .else .warning version 2.15.0 not working yet # Remove versioned symbols to link with FreeBSD's [g]libc @@ -95,8 +95,8 @@ post-patch: # only build the backend part do-build: - ( cd ${WRKSRC}/backend ; ${GMAKE} ) - ( cd ${WRKSRC}/doc ; ${GMAKE} ) + ( cd ${WRKSRC}/backend ; ${MAKE_CMD} ) + ( cd ${WRKSRC}/doc ; ${MAKE_CMD} ) .endif do-install: diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile index 577453f4b50c..ec262cc94c4f 100644 --- a/japanese/dvipsk/Makefile +++ b/japanese/dvipsk/Makefile @@ -91,10 +91,10 @@ post-configure: do-build: cd ${WRKDIR}/${TETEX_SRC}/texk/dvipsk &&\ - ${SETENV} ${MAKE_ENV} ${GMAKE} \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET} cd ${WRKDIR}/${TETEX_SRC}/texk/udvipsk &&\ - ${SETENV} ${MAKE_ENV} ${GMAKE} \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} \ program=udvips XDEFS=-DUDVIPS \ ${ALL_TARGET} @@ -102,7 +102,7 @@ do-build: do-install: ${MKDIR} ${PREFIX}/${DVIPSCONFIGDIR}/config cd ${WRKDIR}/${TETEX_SRC}/texk/dvipsk &&\ - ${SETENV} ${MAKE_ENV} ${GMAKE} \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET} ${INSTALL_PROGRAM} \ ${PATCH_WRKSRC}/udvipsk/udvips \ diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index d024a85cad3c..23d8abf442e2 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -164,8 +164,8 @@ pre-build: ${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; ${RM} -rf ${WRKSRC}/info/* @(cd ${WRKSRC}/src/../lisp; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${EMACS_CMD}) - @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs) + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${EMACS_CMD}) + @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs) @(cd ${WRKSRC}/src/../lisp; \ ${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \ egg.el wnn-egg.el \ diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 652125783de8..fae0b8a67abf 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -64,7 +64,7 @@ GYP_DEFINES= use_libprotobuf=1 \ enable_unittest=0 \ zinnia_model_file="${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model" BUILD_MODE= Release -BUILD_CMD= ${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${GMAKE} +BUILD_CMD= ${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${MAKE_CMD} BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \ ${SETENV} BUILD_COMMAND="${WRKSRC}/mozcmake" \ PYTHONPATH=${WRKSRC}/third_party/gyp/local/lib/python${PYTHON_VER}/site-packages \ diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile index 898d4dbd8a45..6befc9c5f534 100644 --- a/japanese/uim-anthy/Makefile +++ b/japanese/uim-anthy/Makefile @@ -31,18 +31,18 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_dict_Makefile.in do-build: - (cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy.la) - (cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy-utf8.la) + (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy.la) + (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy-utf8.la) .if !defined(WITHOUT_X11) - (cd ${WRKSRC}/gtk2/dict && ${GMAKE} uim-dict-gtk) + (cd ${WRKSRC}/gtk2/dict && ${MAKE_CMD} uim-dict-gtk) .endif do-install: (cd ${WRKSRC}/uim && \ - ${GMAKE} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \ - ${GMAKE} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES) + ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \ + ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES) .if !defined(WITHOUT_X11) - (cd ${WRKSRC}/gtk2/dict && ${GMAKE} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA) + (cd ${WRKSRC}/gtk2/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA) .endif .include "${MASTERDIR}/Makefile" diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index 72a9576c48aa..e6457692f0a5 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -110,9 +110,9 @@ post-install: .if ${PORT_OPTIONS:MTEST} test: build - @(cd ${WRKSRC}; ${GMAKE} check) + @(cd ${WRKSRC}; ${MAKE_CMD} check) .if ${PORT_OPTIONS:MPLUGIN} - @(cd ${WRKSRC}; ${GMAKE} plugin-tests) + @(cd ${WRKSRC}; ${MAKE_CMD} plugin-tests) .endif .endif diff --git a/java/openjdk6/Makefile.test b/java/openjdk6/Makefile.test index 1a75a5ac23dc..880a0580e02a 100644 --- a/java/openjdk6/Makefile.test +++ b/java/openjdk6/Makefile.test @@ -15,5 +15,5 @@ test: ${_TEST_SEQ} do-test: build-depends build @-(cd ${WRKSRC}/jdk/test; ${SETENV} PLATFORM=bsd ARCH=${ARCH} \ - ${MAKE_ENV} ${GMAKE} tests) + ${MAKE_ENV} ${MAKE_CMD} tests) .endif diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile index ec3e2a8bd6c6..7c78174a56b7 100644 --- a/korean/libhangul/Makefile +++ b/korean/libhangul/Makefile @@ -30,8 +30,8 @@ CONFIGURE_ARGS= --disable-nls .if exists(${LOCALBASE}/libdata/pkgconfig/check.pc) test: build - @( cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} ) - @( cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} test && ./test ) + @( cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) + @( cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test && ./test ) .endif .include <bsd.port.mk> diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile index 77fd34007baa..b86dcb1db7b4 100644 --- a/lang/Sather/Makefile +++ b/lang/Sather/Makefile @@ -76,7 +76,7 @@ post-patch: -e 's,(CC_OPTIONS:[[:space:]]*).*,\1"${SAT_CFLAGS}";,' \ -e 's,(GC_LINK:[[:space:]]*).*,\1"${SAT_LIBS}";,' \ -e 's,(CC_OPTIMIZE_FLAG:[[:space:]]*).*,\1""\,"${CFLAGS}";,' \ - -e 's,(MAKE_COMMAND:[[:space:]]*).*,\1"${GMAKE}";,' \ + -e 's,(MAKE_COMMAND:[[:space:]]*).*,\1"${MAKE_CMD}";,' \ -e 's,(FORTRAN_APPEND_UNDERSCORE:[[:space:]]*).*,\1"true";,' \ -e 's,CONFIG_PLATFORMS,unix,' \ -e 's,CONFIG_DEFAULT_PLATFORM,freebsd,' \ diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile index bde6a7b7888b..7d7dec8381b9 100644 --- a/lang/afnix/Makefile +++ b/lang/afnix/Makefile @@ -41,8 +41,8 @@ post-patch: ${WRKSRC}/cnf/bin/afnix-guess post-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} doc - @cd ${WRKSRC}/prj && ${SETENV} ${MAKE_ENV} ${GMAKE} doc + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} doc + @cd ${WRKSRC}/prj && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} doc post-install: .if ! ${PORT_OPTIONS:MDOCS} @@ -51,7 +51,7 @@ post-install: ${STAGEDIR}${MANPREFIX}/man/man${i:E}/ . endfor .else - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${GMAKE} publish + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${MAKE_CMD} publish .endif .include <bsd.port.post.mk> diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile index d5557fb35d44..4a58b4af8e93 100644 --- a/lang/chicken/Makefile +++ b/lang/chicken/Makefile @@ -36,6 +36,6 @@ post-install: # This only works *after* chicken is installed. regression-test: build (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ - ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) .include <bsd.port.post.mk> diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile index 3d79aa1919dc..7b383daa9040 100644 --- a/lang/clang-devel/Makefile +++ b/lang/clang-devel/Makefile @@ -137,10 +137,10 @@ pre-build: ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ - cd ${WRKSRC}/utils/unittest && ${GMAKE} + cd ${WRKSRC}/utils/unittest && ${MAKE_CMD} post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} man html ps + @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man html ps post-install: ${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so @@ -169,7 +169,7 @@ post-install: ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/tools/clang/docs/tools && \ - ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps + ${MAKE_CMD} DESTDIR=${STAGEDIR}/ install-html install-ps ${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1 diff --git a/lang/clang32/Makefile b/lang/clang32/Makefile index 851003f9a025..49ee5f77d021 100644 --- a/lang/clang32/Makefile +++ b/lang/clang32/Makefile @@ -113,12 +113,12 @@ pre-build: ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ - cd ${WRKSRC}/utils/unittest && ${GMAKE} + cd ${WRKSRC}/utils/unittest && ${MAKE_CMD} post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} man + @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man .if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} html ps + @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} html ps .endif post-install: @@ -134,7 +134,7 @@ post-install: .endfor .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/tools/clang/docs/tools && \ - ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps + ${MAKE_CMD} DESTDIR=${STAGEDIR}/ install-html install-ps .endif ${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1 diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile index 73b6157ecdfc..6c9a4d8a4a43 100644 --- a/lang/clang33/Makefile +++ b/lang/clang33/Makefile @@ -122,12 +122,12 @@ pre-build: ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ - cd ${WRKSRC}/utils/unittest && ${GMAKE} + cd ${WRKSRC}/utils/unittest && ${MAKE_CMD} post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} man + @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man .if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} html ps + @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} html ps .endif post-install: @@ -152,7 +152,7 @@ post-install: .endfor .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/tools/clang/docs/tools && \ - ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps + ${MAKE_CMD} DESTDIR=${STAGEDIR}/ install-html install-ps .endif ${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1 diff --git a/lang/clang34/Makefile b/lang/clang34/Makefile index 74acbd29e36f..0afca59afdca 100644 --- a/lang/clang34/Makefile +++ b/lang/clang34/Makefile @@ -119,12 +119,12 @@ pre-build: ${LN} -sf ${LLVM_PREFIX}/lib/${LIBNAME} ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/ ${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/ - cd ${WRKSRC}/utils/unittest && ${GMAKE} + cd ${WRKSRC}/utils/unittest && ${MAKE_CMD} post-build: - @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} man + @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man .if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} html ps + @cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} html ps .endif post-install: @@ -149,7 +149,7 @@ post-install: .endfor .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/tools/clang/docs/tools && \ - ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps + ${MAKE_CMD} DESTDIR=${STAGEDIR}/ install-html install-ps .endif ${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \ ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1 diff --git a/lang/dmd2/Makefile b/lang/dmd2/Makefile index 0c764e390944..0b35a7eb14e7 100644 --- a/lang/dmd2/Makefile +++ b/lang/dmd2/Makefile @@ -69,9 +69,9 @@ post-patch: post-build: cd ${WRKSRC}/../druntime && \ - ${SETENV} PATH=${WRKSRC}:${PATH} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} + ${SETENV} PATH=${WRKSRC}:${PATH} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} cd ${WRKSRC}/../phobos && \ - ${SETENV} PATH=${WRKSRC}:${PATH} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${BUILD} + ${SETENV} PATH=${WRKSRC}:${PATH} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${BUILD} do-install: ${INSTALL_MAN} ${WRKDIR}/dmd2/man/man1/dmd.1 ${STAGEDIR}${MANPREFIX}/man/man1/dmd.1 diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile index 3ff3e9861a37..b33584199c78 100644 --- a/lang/ezm3/Makefile +++ b/lang/ezm3/Makefile @@ -98,7 +98,7 @@ pre-install: do-install: @${RM} -rf ${WRKSRC}/${TARGET} - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) @for i in ${PROGS}; do ${STRIP_CMD} ${PREFIX}/$$i; done @${MKDIR} ${PREFIX}/share/ezm3 diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile index 8150de07f9cb..3c8f9b394a9a 100644 --- a/lang/f2c/Makefile +++ b/lang/f2c/Makefile @@ -59,7 +59,7 @@ pre-configure: do-build: @${ECHO_MSG} "===> Building f2c..." @(cd ${WRKSRC}/src; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) @${ECHO_MSG} "===> Building libf2c..." @(cd ${WRKSRC}/libf2c; \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} libf2c.so) diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 1a7eea6b4ce6..2a18813a92a7 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -129,7 +129,7 @@ pre-configure: .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${GMAKE} -sk check + cd ${WRKSRC}; ${MAKE_CMD} -sk check .endif post-install: diff --git a/lang/gcc410/Makefile b/lang/gcc410/Makefile index 2626d85c0fce..8a96df5cd037 100644 --- a/lang/gcc410/Makefile +++ b/lang/gcc410/Makefile @@ -129,7 +129,7 @@ pre-configure: .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${GMAKE} -sk check \ + cd ${WRKSRC}; ${MAKE_CMD} -sk check \ ; ${SRCDIR}/contrib/test_summary .endif diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 1a8d90a05370..343a6f336f05 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -121,7 +121,7 @@ pre-configure: .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${GMAKE} -sk check \ + cd ${WRKSRC}; ${MAKE_CMD} -sk check \ ; ${SRCDIR}/contrib/test_summary .endif diff --git a/lang/gcc47-aux/Makefile b/lang/gcc47-aux/Makefile index 0294c6748b54..302c3c964703 100644 --- a/lang/gcc47-aux/Makefile +++ b/lang/gcc47-aux/Makefile @@ -260,38 +260,38 @@ do-configure: ${CFG_SCRIPT} ${ADA_CONFIG_ARGS} do-build: - cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} all + cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} all test: build test-ada test-fortran test-objc test-cxx test-c test-ada: .if ${PORT_OPTIONS:MADA} && ${PORT_OPTIONS:MTESTSUITE} - cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-ada + cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${MAKE_CMD} -sk check-ada .endif test-fortran: .if ${PORT_OPTIONS:MFORT} && ${PORT_OPTIONS:MTESTSUITE} - cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-fortran + cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${MAKE_CMD} -sk check-fortran .endif test-objc: .if ${PORT_OPTIONS:MOBJC} && ${PORT_OPTIONS:MTESTSUITE} - cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-objc + cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${MAKE_CMD} -sk check-objc .endif test-cxx: .if ${PORT_OPTIONS:MCXX} && ${PORT_OPTIONS:MTESTSUITE} # libstdc++ testsuite will break every time, TRUE used to force continuation - cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-c++ || true + cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${MAKE_CMD} -sk check-c++ || true .endif test-c: .if ${PORT_OPTIONS:MTESTSUITE} - cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-c + cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${MAKE_CMD} -sk check-c .endif do-install: - cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} install-strip DESTDIR=${STAGEDIR} + cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${MAKE_CMD} install-strip DESTDIR=${STAGEDIR} post-install: ${MV} ${STAGEDIR}${PKG_PREFIX}/share/man ${STAGEDIR}/${PKG_PREFIX} diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 5ceaef2d91fd..322227cec071 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -130,7 +130,7 @@ pre-configure: .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${GMAKE} -sk check \ + cd ${WRKSRC}; ${MAKE_CMD} -sk check \ ; ${SRCDIR}/contrib/test_summary .endif diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index ea98bf293933..ce894fa5bfc5 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -129,7 +129,7 @@ pre-configure: .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${GMAKE} -sk check \ + cd ${WRKSRC}; ${MAKE_CMD} -sk check \ ; ${SRCDIR}/contrib/test_summary .endif diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile index 6a77464a0669..4128e2607aa5 100644 --- a/lang/gcc49/Makefile +++ b/lang/gcc49/Makefile @@ -129,7 +129,7 @@ pre-configure: .if defined(MAINTAINER_MODE) full-regression-test: build - cd ${WRKSRC}; ${GMAKE} -sk check \ + cd ${WRKSRC}; ${MAKE_CMD} -sk check \ ; ${SRCDIR}/contrib/test_summary .endif diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 8923a38f35a7..9f38cf83a72d 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -261,7 +261,7 @@ post-install-script: 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} #post-build: -# @(cd ${WRKSRC} && ${GMAKE} binary-dist) +# @(cd ${WRKSRC} && ${MAKE_CMD} binary-dist) # #do-install: # @${NONE} @@ -289,7 +289,7 @@ pre-configure: @${MKDIR} ${TMPDIR} .if empty(PORT_OPTIONS:MBOOT) @(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT}) - @(cd ${BOOT_DIR} && PACKAGES='' ${GMAKE} install) + @(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install) .endif # Defining with documentation: diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk index e3e8dd9b3899..64ba4283a5a9 100644 --- a/lang/ghc/bsd.cabal.mk +++ b/lang/ghc/bsd.cabal.mk @@ -243,7 +243,7 @@ do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} haddock ${HADDOCK_OPTS} .endif # STANDALONE .if defined(XMLDOCS) - @(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html) + @(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html) .endif # XMLDOCS .endif # DOCS .endif # target(do-build) diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index 78f3f0b65d0b..1966d15858e2 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -56,12 +56,12 @@ post-patch: do-build: . for dir in src libraries docs - 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 do-install: . for dir in src libraries demos docs - 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 .include <bsd.port.post.mk> diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile index 3710737fb17c..5a90f9a34727 100644 --- a/lang/kawa/Makefile +++ b/lang/kawa/Makefile @@ -39,6 +39,6 @@ pre-patch: -e 's|{JAVA-java}|{JAVA-${JAVA}}|g;' ${WRKSRC}/configure regression-test: build - cd ${WRKSRC} && ${GMAKE} check + cd ${WRKSRC} && ${MAKE_CMD} check .include <bsd.port.mk> diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile index 3c7386d0b279..2da3f029de52 100644 --- a/lang/mit-scheme/Makefile +++ b/lang/mit-scheme/Makefile @@ -96,10 +96,10 @@ post-build: @${FIND} ${WRKDIR} -type d -empty -delete do-build: - @cd ${WRKDIR}/mit-scheme-${PORTVERSION}/src/microcode && ${GMAKE} + @cd ${WRKDIR}/mit-scheme-${PORTVERSION}/src/microcode && ${MAKE_CMD} do-install: - @cd ${WRKDIR}/mit-scheme-${PORTVERSION}/src && ${GMAKE} install DESTDIR=${STAGEDIR} + @cd ${WRKDIR}/mit-scheme-${PORTVERSION}/src && ${MAKE_CMD} install DESTDIR=${STAGEDIR} ${INSTALL_MAN} ${WRKDIR}/mit-scheme-${PORTVERSION}/doc/scheme.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ .include <bsd.port.post.mk> diff --git a/lang/mono-basic/Makefile b/lang/mono-basic/Makefile index afeefd139806..fb45feeaeca4 100644 --- a/lang/mono-basic/Makefile +++ b/lang/mono-basic/Makefile @@ -19,7 +19,7 @@ USES= gmake tests: build @${ECHO_MSG} "===> Running ${PORTNAME} regression tests" - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} Makefile ${MAKE_ARGS} test) .include <bsd.port.mk> diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 8c2a37a67c22..952a69c814a1 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -51,7 +51,7 @@ post-patch: tests: build @${ECHO_MSG} "===> Running mono regression tests" - @(cd ${WRKSRC}/mono/tests && ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @(cd ${WRKSRC}/mono/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} Makefile ${MAKE_ARGS} test) post-configure: diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile index 55532b1eb773..470bbf93836d 100644 --- a/lang/pike78/Makefile +++ b/lang/pike78/Makefile @@ -101,7 +101,7 @@ post-patch: ${WRKSRC}/bin/install.pike do-install: - @cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET} buildroot=${STAGEDIR} + @cd ${WRKSRC} && ${MAKE_CMD} ${INSTALL_TARGET} buildroot=${STAGEDIR} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/pike/${PORTVERSION}/bin/pike @@ -116,7 +116,7 @@ post-install: ) >> ${TMPPLIST} verify: - cd ${WRKSRC}; ${GMAKE} verify + cd ${WRKSRC}; ${MAKE_CMD} verify .include "Makefile.common" .include <bsd.port.mk> diff --git a/lang/python33/Makefile b/lang/python33/Makefile index edb7c137a6a1..ec25d1c866c7 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -220,6 +220,6 @@ post-install: .endif regression-test: build - @cd ${WRKSRC} && ${GMAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} test + @cd ${WRKSRC} && ${MAKE_CMD} TESTOPTS=-j${MAKE_JOBS_NUMBER} test .include <bsd.port.post.mk> diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile index c5784da0f4b1..53c8249fca52 100644 --- a/lang/sml-nj-devel/Makefile +++ b/lang/sml-nj-devel/Makefile @@ -280,7 +280,7 @@ do-install: @${CHOWN} -R ${BINOWN}:${BINGRP} "${MLBIN}" "${MLLIB}" .if ${PORT_OPTIONS:MEVERYTHING} @${ECHO} '(* Cleaning base/runtime: *)' - cd ${WRKDIR}/base/runtime/objs && ${GMAKE} clean + cd ${WRKDIR}/base/runtime/objs && ${MAKE_CMD} clean @${ECHO} -n '(* Installing sources into ${MLROOT} ...' @cd ${WRKDIR} && ${TAR} -cf - ${MLSRCEXCLUDES} ${MLSRCDIRS} | \ ${TAR} -xf - -C "${MLROOT}" diff --git a/lang/stklos/Makefile b/lang/stklos/Makefile index b2114f071340..47eddc2f02d8 100644 --- a/lang/stklos/Makefile +++ b/lang/stklos/Makefile @@ -60,6 +60,6 @@ post-patch: regression-test: build (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ - ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) .include <bsd.port.post.mk> diff --git a/lang/vala/Makefile b/lang/vala/Makefile index 088cc2521f25..7183613d5271 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -47,13 +47,13 @@ post-patch: .if defined(VALA_SLAVE) pre-build: - @cd ${WRKSRC} && ${GMAKE} version.h + @cd ${WRKSRC} && ${MAKE_CMD} version.h @cd ${WRKSRC}/gobject-introspection && ${MAKE_CMD} libgidl.la && \ ${MAKE_CMD} gen-introspect @cd ${WRKSRC}/vapigen && ${MAKE_CMD} all post-install: - @cd ${WRKSRC}/gobject-introspection && DESTDIR=${STAGEDIR} ${GMAKE} install + @cd ${WRKSRC}/gobject-introspection && DESTDIR=${STAGEDIR} ${MAKE_CMD} install ${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \ ${STAGEDIR}${PREFIX}/man/man1/ .else diff --git a/lang/ypsilon/Makefile b/lang/ypsilon/Makefile index 4404d5028d36..5c28ff2cf0c5 100644 --- a/lang/ypsilon/Makefile +++ b/lang/ypsilon/Makefile @@ -32,6 +32,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/example/*.scm ${STAGEDIR}${EXAMPLESDIR} regression-test: build - cd ${WRKSRC} && ${GMAKE} check + cd ${WRKSRC} && ${MAKE_CMD} check .include <bsd.port.mk> diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index b65e39f29926..d3c7440791b4 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -130,7 +130,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor - cd ${WRKSRC} && ( ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \ + cd ${WRKSRC} && ( ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \ install-configure ; cd - ) @${ECHO_MSG} "In case you use authpam, you should put the following lines" diff --git a/mail/p3scan/Makefile b/mail/p3scan/Makefile index 10fbc93dc83e..f0fed664eccb 100644 --- a/mail/p3scan/Makefile +++ b/mail/p3scan/Makefile @@ -18,7 +18,7 @@ PLIST_DIRS= etc/p3scan USE_GCC= any USES= gmake -MAKE_ENV= _LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" GMAKE=${GMAKE} +MAKE_ENV= _LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" GMAKE=${MAKE_CMD} SCRIPTS_ENV= PKG_PREFIX=${PREFIX} NONEXISTENT=${NONEXISTENT} PASSWD=/etc/passwd PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/mail/pop3vscan/Makefile b/mail/pop3vscan/Makefile index b454ee5d69aa..df716dd6cbc7 100644 --- a/mail/pop3vscan/Makefile +++ b/mail/pop3vscan/Makefile @@ -32,7 +32,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,g' ${WRKSRC}/*.c @${REINPLACE_CMD} -e 's,#endif.*,#endif,g' ${WRKSRC}/*.h - @${REINPLACE_CMD} -e 's,make,${GMAKE},g' ${WRKSRC}/ripmime/build_tnef + @${REINPLACE_CMD} -e 's,make,${MAKE_CMD},g' ${WRKSRC}/ripmime/build_tnef @${REINPLACE_CMD} -e 's,=4321,=_BYTE_ORDER -include /usr/include/machine/endian.h,g' \ ${WRKSRC}/ripmime/tnef/Makefile diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 3d77f2691c4d..2e0295c7009d 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -140,7 +140,7 @@ pre-configure: post-build: cd ${WRKSRC}/mailnews/extensions/enigmail && \ ./makemake -r -o ${MOZ_OBJDIR} - ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} all xpi \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} all xpi \ -C ${MOZ_OBJDIR}/mailnews/extensions/enigmail .endif diff --git a/math/alt-ergo/Makefile b/math/alt-ergo/Makefile index c895065d9afc..82bd0fd4ecf0 100644 --- a/math/alt-ergo/Makefile +++ b/math/alt-ergo/Makefile @@ -42,7 +42,7 @@ post-patch: \|cp -f.*$$(BINDIR)|s|cp -f|${INSTALL_SCRIPT}|; \ \|cp -f.*$$(MANDIR)|s|cp -f|${INSTALL_MAN}|; \ \|cp -f.*$$(LIBDIR)|s|cp -f|${INSTALL_DATA}|; }' \ - -e 's|make -C|${GMAKE} -C|' \ + -e 's|make -C|${MAKE_CMD} -C|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/configure diff --git a/math/arpack++/Makefile b/math/arpack++/Makefile index 82b915e456a2..9a684ffa2b83 100644 --- a/math/arpack++/Makefile +++ b/math/arpack++/Makefile @@ -76,7 +76,7 @@ test: install (cd `dirname $$sample` ; \ ${ECHO_MSG} "============" ; \ ${ECHO_MSG} "*** Entering `pwd`" ; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \ || ${TRUE}) ; \ done @${ECHO_MSG} "============" diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile index 95fdce3c30b2..7d147692a4c8 100644 --- a/math/blocksolve95/Makefile +++ b/math/blocksolve95/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${MPIDIR}/bin/mpirun:${PORTSDIR}/net/mpich2 USES= fortran gmake MAKEFILE= makefile -MAKE_ARGS= GMAKE=${GMAKE} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT} \ +MAKE_ARGS= GMAKE=${MAKE_CMD} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT} \ BLAS_LIB="${BLAS_LIB}" LAPACK_LIB="${LAPACK_LIB}" MPIDIR= ${LOCALBASE} @@ -71,7 +71,7 @@ regression-test: build . endif ${LOCALBASE}/bin/mpd & @(cd ${BUILD_WRKSRC}/examples; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} bsrunexamples clean) + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} bsrunexamples clean) ${LOCALBASE}/bin/mpdallexit .endif diff --git a/math/calc/Makefile b/math/calc/Makefile index b40317f90228..a52d57f8304c 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -16,7 +16,7 @@ MAKE_JOBS_UNSAFE= yes CALCPAGER?= more MAKE_ENV+= CALCPAGER="${CALCPAGER}" CAT="${CAT}" CHMOD="${CHMOD}" \ - CP="${CP}" GMAKE="${GMAKE}" LN="${LN}" MKDIR="${MKDIR}" \ + CP="${CP}" GMAKE="${MAKE_CMD}" LN="${LN}" MKDIR="${MKDIR}" \ MV="${MV}" RM="${RM}" SED="${SED}" TOUCH="${TOUCH}" \ TRUE="${TRUE}" @@ -24,6 +24,6 @@ PLIST_SUB+= VERSION=${PORTVERSION} VER1=${PORTVERSION:R} \ VER2=${PORTVERSION:R:R} VER3=${PORTVERSION:R:R:R} 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/math/ess/Makefile b/math/ess/Makefile index 8f557d630bf3..e616f0a0eae4 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -45,13 +45,13 @@ post-patch: .SILENT .if ${PORT_OPTIONS:MDOCS} post-build: - @(cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \ + @(cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \ ${MAKE_ARGS} info) .endif post-install: .if ${PORT_OPTIONS:MDOCS} - @(cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \ + @(cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \ ${MAKE_ARGS} install-info) .endif diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile index f8f9d9bb9dbc..81179c97de3e 100644 --- a/math/giacxcas/Makefile +++ b/math/giacxcas/Makefile @@ -73,7 +73,7 @@ post-patch: pre-configure: cd ${COCOALIB-GIAC} && \ ./configure --with-libgmp=${LOCALBASE}/lib/libgmp.a --with-cxx=${CXX}&& \ - ${GMAKE} library && \ + ${MAKE_CMD} library && \ cd ${FLTKDEV-GIAC} && \ ./configure --prefix=${FLTKDEV-GIAC} \ && cd src && ${MAKE} diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile index f0fab899a851..218b7d6165c6 100644 --- a/math/gotoblas/Makefile +++ b/math/gotoblas/Makefile @@ -115,12 +115,12 @@ post-patch: do-build: cd ${WRKSRC} ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=1 USE_THREAD=0 \ - ${GMAKE} ${MAKE_ARGS} + ${MAKE_CMD} ${MAKE_ARGS} ${CP} ${WRKSRC}/libgoto2.a ${WRKDIR}/lib/libgoto2.a ${CP} ${WRKSRC}/libgoto2.so ${WRKDIR}/lib/libgoto2.so.1 - cd ${WRKSRC} ; ${GMAKE} ${MAKE_ARGS} clean + cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean cd ${WRKSRC} ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=${MAXTHREADS} \ - USE_THREAD=1 ${GMAKE} ${MAKE_ARGS} + USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS} ${CP} ${WRKSRC}/libgoto2.a ${WRKDIR}/lib/libgoto2p.a ${CP} ${WRKSRC}/libgoto2.so ${WRKDIR}/lib/libgoto2p.so.1 .if ! ${PORT_OPTIONS:MDEBUG} @@ -136,9 +136,9 @@ BENCHMARK_THREADS_FLAG = GOTO_NUM_THREADS=${BENCHMARK_MAXTHREADS} benchmark: build cd ${WRKSRC} ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=${MAXTHREADS} \ - USE_THREAD=1 ${GMAKE} ${MAKE_ARGS} hpl + USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS} hpl cd ${WRKSRC}/benchmark ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=${MAXTHREADS} \ - USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${GMAKE} ${MAKE_ARGS} + USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS} do-install: cd ${WRKDIR}/lib ; \ diff --git a/math/libflame/Makefile b/math/libflame/Makefile index 02ca22d31e5e..a8d8b580c0ea 100644 --- a/math/libflame/Makefile +++ b/math/libflame/Makefile @@ -296,20 +296,20 @@ do-build: .for o in SHARED STATIC .if ${PORT_OPTIONS:M${o}} @${PRINTF} "\n\n\n===> Building ${o:tl} library:\n\n\n\n" - @cd ${WRKSRC}${o:S|^|_|:M*STATIC}; ${SETENV} ${MAKE_ENV} ${GMAKE} \ + @cd ${WRKSRC}${o:S|^|_|:M*STATIC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${_MAKE_JOBS} ${MAKE_ARGS} libs .endif .endfor do-install: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \ + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \ ${MAKE_ARGS} install-headers .if ${PORT_OPTIONS:MSHARED} - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \ + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \ ${MAKE_ARGS} install-libs install-lib-symlinks .endif .if ${PORT_OPTIONS:MSTATIC} - @cd ${WRKSRC}_STATIC; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \ + @cd ${WRKSRC}_STATIC; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \ ${MAKE_ARGS} install-libs .endif .if ${PORT_OPTIONS:MDOCS} @@ -326,14 +326,14 @@ BUILD_DEPENDS += ${RUN_DEPENDS} CONFIGURE_ARGS+= --enable-verbose-make-output check regression-test test: build - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \ + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \ ${MAKE_ARGS} MK_INCL_DIR_INST_W_ARCH_VERS="${WRKDIR}/include" \ install-headers .for o in SHARED STATIC .if ${PORT_OPTIONS:M${o}} @${PRINTF} "\n\n\n===> Testing ${o:tl} library:\n\n\n\n" @cd ${WRKSRC}${o:S|^|_|:M*STATIC}/test; ${SETENV} ${MAKE_ENV} \ - ${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \ + ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} \ LIBBLAS="-L${LOCALBASE}/lib ${BLAS} -lm" \ LIBLAPACK="-L${LOCALBASE}/lib ${LAPACK}" test_libflame ; \ ./test_libflame.x diff --git a/math/libtommath/Makefile b/math/libtommath/Makefile index 220740172b9f..aa11dfd4d2de 100644 --- a/math/libtommath/Makefile +++ b/math/libtommath/Makefile @@ -48,7 +48,7 @@ post-install: regression-test: (cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} -f ${MAKEFILE} mtest test; \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f ${MAKEFILE} mtest test; \ ./mtest/mtest | ./test) .include <bsd.port.mk> diff --git a/math/mpexpr/Makefile b/math/mpexpr/Makefile index 709c60d54e7f..ace192166871 100644 --- a/math/mpexpr/Makefile +++ b/math/mpexpr/Makefile @@ -36,6 +36,6 @@ do-install: ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/mpexpr.man ${STAGEDIR}${PREFIX}/man/mann/mpexpr.n regression-test: build - cd ${WRKSRC} && ${GMAKE} test + cd ${WRKSRC} && ${MAKE_CMD} test .include <bsd.port.mk> diff --git a/math/openblas/Makefile b/math/openblas/Makefile index 40577256c058..b16432fb769c 100644 --- a/math/openblas/Makefile +++ b/math/openblas/Makefile @@ -131,12 +131,12 @@ post-patch: do-build: cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \ - ${GMAKE} ${MAKE_ARGS} + ${MAKE_CMD} ${MAKE_ARGS} ${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblas.a ${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER} - cd ${WRKSRC} ; ${GMAKE} ${MAKE_ARGS} clean + cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \ - USE_THREAD=1 ${GMAKE} ${MAKE_ARGS} + USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS} ${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a ${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER} .if !${PORT_OPTIONS:MDEBUG} @@ -152,9 +152,9 @@ BENCHMARK_THREADS_FLAG = OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS} benchmark: build cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \ - USE_THREAD=1 ${GMAKE} ${MAKE_ARGS} hpl + USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS} hpl cd ${WRKSRC}/benchmark ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \ - USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${GMAKE} ${MAKE_ARGS} + USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS} do-install: cd ${WRKDIR}/lib ; \ diff --git a/math/proofgeneral/Makefile b/math/proofgeneral/Makefile index c5221db96b32..fff4f1c614d8 100644 --- a/math/proofgeneral/Makefile +++ b/math/proofgeneral/Makefile @@ -30,7 +30,7 @@ NO_STAGE= yes IGNORE= the ProofGeneral developers no longer support XEmacs .endif -MAKE_ARGS+= PREFIX="${LOCALBASE}" DEST_PREFIX="${PREFIX}" MAKE="${GMAKE}" \ +MAKE_ARGS+= PREFIX="${LOCALBASE}" DEST_PREFIX="${PREFIX}" MAKE="${MAKE_CMD}" \ DOCDIR="${DOCSDIR}" MANDIR="${PREFIX}/man/man1" INFODIR="${PREFIX}/info" \ BINDIR="${PREFIX}/bin" DESKTOP="${PREFIX}/share" \ ELISPP="${EMACS_SITE_LISPDIR}/ProofGeneral" \ diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile index add8506beaf3..012c6e7d0ef3 100644 --- a/math/sdpara/Makefile +++ b/math/sdpara/Makefile @@ -80,8 +80,8 @@ pre-build: ${DIRNAME} `${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR do-build: - cd ${WRKSRC} ; ${GMAKE} mumps - cd ${WRKSRC} ; ${GMAKE} + cd ${WRKSRC} ; ${MAKE_CMD} mumps + cd ${WRKSRC} ; ${MAKE_CMD} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sdpara ${PREFIX}/bin diff --git a/math/spooles/Makefile b/math/spooles/Makefile index 13c1e8d496de..65cffea48961 100644 --- a/math/spooles/Makefile +++ b/math/spooles/Makefile @@ -63,15 +63,15 @@ post-patch: do-build: .if defined(WITH_MPI) - @(cd ${WRKSRC}/MPI/src ; ${SETENV} ${MAKE_ENV} ${GMAKE} -f makeGlobalLib) - @(cd ${WRKSRC}_SHARED/MPI/src; ${SETENV} ${MAKE_ENV} ${GMAKE} -f makeGlobalLib) + @(cd ${WRKSRC}/MPI/src ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f makeGlobalLib) + @(cd ${WRKSRC}_SHARED/MPI/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f makeGlobalLib) @(cd ${WRKSRC}_SHARED ; ld -Bshareable -o libspooles.so.1 -x -soname libspooles.so.1 --whole-archive spooles.a ) .else - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} global -f makefile) - @(cd ${WRKSRC}/MT/src; ${SETENV} ${MAKE_ENV} ${GMAKE} -f makeGlobalLib) - @(cd ${WRKSRC}_SHARED; ${SETENV} ${MAKE_ENV} ${GMAKE} global -f makefile) - @(cd ${WRKSRC}_SHARED/MT/src; ${SETENV} ${MAKE_ENV} ${GMAKE} -f makeGlobalLib) + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} global -f makefile) + @(cd ${WRKSRC}/MT/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f makeGlobalLib) + @(cd ${WRKSRC}_SHARED; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} global -f makefile) + @(cd ${WRKSRC}_SHARED/MT/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f makeGlobalLib) @(cd ${WRKSRC}_SHARED ; ld -Bshareable -o libspooles.so.1 -x -soname libspooles.so.1 --whole-archive spooles.a ) .endif diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile index 9dbec686c484..ffe904279c59 100644 --- a/math/suitesparse/Makefile +++ b/math/suitesparse/Makefile @@ -102,9 +102,9 @@ post-patch: do-build: @cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} PICFLAG= \ - ${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS} + ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} @cd ${WRKSRC_SHARED} ; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \ - ${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS} + ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} post-build: @for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \ diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile index 6eddf7f196be..1b6d02571777 100644 --- a/math/superlu_mt/Makefile +++ b/math/superlu_mt/Makefile @@ -91,8 +91,8 @@ post-patch: ${WRKSRC_SHARED}/make.inc do-build: - cd ${WRKSRC} ; ${GMAKE} LDFLAGS="${LDFLAGS}" - cd ${WRKSRC_SHARED} ; ${GMAKE} LDFLAGS="${LDFLAGS}" + cd ${WRKSRC} ; ${MAKE_CMD} LDFLAGS="${LDFLAGS}" + cd ${WRKSRC_SHARED} ; ${MAKE_CMD} LDFLAGS="${LDFLAGS}" ${RM} -rf ${WRKDIR}/tmp_static ${MKDIR} ${WRKDIR}/tmp_static cd ${WRKDIR}/tmp_static @@ -120,7 +120,7 @@ do-install: .endif regression-test: do-build - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} testing) - @(cd ${WRKSRC_SHARED} && ${SETENV} ${MAKE_ENV} ${GMAKE} testing) + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} testing) + @(cd ${WRKSRC_SHARED} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} testing) .include <bsd.port.post.mk> diff --git a/math/unuran/Makefile b/math/unuran/Makefile index af182a500846..70f9c158ba5c 100644 --- a/math/unuran/Makefile +++ b/math/unuran/Makefile @@ -20,14 +20,14 @@ CONFIGURE_ARGS= --enable-shared --with-urng-rngstream --with-urng-default=rngstr --enable-info CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= MAKE="${GMAKE}" +MAKE_ENV= MAKE="${MAKE_CMD}" USE_LDCONFIG= yes INFO= unuran PORTDOCS= unuran.pdf unuran.txt post-patch: - ${REINPLACE_CMD} -e '/UNURANFULLCHECK=true make check/s/make/${GMAKE}/' \ + ${REINPLACE_CMD} -e '/UNURANFULLCHECK=true make check/s/make/${MAKE_CMD}/' \ ${WRKSRC}/Makefile.in .ifndef(NOPORTDOCS) @@ -42,10 +42,10 @@ post-install: CONFIGURE_ARGS+= --enable-check-struct --enable-logging check regression-test test: build - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} check) + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check) fullcheck: build - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} fullcheck) + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} fullcheck) .endif diff --git a/math/yacas/Makefile b/math/yacas/Makefile index 2b6ca38ab4e9..0069412d1636 100644 --- a/math/yacas/Makefile +++ b/math/yacas/Makefile @@ -41,7 +41,7 @@ post-patch: regression-test: build # This requires bash. I don't add it as a dependency to the port, as it's # not needed for the general use. - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} check ${MAKE_ARGS}) .include <bsd.port.mk> diff --git a/misc/e2fsprogs-libblkid/Makefile b/misc/e2fsprogs-libblkid/Makefile index 59751add9171..792a024e5de9 100644 --- a/misc/e2fsprogs-libblkid/Makefile +++ b/misc/e2fsprogs-libblkid/Makefile @@ -22,10 +22,10 @@ PKGDIR= ${.CURDIR} pre-build: ${MKDIR} ${WRKSRC}/lib/blkid/elfshared - cd ${WRKSRC}/util && ${GMAKE} subst + cd ${WRKSRC}/util && ${MAKE_CMD} subst post-build: - cd ${WRKSRC}/lib/uuid && ${GMAKE} - cd ${INSTALL_WRKSRC} && ${GMAKE} check + cd ${WRKSRC}/lib/uuid && ${MAKE_CMD} + cd ${INSTALL_WRKSRC} && ${MAKE_CMD} check .include "${MASTERDIR}/Makefile" diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile index 514453a8fbed..53a13e6007f1 100644 --- a/misc/e2fsprogs-libuuid/Makefile +++ b/misc/e2fsprogs-libuuid/Makefile @@ -31,14 +31,14 @@ post-patch:: pre-build: ${MKDIR} ${WRKSRC}/lib/uuid/elfshared - cd ${WRKSRC}/util && ${GMAKE} subst + cd ${WRKSRC}/util && ${MAKE_CMD} subst # ulimit guards against runaway tests # failure to launch uuidd is fine (one might be running, or we may lack # privileges); if it works, it'll quit after 50 seconds post-build: - cd ${WRKSRC}/misc && ${GMAKE} uuidgen uuidgen.1 uuidd uuidd.8 - cd ${INSTALL_WRKSRC} && ( ulimit -t 5 && ${GMAKE} check ) + cd ${WRKSRC}/misc && ${MAKE_CMD} uuidgen uuidgen.1 uuidd uuidd.8 + cd ${INSTALL_WRKSRC} && ( ulimit -t 5 && ${MAKE_CMD} check ) post-install: ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidgen ${STAGEDIR}${PREFIX}/bin/ diff --git a/misc/posixtestsuite/Makefile b/misc/posixtestsuite/Makefile index 6c871ba34b02..c2d59145ca23 100644 --- a/misc/posixtestsuite/Makefile +++ b/misc/posixtestsuite/Makefile @@ -64,7 +64,7 @@ help: pre-everything aclean: all @${ECHO} "Cleaning tests tree..." - -@(cd ${WRKSRC} && ${RM} -f ${RUN_RESULT} && ${GMAKE} clean) + -@(cd ${WRKSRC} && ${RM} -f ${RUN_RESULT} && ${MAKE_CMD} clean) rerun: all .if defined(WITH_THRLIB) @@ -75,7 +75,7 @@ rerun: all .else @${ECHO} "Running tests (against ${THRLIB}) ..." .endif - @(cd ${WRKSRC} && ${GMAKE} all) ${THEPIPE} ${RUN_RESULT} + @(cd ${WRKSRC} && ${MAKE_CMD} all) ${THEPIPE} ${RUN_RESULT} @${ECHO} "" @${ECHO} "Run output is stored into following files:" @${ECHO} " * short version: ${RUN_RESULT}" diff --git a/misc/sword/Makefile b/misc/sword/Makefile index 25bd402417ea..3d1fdeb1fd32 100644 --- a/misc/sword/Makefile +++ b/misc/sword/Makefile @@ -57,7 +57,7 @@ post-patch: post-install: @${MKDIR} ${PREFIX}/share/sword/mods.d .if !exists(${PREFIX}/etc/sword.conf) - @(cd ${WRKSRC} && ${GMAKE} install_config) + @(cd ${WRKSRC} && ${MAKE_CMD} install_config) .else @${ECHO_CMD} "Config file not installed since ${PREFIX}/etc/sword.conf already exists." @${ECHO_CMD} "Please check that DataPath points to your modules (default ${DATADIR})."; diff --git a/multimedia/avidemux2-plugins/Makefile b/multimedia/avidemux2-plugins/Makefile index bf7951cfd9da..c45967e764fd 100644 --- a/multimedia/avidemux2-plugins/Makefile +++ b/multimedia/avidemux2-plugins/Makefile @@ -25,9 +25,9 @@ post-configure: post-configure-common @cd ${WRKDIR}/.build-plugins && ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC}/plugins do-build: - @cd ${WRKDIR}/.build-plugins && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} + @cd ${WRKDIR}/.build-plugins && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} do-install: - @(cd ${WRKDIR}/.build-plugins && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @(cd ${WRKDIR}/.build-plugins && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .include <bsd.port.post.mk> diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile index 237f76f2e052..47860748c5fe 100644 --- a/multimedia/gstreamer-plugins-bad/Makefile +++ b/multimedia/gstreamer-plugins-bad/Makefile @@ -24,12 +24,12 @@ PLIST= ${.CURDIR}/pkg-plist do-build: .for dir in ${BAD_GST_DIRS} - @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) .endfor do-install: .for dir in ${BAD_GST_DIRS} - @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endfor diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile index 0baaa01a03ad..e4d3125eab82 100644 --- a/multimedia/gstreamer-plugins-good/Makefile +++ b/multimedia/gstreamer-plugins-good/Makefile @@ -26,12 +26,12 @@ NO_GSTREAMER_COMMON= yes do-build: .for dir in ${GOOD_GST_DIRS} - @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) .endfor do-install: .for dir in ${GOOD_GST_DIRS} - @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endfor diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile index 139b5e026752..5ad88758009f 100644 --- a/multimedia/gstreamer-plugins-ugly/Makefile +++ b/multimedia/gstreamer-plugins-ugly/Makefile @@ -23,12 +23,12 @@ PLIST= ${.CURDIR}/pkg-plist do-build: .for dir in ${UGLY_GST_DIRS} - @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) .endfor do-install: .for dir in ${UGLY_GST_DIRS} - @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endfor diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index c1677ccaafc0..14a63b997b3d 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -654,7 +654,7 @@ GST_POSTBUILD_DIR=${gst_${GST_PLUGIN}_GST_POSTBUILD_DIR} .if !target(do-build) do-build: .for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR} - @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} .endfor .endif @@ -662,7 +662,7 @@ do-build: .if !target(do-install) do-install: .for dir in ${GST_PLUGIN_DIR} - @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} .endfor .endif diff --git a/multimedia/gstreamer1-plugins-bad/Makefile b/multimedia/gstreamer1-plugins-bad/Makefile index d5b6514b84b6..59aa83d7882d 100644 --- a/multimedia/gstreamer1-plugins-bad/Makefile +++ b/multimedia/gstreamer1-plugins-bad/Makefile @@ -23,12 +23,12 @@ PLIST= ${.CURDIR}/pkg-plist do-build: .for dir in ${BAD_GST_DIRS} - @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) .endfor do-install: .for dir in ${BAD_GST_DIRS} - @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endfor .include "${MASTERDIR}/Makefile" diff --git a/multimedia/gstreamer1-plugins-good/Makefile b/multimedia/gstreamer1-plugins-good/Makefile index fb00a9188416..dd32ff232c17 100644 --- a/multimedia/gstreamer1-plugins-good/Makefile +++ b/multimedia/gstreamer1-plugins-good/Makefile @@ -27,12 +27,12 @@ NO_GSTREAMER_COMMON= yes do-build: .for dir in ${GOOD_GST_DIRS} - @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) .endfor do-install: .for dir in ${GOOD_GST_DIRS} - @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endfor diff --git a/multimedia/gstreamer1-plugins-ugly/Makefile b/multimedia/gstreamer1-plugins-ugly/Makefile index 4387d8ae4bf8..0431ab20a6a8 100644 --- a/multimedia/gstreamer1-plugins-ugly/Makefile +++ b/multimedia/gstreamer1-plugins-ugly/Makefile @@ -22,12 +22,12 @@ PLIST= ${.CURDIR}/pkg-plist do-build: .for dir in ${UGLY_GST_DIRS} - @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) .endfor do-install: .for dir in ${UGLY_GST_DIRS} - @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endfor .include "${MASTERDIR}/Makefile" diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index 6cf16c1cbf25..69744a835c0a 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -489,7 +489,7 @@ GST_POSTBUILD_DIR= ${gst_${GST_PLUGIN}_GST_POSTBUILD_DIR} .if !target(do-build) do-build: .for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR} - @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} .endfor .endif @@ -497,7 +497,7 @@ do-build: .if !target(do-install) do-install: .for dir in ${GST_PLUGIN_DIR} - @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} .endfor .endif diff --git a/multimedia/libquicktime-lame/Makefile b/multimedia/libquicktime-lame/Makefile index ee55845ba7b8..02e731bad3cf 100644 --- a/multimedia/libquicktime-lame/Makefile +++ b/multimedia/libquicktime-lame/Makefile @@ -39,6 +39,6 @@ CONFIGURE_ARGS+= --with-lame \ NO_STAGE= yes do-install: - @cd ${WRKSRC}/plugins/lame && ${GMAKE} install + @cd ${WRKSRC}/plugins/lame && ${MAKE_CMD} install .include "${MASTERDIR}/Makefile" diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile index 92379fe8914a..09d2c547c79e 100644 --- a/multimedia/smtube/Makefile +++ b/multimedia/smtube/Makefile @@ -27,7 +27,7 @@ post-patch: -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \ -e 's|$$(PREFIX)/share/smtube|${DATADIR}|g' \ -e 's|$$(PREFIX)/share/doc/smtube|${DOCSDIR}|' \ - -e 's| make| ${GMAKE}|' \ + -e 's| make| ${MAKE_CMD}|' \ ${WRKSRC}/Makefile post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index d47e97505b47..d1ee14638522 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -243,7 +243,7 @@ pre-install: ${RM} -rf ${PLIST} ${FAKEDIR} ${MKDIR} ${FAKEDIR} ${TOUCH} -f ${PLIST} - @(cd ${WRKSRC} && ${GMAKE} install prefix=${FAKEDIR} mandir=${FAKEDIR}/man) + @(cd ${WRKSRC} && ${MAKE_CMD} install prefix=${FAKEDIR} mandir=${FAKEDIR}/man) .for dir in bin share/doc lib @(cd ${FAKEDIR}/${dir} && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's|^|${dir}/|' >> ${PLIST}) diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile index 509810d8fce6..a24eae5624d3 100644 --- a/net-im/telepathy-salut/Makefile +++ b/net-im/telepathy-salut/Makefile @@ -25,7 +25,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} post-patch: - @${REINPLACE_CMD} -e 's|make -C|${GMAKE} -C|g' \ + @${REINPLACE_CMD} -e 's|make -C|${MAKE_CMD} -C|g' \ ${WRKSRC}/src/Makefile.in \ ${WRKSRC}/tests/Makefile.in diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile index 4d3da7949775..90913bfd5a41 100644 --- a/net-mgmt/flowd/Makefile +++ b/net-mgmt/flowd/Makefile @@ -63,8 +63,8 @@ post-install: .if ${PORT_OPTIONS:MPERL} cd ${WRKSRC}/Flowd-perl && \ ${PERL} Makefile.PL INSTALLSITEMAN3DIR=${MAN3PREFIX}/man/man3 PREFIX=${PREFIX} && \ - ${GMAKE} && \ - ${GMAKE} install; + ${MAKE_CMD} && \ + ${MAKE_CMD} install; -@${RM} -f ${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod .endif diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile index 668f7dc111a5..cb20656880fe 100644 --- a/net-mgmt/kismet/Makefile +++ b/net-mgmt/kismet/Makefile @@ -77,8 +77,8 @@ post-patch: ${WRKSRC}/conf/kismet.conf.in \ ${WRKSRC}/conf/kismet_drone.conf @${REINPLACE_CMD} -e "s/plugin-/plugin-[aps]/" \ - -e "s/make/${GMAKE}/" \ - -e "s/\$$(MAKE)/${GMAKE}/" \ + -e "s/make/${MAKE_CMD}/" \ + -e "s/\$$(MAKE)/${MAKE_CMD}/" \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s/CXXFLAGS/CPPFLAGS/" \ ${WRKSRC}/plugin-alertsyslog/Makefile diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile index 9a1c24ca7346..8c60e1dac3da 100644 --- a/net-mgmt/xymon-client/Makefile +++ b/net-mgmt/xymon-client/Makefile @@ -21,7 +21,7 @@ XYMONHOSTIP?= 127.0.0.1 MAKE_JOBS_UNSAFE= yes USES= gmake -CONFIGURE_ENV= MAKE=${GMAKE} +CONFIGURE_ENV= MAKE=${MAKE_CMD} MAKE_ENV+= XYMONUSER="${XYMONUSER}" MAKE_ENV+= XYMONHOSTIP="${XYMONHOSTIP}" MAKE_ENV+= INSTALLROOT="${STAGEDIR}" diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile index 526c70755e1d..5d43c6459059 100644 --- a/net-p2p/litecoin/Makefile +++ b/net-p2p/litecoin/Makefile @@ -105,7 +105,7 @@ post-patch: regression-test: .if !${PORT_OPTIONS:MX11} - @${GMAKE} -C ${WRKSRC}/src -f makefile.unix USE_UPNP=${QMAKE_USE_UPNP} test_litecoin + @${MAKE_CMD} -C ${WRKSRC}/src -f makefile.unix USE_UPNP=${QMAKE_USE_UPNP} test_litecoin (cd ${WRKSRC}/src ; ./test_litecoin) .endif diff --git a/net-p2p/transmission-qt4/Makefile b/net-p2p/transmission-qt4/Makefile index 5b476eca18ab..7ff6bf2a061c 100644 --- a/net-p2p/transmission-qt4/Makefile +++ b/net-p2p/transmission-qt4/Makefile @@ -30,7 +30,7 @@ post-patch: general-patch ${WRKSRC}/qt/qtr.pro post-build: - @(cd ${WRKSRC}/qt ; ${QMAKE} ${QMAKE_ARGS} qtr.pro ; ${GMAKE}) + @(cd ${WRKSRC}/qt ; ${QMAKE} ${QMAKE_ARGS} qtr.pro ; ${MAKE_CMD}) do-install: @(cd ${WRKSRC}/qt ; \ 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> diff --git a/news/husky-hpt-devel/Makefile b/news/husky-hpt-devel/Makefile index 062f8e805ea8..7a04c44b5218 100644 --- a/news/husky-hpt-devel/Makefile +++ b/news/husky-hpt-devel/Makefile @@ -38,12 +38,12 @@ post-patch: post-build: .if !defined(NOPORTDOCS) - @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} all + @cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} all .endif post-install: .if !defined(NOPORTDOCS) - @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install + @cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} install .endif .include "${.CURDIR}/../husky-base-devel/Makefile.inc" diff --git a/news/husky-hpt/Makefile b/news/husky-hpt/Makefile index 65bf0795063f..6837885cbda4 100644 --- a/news/husky-hpt/Makefile +++ b/news/husky-hpt/Makefile @@ -36,10 +36,10 @@ post-patch: ${WRKSRC}/man/txt2pkt.1 post-build: - @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} all + @cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} all post-install: - @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install + @cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} install .include "${.CURDIR}/../husky-base/Makefile.inc" .include <bsd.port.mk> diff --git a/news/husky-htick-devel/Makefile b/news/husky-htick-devel/Makefile index ac13207d3af0..62467667a8ba 100644 --- a/news/husky-htick-devel/Makefile +++ b/news/husky-htick-devel/Makefile @@ -27,10 +27,10 @@ post-patch: ${WRKSRC}/man/htick.1 post-build: - @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} all + @cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} all post-install: - @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install + @cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} install .include "${.CURDIR}/../husky-base-devel/Makefile.inc" .include <bsd.port.mk> diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile index c447ca8c8d89..b956b44a8c9f 100644 --- a/news/husky-htick/Makefile +++ b/news/husky-htick/Makefile @@ -24,10 +24,10 @@ post-patch: ${WRKSRC}/man/htick.1 post-build: - @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} all + @cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} all post-install: - @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install + @cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} install .include "${.CURDIR}/../husky-base/Makefile.inc" .include <bsd.port.mk> diff --git a/news/tin/Makefile b/news/tin/Makefile index 146a7797f3c8..e1d8f6832cc3 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -63,7 +63,7 @@ CONFIGURE_ARGS+=--with-nntp-default-server=news \ ${ICONV_CONFIGURE_ARG} \ --with-mime-default-charset=US-ASCII \ --enable-ipv6 -MAKE_ARGS+= MAKE=${GMAKE} +MAKE_ARGS+= MAKE=${MAKE_CMD} CFLAGS+= -DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -88,7 +88,7 @@ post-patch: ${WRKSRC}/tools/tinurl_handler.pl post-build: - ${GMAKE} -C ${WRKSRC}/po + ${MAKE_CMD} -C ${WRKSRC}/po post-install: ${INSTALL_DATA} ${WRKSRC}/doc/tin.defaults \ diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile index c2bb338f6d35..5e49eee01588 100644 --- a/palm/jpilot/Makefile +++ b/palm/jpilot/Makefile @@ -49,7 +49,7 @@ PORTDOCS= * .endif post-build: - cd ${WRKSRC}/docs && ${GMAKE} + cd ${WRKSRC}/docs && ${MAKE_CMD} post-install: @${FIND} ${PREFIX}/lib/jpilot ! -type d | \ ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index 2d35e85266a3..2a7fccc05e7c 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -1152,7 +1152,7 @@ sub check_depends_syntax { } # check USES=gmake - if ($m{'dep'} =~ /^(gmake|\${GMAKE})$/) { + if ($m{'dep'} =~ /^(gmake|\${MAKE_CMD})$/) { &perror("WARN", $file, -1, "dependency to $1 ". "listed in $j. consider using ". "USES[+]=gmake."); @@ -2125,11 +2125,11 @@ ruby sed sdl-config sh sort sysctl touch tr which xargs xmkmf } # - # whole file: check for USE_ANT and USE_GMAKE both defined + # whole file: check for USE_ANT and USE_MAKE_CMD both defined # - if ($use_ant && $whole =~ /^USE_GMAKE[?:]?=\s*(.*)$/m) { + if ($use_ant && $whole =~ /^USE_MAKE_CMD[?:]?=\s*(.*)$/m) { &perror("WARN", $file, -1, "a port shall not define both USE_ANT ". - "and USE_GMAKE"); + "and USE_MAKE_CMD"); } # diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index f096ec80d9fa..93689bddef80 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -105,7 +105,7 @@ post-patch: .if ${PORT_OPTIONS:MPLUGINS} post-build: - cd ${WRKSRC}/plugins; ${GMAKE} + cd ${WRKSRC}/plugins; ${MAKE_CMD} .endif post-install: diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile index 18a5a527aef8..1f24732f00ed 100644 --- a/print/freetype-tools/Makefile +++ b/print/freetype-tools/Makefile @@ -42,16 +42,16 @@ post-patch: ${WRKSRC}/contrib/ttf2pfb/Makefile.in post-build: - @cd ${WRKSRC}/contrib/ttf2bdf && ./configure --prefix=${PREFIX} && ${GMAKE} - @cd ${WRKSRC}/contrib/ttf2pfb && ./configure --prefix=${PREFIX} && ${GMAKE} - @cd ${WRKSRC}/contrib/ttf2pk && ./configure --prefix=${PREFIX} --with-kpathsea-dir=${LOCALBASE} && ${GMAKE} - @cd ${WRKSRC}/contrib/ttfbanner && ./configure --prefix=${PREFIX} && ${GMAKE} + @cd ${WRKSRC}/contrib/ttf2bdf && ./configure --prefix=${PREFIX} && ${MAKE_CMD} + @cd ${WRKSRC}/contrib/ttf2pfb && ./configure --prefix=${PREFIX} && ${MAKE_CMD} + @cd ${WRKSRC}/contrib/ttf2pk && ./configure --prefix=${PREFIX} --with-kpathsea-dir=${LOCALBASE} && ${MAKE_CMD} + @cd ${WRKSRC}/contrib/ttfbanner && ./configure --prefix=${PREFIX} && ${MAKE_CMD} do-install: - @cd ${WRKSRC}/contrib/ttf2bdf && ${GMAKE} install - @cd ${WRKSRC}/contrib/ttf2pfb && ${GMAKE} install - @cd ${WRKSRC}/contrib/ttf2pk && ${GMAKE} install - @cd ${WRKSRC}/contrib/ttfbanner && ${GMAKE} install + @cd ${WRKSRC}/contrib/ttf2bdf && ${MAKE_CMD} install + @cd ${WRKSRC}/contrib/ttf2pfb && ${MAKE_CMD} install + @cd ${WRKSRC}/contrib/ttf2pk && ${MAKE_CMD} install + @cd ${WRKSRC}/contrib/ttfbanner && ${MAKE_CMD} install @${MKDIR} ${TEXMFMAIN}/ttf2pk @for f in ${WRKSRC}/contrib/ttf2pk/data/*; do \ ${INSTALL_DATA} $$f ${TEXMFMAIN}/ttf2pk; \ diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index 7e90abe7eedb..42033722fec7 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -47,7 +47,7 @@ pre-patch: post-configure: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ - ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup) + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup) post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.* diff --git a/print/ghostscript7/files/Makefile.epag b/print/ghostscript7/files/Makefile.epag index 8de63ef8cf1b..7faf3d8b9f11 100644 --- a/print/ghostscript7/files/Makefile.epag +++ b/print/ghostscript7/files/Makefile.epag @@ -17,7 +17,7 @@ post-extract-epag: pre-build-epag: cd ${WRKSRC}/epag-3.09 && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${LN} -s -f ${WRKSRC}/epag-3.09/gdevepag.c ${WRKSRC}/src post-install-epag: diff --git a/print/ghostscript7/files/Makefile.gprint b/print/ghostscript7/files/Makefile.gprint index f650133603c6..11ab9689135a 100644 --- a/print/ghostscript7/files/Makefile.gprint +++ b/print/ghostscript7/files/Makefile.gprint @@ -29,7 +29,7 @@ post-configure-gprint: pre-build-gprint: cd ${WRKSRC}/gimp-print-4.2.7 && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${LN} -sf ${WRKSRC}/gimp-print-4.2.7/src/ghost/*.[ch] \ ${WRKSRC}/src ${MKDIR} ${WRKSRC}/gimp-print diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile index 4bf19e1ffc00..796174c79240 100644 --- a/print/gutenprint-base/Makefile +++ b/print/gutenprint-base/Makefile @@ -108,7 +108,7 @@ pre-build: post-install: .if ${SLAVE_PORT}=="yes" - @(cd ${WRKSRC}/man && ${GMAKE} ${INSTALL_TARGET}) + @(cd ${WRKSRC}/man && ${MAKE_CMD} ${INSTALL_TARGET}) .endif .include <bsd.port.post.mk> diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 8c2010ee031e..747019943abc 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -90,6 +90,6 @@ post-install: @${LN} -fs ${DATADIR}/${PORTVERSION} ${STAGEDIR}${DATADIR}/current regression-test: build - cd ${WRKSRC} && ${GMAKE} -f ${MAKEFILE} test + cd ${WRKSRC} && ${MAKE_CMD} -f ${MAKEFILE} test .include <bsd.port.mk> diff --git a/print/tex/Makefile b/print/tex/Makefile index 4bfdbe7feeb8..2410821828e1 100644 --- a/print/tex/Makefile +++ b/print/tex/Makefile @@ -44,7 +44,7 @@ post-configure: do-build: @(cd ${WRKSRC}; unset `env|${GREP} ^TEX|${SED} -e s/=.*//`; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${ALL_TARGET}) + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${ALL_TARGET}) post-install: @for i in kpsewhich dmp bibtex dvicopy dvitomp dvitype gftodvi gftopk \ diff --git a/print/xdvi/Makefile b/print/xdvi/Makefile index 311e17d31027..b8e45642c0d8 100644 --- a/print/xdvi/Makefile +++ b/print/xdvi/Makefile @@ -42,10 +42,10 @@ post-configure: .endfor do-install: - @(cd ${WRKSRC}; ${GMAKE} install.man \ + @(cd ${WRKSRC}; ${MAKE_CMD} install.man \ MANDIR=${PREFIX}/man/man1 MANSUFFIX=1) - @(cd ${WRKSRC}; ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} xdvi.man) - @(cd ${WRKSRC}; ${GMAKE} -f Makefile install BINDIR=${PREFIX}/bin) + @(cd ${WRKSRC}; ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} xdvi.man) + @(cd ${WRKSRC}; ${MAKE_CMD} -f Makefile install BINDIR=${PREFIX}/bin) @(cd ${WRKSRC}; ${INSTALL_SCRIPT} MakeTeXPK ${PREFIX}/bin) post-install: diff --git a/science/abinit/Makefile b/science/abinit/Makefile index 707078af841c..6f1420fed073 100644 --- a/science/abinit/Makefile +++ b/science/abinit/Makefile @@ -83,6 +83,6 @@ post-install: .endfor regression-test: - cd ${WRKSRC}/tests ; ${GMAKE} tests_min + cd ${WRKSRC}/tests ; ${MAKE_CMD} tests_min .include <bsd.port.mk> diff --git a/science/afni/files/Makefile.FreeBSD_PORT b/science/afni/files/Makefile.FreeBSD_PORT index 00521ba24363..75dadc8694eb 100644 --- a/science/afni/files/Makefile.FreeBSD_PORT +++ b/science/afni/files/Makefile.FreeBSD_PORT @@ -68,8 +68,8 @@ LFLAGS = -s -L. -L${LOCALBASE}/lib MAKE = gmake # Some build scripts pick up the wrong make, so Makefile.INCLUDE is edited -# to use GMAKE -GMAKE = gmake +# to use MAKE_CMD +MAKE_CMD = gmake PLUGIN_SUFFIX = so PLUGIN_LFLAGS = -shared diff --git a/science/afni/files/patch-Makefile.INCLUDE b/science/afni/files/patch-Makefile.INCLUDE index a27fa8ba3f2d..19058fc5be2c 100644 --- a/science/afni/files/patch-Makefile.INCLUDE +++ b/science/afni/files/patch-Makefile.INCLUDE @@ -69,7 +69,7 @@ shared_netcdf_attr: $(RM) netcdf_attr.o - $(MAKE) netcdf_attr.o CCMIN="${CCMIN} -fPIC" -+ $(GMAKE) netcdf_attr.o CCMIN="${CCMIN} -fPIC" ++ $(MAKE_CMD) netcdf_attr.o CCMIN="${CCMIN} -fPIC" # same as .a, but build as a shared object libmrix.a:$(IMOBJS) imseq.h display.h xim.h bbox.h xutil.h @@ -78,14 +78,14 @@ f2c: ( cd f2cdir ; \ - $(MAKE) f2c clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' 'CCMIN=$(CCMIN)' \ -+ $(GMAKE) f2c clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' 'CCMIN=$(CCMIN)' \ ++ $(MAKE_CMD) f2c clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' 'CCMIN=$(CCMIN)' \ 'RANLIB=$(RANLIB)' 'LDFLAGS=$(LDFLAGS)' 'IFLAGS=$(ISFLAGS)' ; \ $(MV) f2c .. ; ) libf2c.a: ( cd f2cdir ; \ - $(MAKE) libf2c.a clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' \ -+ $(GMAKE) libf2c.a clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' \ ++ $(MAKE_CMD) libf2c.a clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' \ 'RANLIB=$(RANLIB)' 'LDFLAGS=$(LDFLAGS)' 'IFLAGS=$(ISFLAGS)' ; \ $(MV) libf2c.a .. ; ) @@ -94,7 +94,7 @@ libdl.a:dlcompat/dlfcn.h dlcompat/dlopen.c ( cd dlcompat ; \ - $(MAKE) libdl.a ; \ -+ $(GMAKE) libdl.a ; \ ++ $(MAKE_CMD) libdl.a ; \ $(CP) libdl.a dlfcn.h .. ; \ cd .. ; \ $(RANLIB) libdl.a ; ) @@ -103,7 +103,7 @@ libcoxplot.a:coxplot.h ( cd coxplot ; \ - $(MAKE) libcoxplot.a clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' \ -+ $(GMAKE) libcoxplot.a clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' \ ++ $(MAKE_CMD) libcoxplot.a clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' \ 'RANLIB=$(RANLIB)' 'LDFLAGS=$(LDFLAGS)' 'IFLAGS=$(ISFLAGS)' ; \ $(MV) libcoxplot.a .. ; ) @@ -112,14 +112,14 @@ file_tool: ge4_header.o ( cd rickr ; \ - $(MAKE) file_tool 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ -+ $(GMAKE) file_tool 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ ++ $(MAKE_CMD) file_tool 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ 'LFLAGS=$(LFLAGS)' 'LLIBS=$(LLIBS)' ; \ $(MV) file_tool .. ; ) Dimon: rickr/Dimon.c rickr/Imon.h rickr/realtime.c rickr/realtime.h ( cd rickr ; \ - $(MAKE) Dimon 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ -+ $(GMAKE) Dimon 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ ++ $(MAKE_CMD) Dimon 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ 'LFLAGS=$(LFLAGS)' 'EXTRA_LIBS_2=$(EXTRA_LIBS_2)' \ 'LGIFTI=$(LGIFTI)' ; \ $(MV) Dimon .. ; ) @@ -127,14 +127,14 @@ Imon: rickr/Imon.c rickr/Imon.h rickr/realtime.c rickr/realtime.h thd_iochan.o ( cd rickr ; \ - $(MAKE) Imon 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ -+ $(GMAKE) Imon 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ ++ $(MAKE_CMD) Imon 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ 'LFLAGS=$(LFLAGS)' 'EXTRA_LIBS_2=$(EXTRA_LIBS_2)' ; \ $(MV) Imon .. ; ) serial_helper: rickr/serial_helper.c ( cd rickr ; \ - $(MAKE) serial_helper 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ -+ $(GMAKE) serial_helper 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ ++ $(MAKE_CMD) serial_helper 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ 'LFLAGS=$(LFLAGS)' 'EXTRA_LIBS_2=$(EXTRA_LIBS_2)' ; \ $(MV) serial_helper .. ; ) @@ -143,7 +143,7 @@ gtest: ( cd gifti ; \ - $(MAKE) gtest 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ -+ $(GMAKE) gtest 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ ++ $(MAKE_CMD) gtest 'RM=$(RM)' 'CC=$(CC)' 'IFLAGS=$(ISFLAGS)' \ 'LFLAGS=$(LFLAGS)' ; \ $(MV) gtest .. ; ) @@ -152,7 +152,7 @@ libvolpack.a: ( cd volpack ; \ - $(MAKE) libvolpack.a clean 'RM=$(RM)' 'CC=$(CCVOL)' 'AR=$(AR)' \ -+ $(GMAKE) libvolpack.a clean 'RM=$(RM)' 'CC=$(CCVOL)' 'AR=$(AR)' \ ++ $(MAKE_CMD) libvolpack.a clean 'RM=$(RM)' 'CC=$(CCVOL)' 'AR=$(AR)' \ 'RANLIB=$(RANLIB)' 'LDFLAGS=$(LDFLAGS)' 'IFLAGS=$(ISFLAGS)' ; \ $(MV) libvolpack.a .. ; ) @@ -161,7 +161,7 @@ qhull: ( cd qhulldir ; \ - $(MAKE) qhull rbox qdelaunay clean \ -+ $(GMAKE) qhull rbox qdelaunay clean \ ++ $(MAKE_CMD) qhull rbox qdelaunay clean \ 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' ; \ $(MV) qhull rbox qdelaunay .. ; ) @@ -170,7 +170,7 @@ qhull.exe: ( cd qhulldir ; \ - $(MAKE) qhull clean 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' ; \ -+ $(GMAKE) qhull clean 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' ; \ ++ $(MAKE_CMD) qhull clean 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' ; \ $(MV) qhull.exe .. ; ) ####### @@ -178,21 +178,21 @@ lib3DEdge.a: - ( cd 3DEdge/src ; $(MAKE) clean lib3DEdge.a 'RM=$(RM)' 'AR=$(AR)' 'RANLIB=$(RANLIB)' 'CC=$(CCFAST)' 'IFLAGS=$(ISFLAGS)' 'LFLAGS=$(LFLAGS)' ; $(MV) *.a ../.. ; ) -+ ( cd 3DEdge/src ; $(GMAKE) clean lib3DEdge.a 'RM=$(RM)' 'AR=$(AR)' 'RANLIB=$(RANLIB)' 'CC=$(CCFAST)' 'IFLAGS=$(ISFLAGS)' 'LFLAGS=$(LFLAGS)' ; $(MV) *.a ../.. ; ) ++ ( cd 3DEdge/src ; $(MAKE_CMD) clean lib3DEdge.a 'RM=$(RM)' 'AR=$(AR)' 'RANLIB=$(RANLIB)' 'CC=$(CCFAST)' 'IFLAGS=$(ISFLAGS)' 'LFLAGS=$(LFLAGS)' ; $(MV) *.a ../.. ; ) ####### # Eispack and CDF library files - make them and move them up here eis_bakvec.o: - ( cd eispack/ ; $(MAKE) all 'CC=$(CCFAST)' 'CCSVD=$(CCSVD)' ; $(MV) *.o .. ; ) -+ ( cd eispack/ ; $(GMAKE) all 'CC=$(CCFAST)' 'CCSVD=$(CCSVD)' ; $(MV) *.o .. ; ) ++ ( cd eispack/ ; $(MAKE_CMD) all 'CC=$(CCFAST)' 'CCSVD=$(CCSVD)' ; $(MV) *.o .. ; ) ####### # Ditto for NIML objects $(NIML_OBJS):niml.h - ( cd niml/ ; $(MAKE) all 'CC=$(CC)' ; $(MV) *.o .. ; ) -+ ( cd niml/ ; $(GMAKE) all 'CC=$(CC)' ; $(MV) *.o .. ; ) ++ ( cd niml/ ; $(MAKE_CMD) all 'CC=$(CC)' ; $(MV) *.o .. ; ) niml.h:niml/niml.h $(CP) niml/niml.h . @@ -201,7 +201,7 @@ $(RM) config.cache config.log config.status ; \ chmod ugo+x ./configure ; \ - ./configure ; $(MAKE) libsrc/all ; \ -+ ./configure ; $(GMAKE) libsrc/all ; \ ++ ./configure ; $(MAKE_CMD) libsrc/all ; \ $(CP) libsrc/netcdf.h ../.. ; \ $(MV) libsrc/attr.o ../../netcdf_attr.o ; \ $(MV) libsrc/dim.o ../../netcdf_dim.o ; \ @@ -210,7 +210,7 @@ $(MV) libsrc/var.o ../../netcdf_var.o ; \ $(RM) config.cache config.log config.status ; \ - $(MAKE) clean ; ) -+ $(GMAKE) clean ; ) ++ $(MAKE_CMD) clean ; ) ####### # 27 Jul 2001 - for fun @@ -218,7 +218,7 @@ gifsicle: ( cd gifsicledir ; \ - $(MAKE) gifsicle clean 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' ; \ -+ $(GMAKE) gifsicle clean 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' ; \ ++ $(MAKE_CMD) gifsicle clean 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' ; \ $(MV) gifsicle .. ; ) ####### @@ -227,7 +227,7 @@ mpeg_encode: ( cd mpeg_encodedir ; \ - $(MAKE) mpeg_encode clean 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' 'LLIBS=$(LLIBS)' ; \ -+ $(GMAKE) mpeg_encode clean 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' 'LLIBS=$(LLIBS)' ; \ ++ $(MAKE_CMD) mpeg_encode clean 'RM=$(RM)' 'CC=$(CC)' 'LFLAGS=$(LFLAGS)' 'LLIBS=$(LLIBS)' ; \ $(MV) mpeg_encode .. ; ) ####### @@ -236,7 +236,7 @@ ( cd mpegtoppm_dir ; chmod ugo+x ./configure ; \ ./configure --disable-sdl --disable-mlib --without-x --disable-dependency-tracking --disable-accel-detect ; \ - $(MAKE) ; mv doc/sample2 ../mpegtoppm ; $(MAKE) clean ; ) -+ $(GMAKE) ; mv doc/sample2 ../mpegtoppm ; $(GMAKE) clean ; ) ++ $(MAKE_CMD) ; mv doc/sample2 ../mpegtoppm ; $(MAKE_CMD) clean ; ) ####### # 11 Sep 2002 - for fun @@ -246,8 +246,8 @@ chmod ugo+x ./configure ; ./configure 'CC=$(CCMIN)' ; \ - $(MAKE) ; $(MV) cjpeg djpeg libjpeg.a .. ; \ - $(MAKE) clean ; $(RM) Makefile ) -+ $(GMAKE) ; $(MV) cjpeg djpeg libjpeg.a .. ; \ -+ $(GMAKE) clean ; $(RM) Makefile ) ++ $(MAKE_CMD) ; $(MV) cjpeg djpeg libjpeg.a .. ; \ ++ $(MAKE_CMD) clean ; $(RM) Makefile ) libXmHTML.a: - ( cd XmHTML ; make lib 'CC=$(CC)' 'II=$(IFLAGS)' ; \ @@ -262,7 +262,7 @@ libfftw.a: ( cd fftw ; \ - $(MAKE) libfftw.a clean 'RM=$(RM)' 'CC=$(CCFAST)' 'AR=$(AR)' \ -+ $(GMAKE) libfftw.a clean 'RM=$(RM)' 'CC=$(CCFAST)' 'AR=$(AR)' \ ++ $(MAKE_CMD) libfftw.a clean 'RM=$(RM)' 'CC=$(CCFAST)' 'AR=$(AR)' \ 'RANLIB=$(RANLIB)' 'LDFLAGS=$(LDFLAGS)' 'IFLAGS=$(ISFLAGS)' ; \ $(MV) libfftw.a .. ; ) @@ -271,7 +271,7 @@ libclam.a: ( cd clamdir ; \ - $(MAKE) libclam.a clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' \ -+ $(GMAKE) libclam.a clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' \ ++ $(MAKE_CMD) libclam.a clean 'RM=$(RM)' 'CC=$(CC)' 'AR=$(AR)' \ 'RANLIB=$(RANLIB)' 'IFLAGS=-I..' ; \ $(MV) libclam.a .. ; ) @@ -280,14 +280,14 @@ ( cd avovk ; \ ./@MakeLocalMake ;\ - $(MAKE) afni_all ; \ -+ $(GMAKE) afni_all ; \ ++ $(MAKE_CMD) afni_all ; \ cd ../ ; ) libsegtools.a: avovk/cluster_floatNOMASK.c avovk/thd_segtools_fNM.c ( cd avovk ; \ ./@MakeLocalMake ;\ - $(MAKE) libsegtools.a ; \ -+ $(GMAKE) libsegtools.a ; \ ++ $(MAKE_CMD) libsegtools.a ; \ $(CP) libsegtools.a ../; \ cd ../ ; ) @@ -296,14 +296,14 @@ ( cd ptaylor ; \ ./@MakeLocalMake ;\ - $(MAKE) all ; \ -+ $(GMAKE) all ; \ ++ $(MAKE_CMD) all ; \ cd ../ ; ) libtracktools.a: ptaylor/libtracktools.a ( cd ptaylor ; \ ./@MakeLocalMake ;\ - $(MAKE) libtracktools.a ; \ -+ $(GMAKE) libtracktools.a ; \ ++ $(MAKE_CMD) libtracktools.a ; \ $(CP) libtracktools.a ../; \ cd ../ ; ) @@ -312,12 +312,12 @@ ( cd SUMA ; \ rm -f libSUMA.a ;\ - $(MAKE) -f $(SUMA_MAKEFILE_NAME) clean MarchingCubes.o libSUMA.a 'INSTALLDIR=$(INSTALLDIR)' \ -+ $(GMAKE) -f $(SUMA_MAKEFILE_NAME) clean MarchingCubes.o libSUMA.a 'INSTALLDIR=$(INSTALLDIR)' \ ++ $(MAKE_CMD) -f $(SUMA_MAKEFILE_NAME) clean MarchingCubes.o libSUMA.a 'INSTALLDIR=$(INSTALLDIR)' \ 'SUMA_INCLUDE_PATH=$(SUMA_INCLUDE_PATH)' \ 'SUMA_BIN_ARCHIVE=$(SUMA_BIN_ARCHIVE)' \ 'RANLIB=$(RANLIB)' \ - 'MAKE=$(MAKE)' \ -+ 'MAKE=$(GMAKE)' \ ++ 'MAKE=$(MAKE_CMD)' \ 'CC=$(CC)' 'RM=$(RM)' 'CEXTRA=$(CEXTRA)' 'MV=$(MV)' 'CP=$(CP)' \ 'TAR=$(TAR)' 'MKDIR=$(MKDIR)'; \ cd ../ ; \ @@ -326,7 +326,7 @@ ( cd SUMA ; \ rm -f libgts.a ;\ - $(MAKE) -f $(SUMA_MAKEFILE_NAME) libgts.a ; \ -+ $(GMAKE) -f $(SUMA_MAKEFILE_NAME) libgts.a ; \ ++ $(MAKE_CMD) -f $(SUMA_MAKEFILE_NAME) libgts.a ; \ cd ../ ; \ if [ ! -d $(INSTALLDIR) ]; then $(MKDIR) -p $(INSTALLDIR); echo WARNING: directory $(INSTALLDIR) has been created. ; fi ;\ $(CP) SUMA/libgts.a ${INSTALLDIR}; \ @@ -335,12 +335,12 @@ ( cd SUMA ; \ rm -f libGLws.a ;\ - $(MAKE) -f $(SUMA_MAKEFILE_NAME) libGLws.a 'INSTALLDIR=$(INSTALLDIR)' \ -+ $(GMAKE) -f $(SUMA_MAKEFILE_NAME) libGLws.a 'INSTALLDIR=$(INSTALLDIR)' \ ++ $(MAKE_CMD) -f $(SUMA_MAKEFILE_NAME) libGLws.a 'INSTALLDIR=$(INSTALLDIR)' \ 'SUMA_INCLUDE_PATH=$(SUMA_INCLUDE_PATH)' \ 'SUMA_BIN_ARCHIVE=$(SUMA_BIN_ARCHIVE)' \ 'RANLIB=$(RANLIB)' \ - 'MAKE=$(MAKE)' \ -+ 'MAKE=$(GMAKE)' \ ++ 'MAKE=$(MAKE_CMD)' \ 'CC=$(CC)' 'RM=$(RM)' 'CEXTRA=$(CEXTRA)' 'MV=$(MV)' 'CP=$(CP)' \ 'TAR=$(TAR)' 'MKDIR=$(MKDIR)'; \ cd ../ ; \ @@ -349,7 +349,7 @@ suma_exec:libGLws.a libSUMA.a libmri.a xutil.o LiteClue.o parser.o parser_int.o libmrix.a libcoxplot.a libf2c.a ( cd SUMA ; \ - $(MAKE) -f $(SUMA_MAKEFILE_NAME) testGL suma ScaleToMap CompareSurfaces \ -+ $(GMAKE) -f $(SUMA_MAKEFILE_NAME) testGL suma ScaleToMap CompareSurfaces \ ++ $(MAKE_CMD) -f $(SUMA_MAKEFILE_NAME) testGL suma ScaleToMap CompareSurfaces \ MakeColorMap ROI2dataset 3dVol2Surf \ 3dSurf2Vol SurfMeasures SurfFWHM \ ConvertSurface ConvertDset SurfClust IsoSurface \ @@ -358,7 +358,7 @@ 'SUMA_GLIB_VER=$(SUMA_GLIB_VER)' \ 'RANLIB=$(RANLIB)' \ - 'MAKE=$(MAKE)' \ -+ 'MAKE=$(GMAKE)' \ ++ 'MAKE=$(MAKE_CMD)' \ 'CC=$(CC)' 'RM=$(RM)' 'CEXTRA=$(CEXTRA)' 'MV=$(MV)' 'CP=$(CP)' \ 'TAR=$(TAR)' 'MKDIR=$(MKDIR)'; \ cd ../ ;) @@ -367,7 +367,7 @@ suma_gts_progs: libgts.a ( cd SUMA ; \ - $(MAKE) -f $(SUMA_MAKEFILE_NAME) SurfMesh 'INSTALLDIR=$(INSTALLDIR)' \ -+ $(GMAKE) -f $(SUMA_MAKEFILE_NAME) SurfMesh 'INSTALLDIR=$(INSTALLDIR)' \ ++ $(MAKE_CMD) -f $(SUMA_MAKEFILE_NAME) SurfMesh 'INSTALLDIR=$(INSTALLDIR)' \ 'SUMA_INCLUDE_PATH=$(SUMA_INCLUDE_PATH)' \ 'SUMA_LINK_PATH=$(SUMA_LINK_PATH)' \ 'SUMA_LINK_LIB=$(SUMA_LINK_LIB)' \ @@ -375,7 +375,7 @@ 'SUMA_GLIB_VER=$(SUMA_GLIB_VER)' \ 'RANLIB=$(RANLIB)' \ - 'MAKE=$(MAKE)' \ -+ 'MAKE=$(GMAKE)' \ ++ 'MAKE=$(MAKE_CMD)' \ 'CC=$(CC)' 'RM=$(RM)' 'CEXTRA=$(CEXTRA)' 'MV=$(MV)' 'CP=$(CP)' \ 'TAR=$(TAR)' 'MKDIR=$(MKDIR)'; \ cd ../ ;) @@ -384,7 +384,7 @@ suma_all:libmri.a xutil.o LiteClue.o parser.o parser_int.o libmrix.a libcoxplot.a libf2c.a ( cd SUMA ; \ - $(MAKE) -f $(SUMA_MAKEFILE_NAME) all 'INSTALLDIR=$(INSTALLDIR)' 'INSTALLDIR_SUMA=$(INSTALLDIR)' \ -+ $(GMAKE) -f $(SUMA_MAKEFILE_NAME) all 'INSTALLDIR=$(INSTALLDIR)' 'INSTALLDIR_SUMA=$(INSTALLDIR)' \ ++ $(MAKE_CMD) -f $(SUMA_MAKEFILE_NAME) all 'INSTALLDIR=$(INSTALLDIR)' 'INSTALLDIR_SUMA=$(INSTALLDIR)' \ 'SUMA_INCLUDE_PATH=$(SUMA_INCLUDE_PATH)' \ 'SUMA_LINK_PATH=$(SUMA_LINK_PATH)' \ 'SUMA_LINK_LIB=$(SUMA_LINK_LIB)' \ @@ -392,7 +392,7 @@ 'SUMA_GLIB_VER=$(SUMA_GLIB_VER)' \ 'RANLIB=$(RANLIB)' \ - 'MAKE=$(MAKE)' \ -+ 'MAKE=$(GMAKE)' \ ++ 'MAKE=$(MAKE_CMD)' \ 'CC=$(CC)' 'RM=$(RM)' 'CEXTRA=$(CEXTRA)' 'MV=$(MV)' 'CP=$(CP)' \ 'TAR=$(TAR)' 'MKDIR=$(MKDIR)'; \ cd ../ ;) @@ -401,7 +401,7 @@ suma_anew:libmri.a xutil.o LiteClue.o parser.o parser_int.o libmrix.a libcoxplot.a libf2c.a ( cd SUMA ; \ - $(MAKE) -f $(SUMA_MAKEFILE_NAME) anew 'INSTALLDIR=$(INSTALLDIR)' 'INSTALLDIR_SUMA=$(INSTALLDIR)' \ -+ $(GMAKE) -f $(SUMA_MAKEFILE_NAME) anew 'INSTALLDIR=$(INSTALLDIR)' 'INSTALLDIR_SUMA=$(INSTALLDIR)' \ ++ $(MAKE_CMD) -f $(SUMA_MAKEFILE_NAME) anew 'INSTALLDIR=$(INSTALLDIR)' 'INSTALLDIR_SUMA=$(INSTALLDIR)' \ 'SUMA_INCLUDE_PATH=$(SUMA_INCLUDE_PATH)' \ 'SUMA_LINK_PATH=$(SUMA_LINK_PATH)' \ 'SUMA_LINK_LIB=$(SUMA_LINK_LIB)' \ @@ -409,7 +409,7 @@ 'SUMA_GLIB_VER=$(SUMA_GLIB_VER)' \ 'RANLIB=$(RANLIB)' \ - 'MAKE=$(MAKE)' \ -+ 'MAKE=$(GMAKE)' \ ++ 'MAKE=$(MAKE_CMD)' \ 'CC=$(CC)' 'RM=$(RM)' 'CEXTRA=$(CEXTRA)' 'MV=$(MV)' 'CP=$(CP)' \ 'TAR=$(TAR)' 'MKDIR=$(MKDIR)'; \ cd ../ ;) @@ -418,7 +418,7 @@ DriveSuma SurfDist SpharmReco SpharmDeco prompt_user SurfRetinoMap \ ParseName 3dGenPriors 3dSeg SurfExtrema 3dinfill; \ - $(MAKE) -f $(SUMA_MAKEFILE_NAME) testGL suma MakeColorMap ROI2dataset \ -+ $(GMAKE) -f $(SUMA_MAKEFILE_NAME) testGL suma MakeColorMap ROI2dataset \ ++ $(MAKE_CMD) -f $(SUMA_MAKEFILE_NAME) testGL suma MakeColorMap ROI2dataset \ 3dVol2Surf 3dSurf2Vol ScaleToMap SurfMeasures SurfFWHM \ MapIcosahedron CreateIcosahedron CompareSurfaces ConvertSurface ConvertDset \ SurfClust IsoSurface ConvexHull SurfaceMetrics SurfSmooth inspec \ @@ -427,7 +427,7 @@ 'SUMA_GLIB_VER=$(SUMA_GLIB_VER)' \ 'RANLIB=$(RANLIB)' \ - 'MAKE=$(MAKE)' \ -+ 'MAKE=$(GMAKE)' \ ++ 'MAKE=$(MAKE_CMD)' \ 'CC=$(CC)' 'RM=$(RM)' 'CEXTRA=$(CEXTRA)' 'MV=$(MV)' 'CP=$(CP)'\ 'TAR=$(TAR)' 'MKDIR=$(MKDIR)'; \ cd ../ ;) @@ -435,7 +435,7 @@ #### R_io.so:R_io.c libmri.a ( if which R >/dev/null ; then \ -+ export MAKE=${GMAKE} ;\ ++ export MAKE=${MAKE_CMD} ;\ echo PKG_CPPFLAGS = $(INFLAGS) > Makevars ;\ echo PKG_LIBS = $(LFLAGS) $(LLIBS) >> Makevars ;\ R CMD SHLIB R_io.c ; \ diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile index 300dfc58c1f5..d49432e506b5 100644 --- a/science/chemtool-devel/Makefile +++ b/science/chemtool-devel/Makefile @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes USES= gettext gmake pkgconfig CONFIGURE_ARGS= --enable-emf=yes PKGNAMESUFFIX= -devel -MAKE_ARGS+= MAKE=${GMAKE} +MAKE_ARGS+= MAKE=${MAKE_CMD} MAKE_JOBS_UNSAFE= yes #to include emf CFLAGS+= -I${LOCALBASE}/include/libEMF diff --git a/science/gamess/Makefile b/science/gamess/Makefile index 0502fadd8135..f0d6e10881e9 100644 --- a/science/gamess/Makefile +++ b/science/gamess/Makefile @@ -134,7 +134,7 @@ pre-build: ${WRKSRC}/tools/Makefile do-build: - (cd ${WRKSRC}; ${GMAKE}) + (cd ${WRKSRC}; ${MAKE_CMD}) do-install: ${MKDIR} ${PREFIX}/bin/gms diff --git a/science/hdf-java/Makefile b/science/hdf-java/Makefile index 5af5801891d3..346f7f066b91 100644 --- a/science/hdf-java/Makefile +++ b/science/hdf-java/Makefile @@ -83,6 +83,6 @@ post-install: .endif regression-test: build - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include <bsd.port.post.mk> diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile index b7ca1092064a..d0f6e62a8983 100644 --- a/science/mpqc/Makefile +++ b/science/mpqc/Makefile @@ -91,14 +91,14 @@ pre-configure: @${ECHO} "You can optimize by setting WITH_OPTIMIZED_FLAGS=yes." do-build: - @cd ${WRKSRC} ; ${GMAKE} + @cd ${WRKSRC} ; ${MAKE_CMD} .if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRC}/doc ; ${GMAKE} + @cd ${WRKSRC}/doc ; ${MAKE_CMD} .endif do-install: - (cd ${WRKSRC} ; ${GMAKE} install) - (cd ${WRKSRC} ; ${GMAKE} install_devel) + (cd ${WRKSRC} ; ${MAKE_CMD} install) + (cd ${WRKSRC} ; ${MAKE_CMD} install_devel) ${MKDIR} ${PREFIX}/share/mpqc/validate cd ${WRKSRC}/src/bin/mpqc/validate/ ; ${TAR} -chf - . | \ ${TAR} -xf - -C ${PREFIX}/share/mpqc/validate @@ -124,6 +124,6 @@ do-install: ${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} validate: - cd ${WRKSRC}/src/bin/mpqc/validate ; ${GMAKE} check0 ; ${GMAKE} check0_run ; ${GMAKE} check0_chk + cd ${WRKSRC}/src/bin/mpqc/validate ; ${MAKE_CMD} check0 ; ${MAKE_CMD} check0_run ; ${MAKE_CMD} check0_chk .include <bsd.port.post.mk> diff --git a/science/psi3/Makefile b/science/psi3/Makefile index 5b68566bf0de..02c4e7df7aab 100644 --- a/science/psi3/Makefile +++ b/science/psi3/Makefile @@ -90,10 +90,10 @@ pre-configure: MAKE_ENV+= SCRATCH=${WRKSRC}/tmp do-build: - @(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE}) + @(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) do-install: - @(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GMAKE} install) + @(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} install) @${TAR} cf - -C ${WRKSRC}/tmpdoc/man . | ${TAR} xf - -C ${PREFIX}/man .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/psi3 diff --git a/science/vmd/Makefile b/science/vmd/Makefile index 62826ed15294..2c2dae33933a 100644 --- a/science/vmd/Makefile +++ b/science/vmd/Makefile @@ -78,15 +78,15 @@ post-patch: -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure do-build: - ${SETENV} ${MAKE_ENV} ${GMAKE} bsd -C ${WRKSRC}/lib/tachyon/unix && ${MV} ${WRKSRC}/lib/tachyon/compile/bsd/tachyon ${WRKSRC}/lib/tachyon/tachyon_${VMD_ARCH} - ${SETENV} ${MAKE_ENV} TCLLIB=-L${PREFIX}/lib/tcl8.5 TCLINC=-I${PREFIX}/include/tcl8.5 PLUGINDIR=${WRKSRC}/plugins ${GMAKE} ${VMD_ARCH} distrib -C ${WRKDIR}/plugins - ${SETENV} ${MAKE_ENV} TCL_INCLUDE_DIR=${PREFIX}/include/tcl8.5 TK_INCLUDE_DIR=${PREFIX}/include/tk8.5 ${GMAKE} ${VMD_TARGET} -C ${WRKSRC} - ${SETENV} ${MAKE_ENV} ${GMAKE} all -C ${WRKSRC}/src - ${SETENV} ${MAKE_ENV} ${GMAKE} depend -C ${WRKSRC}/lib/surf && ${SETENV} ${MAKE_ENV} ${GMAKE} surf -C ${WRKSRC}/lib/surf && ${MV} ${WRKSRC}/lib/surf/surf ${WRKSRC}/lib/surf/surf_${VMD_ARCH} - ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/lib/stride && ${MV} ${WRKSRC}/lib/stride/stride ${WRKSRC}/lib/stride/stride_${VMD_ARCH} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} bsd -C ${WRKSRC}/lib/tachyon/unix && ${MV} ${WRKSRC}/lib/tachyon/compile/bsd/tachyon ${WRKSRC}/lib/tachyon/tachyon_${VMD_ARCH} + ${SETENV} ${MAKE_ENV} TCLLIB=-L${PREFIX}/lib/tcl8.5 TCLINC=-I${PREFIX}/include/tcl8.5 PLUGINDIR=${WRKSRC}/plugins ${MAKE_CMD} ${VMD_ARCH} distrib -C ${WRKDIR}/plugins + ${SETENV} ${MAKE_ENV} TCL_INCLUDE_DIR=${PREFIX}/include/tcl8.5 TK_INCLUDE_DIR=${PREFIX}/include/tk8.5 ${MAKE_CMD} ${VMD_TARGET} -C ${WRKSRC} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} all -C ${WRKSRC}/src + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} depend -C ${WRKSRC}/lib/surf && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} surf -C ${WRKSRC}/lib/surf && ${MV} ${WRKSRC}/lib/surf/surf ${WRKSRC}/lib/surf/surf_${VMD_ARCH} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/lib/stride && ${MV} ${WRKSRC}/lib/stride/stride ${WRKSRC}/lib/stride/stride_${VMD_ARCH} do-install: - ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/src install + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/src install @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/vmd .include <bsd.port.post.mk> diff --git a/security/axTLS/Makefile b/security/axTLS/Makefile index 77e5a454a113..a90bf423c26f 100644 --- a/security/axTLS/Makefile +++ b/security/axTLS/Makefile @@ -133,6 +133,6 @@ do-install: regression-test: build ${DO_MAKE_BUILD} -C ${WRKSRC} test - cd ${WRKSRC} && ${GMAKE} test + cd ${WRKSRC} && ${MAKE_CMD} test .include <bsd.port.mk> diff --git a/security/clamav/Makefile b/security/clamav/Makefile index e0e07a53d59d..42b4c6891c2c 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -195,7 +195,7 @@ pre-configure: .if ${PORT_OPTIONS:MTESTS} post-build: @if [ ! -f "${PY_NO_THREAD}" ]; then \ - ${GMAKE} -C ${WRKSRC} check; \ + ${MAKE_CMD} -C ${WRKSRC} check; \ fi .endif diff --git a/security/fl0p/Makefile b/security/fl0p/Makefile index a0de47f27ba5..f6c3c77dc240 100644 --- a/security/fl0p/Makefile +++ b/security/fl0p/Makefile @@ -23,7 +23,7 @@ post-patch: @${REINPLACE_CMD} -e \ 's|"/etc/fl0p"|"${DATADIR}"|' ${WRKSRC}/config.h @${REINPLACE_CMD} -e \ - 's|^GMAKE_OK|#GMAKE_OK|' ${WRKSRC}/Build + 's|^MAKE_CMD_OK|#MAKE_CMD_OK|' ${WRKSRC}/Build @${REINPLACE_CMD} -e \ '/^CC/s|\([[:blank:]]\)=|\1?=| ; \ /^CFLAGS/s|\([[:blank:]]\)=|\1+=| ; \ diff --git a/security/libtomcrypt/Makefile b/security/libtomcrypt/Makefile index 223eec732296..bee5318ede37 100644 --- a/security/libtomcrypt/Makefile +++ b/security/libtomcrypt/Makefile @@ -56,21 +56,21 @@ MAKE_ARGS+= NODOCS=yes .if defined(MAINTAINER_MODE) test: build @${ECHO_MSG} "Testing with -DUSE_TFM..." - (cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_TFM" EXTRALIBS="-L${PREFIX}/lib -ltfm" ${GMAKE} test && ${WRKSRC}/test) + (cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_TFM" EXTRALIBS="-L${PREFIX}/lib -ltfm" ${MAKE_CMD} test && ${WRKSRC}/test) @${ECHO_MSG} "Cleaning up test binary..." @${RM} ${WRKSRC}/test @${RM} ${WRKSRC}/demos/test.o @${ECHO_MSG} "Testing with -DUSE_LTM..." - (cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_LTM" EXTRALIBS="-L${PREFIX}/lib -ltommath" ${GMAKE} test && ${WRKSRC}/test) + (cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_LTM" EXTRALIBS="-L${PREFIX}/lib -ltommath" ${MAKE_CMD} test && ${WRKSRC}/test) @${ECHO_MSG} "Cleaning up test binary..." @${RM} ${WRKSRC}/test @${RM} ${WRKSRC}/demos/test.o @${ECHO_MSG} "Testing with -DUSE_GMP..." - (cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_GMP" EXTRALIBS="-L${PREFIX}/lib -lgmp" ${GMAKE} test && ${WRKSRC}/test) + (cd ${WRKSRC} && CFLAGS="${CFLAGS} -DUSE_GMP" EXTRALIBS="-L${PREFIX}/lib -lgmp" ${MAKE_CMD} test && ${WRKSRC}/test) .endif .include <bsd.port.mk> diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile index be87b0bf5709..1ade2ac86058 100644 --- a/security/pam_krb5/Makefile +++ b/security/pam_krb5/Makefile @@ -38,6 +38,6 @@ CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}" NO_STAGE= yes post-install: - cd ${WRKSRC} && ${GMAKE} install-man + cd ${WRKSRC} && ${MAKE_CMD} install-man .include <bsd.port.mk> diff --git a/security/pev/Makefile b/security/pev/Makefile index 2713a43a7a9b..a14570eba602 100644 --- a/security/pev/Makefile +++ b/security/pev/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USES= gmake USE_LDCONFIG= yes -MAKE_ARGS= MAKE=${GMAKE} +MAKE_ARGS= MAKE=${MAKE_CMD} CFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> diff --git a/security/pft/Makefile b/security/pft/Makefile index 7abc61989c60..dfecea4fb709 100644 --- a/security/pft/Makefile +++ b/security/pft/Makefile @@ -23,7 +23,7 @@ post-patch: ${WRKSRC}/pft/Makefile post-build: - @(cd ${WRKSRC}/pft; ${SETENV} ${MAKE_ENV} ${GMAKE} pft) + @(cd ${WRKSRC}/pft; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} pft) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pft/pft ${PREFIX}/bin diff --git a/security/putty/Makefile b/security/putty/Makefile index c2388e292d1d..3bdaf542b219 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -66,7 +66,7 @@ MAKE_ARGS+= COMPAT="${_COMPAT}" \ post-patch: @${REINPLACE_CMD} -e 's,prefix=/usr/local,prefix=${PREFIX},;\ - s,make,${GMAKE},'\ + s,make,${MAKE_CMD},'\ ${WRKSRC}/${MAKEFILE} .include <bsd.port.post.mk> diff --git a/security/py-pyme/Makefile b/security/py-pyme/Makefile index 8556c4ec823b..e6432d081d4d 100644 --- a/security/py-pyme/Makefile +++ b/security/py-pyme/Makefile @@ -29,6 +29,6 @@ post-patch: @${REINPLACE_CMD} -e 's,include/,&gpgme/,' ${WRKSRC}/Makefile pre-build: - cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} build + cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} build .include <bsd.port.post.mk> diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile index 7704e76ab38a..67bbe1857393 100644 --- a/security/signing-party/Makefile +++ b/security/signing-party/Makefile @@ -46,7 +46,7 @@ post-patch: ${WRKSRC}/caff/caff @${REINPLACE_CMD} -e 's|/usr/bin/pinentry-gtk-2|${LOCALBASE}/bin/pinentry-gtk-2|' \ ${WRKSRC}/caff/README.gpg-agent - @${REINPLACE_CMD} -e 's|[[:<:]]make|${GMAKE}|' \ + @${REINPLACE_CMD} -e 's|[[:<:]]make|${MAKE_CMD}|' \ -e '/^all/s|pgpring/pgpring||' \ ${WRKSRC}/gpgwrap/Makefile \ ${WRKSRC}/keyanalyze/Makefile diff --git a/security/sks/Makefile b/security/sks/Makefile index 305309cd9462..0f29dfef7161 100644 --- a/security/sks/Makefile +++ b/security/sks/Makefile @@ -35,7 +35,7 @@ post-patch: ${WRKSRC}/Makefile ${WRKSRC}/bdb/Makefile pre-build: - @cd ${WRKSRC} && test -f .depend || ${GMAKE} dep + @cd ${WRKSRC} && test -f .depend || ${MAKE_CMD} dep post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile index 383fcac4c442..9b8865f2143f 100644 --- a/security/tripwire/Makefile +++ b/security/tripwire/Makefile @@ -118,12 +118,12 @@ install-config-files: .endif @ cd ${WRKSRC} && ${LN} -sf install/install.cfg install/install.sh . .ifdef PACKAGE_BUILDING - @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook + @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${MAKE_CMD} install-data-hook .else .if ${PORT_OPTIONS:MSW_ONLY} - @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook + @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${MAKE_CMD} install-data-hook .else - @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${GMAKE} install-data-hook + @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${MAKE_CMD} install-data-hook .endif .endif diff --git a/security/truecrypt/Makefile b/security/truecrypt/Makefile index 6c0ee63fcd1d..38daf003c364 100644 --- a/security/truecrypt/Makefile +++ b/security/truecrypt/Makefile @@ -79,9 +79,9 @@ do-build: @${CP} ${DISTDIR}/pkcs11t.h ${WRKDIR}/rsa @${CP} ${DISTDIR}/pkcs11f.h ${WRKDIR}/rsa @${ECHO_MSG} "===> Building for wxWidgets dependency" - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${NOGUI} PKCS11_INC=${WRKDIR}/rsa WX_ROOT=${WRKDIR}/wxWidgets-${WX_VER} wxbuild) + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${NOGUI} PKCS11_INC=${WRKDIR}/rsa WX_ROOT=${WRKDIR}/wxWidgets-${WX_VER} wxbuild) @${ECHO_MSG} "===> Building for ${PKGNAME}" - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${NOGUI} WXSTATIC=1 PKCS11_INC=${WRKDIR}/rsa) + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${NOGUI} WXSTATIC=1 PKCS11_INC=${WRKDIR}/rsa) do-install: @${INSTALL_PROGRAM} ${WRKSRC}/Main/truecrypt ${STAGEDIR}${PREFIX}/bin diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile index bb4ade7618a3..957b759d96f3 100644 --- a/security/tthsum/Makefile +++ b/security/tthsum/Makefile @@ -22,6 +22,6 @@ MAKE_ENV+= STAGEDIR=${STAGEDIR} WRKSRC= ${WRKDIR}/${PORTNAME} regression-test: build - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} test runtest + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test runtest .include <bsd.port.mk> 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 diff --git a/textproc/bibutils/Makefile b/textproc/bibutils/Makefile index 9163be2f0205..26cc43a555b1 100644 --- a/textproc/bibutils/Makefile +++ b/textproc/bibutils/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} HAS_CONFIGURE= yes test: all - cd ${WRKSRC}/test && ${GMAKE} all test + cd ${WRKSRC}/test && ${MAKE_CMD} all test BINARIES= bib2xml biblatex2xml copac2xml ebi2xml end2xml endx2xml \ isi2xml med2xml modsclean ris2xml wordbib2xml xml2ads \ diff --git a/textproc/clit/Makefile b/textproc/clit/Makefile index efed6b8871ab..0bac6efdb9f9 100644 --- a/textproc/clit/Makefile +++ b/textproc/clit/Makefile @@ -31,9 +31,9 @@ post-extract: do-build: cd ${WRKDIR}/libtommath-0.33 && \ ${SETENV} ${MAKE_ENV} ${MAKE} -f makefile libtommath.a - cd ${WRKDIR}/lib && ${SETENV} ${MAKE_ENV} ${GMAKE} -f Makefile all + cd ${WRKDIR}/lib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile all cd ${WRKDIR}/${PORTNAME}${MAJ_VER}${MIN_VER} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} -f Makefile all + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile all do-install: @${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME}${MAJ_VER}${MIN_VER}/clit \ diff --git a/textproc/confget/Makefile b/textproc/confget/Makefile index dea23b483c3d..a2b21dcc71c1 100644 --- a/textproc/confget/Makefile +++ b/textproc/confget/Makefile @@ -30,6 +30,6 @@ post-build: @${STRIP_CMD} ${WRKSRC}/confget regression-test test: build - cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test + cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test .include <bsd.port.mk> diff --git a/textproc/extract_url/Makefile b/textproc/extract_url/Makefile index 1a14fe4b5b13..2b7663352c9a 100644 --- a/textproc/extract_url/Makefile +++ b/textproc/extract_url/Makefile @@ -44,7 +44,7 @@ URI_FIND_RUN_DEPENDS= p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find PORTDOCS= AUTHORS NEWS README post-patch: - @${REINPLACE_CMD} '/pod2man.mk/s|make|${GMAKE}|' \ + @${REINPLACE_CMD} '/pod2man.mk/s|make|${MAKE_CMD}|' \ ${WRKSRC}/${MAKEFILE} post-install: diff --git a/textproc/libroxml/Makefile b/textproc/libroxml/Makefile index 94a86257f9da..3a5dd1fad8ea 100644 --- a/textproc/libroxml/Makefile +++ b/textproc/libroxml/Makefile @@ -29,6 +29,6 @@ PLIST_FILES= bin/roxml \ man/man1/roxml.1.gz pre-build: - @cd ${WRKSRC} && ${GMAKE} clean + @cd ${WRKSRC} && ${MAKE_CMD} clean .include <bsd.port.mk> diff --git a/textproc/libxml++26-reference/Makefile b/textproc/libxml++26-reference/Makefile index 02051c50b95e..947df3bb6c6a 100644 --- a/textproc/libxml++26-reference/Makefile +++ b/textproc/libxml++26-reference/Makefile @@ -13,6 +13,6 @@ GNU_CONFIGURE= yes DOCSDIR= ${PREFIX}/share/doc/libxml++-2.6 do-install: - @cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} install-data-local install-dist_referenceDATA + @cd ${WRKSRC} && ${MAKE_CMD} ${MAKE_ARGS} install-data-local install-dist_referenceDATA .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" diff --git a/textproc/libxml2-reference/Makefile b/textproc/libxml2-reference/Makefile index 3ca1aead039a..ec4d69bf9bd9 100644 --- a/textproc/libxml2-reference/Makefile +++ b/textproc/libxml2-reference/Makefile @@ -18,7 +18,7 @@ PLIST_DIRS= %%EXAMPLESDIR%% do-install: .for d in . doc doc/examples - @cd ${PARENT_WRKSRC}/${d} && ${GMAKE} ${MAKE_ARGS} install-data-local + @cd ${PARENT_WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ARGS} install-data-local .endfor .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" diff --git a/textproc/libxslt-reference/Makefile b/textproc/libxslt-reference/Makefile index 0710dfcc37c1..61e569b7db82 100644 --- a/textproc/libxslt-reference/Makefile +++ b/textproc/libxslt-reference/Makefile @@ -10,6 +10,6 @@ EXTRACT_ONLY= USES= gmake do-install: - @cd ${PARENT_WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install-data-local + @cd ${PARENT_WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} install-data-local .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile index 9aa65062db1c..416cbf42a35e 100644 --- a/textproc/openvanilla-modules/Makefile +++ b/textproc/openvanilla-modules/Makefile @@ -109,66 +109,66 @@ PLIST_SUB+= OVIMUnicode="@comment " do-build: .if ${PORT_OPTIONS:MOVIMArray} - @(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) + @(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) .endif .if ${PORT_OPTIONS:MOVIMBig5} - @(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) + @(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) .endif #.if ${PORT_OPTIONS:MOVIMBoshiamy} -# @(cd ${WRKSRC}/Modules/OVIMBoshiamy; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) +# @(cd ${WRKSRC}/Modules/OVIMBoshiamy; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) #.endif .if ${PORT_OPTIONS:MOVIMGeneric} - @(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) + @(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) .endif .if ${PORT_OPTIONS:MOVIMPOJ_Holo} - @(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) + @(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) .endif .if ${PORT_OPTIONS:MOVIMPhonetic} - @(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) + @(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) .endif .if ${PORT_OPTIONS:MOVIMSpaceChewing} - @(cd ${WRKSRC}/Modules/OVIMSpaceChewing0.3; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} data all) + @(cd ${WRKSRC}/Modules/OVIMSpaceChewing0.3; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} data all) .endif .if ${PORT_OPTIONS:MOVIMRoman} - @(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) + @(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) .endif .if ${PORT_OPTIONS:MOVIMTibetan} - @(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) + @(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) .endif .if ${PORT_OPTIONS:MOVIMUnicode} - @(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} all) + @(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all) .endif do-install: .if ${PORT_OPTIONS:MOVIMArray} - @(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/Modules/OVIMArray; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) .endif .if ${PORT_OPTIONS:MOVIMBig5} - @(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/Modules/OVIMBig5; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) .endif #.if ${PORT_OPTIONS:MOVIMBoshiamy} -# @(cd ${WRKSRC}/Modules/OVIMBoshiamy; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) +# @(cd ${WRKSRC}/Modules/OVIMBoshiamy; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) #.endif .if ${PORT_OPTIONS:MOVIMGeneric} - @(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/Modules/OVIMGeneric; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) .endif .if ${PORT_OPTIONS:MOVIMPOJ_Holo} - @(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/Modules/OVIMPOJ-Holo; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) .endif .if ${PORT_OPTIONS:MOVIMPhonetic} - @(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/Modules/OVIMPhonetic; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) .endif .if ${PORT_OPTIONS:MOVIMRoman} - @(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/Modules/OVIMRoman; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) .endif .if ${PORT_OPTIONS:MOVIMSpaceChewing} - @(cd ${WRKSRC}/Modules/OVIMSpaceChewing0.3; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/Modules/OVIMSpaceChewing0.3; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) .endif .if ${PORT_OPTIONS:MOVIMTibetan} - @(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/Modules/OVIMTibetan; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) .endif .if ${PORT_OPTIONS:MOVIMUnicode} - @(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install) + @(cd ${WRKSRC}/Modules/OVIMUnicode; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install) .endif .include <bsd.port.mk> diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile index 20937ecd9ad5..50fea5f13334 100644 --- a/textproc/scew/Makefile +++ b/textproc/scew/Makefile @@ -29,7 +29,7 @@ post-install: .ifdef MAINTAINER_MODE LIB_DEPENDS+= libcheck.so:${PORTSDIR}/devel/libcheck regression-test: build - cd ${WRKSRC}/tests && ${GMAKE} check + cd ${WRKSRC}/tests && ${MAKE_CMD} check .endif .include <bsd.port.pre.mk> diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile index 0cc71a0248dc..5c116dbf5bad 100644 --- a/textproc/source-highlight/Makefile +++ b/textproc/source-highlight/Makefile @@ -33,6 +33,6 @@ BASH_CONFIGURE_WITH= --with-bash-completion OPTIONS_SUB= yes test: build - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS} check) + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} check) .include <bsd.port.mk> diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile index 703197672401..863008b845a1 100644 --- a/textproc/sowing/Makefile +++ b/textproc/sowing/Makefile @@ -26,7 +26,7 @@ MAN1= bfort.1 doctext.1 tohtml.1 .if defined(MAINTAINER_MODE) regression-test: install @(cd ${BUILD_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} testing) + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} testing) .endif NO_STAGE= yes diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile index e9c1fed02d3e..824ee11e868f 100644 --- a/textproc/stardict3/Makefile +++ b/textproc/stardict3/Makefile @@ -58,6 +58,6 @@ post-patch: pre-configure: cd ${WRKSRC}/lib && \ ${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .include <bsd.port.mk> diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile index dd4e5ebde338..27ee3cc549a4 100644 --- a/textproc/uim-gtk/Makefile +++ b/textproc/uim-gtk/Makefile @@ -25,18 +25,18 @@ IGNORE= requires X11 .endif do-build: - (cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la libuim-counted-init.la) - (cd ${WRKSRC}/gtk2/immodule && ${GMAKE}) - (cd ${WRKSRC}/gtk2/pad && ${GMAKE}) - (cd ${WRKSRC}/gtk2/pref && ${GMAKE}) - (cd ${WRKSRC}/gtk2/switcher && ${GMAKE}) - (cd ${WRKSRC}/gtk2/toolbar && ${GMAKE}) + (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) + (cd ${WRKSRC}/gtk2/immodule && ${MAKE_CMD}) + (cd ${WRKSRC}/gtk2/pad && ${MAKE_CMD}) + (cd ${WRKSRC}/gtk2/pref && ${MAKE_CMD}) + (cd ${WRKSRC}/gtk2/switcher && ${MAKE_CMD}) + (cd ${WRKSRC}/gtk2/toolbar && ${MAKE_CMD}) do-install: - (cd ${WRKSRC}/gtk2/immodule && ${GMAKE} DESTDIR=${STAGEDIR} install) - (cd ${WRKSRC}/gtk2/pad && ${GMAKE} DESTDIR=${STAGEDIR} install) - (cd ${WRKSRC}/gtk2/pref && ${GMAKE} DESTDIR=${STAGEDIR} install) - (cd ${WRKSRC}/gtk2/switcher && ${GMAKE} DESTDIR=${STAGEDIR} install) - (cd ${WRKSRC}/gtk2/toolbar && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk2/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-gtk3/Makefile b/textproc/uim-gtk3/Makefile index 50111e442bf6..0c28077dabd8 100644 --- a/textproc/uim-gtk3/Makefile +++ b/textproc/uim-gtk3/Makefile @@ -27,10 +27,10 @@ IGNORE= requires X11 .endif do-build: - (cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la libuim-counted-init.la) - (cd ${WRKSRC}/gtk3 && ${GMAKE}) + (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) + (cd ${WRKSRC}/gtk3 && ${MAKE_CMD}) do-install: - (cd ${WRKSRC}/gtk3 && ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/gtk3 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile index 65a39041a0b5..979ed82b1d1f 100644 --- a/textproc/uim-kde4/Makefile +++ b/textproc/uim-kde4/Makefile @@ -31,9 +31,9 @@ IGNORE= requires X11 .endif do-build: - (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE}) + (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) do-install: - (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile index 8aca291a5d5f..ae3344d18734 100644 --- a/textproc/uim-m17nlib/Makefile +++ b/textproc/uim-m17nlib/Makefile @@ -27,11 +27,11 @@ UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in do-build: - (cd ${WRKSRC}/uim && ${GMAKE} libuim-m17nlib.la) + (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-m17nlib.la) do-install: (cd ${WRKSRC}/uim && \ - ${GMAKE} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES && \ + ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES && \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/uim/pixmaps && \ DESTDIR="${STAGEDIR}" ${SH} ../pixmaps/uim-m17nlib-relink-icons) diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile index 86efc3f1a57c..a8258a78570e 100644 --- a/textproc/uim-qt4/Makefile +++ b/textproc/uim-qt4/Makefile @@ -26,11 +26,11 @@ IGNORE= cannot be built without X11. Please, unset WITHOUT_X11 .endif do-build: - (cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${GMAKE} libuim-x-util.la libuim-counted-init.la) - (cd ${WRKSRC}/replace && ${SETENV} ${MAKE_ENV} ${GMAKE}) - (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE}) + (cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) + (cd ${WRKSRC}/replace && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) + (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) do-install: - (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE} DESTDIR=${STAGEDIR} install) + (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 727133182a29..a89107c6960a 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -78,21 +78,21 @@ post-patch: do-build: .if !defined(UIM_SLAVE) .for d in replace sigscheme uim scm xim po fep emacs pixmaps tables - cd ${WRKSRC}/${d} && ${GMAKE} + cd ${WRKSRC}/${d} && ${MAKE_CMD} .endfor .if !defined(WITHOUT_X11) - cd ${WRKSRC}/gtk2/candwin && ${GMAKE} + cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD} .endif .endif do-install: .if !defined(UIM_SLAVE) - cd ${WRKSRC} && ${GMAKE} DESTDIR=${STAGEDIR} install-data-am + cd ${WRKSRC} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-data-am .for d in sigscheme uim scm xim po fep emacs pixmaps tables - cd ${WRKSRC}/${d} && ${GMAKE} DESTDIR=${STAGEDIR} install + cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install .endfor .if !defined(WITHOUT_X11) - cd ${WRKSRC}/gtk2/candwin && ${GMAKE} DESTDIR=${STAGEDIR} install + cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install .endif .endif diff --git a/textproc/xqilla/Makefile b/textproc/xqilla/Makefile index 7e700293acdd..6550499a21b1 100644 --- a/textproc/xqilla/Makefile +++ b/textproc/xqilla/Makefile @@ -31,7 +31,7 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ dot:${PORTSDIR}/graphics/graphviz post-build: - cd ${WRKSRC} && ${GMAKE} docs + cd ${WRKSRC} && ${MAKE_CMD} docs post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/www/R-cran-httpuv/Makefile b/www/R-cran-httpuv/Makefile index 58abdd504d78..73e385ca0bdd 100644 --- a/www/R-cran-httpuv/Makefile +++ b/www/R-cran-httpuv/Makefile @@ -17,7 +17,7 @@ LICENSE_PERMS_NODE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= R-cran-Rcpp>=0.11.0:${PORTSDIR}/devel/R-cran-Rcpp -MAKE_ENV= MAKE=${GMAKE} +MAKE_ENV= MAKE=${MAKE_CMD} USES= cran:auto-plist gmake .include <bsd.port.mk> diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile index 378c3e190ff1..ad93a59f6011 100644 --- a/www/aws-demos/Makefile +++ b/www/aws-demos/Makefile @@ -82,12 +82,12 @@ post-patch: do-configure: ${MKDIR} ${WRKSRC}/.build/native/debug/static/obj cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${GMAKE} setup ${CONF_ARGS} + ${MAKE_CMD} setup ${CONF_ARGS} do-build: .for dd in ${DEMO_DIRS} @${ECHO_MSG} "=== BUILD ${dd} ===" - cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} ${GMAKE} + cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} .endfor do-install: diff --git a/www/aws/Makefile b/www/aws/Makefile index d5631ecf1657..723f7dbdc192 100644 --- a/www/aws/Makefile +++ b/www/aws/Makefile @@ -152,13 +152,13 @@ do-configure: @${CP} ${LOCALBASE}/lib/templates_parser.relocatable/*.ali \ ${TEMPARSE}/relocatable/lib/temparse @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${GMAKE} setup ${CONF_ARGS} + ${MAKE_CMD} setup ${CONF_ARGS} do-build: # We cannot use a redefined ALL_TARGET because MAKE_JOBS_SAFE is set # for PROCESSORS, but that also sets -j for gmake which breaks build cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${GMAKE} ${MAKE_ARGS} build + ${MAKE_CMD} ${MAKE_ARGS} build .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} html diff --git a/www/fnord/Makefile b/www/fnord/Makefile index a9d4c6db77de..ca9bf2f3da8a 100644 --- a/www/fnord/Makefile +++ b/www/fnord/Makefile @@ -78,7 +78,7 @@ post-patch: @${REINPLACE_CMD} -e "/strip/d" ${WRKSRC}/Makefile do-build: - cd ${WRKSRC}; ${GMAKE} DIET="" + cd ${WRKSRC}; ${MAKE_CMD} DIET="" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fnord ${PREFIX}/bin/ diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile index a733670905b6..39d583661251 100644 --- a/www/libapreq2/Makefile +++ b/www/libapreq2/Makefile @@ -19,7 +19,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf libtool CONFIGURE_ARGS+= --with-apache2-apxs=${APXS} --with-expat=${LOCALBASE} -MAKE_ENV+= MAKE=${GMAKE} ## MakeMaker blows it without this +MAKE_ENV+= MAKE=${MAKE_CMD} ## MakeMaker blows it without this SHLIB_MAJOR= 11 PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" diff --git a/www/npm/Makefile b/www/npm/Makefile index 5ce04f5606e2..34aee81a96e8 100644 --- a/www/npm/Makefile +++ b/www/npm/Makefile @@ -61,7 +61,7 @@ maketar: do-clean @${REINPLACE_CMD} -e '/manRoot/ s|, "share"||' ${MS_WRKSRC}/${MS_DISTNAME}/lib/build.js ${MS_WRKSRC}/${MS_DISTNAME}/lib/unbuild.js @${REINPLACE_CMD} -e '1 s|#!/bin/bash|#!${LOCALBASE}/bin/bash|; s|make|gmake|; s|perl -pi|perl -p|' ${MS_WRKSRC}/${MS_DISTNAME}/scripts/doc-build.sh @${GREP} -lr share/man ${MS_WRKSRC}/${MS_DISTNAME}/doc/ ${MS_WRKSRC}/${MS_DISTNAME}/scripts/ | ${XARGS} -I % ${REINPLACE_CMD} 's|share/man|man|g' % - @cd ${MS_WRKSRC}/${MS_DISTNAME}/ && ${GMAKE} + @cd ${MS_WRKSRC}/${MS_DISTNAME}/ && ${MAKE_CMD} @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type d -exec ${CHMOD} 755 '{}' \; @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -exec ${CHMOD} 644 '{}' \; @${FIND} ${MS_WRKSRC}/${MS_DISTNAME}/ -type f -name '*.sh' -exec ${CHMOD} 755 '{}' \; diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile index 00d5dbd7c00a..7f89f7d4385a 100644 --- a/www/p5-libapreq2/Makefile +++ b/www/p5-libapreq2/Makefile @@ -9,6 +9,6 @@ COMMENT= Generic Apache2 Request Library with perl binding MASTERDIR= ${.CURDIR}/../libapreq2 WITH_MODPERL2= yes -MAKE_ENV+= MAKE=${GMAKE} ## MakeMaker blows it without this +MAKE_ENV+= MAKE=${MAKE_CMD} ## MakeMaker blows it without this .include "${MASTERDIR}/Makefile" diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index ab7a35296b76..cf9147e4c25b 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -193,7 +193,7 @@ post-configure: .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} post-build: - ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} all xpi \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} all xpi \ -C ${WRKSRC}/mailnews/extensions/enigmail .endif diff --git a/www/snownews/Makefile b/www/snownews/Makefile index 1296eaf0f7cc..69dd94e9a2a4 100644 --- a/www/snownews/Makefile +++ b/www/snownews/Makefile @@ -47,7 +47,7 @@ post-patch: @${REINPLACE_CMD} -e 's|ncurses|ncursesw|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|make|${GMAKE}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/Makefile .if ! ${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e 's/ install-locales / /g' ${WRKSRC}/Makefile diff --git a/www/varnish/Makefile b/www/varnish/Makefile index c57e3626d288..2779c4b1959d 100644 --- a/www/varnish/Makefile +++ b/www/varnish/Makefile @@ -41,7 +41,7 @@ post-patch: .endif regression-test check test: build - ${GMAKE} TESTS_PARALLELISM=1 -C ${WRKSRC} check + ${MAKE_CMD} TESTS_PARALLELISM=1 -C ${WRKSRC} check post-build: # diff --git a/www/websh/Makefile b/www/websh/Makefile index c97b1312d7be..fb146b4bfb8a 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -56,7 +56,7 @@ post-configure: -e 's,-DPACKAGE_[^=]*=."[^"]*",,g' ${WRKSRC}/Makefile post-build test: - ${SETENV} LANG=C ${GMAKE} -C ${WRKSRC} test | ${AWK} '\ + ${SETENV} LANG=C ${MAKE_CMD} -C ${WRKSRC} test | ${AWK} '\ /Failed/ && $$NF {failed=1} \ END {exit failed} \ {print}' diff --git a/www/wml/Makefile b/www/wml/Makefile index 26b82acdde63..0a0042742131 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -43,6 +43,6 @@ post-build: @${ECHO_MSG} "===> Use 'make test' to run a quick test suite." test: - @cd ${WRKSRC} && ${GMAKE} test + @cd ${WRKSRC} && ${MAKE_CMD} test .include <bsd.port.post.mk> diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 0fa5429a5b2f..ce6f25f7bf68 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -21,7 +21,7 @@ post-patch: .endif post-build: - @cd ${WRKSRC}/config/ && ${GMAKE} config + @cd ${WRKSRC}/config/ && ${MAKE_CMD} config post-install: ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config.default diff --git a/x11-servers/x11rdp/Makefile b/x11-servers/x11rdp/Makefile index d25e79b71008..5128c1011db7 100644 --- a/x11-servers/x11rdp/Makefile +++ b/x11-servers/x11rdp/Makefile @@ -33,10 +33,10 @@ post-patch: @${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" ${WRKSRC}/buildx.sh @${REINPLACE_CMD} -e "s|%%CXX%%|${CXX}|g" ${WRKSRC}/buildx.sh @${REINPLACE_CMD} -e "s|%%CPP%%|${CPP}|g" ${WRKSRC}/buildx.sh - @${REINPLACE_CMD} -e "s|%%GMAKE%%|${GMAKE}|g" ${WRKSRC}/buildx.sh + @${REINPLACE_CMD} -e "s|%%MAKE_CMD%%|${MAKE_CMD}|g" ${WRKSRC}/buildx.sh do-build: - @cd ${WRKSRC} && GNUMAKE=${GMAKE} ${SH} ${WRKSRC}/buildx.sh ${WRKSRC}/build_dir + @cd ${WRKSRC} && GNUMAKE=${MAKE_CMD} ${SH} ${WRKSRC}/buildx.sh ${WRKSRC}/build_dir do-install: ${INSTALL_PROGRAM} ${WRKSRC}/build_dir/bin/X11rdp ${STAGEDIR}${PREFIX}/bin/ diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile index 3a3e49ea98ea..9e0c61480faa 100644 --- a/x11-toolkits/gtkada/Makefile +++ b/x11-toolkits/gtkada/Makefile @@ -54,7 +54,7 @@ do-build: # This target is recreated because -j cannot be set, but # MAKE_JOBS_SAFE=yes is needed for PROCESSORS value cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${ALL_TARGET} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libdata diff --git a/x11-toolkits/gtkada3/Makefile b/x11-toolkits/gtkada3/Makefile index 116d8f9e69ee..1c1ed22fb089 100644 --- a/x11-toolkits/gtkada3/Makefile +++ b/x11-toolkits/gtkada3/Makefile @@ -71,7 +71,7 @@ do-build: # This target is recreated because -j cannot be set, but # MAKE_JOBS_SAFE=yes is needed for PROCESSORS value cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${ALL_TARGET} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libdata diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile index 00645a38227b..cbf0b13582eb 100644 --- a/x11-toolkits/gtkmm20-reference/Makefile +++ b/x11-toolkits/gtkmm20-reference/Makefile @@ -16,7 +16,7 @@ post-patch: do-install: .for d in docs examples - @cd ${WRKSRC}/${d} && ${GMAKE} ${MAKE_ARGS} install + @cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ARGS} install .endfor .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile index d7be86d9bd7c..c1d4f718b768 100644 --- a/x11-toolkits/gtkmm24-reference/Makefile +++ b/x11-toolkits/gtkmm24-reference/Makefile @@ -13,7 +13,7 @@ DOCSDIR= ${PREFIX}/share/doc/gtkmm-2.4 do-install: .for d in docs - @cd ${WRKSRC}/${d} && ${GMAKE} ${MAKE_ARGS} install + @cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ARGS} install .endfor .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile index 821668eeb300..90b0ed15e6d6 100644 --- a/x11-toolkits/gtkmm30-reference/Makefile +++ b/x11-toolkits/gtkmm30-reference/Makefile @@ -13,7 +13,7 @@ DOCSDIR= ${PREFIX}/share/doc/gtkmm-3.0 do-install: .for d in docs - @cd ${WRKSRC}/${d} && ${GMAKE} ${MAKE_ARGS} install + @cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ARGS} install .endfor .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile index 7c47a4b39fab..f129554ca1ae 100644 --- a/x11-toolkits/p5-Gtk2/Makefile +++ b/x11-toolkits/p5-Gtk2/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= p5-Cairo>=1:${PORTSDIR}/graphics/p5-Cairo \ p5-Glib2>=1.280:${PORTSDIR}/devel/p5-Glib2 \ p5-Pango>=1.220:${PORTSDIR}/x11-toolkits/p5-Pango -CONFIGURE_ENV= FORCE_GMAKE=yes +CONFIGURE_ENV= FORCE_MAKE_CMD=yes MAKE_ENV= LANG=C USES= gmake perl5 USE_PERL5= configure diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile index 40e88361683a..2e0d59ec0289 100644 --- a/x11-wm/aewm/Makefile +++ b/x11-wm/aewm/Makefile @@ -43,10 +43,10 @@ post-patch: post-build: .if ${HAVE_GNOME:Mgtk20} != "" - cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \ + cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \ ${GTKCLIENTS} ${XAWCLIENTS} .else - cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \ + cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \ ${XAWCLIENTS} .endif diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile index 536c200161d9..df2058041354 100644 --- a/x11-wm/golem/Makefile +++ b/x11-wm/golem/Makefile @@ -51,10 +51,10 @@ post-patch: # avoid using standard MAKE_ENV do-build: @cd ${BUILD_WRKSRC}; \ - ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} do-install: @cd ${INSTALL_WRKSRC}; \ - ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} .include <bsd.port.post.mk> diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile index 866c29771754..1b3bf393a807 100644 --- a/x11/xscreensaver-gnome-hacks/Makefile +++ b/x11/xscreensaver-gnome-hacks/Makefile @@ -28,7 +28,7 @@ MAN1= xscreensaver-getimage-desktop.1 xscreensaver-getimage-file.1 \ NO_STAGE= yes post-build: - @cd ${WRKSRC}/driver && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @cd ${WRKSRC}/driver && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} xscreensaver-getimage post-install-slave: |