- add /usr/lib/pkgconfig/ to the paths to look for .pc files, and search

  there first (as the original pkgconfig does too).

2 files changed, 7 insertions, 5 deletions

diff --git a/usr.bin/pkg-config/pkg-config b/usr.bin/pkg-config/pkg-config
index 6a277cc173e..cb4f6a4a277 100644
--- a/usr.bin/pkg-config/pkg-config
+++ b/usr.bin/pkg-config/pkg-config
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $OpenBSD: pkg-config,v 1.26 2010/09/29 16:48:41 jasper Exp $
+# $OpenBSD: pkg-config,v 1.27 2010/12/28 14:31:38 jasper Exp $
 
 #$CSK: pkgconfig.pl,v 1.39 2006/11/27 16:26:20 ckuethe Exp $
 # Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
@@ -22,7 +22,7 @@ use Getopt::Long;
 use File::Basename;
 use OpenBSD::PkgConfig;
 
-my @PKGPATH = qw(/usr/local/lib/pkgconfig /usr/X11R6/lib/pkgconfig );
+my @PKGPATH = qw(/usr/lib/pkgconfig /usr/local/lib/pkgconfig /usr/X11R6/lib/pkgconfig);
 
 if (defined($ENV{PKG_CONFIG_LIBDIR}) && $ENV{PKG_CONFIG_LIBDIR}) {
 	@PKGPATH = split /:/, $ENV{PKG_CONFIG_LIBDIR};
diff --git a/usr.bin/pkg-config/pkg-config.1 b/usr.bin/pkg-config/pkg-config.1
index e674e81e0ec..0c329f66a27 100644
--- a/usr.bin/pkg-config/pkg-config.1
+++ b/usr.bin/pkg-config/pkg-config.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg-config.1,v 1.14 2010/09/03 11:09:29 jmc Exp $
+.\"	$OpenBSD: pkg-config.1,v 1.15 2010/12/28 14:31:38 jasper Exp $
 .\"
 .\"	Copyright (c) 2006 Chris Kuethe <ckuethe@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\"	ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\"	OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: December 28 2010 $
 .Dt PKG-CONFIG 1
 .Os
 .Sh NAME
@@ -38,7 +38,9 @@ Yoyodyne package would likely be described by "yoyodyne.pc".
 Not all software packages provide
 .Nm
 metadata.
-Packages controlled by the
+Libraries from base install their metadata in
+.Pa /usr/lib/pkgconfig ;
+packages controlled by the
 .Xr ports 7
 system store their metadata, if provided, in
 .Pa ${LOCALBASE}/lib/pkgconfig ;