ports/178070: [PATCH] [ports] fix bareword calls to make preventing ${MAKE:T} != make

[Garrett Cooper]

>Number:         178070
>Category:       ports
>Synopsis:       [PATCH] [ports] fix bareword calls to make preventing ${MAKE:T} != make
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 23 05:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        10-CURRENT
>Organization:
EMC Isilon
>Environment:
FreeBSD gran-tourismo.west.isilon.com 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r+ba9afe9: Fri Apr 19 20:29:10 PDT 2013     gcooper at gran-tourismo.west.isilon.com:/usr/obj/usr/src/sys/GRAN-TOURISMO  amd64
>Description:
The attached patch allows me to run my system with make == bmake (e.g. WITH_BMAKE=yes), by making ports with fmake.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Mk/bsd.port.subdir.mk
===================================================================
--- Mk/bsd.port.subdir.mk	(revision 316288)
+++ Mk/bsd.port.subdir.mk	(working copy)
@@ -107,33 +107,33 @@
 .endif
 
 .if !defined(PYTHON_DEFAULT_VERSION)
-PYTHON_DEFAULT_VERSION!=	make -V PYTHON_DEFAULT_VERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
+PYTHON_DEFAULT_VERSION!=	${MAKE} -V PYTHON_DEFAULT_VERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
 .endif
 
 .if !defined(PYTHON_DEFAULT_PORTVERSION)
 # We are caching the PYTHON_PORTVERSION of the default python version so we can reuse it in the
 # common case.
-PYTHON_DEFAULT_PORTVERSION!=	make -V PYTHON_PORTVERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
+PYTHON_DEFAULT_PORTVERSION!=	${MAKE} -V PYTHON_PORTVERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
 .endif
 
 .if !defined(PYTHONBASE)
-PYTHONBASE!=			make -V PYTHONBASE USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
+PYTHONBASE!=			${MAKE} -V PYTHONBASE USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
 .endif
 
 .if !defined(_JAVA_VERSION_LIST_REGEXP)
-_JAVA_VERSION_LIST_REGEXP!=	make -V _JAVA_VERSION_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
+_JAVA_VERSION_LIST_REGEXP!=	${MAKE} -V _JAVA_VERSION_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
 .endif
 
 .if !defined(_JAVA_VENDOR_LIST_REGEXP)
-_JAVA_VENDOR_LIST_REGEXP!=	make -V _JAVA_VENDOR_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
+_JAVA_VENDOR_LIST_REGEXP!=	${MAKE} -V _JAVA_VENDOR_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
 .endif
 
 .if !defined(_JAVA_OS_LIST_REGEXP)
-_JAVA_OS_LIST_REGEXP!=		make -V _JAVA_OS_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
+_JAVA_OS_LIST_REGEXP!=		${MAKE} -V _JAVA_OS_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
 .endif
 
 .if !defined(_JAVA_PORTS_INSTALLED)
-_JAVA_PORTS_INSTALLED!=		make -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
+_JAVA_PORTS_INSTALLED!=		${MAKE} -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
 .endif
 
 .if !defined(UID)
Index: Mk/bsd.gnustep.mk
===================================================================
--- Mk/bsd.gnustep.mk	(revision 316288)
+++ Mk/bsd.gnustep.mk	(working copy)
@@ -542,7 +542,7 @@
 .endif
 
 .if !defined(GNUSTEP_WITH_BASE_GCC)
-TARGLIB!=	(cd ${PORTSDIR}/${GNUSTEP_GCC_PORT} && make -V TARGLIB)
+TARGLIB!=	(cd ${PORTSDIR}/${GNUSTEP_GCC_PORT} && ${MAKE} -V TARGLIB)
 .endif
 
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted: