From owner-svn-ports-head@FreeBSD.ORG Mon Jul 8 13:34:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EA803A03; Mon, 8 Jul 2013 13:34:24 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DD101114F; Mon, 8 Jul 2013 13:34:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68DYOI9082790; Mon, 8 Jul 2013 13:34:24 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68DYOw3082789; Mon, 8 Jul 2013 13:34:24 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201307081334.r68DYOw3082789@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 8 Jul 2013 13:34:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322503 - 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-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: Mon, 08 Jul 2013 13:34:25 -0000 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)