[src/trunk]: src/share/mk Fix generation of pkg-config(1) files. Patch from R...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d8e458d5746b
branches:  trunk
changeset: 328019:d8e458d5746b
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Mar 23 19:49:52 2014 +0000

description:
Fix generation of pkg-config(1) files. Patch from Ryo ONODERA via
"current-users" mailing list.

diffstat:

 share/mk/bsd.x11.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r b54b58095feb -r d8e458d5746b share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Sun Mar 23 15:26:47 2014 +0000
+++ b/share/mk/bsd.x11.mk       Sun Mar 23 19:49:52 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.109 2014/03/20 22:24:32 mrg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.110 2014/03/23 19:49:52 tron Exp $
 
 .include <bsd.init.mk>
 
@@ -344,10 +344,10 @@
                s,@abi_font@,0.6,; \
                s,@fchown_define@,-DHAS_FCHOWN,; \
                s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT," \
-               -e "s,@PKG_CONFIG_LIBS@,xx,; \
+               -e "s,@PKG_CONFIG_LIBS@,${PKG_CONFIG_LIBS},; \
                s,@PACKAGE@,${PKGDIST},; \
-               s,@PKGCONFIG_REQUIRES@,xx,; \
-               s,@PKGCONFIG_REQUIRES_PRIVATELY@,xx,; \
+               s,@PKGCONFIG_REQUIRES@,${PKGCONFIG_REQUIRES},; \
+               s,@PKGCONFIG_REQUIRES_PRIVATELY@,${PKGCONFIG_REQUIRES_PRIVATELY},; \
                s,@ERRORDBDIR@,${X11LIBDIR},; \
                s,@EXPAT_CFLAGS@,,; \
                s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \