[src/trunk]: src allow for .pc substitutions to be listed per makefile

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

details:   https://anonhg.NetBSD.org/src/rev/67816e4afd00
branches:  trunk
changeset: 328022:67816e4afd00
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 23 20:40:18 2014 +0000

description:
allow for .pc substitutions to be listed per makefile
(could maybe do per-target, as well.)  fix the remaining
substitutions for xcb-proto, fontconfig and xorg-server.

(XXX: move many per-package-specific parts out of
bsd.x11.mk itself, into the relevant Makefile.)

diffstat:

 external/mit/xorg/include/xcb-proto/Makefile  |   4 +++-
 external/mit/xorg/lib/fontconfig/src/Makefile |  10 ++++++++--
 external/mit/xorg/server/xorg-server/Makefile |   6 +++++-
 share/mk/bsd.x11.mk                           |   3 ++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diffs (87 lines):

diff -r 6c98c88cea8f -r 67816e4afd00 external/mit/xorg/include/xcb-proto/Makefile
--- a/external/mit/xorg/include/xcb-proto/Makefile      Sun Mar 23 20:39:40 2014 +0000
+++ b/external/mit/xorg/include/xcb-proto/Makefile      Sun Mar 23 20:40:18 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2014/03/16 23:25:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2014/03/23 20:40:18 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -14,6 +14,8 @@
 FILESDIR=${X11SHAREDIR}/xcb
 
 PKGCONFIG=     xcb-proto
+PKGCONFIG_SED_FLAGS= \
+       -e "s,@pythondir@,,"
 
 NOPROG=        # defined
 
diff -r 6c98c88cea8f -r 67816e4afd00 external/mit/xorg/lib/fontconfig/src/Makefile
--- a/external/mit/xorg/lib/fontconfig/src/Makefile     Sun Mar 23 20:39:40 2014 +0000
+++ b/external/mit/xorg/lib/fontconfig/src/Makefile     Sun Mar 23 20:40:18 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2013/06/27 12:44:58 wiz Exp $
+#      $NetBSD: Makefile,v 1.16 2014/03/23 20:40:18 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -95,8 +95,9 @@
        freetype        ${.CURDIR}/../../freetype
 
 # XXX FONTCONFIG_PATH was arbitrarily chosen
+FONTCONFIG_PATH=/etc/fonts
 CPPFLAGS+=     -DHAVE_CONFIG_H
-CPPFLAGS+=     -DFONTCONFIG_PATH='"/etc/fonts"' \
+CPPFLAGS+=     -DFONTCONFIG_PATH='"${FONTCONFIG_PATH}"' \
                -DFC_DEFAULT_FONTS='"${X11FONTDIR}"' \
                -DFC_CACHEDIR='"/var/cache/fontconfig"' \
                -DHAVE_FT_BITMAP_SIZE_Y_PPEM \
@@ -121,6 +122,11 @@
 CLEANFILES+= fcarch.h
 
 PKGCONFIG=     fontconfig
+PKGCONFIG_SED_FLAGS= \
+       -e "s,@sysconfdir@,${X11ETCDIR},; \
+           s,@localstatedir@,/var,; \
+           s,@baseconfigdir@,/etc/fonts,; \
+           s,@fc_cachedir@,${FONTCONFIG_PATH},"
 
 # XXX
 CPPFLAGS.fcxml.c=      -Wno-error
diff -r 6c98c88cea8f -r 67816e4afd00 external/mit/xorg/server/xorg-server/Makefile
--- a/external/mit/xorg/server/xorg-server/Makefile     Sun Mar 23 20:39:40 2014 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile     Sun Mar 23 20:40:18 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2013/06/12 21:35:29 mrg Exp $
+#      $NetBSD: Makefile,v 1.21 2014/03/23 20:40:18 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,6 +20,10 @@
 .PATH: ${X11SRCDIR.xorg-server}
 
 PKGCONFIG=     xorg-server
+# Use -fvisibility=hidden for symbol_visibility?
+PKGCONFIG_SED_FLAGS= \
+       -e "s,@sysconfigdir@,${X11ETCDIR},; \
+           s,@symbol_visibility@,,"
 
 .include <bsd.x11.mk>
 .include <bsd.man.mk>
diff -r 6c98c88cea8f -r 67816e4afd00 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Sun Mar 23 20:39:40 2014 +0000
+++ b/share/mk/bsd.x11.mk       Sun Mar 23 20:40:18 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.110 2014/03/23 19:49:52 tron Exp $
+#      $NetBSD: bsd.x11.mk,v 1.111 2014/03/23 20:40:18 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -272,6 +272,7 @@
                    ${PKGDIST.${.PREFIX}}/configure); \
        fi; \
        ${TOOL_SED} \
+               ${PKGCONFIG_SED_FLAGS} \
                -e "s,@prefix@,${X11ROOTDIR},; \
                s,@INSTALL_DIR@,${X11ROOTDIR},; \
                s,@exec_prefix@,\\$$\{prefix\},; \