From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 23 03:59:06 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 424BBBEC;
 Mon, 23 Mar 2015 03:59:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 13D583B3;
 Mon, 23 Mar 2015 03:59:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2N3x5jO010484;
 Mon, 23 Mar 2015 03:59:05 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2N3x5Dg010481;
 Mon, 23 Mar 2015 03:59:05 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201503230359.t2N3x5Dg010481@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 23 Mar 2015 03:59:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r381976 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Mar 2015 03:59:06 -0000

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

Log:
  Allow user to override MAKE_CMD without breaking gmake/fmake/scons ports.
  
  With hat:	portmgr

Modified:
  head/Mk/Uses/fmake.mk
  head/Mk/Uses/gmake.mk
  head/Mk/Uses/scons.mk

Modified: head/Mk/Uses/fmake.mk
==============================================================================
--- head/Mk/Uses/fmake.mk	Mon Mar 23 03:54:44 2015	(r381975)
+++ head/Mk/Uses/fmake.mk	Mon Mar 23 03:59:04 2015	(r381976)
@@ -18,6 +18,6 @@ IGNORE=	Incorrect 'USES+= fmake:${fmake_
 FMAKE=			${LOCALBASE}/bin/fmake
 BUILD_DEPENDS+=		${FMAKE}:${PORTSDIR}/devel/fmake
 CONFIGURE_ENV+=		MAKE=${FMAKE}
-MAKE_CMD?=		${FMAKE}
+MAKE_CMD=		${FMAKE}
 .endif
 .endif

Modified: head/Mk/Uses/gmake.mk
==============================================================================
--- head/Mk/Uses/gmake.mk	Mon Mar 23 03:54:44 2015	(r381975)
+++ head/Mk/Uses/gmake.mk	Mon Mar 23 03:59:04 2015	(r381976)
@@ -24,6 +24,6 @@ _GMAKE_EXT=	-lite
 
 BUILD_DEPENDS+=		gmake${_GMAKE_EXT}:${PORTSDIR}/devel/gmake${_GMAKE_EXT}
 CONFIGURE_ENV+=		MAKE=gmake${_GMAKE_EXT}
-MAKE_CMD?=		gmake${_GMAKE_EXT}
+MAKE_CMD=		gmake${_GMAKE_EXT}
 
 .endif

Modified: head/Mk/Uses/scons.mk
==============================================================================
--- head/Mk/Uses/scons.mk	Mon Mar 23 03:54:44 2015	(r381975)
+++ head/Mk/Uses/scons.mk	Mon Mar 23 03:59:04 2015	(r381976)
@@ -23,7 +23,7 @@ LIBPATH?=		${LOCALBASE}/lib
 CPPPATH?=		${LOCALBASE}/include
 SCONS=			${LOCALBASE}/bin/scons
 BUILD_DEPENDS+=		${SCONS}:${PORTSDIR}/devel/scons
-MAKE_CMD?=		${SCONS}
+MAKE_CMD=		${SCONS}
 MAKE_ARGS+=	CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}"  \
 		CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \