CVS commit: pkgsrc/devel/pkgconf

["NONAKA Kimihiro" <nonaka%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nonaka
Date:           Thu Aug  4 14:30:08 UTC 2016

Modified Files:
        pkgsrc/devel/pkgconf: Makefile

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

bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/pkgconf/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/pkgconf/Makefile
diff -u pkgsrc/devel/pkgconf/Makefile:1.7 pkgsrc/devel/pkgconf/Makefile:1.8
--- pkgsrc/devel/pkgconf/Makefile:1.7   Mon Aug  1 11:14:41 2016
+++ pkgsrc/devel/pkgconf/Makefile       Thu Aug  4 14:30:08 2016
@@ -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 @@ LICENSE=    modified-bsd
 
 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