From owner-svn-ports-head@FreeBSD.ORG  Wed Mar 20 17:03:01 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 689B867A;
 Wed, 20 Mar 2013 17:03:01 +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 5B67B64B;
 Wed, 20 Mar 2013 17:03:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2KH31WL009370;
 Wed, 20 Mar 2013 17:03:01 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2KH31Eb009368;
 Wed, 20 Mar 2013 17:03:01 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201303201703.r2KH31Eb009368@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 20 Mar 2013 17:03:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314747 - in head/devel/pkgconf: . files
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: Wed, 20 Mar 2013 17:03:01 -0000

Author: bapt
Date: Wed Mar 20 17:03:00 2013
New Revision: 314747
URL: http://svnweb.freebsd.org/changeset/ports/314747

Log:
  Fix a corner case usage of pkgconf spotted in webkit-gtk3
  
  Reported by:	Gustau Pérez i Querol, kwm (both via irc)
  Tested by:	Gustau Pérez i Querol, kwm
  Obtained from:	pkgconf git

Added:
  head/devel/pkgconf/files/patch-pkg.c-2   (contents, props changed)
Modified:
  head/devel/pkgconf/Makefile

Modified: head/devel/pkgconf/Makefile
==============================================================================
--- head/devel/pkgconf/Makefile	Wed Mar 20 17:01:02 2013	(r314746)
+++ head/devel/pkgconf/Makefile	Wed Mar 20 17:03:00 2013	(r314747)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pkgconf
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://rabbit.dereferenced.org/~nenolod/distfiles/ \
 		http://files.etoilebsd.net/pkgconf/

Added: head/devel/pkgconf/files/patch-pkg.c-2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pkgconf/files/patch-pkg.c-2	Wed Mar 20 17:03:00 2013	(r314747)
@@ -0,0 +1,22 @@
+diff --git pkg.c pkg.c
+index ed23b47..58eed08 100644
+--- pkg.c
++++ pkg.c
+@@ -461,6 +461,8 @@ pkg_find(const char *name, unsigned int flags)
+ 	pkg_node_t *n;
+ 	FILE *f;
+ 
++	pkg_dir_list_build(flags);
++
+ 	/* name might actually be a filename. */
+ 	if (str_has_suffix(name, PKG_CONFIG_EXT))
+ 	{
+@@ -485,8 +487,6 @@ pkg_find(const char *name, unsigned int flags)
+ 		}
+ 	}
+ 
+-	pkg_dir_list_build(flags);
+-
+ 	PKG_FOREACH_LIST_ENTRY(pkg_dir_list.head, n)
+ 	{
+ 		pkg_path_t *pkg_path = n->data;