From owner-svn-ports-head@FreeBSD.ORG  Mon Apr 22 22:25:21 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 080C241D;
 Mon, 22 Apr 2013 22:25:21 +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 D50201A9D;
 Mon, 22 Apr 2013 22:25:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MMPK2t030557;
 Mon, 22 Apr 2013 22:25:20 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3MMPKcw030555;
 Mon, 22 Apr 2013 22:25:20 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201304222225.r3MMPKcw030555@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 22 Apr 2013 22:25:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316283 - in head: . Mk/Uses
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: Mon, 22 Apr 2013 22:25:21 -0000

Author: bapt
Date: Mon Apr 22 22:25:20 2013
New Revision: 316283
URL: http://svnweb.freebsd.org/changeset/ports/316283

Log:
  Introduce USES= pkgconfig to replace USE_PKGCONFIG
  
  It can take 3 arguments:
  build (default,implicit) to add pkgconf into BUILD_DEPENDS
  run to add pkgconf into RUN_DEPENDS
  both to add pkgconf into both RUN and BUILD DEPENDS
  
  This deprecates USE_PKGCONFIG, please convert your ports.
  USE_PKGCONFIG will be removed as soon as it is no more used in
  the ports tree

Added:
  head/Mk/Uses/pkgconfig.mk   (contents, props changed)
Modified:
  head/CHANGES

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Mon Apr 22 22:16:28 2013	(r316282)
+++ head/CHANGES	Mon Apr 22 22:25:20 2013	(r316283)
@@ -10,6 +10,18 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20130323:
+AUTHOR: bapt@FreeBSD.org
+
+  * New USES macro to handle support for pkgconf (pkg-config) dependency:
+
+    USES= pkgconfig[:build] will add pkgconf into BUILD_DEPENDS
+    USES= pkgconfig:run will add pkgconf into RUN_DEPENDS
+    USES= pkgconfig:both will add pkgconf into both RUN and BUILD DEPENDS
+
+    It deprecates USE_PKGCONFIG which will be removed as soon as it is not
+    used anymore
+
 20130320:
 AUTHOR: jgh@FreeBSD.org
 

Added: head/Mk/Uses/pkgconfig.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/pkgconfig.mk	Mon Apr 22 22:25:20 2013	(r316283)
@@ -0,0 +1,34 @@
+# $FreeBSD$
+#
+# handle dependency on the pkgconf port
+#
+# MAINTAINER: portmgr@FreeBSD.org
+#
+# Feature:	pkgconfig
+# Usage:	USES=pkgconfig or USES=pkgconfig:ARGS
+# Valid ARGS:	build (default, implicit), run, both
+#
+#
+.if !defined(_INCLUDE_USES_PKGCONFIG_MK)
+_INCLUDE_USES_PKGCONFIG_MK=	yes
+
+_PKGCONFIG_DEPENDS=	pkgconf:${PORTSDIR}/devel/pkgconf
+
+.if !defined(pkgconfig_ARGS)
+pkgconfig_ARGS=	build
+.endif
+
+.if ${pkgconfig_ARGS} == "build"
+BUILD_DEPENDS+=	${_PKGCONFIG_DEPENDS}
+CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
+.elif ${pkgconfig_ARGS} == "run"
+RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
+.elif ${pkgconfig_ARGS} == "both"
+CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
+BUILD_DEPENDS+=	${_PKGCONFIG_DEPENDS}
+RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
+.else
+IGNORE=	USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specifed
+.endif
+
+.endif