[pkgsrc/trunk]: pkgsrc/mk Handle the share/pkgconfig directory where platform...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83a79b512567
branches:  trunk
changeset: 517180:83a79b512567
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Aug 06 09:35:39 2006 +0000

description:
Handle the share/pkgconfig directory where platform-independent packages
(e.g. gtk-doc 1.6) want to install .pc files.

diffstat:

 mk/platform/AIX.pkg.dist       |  4 +++-
 mk/platform/BSDOS.pkg.dist     |  4 +++-
 mk/platform/Darwin.pkg.dist    |  4 +++-
 mk/platform/DragonFly.pkg.dist |  4 +++-
 mk/platform/FreeBSD.pkg.dist   |  4 +++-
 mk/platform/IRIX.pkg.dist      |  4 +++-
 mk/platform/Interix.pkg.dist   |  4 +++-
 mk/platform/Linux.pkg.dist     |  4 +++-
 mk/platform/NetBSD.pkg.dist    |  4 +++-
 mk/platform/OSF1.pkg.dist      |  4 +++-
 mk/platform/OpenBSD.pkg.dist   |  4 +++-
 mk/platform/SunOS.pkg.dist     |  4 +++-
 mk/platform/UnixWare.pkg.dist  |  4 +++-
 mk/tools/pkg-config.mk         |  4 ++--
 14 files changed, 41 insertions(+), 15 deletions(-)

diffs (261 lines):

diff -r 41ea961a164d -r 83a79b512567 mk/platform/AIX.pkg.dist
--- a/mk/platform/AIX.pkg.dist  Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/AIX.pkg.dist  Sun Aug 06 09:35:39 2006 +0000
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#      $NetBSD: AIX.pkg.dist,v 1.19 2006/07/12 13:46:34 wiz Exp $
+#      $NetBSD: AIX.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
@@ -1215,6 +1215,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/BSDOS.pkg.dist
--- a/mk/platform/BSDOS.pkg.dist        Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/BSDOS.pkg.dist        Sun Aug 06 09:35:39 2006 +0000
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#      $NetBSD: BSDOS.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: BSDOS.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1215,6 +1215,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/Darwin.pkg.dist
--- a/mk/platform/Darwin.pkg.dist       Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/Darwin.pkg.dist       Sun Aug 06 09:35:39 2006 +0000
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#      $NetBSD: Darwin.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: Darwin.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1265,6 +1265,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/DragonFly.pkg.dist
--- a/mk/platform/DragonFly.pkg.dist    Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/DragonFly.pkg.dist    Sun Aug 06 09:35:39 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: DragonFly.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: DragonFly.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1264,6 +1264,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/FreeBSD.pkg.dist
--- a/mk/platform/FreeBSD.pkg.dist      Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/FreeBSD.pkg.dist      Sun Aug 06 09:35:39 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: FreeBSD.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: FreeBSD.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1264,6 +1264,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/IRIX.pkg.dist
--- a/mk/platform/IRIX.pkg.dist Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/IRIX.pkg.dist Sun Aug 06 09:35:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+# $NetBSD: IRIX.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -1264,6 +1264,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/Interix.pkg.dist
--- a/mk/platform/Interix.pkg.dist      Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/Interix.pkg.dist      Sun Aug 06 09:35:39 2006 +0000
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#      $NetBSD: Interix.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: Interix.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uid=197108 gid=131616 mode=0775
@@ -1261,6 +1261,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/Linux.pkg.dist
--- a/mk/platform/Linux.pkg.dist        Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/Linux.pkg.dist        Sun Aug 06 09:35:39 2006 +0000
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#      $NetBSD: Linux.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: Linux.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -1265,6 +1265,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/NetBSD.pkg.dist
--- a/mk/platform/NetBSD.pkg.dist       Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/NetBSD.pkg.dist       Sun Aug 06 09:35:39 2006 +0000
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#      $NetBSD: NetBSD.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: NetBSD.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1261,6 +1261,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/OSF1.pkg.dist
--- a/mk/platform/OSF1.pkg.dist Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/OSF1.pkg.dist Sun Aug 06 09:35:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+# $NetBSD: OSF1.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
@@ -1264,6 +1264,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/OpenBSD.pkg.dist
--- a/mk/platform/OpenBSD.pkg.dist      Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/OpenBSD.pkg.dist      Sun Aug 06 09:35:39 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: OpenBSD.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: OpenBSD.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -1264,6 +1264,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/SunOS.pkg.dist
--- a/mk/platform/SunOS.pkg.dist        Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/SunOS.pkg.dist        Sun Aug 06 09:35:39 2006 +0000
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
-#      $NetBSD: SunOS.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: SunOS.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -1269,6 +1269,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/platform/UnixWare.pkg.dist
--- a/mk/platform/UnixWare.pkg.dist     Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/platform/UnixWare.pkg.dist     Sun Aug 06 09:35:39 2006 +0000
@@ -1,6 +1,6 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
 #      NetBSD: SunOS.pkg.dist,v 1.64 2004/04/01 12:19:09 jmmv Exp
-#      $NetBSD: UnixWare.pkg.dist,v 1.19 2006/07/12 13:46:35 wiz Exp $
+#      $NetBSD: UnixWare.pkg.dist,v 1.20 2006/08/06 09:35:39 jmmv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -1270,6 +1270,8 @@
            uk_UA.KOI8-U
            ..
         ..
+        pkgconfig
+        ..
         skel
         ..
     ..
diff -r 41ea961a164d -r 83a79b512567 mk/tools/pkg-config.mk
--- a/mk/tools/pkg-config.mk    Sun Aug 06 09:14:46 2006 +0000
+++ b/mk/tools/pkg-config.mk    Sun Aug 06 09:35:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-config.mk,v 1.5 2005/12/05 22:07:08 rillig Exp $
+# $NetBSD: pkg-config.mk,v 1.6 2006/08/06 09:35:39 jmmv Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,7 @@
 # Override the location where pkg-config searches for *.pc files in the
 # pkg-config wrapper script.
 #
-_PKG_CONFIG_LIBDIR?=   ${BUILDLINK_DIR}/lib/pkgconfig
+_PKG_CONFIG_LIBDIR?=   ${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig
 _PKG_CONFIG_LOG?=      ${WRKDIR}/.pkg-config.log
 
 TOOLS_SCRIPT.pkg-config=       \