svn commit: r322503 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Mon Jul  8 13:34:24 2013
New Revision: 322503
URL: http://svnweb.freebsd.org/changeset/ports/322503

Log:
  Move loading of USES post actions after the load of all the bsd.*.mk post actions.
  This fixes bsd.php.mk complaining about do-install being already defined

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Jul  8 12:42:01 2013	(r322502)
+++ head/Mk/bsd.port.mk	Mon Jul  8 13:34:24 2013	(r322503)
@@ -1543,15 +1543,6 @@ check-makefile::
 
 _POSTMKINCLUDED=	yes
 
-# Loading features
-.for f in ${_USES_POST}
-_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}
@@ -2051,6 +2042,15 @@ RUN_DEPENDS+=	${_GL_${_component}_RUN_DE
 USE_SUBMAKE=	yes
 .endif
 
+# Loading features
+.for f in ${_USES_POST}
+_f=${f:C/\:.*//g}
+.if ${_f} != ${f}
+${_f}_ARGS:=	${f:C/^[^\:]*\://g}
+.endif
+.include "${USESDIR}/${_f}.mk"
+.endfor
+
 .if defined(USE_XORG)
 # Add explicit X options to avoid problems with false positives in configure
 .if defined(GNU_CONFIGURE)