Date: Fri, 15 Mar 2013 16:37:32 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314316 - head/Mk Message-ID: <201303151637.r2FGbWRH085025@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Mar 15 16:37:31 2013 New Revision: 314316 URL: http://svnweb.freebsd.org/changeset/ports/314316 Log: Load features at the end of pre.mk instead of the begonning of post.mk This allows to test/manipulates variables from USES between .pre.mk and .post.mk Having it loaded in the end of pre.mk still allows to set USES inside bsd.*.mk and after bsd.port.options.mk. The only limitation is that USES set after bsd.port.pre.mk will not be taken loaded. Which is the same behaviour as for USE_*. Requested by: bdrewery Exp-run by: miwi Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Mar 15 16:30:49 2013 (r314315) +++ head/Mk/bsd.port.mk Fri Mar 15 16:37:31 2013 (r314316) @@ -1527,6 +1527,15 @@ CD_MOUNTPTS?= /cdrom ${CD_MOUNTPT} WWWOWN?= www WWWGRP?= www +# Loading features +.for f in ${USES} +_f=${f:C/\:.*//g} +.if ${_f} != ${f} +${_f}_ARGS:= ${f:C/^[^\:]*\://g} +.endif +.include "${USESDIR}/${_f}.mk" +.endfor + .endif # End of pre-makefile section. @@ -1541,15 +1550,6 @@ check-makefile:: _POSTMKINCLUDED= yes -# Loading features -.for f in ${USES} -_f=${f:C/\:.*//g} -.if ${_f} != ${f} -${_f}_ARGS:= ${f:C/^[^\:]*\://g} -.endif -.include "${USESDIR}/${_f}.mk" -.endfor - WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work .if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) WRKSRC?= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303151637.r2FGbWRH085025>