[src/netbsd-6]: src/external/mit/xorg Pullup additional patches requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/129378588a9c
branches:  netbsd-6
changeset: 776843:129378588a9c
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Dec 25 05:05:02 2014 +0000

description:
Pullup additional patches requested by mrg in ticket #1178:

external/mit/xorg/include/xcb-proto/Makefile    patch
external/mit/xorg/lib/fontconfig/src/Makefile   patch
external/mit/xorg/server/xorg-server/Makefile   patch
xsrc/external/mit/fontconfig/include/config.h   patch

        - Fix compile error on non x86 archs.
        - Fix unexpanded @@ in .pc files.

diffstat:

 external/mit/xorg/include/xcb-proto/Makefile  |   4 +++-
 external/mit/xorg/lib/fontconfig/src/Makefile |  17 ++++++++++++++++-
 external/mit/xorg/server/xorg-server/Makefile |   6 +++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diffs (76 lines):

diff -r ce7856d2c826 -r 129378588a9c external/mit/xorg/include/xcb-proto/Makefile
--- a/external/mit/xorg/include/xcb-proto/Makefile      Thu Dec 25 02:56:48 2014 +0000
+++ b/external/mit/xorg/include/xcb-proto/Makefile      Thu Dec 25 05:05:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2010/07/17 23:44:29 mrg Exp $
+#      $NetBSD: Makefile,v 1.1.8.1 2014/12/25 05:05:02 msaitoh Exp $
 
 .include <bsd.own.mk>
 
@@ -13,6 +13,8 @@
 FILESDIR=${X11SHAREDIR}/xcb
 
 PKGCONFIG=     xcb-proto
+PKGCONFIG_SED_FLAGS= \
+       -e "s,@pythondir@,,"
 
 NOPROG=        # defined
 
diff -r ce7856d2c826 -r 129378588a9c external/mit/xorg/lib/fontconfig/src/Makefile
--- a/external/mit/xorg/lib/fontconfig/src/Makefile     Thu Dec 25 02:56:48 2014 +0000
+++ b/external/mit/xorg/lib/fontconfig/src/Makefile     Thu Dec 25 05:05:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7.4.2 2014/12/21 19:12:10 msaitoh Exp $
+#      $NetBSD: Makefile,v 1.7.4.3 2014/12/25 05:05:02 msaitoh Exp $
 
 .include <bsd.own.mk>
 
@@ -119,13 +119,28 @@
 
 .include "Makefile.fcarch"
 
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+CPPFLAGS+=     -DHAVE_INTEL_ATOMIC_PRIMITIVES=1
+.endif
+
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+CPPFLAGS+=     -DHAVE_INTEL_ATOMIC_PRIMITIVES=1
+.endif
+
 CLEANFILES+= fcarch.h
 
 PKGCONFIG=     fontconfig
 PKGCONFIG_SED_FLAGS= \
        -e "s,@sysconfdir@,${X11ETCDIR},; \
            s,@localstatedir@,/var,; \
+           s,@PACKAGE@,${PKGDIST},; \
            s,@BASECONFIGDIR@,/etc/fonts,; \
+           s,@PKGCONFIG_REQUIRES@,${PKGCONFIG_REQUIRES},; \
+           s,@PKGCONFIG_REQUIRES_PRIVATELY@,${PKGCONFIG_REQUIRES_PRIVATELY},; \
+           s,@EXPAT_CFLAGS@,,; \
+           s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \
+           s,@ICONV_CFLAGS@,,; \
+           s,@LIBXML2_CFLAGS@,,; \
            s,@fc_cachedir@,${FONTCONFIG_PATH},"
 
 # XXX
diff -r ce7856d2c826 -r 129378588a9c external/mit/xorg/server/xorg-server/Makefile
--- a/external/mit/xorg/server/xorg-server/Makefile     Thu Dec 25 02:56:48 2014 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile     Thu Dec 25 05:05:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2009/06/11 05:43:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.19.8.1 2014/12/25 05:05:02 msaitoh Exp $
 
 .include <bsd.own.mk>
 
@@ -32,6 +32,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>