[src/trunk]: src/external/mit/xorg add fc-pattern. fix fc-cache build with f...

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

details:   https://anonhg.NetBSD.org/src/rev/b1093547094f
branches:  trunk
changeset: 787115:b1093547094f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jun 03 06:56:32 2013 +0000

description:
add fc-pattern.  fix fc-cache build with fontconfig 2.10.2

diffstat:

 external/mit/xorg/bin/Makefile            |  4 ++--
 external/mit/xorg/bin/fc-cache/Makefile   |  3 ++-
 external/mit/xorg/tools/fc-cache/Makefile |  7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 1d69373465a0 -r b1093547094f external/mit/xorg/bin/Makefile
--- a/external/mit/xorg/bin/Makefile    Mon Jun 03 06:46:53 2013 +0000
+++ b/external/mit/xorg/bin/Makefile    Mon Jun 03 06:56:32 2013 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.11 2011/10/22 22:23:50 jmcneill Exp $
+#      $NetBSD: Makefile,v 1.12 2013/06/03 06:56:32 mrg Exp $
 
 SUBDIR=        appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
        cleanlinks cxpm editres \
-       fc-cache fc-cat fc-list fc-match fc-query fc-scan \
+       fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
        fonttosfnt fslsfonts fstobdf glxgears glxinfo \
        iceauth ico imake listres lndir luit makedepend \
        makeg makestrs mergelib mkdirhier mkfontdir \
diff -r 1d69373465a0 -r b1093547094f external/mit/xorg/bin/fc-cache/Makefile
--- a/external/mit/xorg/bin/fc-cache/Makefile   Mon Jun 03 06:46:53 2013 +0000
+++ b/external/mit/xorg/bin/fc-cache/Makefile   Mon Jun 03 06:56:32 2013 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2013/06/03 06:56:32 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  fc-cache
 
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I.
+CPPFLAGS+=     -DHAVE_CONFIG_H -I${X11SRCDIR.fontconfig}/../include
 
 LDADD+=        -lfontconfig -lfreetype -lexpat
 DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
diff -r 1d69373465a0 -r b1093547094f external/mit/xorg/tools/fc-cache/Makefile
--- a/external/mit/xorg/tools/fc-cache/Makefile Mon Jun 03 06:46:53 2013 +0000
+++ b/external/mit/xorg/tools/fc-cache/Makefile Mon Jun 03 06:56:32 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2012/02/29 20:07:57 tron Exp $
+#      $NetBSD: Makefile,v 1.7 2013/06/03 06:56:32 mrg Exp $
 
 NOMAN=         1
 
@@ -17,7 +17,7 @@
 SRCS.fontconfig=       fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
                fcdefault.c fcdir.c fcfreetype.c fcfs.c fcinit.c fclang.c \
                fclist.c fcmatch.c fcmatrix.c fcname.c fcpat.c fcserialize.c \
-               fcstr.c fcxml.c ftglue.h ftglue.c
+               fcstat.c fcstr.c fcxml.c ftglue.h ftglue.c
 
 .PATH: ${FREETYPE}/src/base
 SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
@@ -99,7 +99,8 @@
                -DHAVE_EXPAT -DXFREE86_FT2 -DHAVE_INTTYPES_H \
                -DFT2_BUILD_LIBRARY \
                -DXML_BYTE_ORDER=0 -DHAVE_MEMMOVE=1 \
-               -DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON
+               -DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON \
+               -DFLEXIBLE_ARRAY_MEMBER="/**/"
 HOST_CPPFLAGS+=        -DFT_CONFIG_OPTION_DISABLE_BZIP2
 HOST_CPPFLAGS+=        -I${FONTCONFIG} -I${FREETYPE} \
                -I${FREETYPE}/include -I${EXPAT}/lib \