Module Name: src
Committed By: mrg
Date: Sun Mar 23 20:40:18 UTC 2014
Modified Files:
src/external/mit/xorg/include/xcb-proto: Makefile
src/external/mit/xorg/lib/fontconfig/src: Makefile
src/external/mit/xorg/server/xorg-server: Makefile
src/share/mk: bsd.x11.mk
Log Message:
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.)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/include/xcb-proto/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.110 -r1.111 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/include/xcb-proto/Makefile
diff -u src/external/mit/xorg/include/xcb-proto/Makefile:1.3 src/external/mit/xorg/include/xcb-proto/Makefile:1.4
--- src/external/mit/xorg/include/xcb-proto/Makefile:1.3 Sun Mar 16 23:25:15 2014
+++ src/external/mit/xorg/include/xcb-proto/Makefile Sun Mar 23 20:40:18 2014
@@ -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 @@ FILES= bigreq.xml composite.xml damage.x
FILESDIR=${X11SHAREDIR}/xcb
PKGCONFIG= xcb-proto
+PKGCONFIG_SED_FLAGS= \
+ -e "s,@pythondir@,,"
NOPROG= # defined
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.15 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.16
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.15 Thu Jun 27 12:44:58 2013
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Sun Mar 23 20:40:18 2014
@@ -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 @@ LIBDPLIBS=\
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 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
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
Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.20 src/external/mit/xorg/server/xorg-server/Makefile:1.21
--- src/external/mit/xorg/server/xorg-server/Makefile:1.20 Wed Jun 12 21:35:29 2013
+++ src/external/mit/xorg/server/xorg-server/Makefile Sun Mar 23 20:40:18 2014
@@ -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 @@ SUBDIR+= hw
.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>
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.110 src/share/mk/bsd.x11.mk:1.111
--- src/share/mk/bsd.x11.mk:1.110 Sun Mar 23 19:49:52 2014
+++ src/share/mk/bsd.x11.mk Sun Mar 23 20:40:18 2014
@@ -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 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
${PKGDIST.${.PREFIX}}/configure); \
fi; \
${TOOL_SED} \
+ ${PKGCONFIG_SED_FLAGS} \
-e "s,@prefix@,${X11ROOTDIR},; \
s,@INSTALL_DIR@,${X11ROOTDIR},; \
s,@exec_prefix@,\\$$\{prefix\},; \
