Date: Wed, 25 Jun 2014 05:35:32 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359185 - in head: audio/libcanberra-gtk3 audio/liquidsoap cad/freehdl databases/libgda5 databases/libgda5-ui databases/pgpool-II databases/postgresql91-docs devel/aros-sdk devel/avr-li... Message-ID: <201406250535.s5P5ZWUx097105@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Jun 25 05:35:31 2014 New Revision: 359185 URL: http://svnweb.freebsd.org/changeset/ports/359185 QAT: https://qat.redports.org/buildarchive/r359185/ Log: 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 Modified: head/audio/libcanberra-gtk3/Makefile head/audio/liquidsoap/Makefile head/cad/freehdl/Makefile head/databases/libgda5-ui/Makefile head/databases/libgda5/Makefile head/databases/pgpool-II/Makefile head/databases/postgresql91-docs/Makefile head/devel/aros-sdk/Makefile head/devel/avr-libc/Makefile head/devel/hadoop/Makefile head/devel/hgview/Makefile head/devel/htable/Makefile head/devel/icu/Makefile head/devel/kBuild/Makefile head/devel/libchipcard/Makefile head/devel/libreadline-java/Makefile head/devel/libsoup/Makefile head/devel/libuv/Makefile head/devel/libvirt/Makefile head/devel/llvm-devel/Makefile head/devel/llvm32/Makefile head/devel/llvm33/Makefile head/devel/llvm34/Makefile head/devel/lm4tools/Makefile head/devel/meta-cvs/Makefile head/devel/mingw32-pthreads/Makefile head/devel/nspr/Makefile head/devel/ocaml-event/Makefile head/devel/ode-devel/Makefile head/devel/pire/Makefile head/devel/py-aspects/Makefile head/devel/seed/Makefile head/devel/seed3/Makefile head/devel/stlport/Makefile head/devel/swig20/Makefile head/devel/tigcc/Makefile head/devel/tla/Makefile head/devel/valgrind-devel/Makefile head/devel/xsd/Makefile head/devel/zpu-binutils/Makefile head/devel/zpu-gcc/Makefile head/dns/ldns/Makefile head/dns/nss_mdns/Makefile head/editors/emacs21/Makefile head/editors/lazarus/Makefile head/editors/lazarus/Makefile.common head/emulators/fmsx/Makefile head/emulators/higan/Makefile head/emulators/kqemu-kmod-devel/Makefile head/emulators/kqemu-kmod/Makefile head/emulators/wine-devel/Makefile head/emulators/wine/Makefile head/emulators/x49gp/Makefile head/finance/aqbanking/Makefile head/ftp/bbftp/Makefile head/games/adonthell/Makefile head/games/airstrike/Makefile head/games/alienblaster/Makefile head/games/blockout/Makefile head/games/fgkicker/Makefile head/games/fxsudoku/Makefile head/games/glbsp/Makefile head/games/kiki/Makefile head/games/mirrormagic/Makefile head/games/nimuh/Makefile head/games/poker-engine/Makefile head/games/poker-eval/Makefile head/games/pykawari/Makefile head/games/quackle/Makefile head/games/rnd_jue/Makefile head/games/rocksndiamonds/Makefile head/games/sol/Makefile head/games/tbe/Makefile head/games/tuxmath/Makefile head/games/ufoai/Makefile head/games/volleyball/Makefile head/games/vultures-eye/Makefile head/games/wop/Makefile head/graphics/ayam/Makefile head/graphics/epstool/Makefile head/graphics/evas-engine-opengl/Makefile head/graphics/evas-loader-bmp/Makefile head/graphics/evas-loader-eet/Makefile head/graphics/evas-loader-generic/Makefile head/graphics/evas-loader-gif/Makefile head/graphics/evas-loader-ico/Makefile head/graphics/evas-loader-jpeg/Makefile head/graphics/evas-loader-pmaps/Makefile head/graphics/evas-loader-png/Makefile head/graphics/evas-loader-psd/Makefile head/graphics/evas-loader-svg/Makefile head/graphics/evas-loader-tga/Makefile head/graphics/evas-loader-tiff/Makefile head/graphics/evas-loader-wbmp/Makefile head/graphics/evas-loader-xpm/Makefile head/graphics/gdk-pixbuf2/Makefile head/graphics/gegl/Makefile head/graphics/gimp-refocus-plugin/Makefile head/graphics/gnash/Makefile head/graphics/libetonyek/Makefile head/graphics/megapov/Makefile head/graphics/netpbm/Makefile head/graphics/poppler-glib/Makefile head/graphics/povray36/Makefile head/graphics/quesa/Makefile head/graphics/sane-epkowa/Makefile head/japanese/dvipsk/Makefile head/japanese/emacs-emcws/Makefile head/japanese/mozc-server/Makefile head/japanese/uim-anthy/Makefile head/java/icedtea-web/Makefile head/java/openjdk6/Makefile.test head/korean/libhangul/Makefile head/lang/Sather/Makefile head/lang/afnix/Makefile head/lang/chicken/Makefile head/lang/clang-devel/Makefile head/lang/clang32/Makefile head/lang/clang33/Makefile head/lang/clang34/Makefile head/lang/dmd2/Makefile head/lang/ezm3/Makefile head/lang/f2c/Makefile head/lang/gcc/Makefile head/lang/gcc410/Makefile head/lang/gcc46/Makefile head/lang/gcc47-aux/Makefile head/lang/gcc47/Makefile head/lang/gcc48/Makefile head/lang/gcc49/Makefile head/lang/ghc/Makefile head/lang/ghc/bsd.cabal.mk head/lang/hugs/Makefile head/lang/kawa/Makefile head/lang/mit-scheme/Makefile head/lang/mono-basic/Makefile head/lang/mono/Makefile head/lang/pike78/Makefile head/lang/python33/Makefile head/lang/sml-nj-devel/Makefile head/lang/stklos/Makefile head/lang/vala/Makefile head/lang/ypsilon/Makefile head/mail/courier-imap/Makefile head/mail/p3scan/Makefile head/mail/pop3vscan/Makefile head/mail/thunderbird/Makefile head/math/alt-ergo/Makefile head/math/arpack++/Makefile head/math/blocksolve95/Makefile head/math/calc/Makefile head/math/ess/Makefile head/math/giacxcas/Makefile head/math/gotoblas/Makefile head/math/libflame/Makefile head/math/libtommath/Makefile head/math/mpexpr/Makefile head/math/openblas/Makefile head/math/proofgeneral/Makefile head/math/sdpara/Makefile head/math/spooles/Makefile head/math/suitesparse/Makefile head/math/superlu_mt/Makefile head/math/unuran/Makefile head/math/yacas/Makefile head/misc/e2fsprogs-libblkid/Makefile head/misc/e2fsprogs-libuuid/Makefile head/misc/posixtestsuite/Makefile head/misc/sword/Makefile head/multimedia/avidemux2-plugins/Makefile head/multimedia/gstreamer-plugins-bad/Makefile head/multimedia/gstreamer-plugins-good/Makefile head/multimedia/gstreamer-plugins-ugly/Makefile head/multimedia/gstreamer-plugins/Makefile.common head/multimedia/gstreamer1-plugins-bad/Makefile head/multimedia/gstreamer1-plugins-good/Makefile head/multimedia/gstreamer1-plugins-ugly/Makefile head/multimedia/gstreamer1-plugins/Makefile.common head/multimedia/libquicktime-lame/Makefile head/multimedia/smtube/Makefile head/multimedia/transcode/Makefile head/net-im/telepathy-salut/Makefile head/net-mgmt/flowd/Makefile head/net-mgmt/kismet/Makefile head/net-mgmt/xymon-client/Makefile head/net-p2p/litecoin/Makefile head/net-p2p/transmission-qt4/Makefile head/net/asterisk/Makefile head/net/asterisk11/Makefile head/net/avahi-gtk/Makefile head/net/avahi-gtk3/Makefile head/net/beanstalkd/Makefile head/net/c3270/Makefile head/net/erlang_xmlrpc/Makefile head/net/gogoc/Makefile head/net/hawknl-devel/Makefile head/net/hawknl/Makefile head/net/mgen/Makefile head/net/ntop/Makefile head/net/ntopng/Makefile head/net/openvswitch/Makefile head/net/py-avahi/Makefile head/net/samba36/Makefile head/net/ssvnc/Makefile head/net/tigervnc/Makefile head/net/tramp/Makefile head/net/unison-devel/Makefile head/net/unison/Makefile head/net/unison232/Makefile head/net/wire/Makefile head/news/husky-hpt-devel/Makefile head/news/husky-hpt/Makefile head/news/husky-htick-devel/Makefile head/news/husky-htick/Makefile head/news/tin/Makefile head/palm/jpilot/Makefile head/ports-mgmt/portlint/src/portlint.pl head/print/fontforge/Makefile head/print/freetype-tools/Makefile head/print/freetype2/Makefile head/print/ghostscript7/files/Makefile.epag head/print/ghostscript7/files/Makefile.gprint head/print/gutenprint-base/Makefile head/print/lilypond/Makefile head/print/tex/Makefile head/print/xdvi/Makefile head/science/abinit/Makefile head/science/afni/files/Makefile.FreeBSD_PORT head/science/afni/files/patch-Makefile.INCLUDE head/science/chemtool-devel/Makefile head/science/gamess/Makefile head/science/hdf-java/Makefile head/science/mpqc/Makefile head/science/psi3/Makefile head/science/vmd/Makefile head/security/axTLS/Makefile head/security/clamav/Makefile head/security/fl0p/Makefile head/security/libtomcrypt/Makefile head/security/pam_krb5/Makefile head/security/pev/Makefile head/security/pft/Makefile head/security/putty/Makefile head/security/py-pyme/Makefile head/security/signing-party/Makefile head/security/sks/Makefile head/security/tripwire/Makefile head/security/truecrypt/Makefile head/security/tthsum/Makefile head/sysutils/busybox-unstable/Makefile head/sysutils/busybox/Makefile head/sysutils/coreutils/Makefile head/sysutils/createrepo/Makefile head/sysutils/deltup/Makefile head/sysutils/e2fsprogs/Makefile head/sysutils/gkrellm/Makefile head/sysutils/logtool/Makefile head/sysutils/sdd/Makefile head/sysutils/tracker-client/Makefile head/sysutils/u-boot-beaglebone-eabi/Makefile head/sysutils/yum/Makefile head/textproc/bibutils/Makefile head/textproc/clit/Makefile head/textproc/confget/Makefile head/textproc/extract_url/Makefile head/textproc/libroxml/Makefile head/textproc/libxml++26-reference/Makefile head/textproc/libxml2-reference/Makefile head/textproc/libxslt-reference/Makefile head/textproc/openvanilla-modules/Makefile head/textproc/scew/Makefile head/textproc/source-highlight/Makefile head/textproc/sowing/Makefile head/textproc/stardict3/Makefile head/textproc/uim-gtk/Makefile head/textproc/uim-gtk3/Makefile head/textproc/uim-kde4/Makefile head/textproc/uim-m17nlib/Makefile head/textproc/uim-qt4/Makefile head/textproc/uim/Makefile head/textproc/xqilla/Makefile head/www/R-cran-httpuv/Makefile head/www/aws-demos/Makefile head/www/aws/Makefile head/www/fnord/Makefile head/www/libapreq2/Makefile head/www/npm/Makefile head/www/p5-libapreq2/Makefile head/www/seamonkey/Makefile head/www/snownews/Makefile head/www/varnish/Makefile head/www/websh/Makefile head/www/wml/Makefile head/x11-fonts/xfs/Makefile head/x11-servers/x11rdp/Makefile head/x11-toolkits/gtkada/Makefile head/x11-toolkits/gtkada3/Makefile head/x11-toolkits/gtkmm20-reference/Makefile head/x11-toolkits/gtkmm24-reference/Makefile head/x11-toolkits/gtkmm30-reference/Makefile head/x11-toolkits/p5-Gtk2/Makefile head/x11-wm/aewm/Makefile head/x11-wm/golem/Makefile head/x11/xscreensaver-gnome-hacks/Makefile Modified: head/audio/libcanberra-gtk3/Makefile ============================================================================== --- head/audio/libcanberra-gtk3/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/audio/libcanberra-gtk3/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/audio/liquidsoap/Makefile ============================================================================== --- head/audio/liquidsoap/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/audio/liquidsoap/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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> Modified: head/cad/freehdl/Makefile ============================================================================== --- head/cad/freehdl/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/cad/freehdl/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 \ Modified: head/databases/libgda5-ui/Makefile ============================================================================== --- head/databases/libgda5-ui/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/databases/libgda5-ui/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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" Modified: head/databases/libgda5/Makefile ============================================================================== --- head/databases/libgda5/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/databases/libgda5/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/databases/pgpool-II/Makefile ============================================================================== --- head/databases/pgpool-II/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/databases/pgpool-II/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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} Modified: head/databases/postgresql91-docs/Makefile ============================================================================== --- head/databases/postgresql91-docs/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/databases/postgresql91-docs/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -30,7 +30,7 @@ BUILD_DEPENDS+= onsgmls:${PORTSDIR}/text ${dbdir}/4.2:${PORTSDIR}/textproc/docbook-sgml do-build: - ${GMAKE} -C ${WRKSRC} html + ${MAKE_CMD} -C ${WRKSRC} html do-install: @ $(MKDIR) ${STAGEDIR}${PGDOCSDIR} Modified: head/devel/aros-sdk/Makefile ============================================================================== --- head/devel/aros-sdk/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/aros-sdk/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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} Modified: head/devel/avr-libc/Makefile ============================================================================== --- head/devel/avr-libc/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/avr-libc/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 \ Modified: head/devel/hadoop/Makefile ============================================================================== --- head/devel/hadoop/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/hadoop/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -66,7 +66,7 @@ CONF= capacity-scheduler.xml configurat 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> Modified: head/devel/hgview/Makefile ============================================================================== --- head/devel/hgview/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/hgview/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/devel/htable/Makefile ============================================================================== --- head/devel/htable/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/htable/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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> Modified: head/devel/icu/Makefile ============================================================================== --- head/devel/icu/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/icu/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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} Modified: head/devel/kBuild/Makefile ============================================================================== --- head/devel/kBuild/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/kBuild/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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} Modified: head/devel/libchipcard/Makefile ============================================================================== --- head/devel/libchipcard/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/libchipcard/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -50,7 +50,7 @@ post-patch: post-build: .if ${PORT_OPTIONS:MDOXYGEN} - @cd ${WRKSRC} && ${GMAKE} srcdoc + @cd ${WRKSRC} && ${MAKE_CMD} srcdoc .endif post-install: Modified: head/devel/libreadline-java/Makefile ============================================================================== --- head/devel/libreadline-java/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/libreadline-java/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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> Modified: head/devel/libsoup/Makefile ============================================================================== --- head/devel/libsoup/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/libsoup/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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: Modified: head/devel/libuv/Makefile ============================================================================== --- head/devel/libuv/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/libuv/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/devel/libvirt/Makefile ============================================================================== --- head/devel/libvirt/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/libvirt/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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> Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/llvm-devel/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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; \ Modified: head/devel/llvm32/Makefile ============================================================================== --- head/devel/llvm32/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/llvm32/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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; \ Modified: head/devel/llvm33/Makefile ============================================================================== --- head/devel/llvm33/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/llvm33/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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; \ Modified: head/devel/llvm34/Makefile ============================================================================== --- head/devel/llvm34/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/llvm34/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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; \ Modified: head/devel/lm4tools/Makefile ============================================================================== --- head/devel/lm4tools/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/lm4tools/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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/ Modified: head/devel/meta-cvs/Makefile ============================================================================== --- head/devel/meta-cvs/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/meta-cvs/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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} Modified: head/devel/mingw32-pthreads/Makefile ============================================================================== --- head/devel/mingw32-pthreads/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/mingw32-pthreads/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/devel/nspr/Makefile ============================================================================== --- head/devel/nspr/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/nspr/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/devel/ocaml-event/Makefile ============================================================================== --- head/devel/ocaml-event/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/ocaml-event/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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: Modified: head/devel/ode-devel/Makefile ============================================================================== --- head/devel/ode-devel/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/ode-devel/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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: Modified: head/devel/pire/Makefile ============================================================================== --- head/devel/pire/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/pire/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -40,7 +40,7 @@ BUILD_DEPENDS+= cppunit-config:${PORTSDI 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 Modified: head/devel/py-aspects/Makefile ============================================================================== --- head/devel/py-aspects/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/py-aspects/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -28,7 +28,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py 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} Modified: head/devel/seed/Makefile ============================================================================== --- head/devel/seed/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/seed/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/devel/seed3/Makefile ============================================================================== --- head/devel/seed3/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/seed3/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/devel/stlport/Makefile ============================================================================== --- head/devel/stlport/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/stlport/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/devel/swig20/Makefile ============================================================================== --- head/devel/swig20/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/swig20/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -65,6 +65,6 @@ post-install: .endif regression-test: build - cd ${WRKSRC} && ${GMAKE} check + cd ${WRKSRC} && ${MAKE_CMD} check .include <bsd.port.post.mk> Modified: head/devel/tigcc/Makefile ============================================================================== --- head/devel/tigcc/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/tigcc/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/devel/tla/Makefile ============================================================================== --- head/devel/tla/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/tla/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 \ Modified: head/devel/valgrind-devel/Makefile ============================================================================== --- head/devel/valgrind-devel/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/valgrind-devel/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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> Modified: head/devel/xsd/Makefile ============================================================================== --- head/devel/xsd/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/xsd/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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} Modified: head/devel/zpu-binutils/Makefile ============================================================================== --- head/devel/zpu-binutils/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/zpu-binutils/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -22,7 +22,7 @@ INFO= zpu/as zpu/bfd zpu/binutils zpu/c 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 Modified: head/devel/zpu-gcc/Makefile ============================================================================== --- head/devel/zpu-gcc/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/devel/zpu-gcc/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -25,7 +25,7 @@ INFO= zpuc/cpp zpuc/cppinternals zpuc/d 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 Modified: head/dns/ldns/Makefile ============================================================================== --- head/dns/ldns/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/dns/ldns/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/dns/nss_mdns/Makefile ============================================================================== --- head/dns/nss_mdns/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/dns/nss_mdns/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/editors/emacs21/Makefile ============================================================================== --- head/editors/emacs21/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/editors/emacs21/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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} Modified: head/editors/lazarus/Makefile ============================================================================== --- head/editors/lazarus/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/editors/lazarus/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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} && \ Modified: head/editors/lazarus/Makefile.common ============================================================================== --- head/editors/lazarus/Makefile.common Wed Jun 25 05:18:07 2014 (r359184) +++ head/editors/lazarus/Makefile.common Wed Jun 25 05:35:31 2014 (r359185) @@ -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} Modified: head/emulators/fmsx/Makefile ============================================================================== --- head/emulators/fmsx/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/emulators/fmsx/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/emulators/higan/Makefile ============================================================================== --- head/emulators/higan/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/emulators/higan/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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: Modified: head/emulators/kqemu-kmod-devel/Makefile ============================================================================== --- head/emulators/kqemu-kmod-devel/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/emulators/kqemu-kmod-devel/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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: Modified: head/emulators/kqemu-kmod/Makefile ============================================================================== --- head/emulators/kqemu-kmod/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/emulators/kqemu-kmod/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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: Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/emulators/wine-devel/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 \ Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/emulators/wine/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -132,7 +132,7 @@ IGNORE= lacks required sound support on .endif pre-build: - cd ${WRKSRC} && ${GMAKE} depend + cd ${WRKSRC} && ${MAKE_CMD} depend post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ Modified: head/emulators/x49gp/Makefile ============================================================================== --- head/emulators/x49gp/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/emulators/x49gp/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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} Modified: head/finance/aqbanking/Makefile ============================================================================== --- head/finance/aqbanking/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/finance/aqbanking/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -54,7 +54,7 @@ LIB_DEPENDS+= libktoblzcheck.so:${PORTSD post-build: .if ${PORT_OPTIONS:MDOXYGEN} - @cd ${WRKSRC} && ${GMAKE} srcdoc + @cd ${WRKSRC} && ${MAKE_CMD} srcdoc .endif post-install: Modified: head/ftp/bbftp/Makefile ============================================================================== --- head/ftp/bbftp/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/ftp/bbftp/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/games/adonthell/Makefile ============================================================================== --- head/games/adonthell/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/adonthell/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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> Modified: head/games/airstrike/Makefile ============================================================================== --- head/games/airstrike/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/airstrike/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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/ Modified: head/games/alienblaster/Makefile ============================================================================== --- head/games/alienblaster/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/alienblaster/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 ; \ Modified: head/games/blockout/Makefile ============================================================================== --- head/games/blockout/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/blockout/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/games/fgkicker/Makefile ============================================================================== --- head/games/fgkicker/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/fgkicker/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/games/fxsudoku/Makefile ============================================================================== --- head/games/fxsudoku/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/fxsudoku/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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> Modified: head/games/glbsp/Makefile ============================================================================== --- head/games/glbsp/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/glbsp/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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: Modified: head/games/kiki/Makefile ============================================================================== --- head/games/kiki/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/kiki/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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/ Modified: head/games/mirrormagic/Makefile ============================================================================== --- head/games/mirrormagic/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/mirrormagic/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -14,7 +14,7 @@ COMMENT= Arcade style game with stereo s 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?) Modified: head/games/nimuh/Makefile ============================================================================== --- head/games/nimuh/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/nimuh/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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> Modified: head/games/poker-engine/Makefile ============================================================================== --- head/games/poker-engine/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/poker-engine/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -33,6 +33,6 @@ post-patch: ${WRKSRC}/Makefile.in test: - @cd ${WRKSRC} && ${GMAKE} check + @cd ${WRKSRC} && ${MAKE_CMD} check .include <bsd.port.mk> Modified: head/games/poker-eval/Makefile ============================================================================== --- head/games/poker-eval/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/poker-eval/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -23,6 +23,6 @@ post-patch: ${WRKSRC}/Makefile.in test: - @cd ${WRKSRC} && ${GMAKE} check + @cd ${WRKSRC} && ${MAKE_CMD} check .include <bsd.port.mk> Modified: head/games/pykawari/Makefile ============================================================================== --- head/games/pykawari/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/pykawari/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/games/quackle/Makefile ============================================================================== --- head/games/quackle/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/quackle/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/games/rnd_jue/Makefile ============================================================================== --- head/games/rnd_jue/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/rnd_jue/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -27,7 +27,7 @@ EXTRACT_DEPENDS+=${UNZIP_CMD}:${PORTSDIR 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 Modified: head/games/rocksndiamonds/Makefile ============================================================================== --- head/games/rocksndiamonds/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/rocksndiamonds/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -29,7 +29,7 @@ EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR} 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 Modified: head/games/sol/Makefile ============================================================================== --- head/games/sol/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/sol/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -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 Modified: head/games/tbe/Makefile ============================================================================== --- head/games/tbe/Makefile Wed Jun 25 05:18:07 2014 (r359184) +++ head/games/tbe/Makefile Wed Jun 25 05:35:31 2014 (r359185) @@ -25,7 +25,7 @@ DESKTOP_ENTRIES="The Butterfly Effect" " "${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 OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406250535.s5P5ZWUx097105>