From owner-svn-ports-all@FreeBSD.ORG Mon Mar 23 04:03:02 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B3FAEC0; Mon, 23 Mar 2015 04:03:02 +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 5712C653; Mon, 23 Mar 2015 04:03:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2N432Y1014589; Mon, 23 Mar 2015 04:03:02 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2N431Un014586; Mon, 23 Mar 2015 04:03:01 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201503230403.t2N431Un014586@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 23 Mar 2015 04:03:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381977 - in head: . Mk 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2015 04:03:02 -0000 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@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@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}" \