From owner-svn-ports-head@FreeBSD.ORG  Fri Mar 15 16:37:32 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 9C5664F7;
 Fri, 15 Mar 2013 16:37:32 +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 83220BFD;
 Fri, 15 Mar 2013 16:37:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2FGbWO3085026;
 Fri, 15 Mar 2013 16:37:32 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2FGbWRH085025;
 Fri, 15 Mar 2013 16:37:32 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201303151637.r2FGbWRH085025@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 15 Mar 2013 16:37:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314316 - 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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Mar 2013 16:37:32 -0000

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}