[pkgsrc/trunk]: pkgsrc/devel/pkgconfig As reported by Matthias Drochner, pkg-...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9fde22b26ae5
branches:  trunk
changeset: 492879:9fde22b26ae5
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Apr 21 08:22:32 2005 +0000

description:
As reported by Matthias Drochner, pkg-config tries to use always
PKG_CONFIG_PC_PATH even when PKG_CONFIG_PATH is defined, this is not
good for pkgsrc, apply suggested code by Johnny C. Lam to use
PKG_CONFIG_LIBDIR again.

Now our pkg-config does the following:

* If PKG_CONFIG_LIBDIR is set, use it.
* Otherwise PKG_CONFIG_PATH and default directories are used.

Bump PKGREVISION and sync the bl3 file again.

diffstat:

 devel/pkgconfig/Makefile         |   4 ++--
 devel/pkgconfig/buildlink3.mk    |   8 ++++----
 devel/pkgconfig/distinfo         |   3 ++-
 devel/pkgconfig/patches/patch-aa |  25 +++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 7 deletions(-)

diffs (78 lines):

diff -r cbeeff5da476 -r 9fde22b26ae5 devel/pkgconfig/Makefile
--- a/devel/pkgconfig/Makefile  Thu Apr 21 07:26:59 2005 +0000
+++ b/devel/pkgconfig/Makefile  Thu Apr 21 08:22:32 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2005/04/18 17:02:50 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2005/04/21 08:22:32 xtraeme Exp $
 #
 
 DISTNAME=      pkgconfig-0.17.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  http://www.freedesktop.org/software/pkgconfig/releases/
 
diff -r cbeeff5da476 -r 9fde22b26ae5 devel/pkgconfig/buildlink3.mk
--- a/devel/pkgconfig/buildlink3.mk     Thu Apr 21 07:26:59 2005 +0000
+++ b/devel/pkgconfig/buildlink3.mk     Thu Apr 21 08:22:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/03/30 22:31:30 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/04/21 08:22:32 xtraeme Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 PKGCONFIG_BUILDLINK3_MK:=      ${PKGCONFIG_BUILDLINK3_MK}+
@@ -15,11 +15,11 @@
 BUILDLINK_PKGSRCDIR.pkgconfig?=        ../../devel/pkgconfig
 BUILDLINK_DEPMETHOD.pkgconfig?=        build
 
-PKG_CONFIG_PATH?=      ${BUILDLINK_DIR}/lib/pkgconfig
+PKG_CONFIG_LIBDIR?=    ${BUILDLINK_DIR}/lib/pkgconfig
 CONFIGURE_ENV+=                PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config
-CONFIGURE_ENV+=                PKG_CONFIG_PATH=${PKG_CONFIG_PATH:Q}
+CONFIGURE_ENV+=                PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
 MAKE_ENV+=             PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config
-MAKE_ENV+=             PKG_CONFIG_PATH=${PKG_CONFIG_PATH:Q}
+MAKE_ENV+=             PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
 
 .endif # PKGCONFIG_BUILDLINK3_MK
 
diff -r cbeeff5da476 -r 9fde22b26ae5 devel/pkgconfig/distinfo
--- a/devel/pkgconfig/distinfo  Thu Apr 21 07:26:59 2005 +0000
+++ b/devel/pkgconfig/distinfo  Thu Apr 21 08:22:32 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.15 2005/04/17 20:23:36 hira Exp $
+$NetBSD: distinfo,v 1.16 2005/04/21 08:22:32 xtraeme Exp $
 
 SHA1 (pkgconfig-0.17.2.tar.gz) = 93e32aa176fceb2f7fe4d4e938f599ade74edb09
 RMD160 (pkgconfig-0.17.2.tar.gz) = ff6de406416abf9dcd5eaa77d1d8ef5e6bc6d935
 Size (pkgconfig-0.17.2.tar.gz) = 965129 bytes
+SHA1 (patch-aa) = 58592474033f44f244c639a29b89b73a9966b1a2
diff -r cbeeff5da476 -r 9fde22b26ae5 devel/pkgconfig/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pkgconfig/patches/patch-aa  Thu Apr 21 08:22:32 2005 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.5 2005/04/21 08:22:32 xtraeme Exp $
+
+--- main.c.orig        2005-04-21 10:11:45.000000000 +0200
++++ main.c     2005-04-21 10:12:43.000000000 +0200
+@@ -278,13 +278,17 @@
+       debug_spew ("PKG_CONFIG_DEBUG_SPEW variable enabling debug spew\n");
+     }
+ 
+-  search_path = getenv ("PKG_CONFIG_PATH");
++  search_path = getenv("PKG_CONFIG_LIBDIR");
++
++  if (search_path)
++      add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S);
++  else {
++      search_path = getenv("PKG_CONFIG_PATH");
+   if (search_path) 
+-    {
+       add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S);
+-    }
+ 
+   add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S);
++  }
+ 
+ #ifdef G_OS_WIN32
+   {