svn commit: r314747 - in head/devel/pkgconf: . files

[Baptiste Daroussin]

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;