Module Name: src
Committed By: mrg
Date: Mon Jun 3 06:56:32 UTC 2013
Modified Files:
src/external/mit/xorg/bin: Makefile
src/external/mit/xorg/bin/fc-cache: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
add fc-pattern. fix fc-cache build with fontconfig 2.10.2
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/fc-cache/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/fc-cache/Makefile
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/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.11 src/external/mit/xorg/bin/Makefile:1.12
--- src/external/mit/xorg/bin/Makefile:1.11 Sat Oct 22 22:23:50 2011
+++ src/external/mit/xorg/bin/Makefile Mon Jun 3 06:56:32 2013
@@ -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 \
Index: src/external/mit/xorg/bin/fc-cache/Makefile
diff -u src/external/mit/xorg/bin/fc-cache/Makefile:1.1.1.1 src/external/mit/xorg/bin/fc-cache/Makefile:1.2
--- src/external/mit/xorg/bin/fc-cache/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/fc-cache/Makefile Mon Jun 3 06:56:32 2013
@@ -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}
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.6 src/external/mit/xorg/tools/fc-cache/Makefile:1.7
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.6 Wed Feb 29 20:07:57 2012
+++ src/external/mit/xorg/tools/fc-cache/Makefile Mon Jun 3 06:56:32 2013
@@ -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.fc-cache= fc-cache.c
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 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
-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 \
