Date: Fri, 15 Mar 2013 16:45:48 +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: r314317 - head/Mk Message-ID: <201303151645.r2FGjm0Z087803@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Mar 15 16:45:47 2013 New Revision: 314317 URL: http://svnweb.freebsd.org/changeset/ports/314317 Log: r314316 loads the features a bit too late it should be done prior to the path sanity checking Reported by: bdrewery Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Mar 15 16:37:31 2013 (r314316) +++ head/Mk/bsd.port.mk Fri Mar 15 16:45:47 2013 (r314317) @@ -1510,6 +1510,15 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/ .include "${PORTSDIR}/Mk/bsd.pbi.mk" +# Loading features +.for f in ${USES} +_f=${f:C/\:.*//g} +.if ${_f} != ${f} +${_f}_ARGS:= ${f:C/^[^\:]*\://g} +.endif +.include "${USESDIR}/${_f}.mk" +.endfor + # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) .if (${PREFIX:C,(^.).*,\1,} != "/") @@ -1527,15 +1536,6 @@ 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303151645.r2FGjm0Z087803>