Module Name: src
Committed By: mrg
Date: Mon Jun 3 20:23:40 UTC 2013
Modified Files:
src/distrib/sets/lists/xbase: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/distrib/sets/lists/xetc: mi
src/external/mit/xorg/bin: Makefile
src/external/mit/xorg/bin/fc-cache: Makefile
src/external/mit/xorg/bin/fc-cat: Makefile
src/external/mit/xorg/bin/fc-list: Makefile
src/external/mit/xorg/bin/fc-match: Makefile
src/external/mit/xorg/bin/fc-query: Makefile
src/external/mit/xorg/bin/fc-scan: Makefile
src/external/mit/xorg/lib/fontconfig/etc/conf.avail: Makefile
src/external/mit/xorg/lib/fontconfig/etc/conf.d: Makefile
src/external/mit/xorg/lib/fontconfig/src: Makefile shlib_version
src/external/mit/xorg/tools/fc-cache: Makefile
Added Files:
src/external/mit/xorg/bin/fc-validate: Makefile
Log Message:
updates for fontconfig 2.10.93.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-cache/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/fc-cat/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/fc-list/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/fc-match/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/fc-query/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/fc-scan/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/fc-validate/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/fontconfig/src/shlib_version
cvs rdiff -u -r1.7 -r1.8 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/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.117 src/distrib/sets/lists/xbase/mi:1.118
--- src/distrib/sets/lists/xbase/mi:1.117 Mon Jun 3 07:08:20 2013
+++ src/distrib/sets/lists/xbase/mi Mon Jun 3 20:23:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.117 2013/06/03 07:08:20 mrg Exp $
+# $NetBSD: mi,v 1.118 2013/06/03 20:23:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1371,6 +1371,7 @@
./usr/X11R7/bin/fc-query -unknown- xorg
./usr/X11R7/bin/fc-scan -unknown- xorg
./usr/X11R7/bin/fc-pattern -unknown- xorg
+./usr/X11R7/bin/fc-validate -unknown- xorg
./usr/X11R7/bin/fillblnk -unknown- xorg
./usr/X11R7/bin/fonttosfnt -unknown- xorg
./usr/X11R7/bin/fslsfonts -unknown- xorg
@@ -2499,6 +2500,7 @@
./usr/X11R7/man/cat1/fc-query.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-scan.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-pattern.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/fc-validate.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fonttosfnt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fslsfonts.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fstobdf.0 -unknown- .cat,xorg
@@ -2638,6 +2640,7 @@
./usr/X11R7/man/html1/fc-query.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-scan.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-pattern.html -unknown- html,xorg
+./usr/X11R7/man/html1/fc-validate.html -unknown- html,xorg
./usr/X11R7/man/html1/fonttosfnt.html -unknown- html,xorg
./usr/X11R7/man/html1/fslsfonts.html -unknown- html,xorg
./usr/X11R7/man/html1/fstobdf.html -unknown- html,xorg
@@ -2777,6 +2780,7 @@
./usr/X11R7/man/man1/fc-query.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-scan.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-pattern.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/fc-validate.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fonttosfnt.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fslsfonts.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fstobdf.1 -unknown- .man,xorg
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.48 src/distrib/sets/lists/xbase/shl.mi:1.49
--- src/distrib/sets/lists/xbase/shl.mi:1.48 Mon Jun 3 07:24:11 2013
+++ src/distrib/sets/lists/xbase/shl.mi Mon Jun 3 20:23:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.48 2013/06/03 07:24:11 mrg Exp $
+# $NetBSD: shl.mi,v 1.49 2013/06/03 20:23:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -311,7 +311,7 @@
./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete
./usr/X11R7/lib/libfontconfig.so -unknown- xorg
./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg
-./usr/X11R7/lib/libfontconfig.so.2.1 -unknown- xorg
+./usr/X11R7/lib/libfontconfig.so.2.2 -unknown- xorg
./usr/X11R7/lib/libfontenc.so -unknown- xorg
./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.3 src/distrib/sets/lists/xdebug/mi:1.4
--- src/distrib/sets/lists/xdebug/mi:1.3 Thu Jan 17 21:42:18 2013
+++ src/distrib/sets/lists/xdebug/mi Mon Jun 3 20:23:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.3 2013/01/17 21:42:18 christos Exp $
+# $NetBSD: mi,v 1.4 2013/06/03 20:23:40 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/libdata/debug/usr/X11R6/bin/Xdmx.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xnest.debug -unknown- debug,x11
@@ -156,6 +156,8 @@
./usr/libdata/debug/usr/X11R7/bin/fc-match.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-query.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-scan.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/fc-pattern.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/fc-validate.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fonttosfnt.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fslsfonts.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fstobdf.debug -unknown- debug,xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.7 src/distrib/sets/lists/xdebug/shl.mi:1.8
--- src/distrib/sets/lists/xdebug/shl.mi:1.7 Mon Jun 3 07:24:11 2013
+++ src/distrib/sets/lists/xdebug/shl.mi Mon Jun 3 20:23:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.7 2013/06/03 07:24:11 mrg Exp $
+# $NetBSD: shl.mi,v 1.8 2013/06/03 20:23:40 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -101,7 +101,7 @@
./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete
-./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.7.3.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.21 src/distrib/sets/lists/xetc/mi:1.22
--- src/distrib/sets/lists/xetc/mi:1.21 Mon Jun 3 17:58:28 2013
+++ src/distrib/sets/lists/xetc/mi Mon Jun 3 20:23:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.21 2013/06/03 17:58:28 mrg Exp $
+# $NetBSD: mi,v 1.22 2013/06/03 20:23:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -57,6 +57,7 @@
./etc/X11/xsm/system.xsm -unknown- xorg
./etc/fonts/conf.avail/10-autohint.conf -unknown- xorg
./etc/fonts/conf.avail/10-no-sub-pixel.conf -unknown- xorg
+./etc/fonts/conf.avail/10-scale-bitmap-fonts.conf -unknown- xorg
./etc/fonts/conf.avail/10-sub-pixel-bgr.conf -unknown- xorg
./etc/fonts/conf.avail/10-sub-pixel-rgb.conf -unknown- xorg
./etc/fonts/conf.avail/10-sub-pixel-vbgr.conf -unknown- xorg
@@ -84,6 +85,7 @@
./etc/fonts/conf.avail/70-yes-bitmaps.conf -unknown- xorg
./etc/fonts/conf.avail/80-delicious.conf -unknown- xorg
./etc/fonts/conf.avail/90-synthetic.conf -unknown- xorg
+./etc/fonts/conf.d/10-scale-bitmap-fonts.conf -unknown- xorg
./etc/fonts/conf.d/20-fix-globaladvance.conf -unknown- obsolete
./etc/fonts/conf.d/20-unhint-small-vera.conf -unknown- xorg
./etc/fonts/conf.d/30-metric-aliases.conf -unknown- xorg
Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.12 src/external/mit/xorg/bin/Makefile:1.13
--- src/external/mit/xorg/bin/Makefile:1.12 Mon Jun 3 06:56:32 2013
+++ src/external/mit/xorg/bin/Makefile Mon Jun 3 20:23:39 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2013/06/03 06:56:32 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/03 20:23:39 mrg Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cxpm editres \
fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
+ fc-validate \
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.2 src/external/mit/xorg/bin/fc-cache/Makefile:1.3
--- src/external/mit/xorg/bin/fc-cache/Makefile:1.2 Mon Jun 3 06:56:32 2013
+++ src/external/mit/xorg/bin/fc-cache/Makefile Mon Jun 3 20:23:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/06/03 06:56:32 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
.include <bsd.own.mk>
@@ -12,7 +12,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-cache.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
Index: src/external/mit/xorg/bin/fc-cat/Makefile
diff -u src/external/mit/xorg/bin/fc-cat/Makefile:1.1.1.1 src/external/mit/xorg/bin/fc-cat/Makefile:1.2
--- src/external/mit/xorg/bin/fc-cat/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/fc-cat/Makefile Mon Jun 3 20:23:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
.include <bsd.own.mk>
@@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-cat.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
Index: src/external/mit/xorg/bin/fc-list/Makefile
diff -u src/external/mit/xorg/bin/fc-list/Makefile:1.1.1.1 src/external/mit/xorg/bin/fc-list/Makefile:1.2
--- src/external/mit/xorg/bin/fc-list/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/fc-list/Makefile Mon Jun 3 20:23:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
.include <bsd.own.mk>
@@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-list.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
Index: src/external/mit/xorg/bin/fc-match/Makefile
diff -u src/external/mit/xorg/bin/fc-match/Makefile:1.1.1.1 src/external/mit/xorg/bin/fc-match/Makefile:1.2
--- src/external/mit/xorg/bin/fc-match/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/fc-match/Makefile Mon Jun 3 20:23:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
.include <bsd.own.mk>
@@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-list.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
Index: src/external/mit/xorg/bin/fc-query/Makefile
diff -u src/external/mit/xorg/bin/fc-query/Makefile:1.1 src/external/mit/xorg/bin/fc-query/Makefile:1.2
--- src/external/mit/xorg/bin/fc-query/Makefile:1.1 Sun Nov 21 07:20:06 2010
+++ src/external/mit/xorg/bin/fc-query/Makefile Mon Jun 3 20:23:39 2013
@@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-cat.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
Index: src/external/mit/xorg/bin/fc-scan/Makefile
diff -u src/external/mit/xorg/bin/fc-scan/Makefile:1.1 src/external/mit/xorg/bin/fc-scan/Makefile:1.2
--- src/external/mit/xorg/bin/fc-scan/Makefile:1.1 Sun Nov 21 07:20:06 2010
+++ src/external/mit/xorg/bin/fc-scan/Makefile Mon Jun 3 20:23:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/11/21 07:20:06 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
.include <bsd.own.mk>
@@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-cat.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.3 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.4
--- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.3 Mon Jun 3 17:50:28 2013
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Mon Jun 3 20:23:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/06/03 17:50:28 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/06/03 20:23:39 mrg Exp $
.include <bsd.own.mk>
@@ -10,6 +10,7 @@ CONFIGFILES= \
10-sub-pixel-rgb.conf \
10-sub-pixel-vbgr.conf \
10-sub-pixel-vrgb.conf \
+ 10-scale-bitmap-fonts.conf \
10-unhinted.conf \
11-lcdfilter-default.conf \
11-lcdfilter-legacy.conf \
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.2 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.3
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.2 Mon Jun 3 06:46:54 2013
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Mon Jun 3 20:23:39 2013
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2013/06/03 06:46:54 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.fontconfig}/conf.d
FONTCONFIG_LINKS= \
+ 10-scale-bitmap-fonts.conf \
20-unhint-small-vera.conf \
30-urw-aliases.conf \
30-metric-aliases.conf \
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.11 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.12
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.11 Mon Jun 3 07:23:02 2013
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Mon Jun 3 20:23:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/06/03 07:23:02 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/03 20:23:39 mrg Exp $
.include <bsd.own.mk>
@@ -10,18 +10,21 @@ SRCS= fcatomic.c \
fccache.c \
fccfg.c \
fccharset.c \
+ fccompat.c \
fcdbg.c \
fcdefault.c \
fcdir.c \
fcformat.c \
fcfreetype.c \
fcfs.c \
+ fchash.c \
fcinit.c \
fclang.c \
fclist.c \
fcmatch.c \
fcmatrix.c \
fcname.c \
+ fcobjs.c \
fcpat.c \
fcserialize.c \
fcstat.c \
@@ -113,7 +116,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
-I. \
-I${X11SRCDIR.${LIB}}
-FCARCH_DEPFILE= fccache.c
.include "Makefile.fcarch"
CLEANFILES+= fcarch.h
Index: src/external/mit/xorg/lib/fontconfig/src/shlib_version
diff -u src/external/mit/xorg/lib/fontconfig/src/shlib_version:1.3 src/external/mit/xorg/lib/fontconfig/src/shlib_version:1.4
--- src/external/mit/xorg/lib/fontconfig/src/shlib_version:1.3 Mon Jun 3 07:21:32 2013
+++ src/external/mit/xorg/lib/fontconfig/src/shlib_version Mon Jun 3 20:23:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.3 2013/06/03 07:21:32 mrg Exp $
+# $NetBSD: shlib_version,v 1.4 2013/06/03 20:23:39 mrg Exp $
#
major=2
-minor=1
+minor=2
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.7 src/external/mit/xorg/tools/fc-cache/Makefile:1.8
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.7 Mon Jun 3 06:56:32 2013
+++ src/external/mit/xorg/tools/fc-cache/Makefile Mon Jun 3 20:23:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/06/03 06:56:32 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2013/06/03 20:23:40 mrg Exp $
NOMAN= 1
@@ -14,10 +14,12 @@ EXPAT= ${NETBSDSRCDIR}/external/mit/exp
SRCS.fc-cache= fc-cache.c
.PATH: ${FONTCONFIG}/src
-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 \
- fcstat.c fcstr.c fcxml.c ftglue.h ftglue.c
+SRCS.fontconfig= fcatomic.c fcblanks.c fccache.c fccfg.c \
+ fccharset.c fcdbg.c fccompat.c fcdefault.c fcdir.c \
+ fcfreetype.c fcfs.c fchash.c fcinit.c fclang.c \
+ fclist.c fcmatch.c fcmatrix.c fcname.c fcobjs.c \
+ fcpat.c fcserialize.c fcstat.c fcstr.c fcxml.c \
+ ftglue.c
.PATH: ${FREETYPE}/src/base
SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
@@ -100,6 +102,8 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
-DFT2_BUILD_LIBRARY \
-DXML_BYTE_ORDER=0 -DHAVE_MEMMOVE=1 \
-DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON \
+ -DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H \
+ -DHAVE_MKSTEMP \
-DFLEXIBLE_ARRAY_MEMBER="/**/"
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
@@ -110,7 +114,6 @@ HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREE
LDADD= -lz
#LDADD+= -lbz2
-FCARCH_DEPFILE= fc-cache.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
Added files:
Index: src/external/mit/xorg/bin/fc-validate/Makefile
diff -u /dev/null src/external/mit/xorg/bin/fc-validate/Makefile:1.1
--- /dev/null Mon Jun 3 20:23:40 2013
+++ src/external/mit/xorg/bin/fc-validate/Makefile Mon Jun 3 20:23:39 2013
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2013/06/03 20:23:39 mrg Exp $
+
+.include <bsd.own.mk>
+
+PROG= fc-validate
+
+CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
+
+LDADD+= -lfontconfig -lfreetype -lexpat
+DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+
+.PATH: ${X11SRCDIR.fontconfig}/${PROG}
+
+.include "../../lib/fontconfig/src/Makefile.fcarch"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
