svn commit: r381977 - in head: . Mk

[Bryan Drewery]

Author: bdrewery
Date: Mon Mar 23 04:03:00 2015
New Revision: 381977
URL: https://svnweb.freebsd.org/changeset/ports/381977
QAT: https://qat.redports.org/buildarchive/r381977/

Log:
  Introduce a BSDMAKE?= /usr/bin/make and use it as the default MAKE_CMD.
  
  With hat:	portmgr

Modified:
  head/CHANGES
  head/Mk/bsd.commands.mk
  head/Mk/bsd.port.mk

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Mon Mar 23 03:59:04 2015	(r381976)
+++ head/CHANGES	Mon Mar 23 04:03:00 2015	(r381977)
@@ -10,6 +10,13 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20150322:
+  AUTHOR: bdrewery at FreeBSD.org
+
+  There is now a BSDMAKE that can be overriden for the location of
+  /usr/bin/make. It is a safer alternative to overriding MAKE_CMD which
+  will be force reset for gmake/fmake/scons ports.
+
 20150319:
   AUTHOR: bdrewery at FreeBSD.org
 

Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk	Mon Mar 23 03:59:04 2015	(r381976)
+++ head/Mk/bsd.commands.mk	Mon Mar 23 04:03:00 2015	(r381977)
@@ -18,6 +18,7 @@ _COMMANDSMKINCLUDED=	yes
 AWK?=			/usr/bin/awk
 BASENAME?=		/usr/bin/basename
 BRANDELF?=		/usr/bin/brandelf
+BSDMAKE?=		/usr/bin/make
 BZCAT?=			/usr/bin/bzcat
 BZIP2_CMD?=		/usr/bin/bzip2
 CAT?=			/bin/cat

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Mar 23 03:59:04 2015	(r381976)
+++ head/Mk/bsd.port.mk	Mon Mar 23 04:03:00 2015	(r381977)
@@ -2019,7 +2019,7 @@ DISTINFO_FILE?=		${MASTERDIR}/distinfo
 
 MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
-MAKE_CMD?=		/usr/bin/make
+MAKE_CMD?=		${BSDMAKE}
 MAKE_ENV+=		PREFIX=${PREFIX} \
 			LOCALBASE=${LOCALBASE} \
 			LIBDIR="${LIBDIR}" \