[pkgsrc/trunk]: pkgsrc/x11 When creating fake .pc files, first check all poss...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc610ae805cd
branches:  trunk
changeset: 631564:bc610ae805cd
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Mar 10 11:56:02 2014 +0000

description:
When creating fake .pc files, first check all possible pkgconfig
directories rather than just lib/pkgconfig.  Required for Red Hat
Linux support which spreads them across lib${LIBABISUFFIX} and
share directories.

diffstat:

 x11/Xrender/builtin.mk   |  5 ++++-
 x11/libXau/builtin.mk    |  5 ++++-
 x11/libXdmcp/builtin.mk  |  5 ++++-
 x11/xextproto/builtin.mk |  5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diffs (76 lines):

diff -r 0646f41b7b0f -r bc610ae805cd x11/Xrender/builtin.mk
--- a/x11/Xrender/builtin.mk    Mon Mar 10 11:35:07 2014 +0000
+++ b/x11/Xrender/builtin.mk    Mon Mar 10 11:56:02 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.20 2012/03/19 12:34:21 joerg Exp $
+# $NetBSD: builtin.mk,v 1.21 2014/03/10 11:56:02 jperkin Exp $
 
 BUILTIN_PKG:=  Xrender
 
@@ -118,6 +118,9 @@
 
 Xrender-fake-pc:
        ${RUN} \
+       for dir in lib lib${LIBABISUFFIX} share; do \
+               ${TEST} -f ${BUILDLINK_PREFIX.Xrender}/$${dir}/pkgconfig/xrender.pc && exit; \
+       done; \
        src=${BUILDLINK_PREFIX.Xrender}/lib/pkgconfig/xrender.pc; \
        dst=${BUILDLINK_DIR}/lib/pkgconfig/xrender.pc; \
        ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
diff -r 0646f41b7b0f -r bc610ae805cd x11/libXau/builtin.mk
--- a/x11/libXau/builtin.mk     Mon Mar 10 11:35:07 2014 +0000
+++ b/x11/libXau/builtin.mk     Mon Mar 10 11:56:02 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2010/12/13 07:51:45 obache Exp $
+# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:56:02 jperkin Exp $
 
 BUILTIN_PKG:=  libXau
 
@@ -60,6 +60,9 @@
 
 xau-fake-pc:
        ${RUN} \
+       for dir in lib lib${LIBABISUFFIX} share; do \
+               ${TEST} -f ${BUILDLINK_PREFIX.libXau}/$${dir}/pkgconfig/xau.pc && exit; \
+       done; \
        src=${BUILDLINK_PREFIX.libXau}/lib/pkgconfig/xau.pc; \
        dst=${BUILDLINK_DIR}/lib/pkgconfig/xau.pc; \
        ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
diff -r 0646f41b7b0f -r bc610ae805cd x11/libXdmcp/builtin.mk
--- a/x11/libXdmcp/builtin.mk   Mon Mar 10 11:35:07 2014 +0000
+++ b/x11/libXdmcp/builtin.mk   Mon Mar 10 11:56:02 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2010/12/13 07:51:45 obache Exp $
+# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:56:02 jperkin Exp $
 
 BUILTIN_PKG:=  libXdmcp
 
@@ -60,6 +60,9 @@
 
 xdmcp-fake-pc:
        ${RUN} \
+       for dir in lib lib${LIBABISUFFIX} share; do \
+               ${TEST} -f ${BUILDLINK_PREFIX.libXdmcp}/$${dir}/pkgconfig/xdmcp.pc && exit; \
+       done; \
        src=${BUILDLINK_PREFIX.libXdmcp}/lib/pkgconfig/xdmcp.pc; \
        dst=${BUILDLINK_DIR}/lib/pkgconfig/xdmcp.pc; \
        ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
diff -r 0646f41b7b0f -r bc610ae805cd x11/xextproto/builtin.mk
--- a/x11/xextproto/builtin.mk  Mon Mar 10 11:35:07 2014 +0000
+++ b/x11/xextproto/builtin.mk  Mon Mar 10 11:56:02 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2009/05/26 21:59:58 rillig Exp $
+# $NetBSD: builtin.mk,v 1.8 2014/03/10 11:56:02 jperkin Exp $
 
 BUILTIN_PKG:=  xextproto
 
@@ -71,6 +71,9 @@
 
 xextproto-fake-pc:
        ${RUN} \
+       for dir in lib lib${LIBABISUFFIX} share; do \
+               ${TEST} -f ${BUILDLINK_PREFIX.xextproto}/$${dir}/pkgconfig/xextproto.pc && exit; \
+       done; \
        src=${BUILDLINK_PREFIX.xextproto}/lib/pkgconfig/xextproto.pc; \
        dst=${BUILDLINK_DIR}/lib/pkgconfig/xextproto.pc; \
        ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \