[pkgsrc/trunk]: pkgsrc/devel/pkgconf PR/51360: handle ${X11BASE}/lib/pkgconfig.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/567c91d2e36b
branches:  trunk
changeset: 350754:567c91d2e36b
user:      nonaka <nonaka%pkgsrc.org@localhost>
date:      Thu Aug 04 14:30:08 2016 +0000

description:
PR/51360: handle ${X11BASE}/lib/pkgconfig.

bump PKGREVISION.

diffstat:

 devel/pkgconf/Makefile |  18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 067e10ddc864 -r 567c91d2e36b devel/pkgconf/Makefile
--- a/devel/pkgconf/Makefile    Thu Aug 04 14:18:15 2016 +0000
+++ b/devel/pkgconf/Makefile    Thu Aug 04 14:30:08 2016 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2016/08/01 11:14:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/04 14:30:08 nonaka Exp $
 
 DISTNAME=      pkgconf-1
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://rabbit.dereferenced.org/~nenolod/distfiles/
 #EXTRACT_SUFX= .tar.bz2
@@ -12,12 +13,23 @@
 
 CONFLICTS+=    pkg-config-[0-9]*
 
+.include "../../mk/bsd.prefs.mk"
+
 GNU_CONFIGURE= yes
-CONFIGURE_ARGS=        --with-pkg-config-dir=${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig:/usr/lib/pkgconfig \
-               --with-system-libdir=/usr/lib \
+CONFIGURE_ARGS=        --with-system-libdir=/usr/lib \
                --with-system-includedir=/usr/include
 MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}/man1
 
+PKGCONFIG_PATHS=       ${PREFIX}/lib/pkgconfig
+PKGCONFIG_PATHS+=      ${PREFIX}/share/pkgconfig
+PKGCONFIG_PATHS+=      /usr/lib/pkgconfig
+
+.if ${LOCALBASE} != ${X11BASE}
+PKGCONFIG_PATHS+=      ${X11BASE}/lib/pkgconfig
+.endif
+
+CONFIGURE_ARGS+=       --with-pkg-config-dir='${PKGCONFIG_PATHS:ts::Q}'
+
 post-install:
        ${LN} -s ${PREFIX}/bin/pkgconf ${DESTDIR}${PREFIX}/bin/pkg-config