From owner-svn-ports-head@FreeBSD.ORG Tue Jul 30 05:33:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9C435937; Tue, 30 Jul 2013 05:33:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7BD282464; Tue, 30 Jul 2013 05:33:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6U5XQnb086815; Tue, 30 Jul 2013 05:33:26 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6U5XPRc086812; Tue, 30 Jul 2013 05:33:25 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201307300533.r6U5XPRc086812@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 30 Jul 2013 05:33:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323939 - in 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jul 2013 05:33:26 -0000 Author: bapt Date: Tue Jul 30 05:33:25 2013 New Revision: 323939 URL: http://svnweb.freebsd.org/changeset/ports/323939 Log: Reduce code duplication by overwriting MAKE_CMD when it is different. Modified: head/Mk/Uses/fmake.mk head/Mk/Uses/gmake.mk head/Mk/bsd.port.mk Modified: head/Mk/Uses/fmake.mk ============================================================================== --- head/Mk/Uses/fmake.mk Tue Jul 30 05:32:11 2013 (r323938) +++ head/Mk/Uses/fmake.mk Tue Jul 30 05:33:25 2013 (r323939) @@ -19,21 +19,6 @@ IGNORE= Incorrect 'USES+= fmake:${fmake_ FMAKE= ${LOCALBASE}/bin/fmake BUILD_DEPENDS+= ${FMAKE}:${PORTSDIR}/devel/fmake CONFIGURE_ENV+= MAKE=${FMAKE} - -.if !target(do-build) -do-build: - @set -e ; (cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${FMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ - if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ - ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ - (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \ - fi; \ - ${FALSE}; \ - fi) -.endif - -.if !target(do-install) -do-install: - @set -e ; (cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.endif +MAKE_CMD= ${FMAKE} .endif .endif Modified: head/Mk/Uses/gmake.mk ============================================================================== --- head/Mk/Uses/gmake.mk Tue Jul 30 05:32:11 2013 (r323938) +++ head/Mk/Uses/gmake.mk Tue Jul 30 05:33:25 2013 (r323939) @@ -17,26 +17,7 @@ IGNORE= Incorrect 'USES+= gmake:${gmake_ BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake CONFIGURE_ENV+= MAKE=${GMAKE} +MAKE_CMD= ${GMAKE} _USES_POST+= gmake -.endif - -.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GMAKE_MK_POST) -_INCLUDE_USES_GMAKE_MK_POST= yes - -.if !target(do-build) -do-build: - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ - if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ - ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ - (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \ - fi; \ - ${FALSE}; \ - fi) -.endif - -.if !target(do-install) -do-install: - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.endif .endif Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Jul 30 05:32:11 2013 (r323938) +++ head/Mk/bsd.port.mk Tue Jul 30 05:33:25 2013 (r323939) @@ -3662,7 +3662,7 @@ do-configure: .if !target(do-build) do-build: - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ + @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \