Wed Jul 16 14:05:04 2014 UTC ()
The placeholder name in fontconfig.pc.in has been changed.


(nakayama)
diff -r1.16 -r1.17 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs diff -r1.16 -r1.17 src/external/mit/xorg/lib/fontconfig/src/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/fontconfig/src/Makefile 2014/03/23 20:40:18 1.16
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile 2014/07/16 14:05:04 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.16 2014/03/23 20:40:18 mrg Exp $ 1# $NetBSD: Makefile,v 1.17 2014/07/16 14:05:04 nakayama Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= fontconfig 5LIB= fontconfig
6 6
7.PATH: ${X11SRCDIR.${LIB}}/src 7.PATH: ${X11SRCDIR.${LIB}}/src
8SRCS= fcatomic.c \ 8SRCS= fcatomic.c \
9 fcblanks.c \ 9 fcblanks.c \
10 fccache.c \ 10 fccache.c \
11 fccfg.c \ 11 fccfg.c \
12 fccharset.c \ 12 fccharset.c \
13 fccompat.c \ 13 fccompat.c \
14 fcdbg.c \ 14 fcdbg.c \
@@ -115,23 +115,23 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free @@ -115,23 +115,23 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
115 -I${X11SRCDIR.freetype}/include \ 115 -I${X11SRCDIR.freetype}/include \
116 -I${X11SRCDIR.${LIB}}/../include \ 116 -I${X11SRCDIR.${LIB}}/../include \
117 -I. \ 117 -I. \
118 -I${X11SRCDIR.${LIB}} 118 -I${X11SRCDIR.${LIB}}
119 119
120.include "Makefile.fcarch" 120.include "Makefile.fcarch"
121 121
122CLEANFILES+= fcarch.h 122CLEANFILES+= fcarch.h
123 123
124PKGCONFIG= fontconfig 124PKGCONFIG= fontconfig
125PKGCONFIG_SED_FLAGS= \ 125PKGCONFIG_SED_FLAGS= \
126 -e "s,@sysconfdir@,${X11ETCDIR},; \ 126 -e "s,@sysconfdir@,${X11ETCDIR},; \
127 s,@localstatedir@,/var,; \ 127 s,@localstatedir@,/var,; \
128 s,@baseconfigdir@,/etc/fonts,; \ 128 s,@BASECONFIGDIR@,/etc/fonts,; \
129 s,@fc_cachedir@,${FONTCONFIG_PATH}," 129 s,@fc_cachedir@,${FONTCONFIG_PATH},"
130 130
131# XXX 131# XXX
132CPPFLAGS.fcxml.c= -Wno-error 132CPPFLAGS.fcxml.c= -Wno-error
133 133
134CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-switch 134CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-switch
135 135
136.include <bsd.x11.mk> 136.include <bsd.x11.mk>
137.include <bsd.lib.mk> 137.include <bsd.lib.mk>