CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: kre
Date: Sun Mar 24 10:39:45 UTC 2019
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
Make "includes" depend upon uuid/uuid.h (as already did
depends, dependall, and all) rather than unconditionally
"building" it.
This avoids a "file exists" error from an update build
(where the objdir already contained the link to the file.)
ok mrg@ :
"if it works from a clean objdir, please commit it. we can fix more later.."
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.24 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.25
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.24 Mon Mar 11 01:40:05 2019
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Sun Mar 24 10:39:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/03/11 01:40:05 mrg Exp $
+# $NetBSD: Makefile,v 1.25 2019/03/24 10:39:45 kre Exp $
.include
@@ -321,8 +321,8 @@ LIBUUID_DIST= ${NETBSDSRCDIR}/external/b
.include "${LIBUUID_DIST}/libuuid_ul-rename.mk"
SRCS+= ${UUID_UL_SRCS}
-depend dependall all: uuid/uuid.h
-includes uuid/uuid.h:
+includes depend dependall all: uuid/uuid.h
+uuid/uuid.h:
@-mkdir -p uuid
ln -s ${X11SRCDIR}/external/bsd/libuuid_ul/dist/uuid.h uuid/uuid.h
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: mrg
Date: Mon Mar 11 01:40:05 UTC 2019
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
handle @PKG_EXPAT_LIBS@ and @PKG_EXPAT_CFLAGS@.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.23 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.24
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.23 Fri Mar 8 09:58:24 2019
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Mon Mar 11 01:40:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/03/08 09:58:24 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2019/03/11 01:40:05 mrg Exp $
.include
@@ -297,6 +297,8 @@ PKGCONFIG_SED_FLAGS= \
-e "s,@sysconfdir@,${X11ETCDIR},; \
s,@localstatedir@,/var,; \
s,@BASECONFIGDIR@,${FONTCONFIG_PATH},; \
+ s,@PKG_EXPAT_LIBS@,-lexpat,; \
+ s,@PKG_EXPAT_CFLAGS@,,; \
s,@TEMPLATEDIR@,${TEMPLATEDIR},; \
s,@fc_cachedir@,${FONTCONFIG_PATH},"
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: mrg
Date: Wed May 9 08:15:09 UTC 2018
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
add more include paths for freetype 2.9.1.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.20 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.21
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.20 Tue Aug 29 09:02:10 2017
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Wed May 9 08:15:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/08/29 09:02:10 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2018/05/09 08:15:09 mrg Exp $
.include
@@ -116,6 +116,7 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
-I${X11SRCDIR.freetype}/src \
-I${X11SRCDIR.freetype}/include \
+ -I${X11SRCDIR.freetype}/include/freetype \
-I${X11SRCDIR.${LIB}}/../include \
-I. \
-I${X11SRCDIR.${LIB}}
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: pgoyette
Date: Tue May 31 02:35:49 UTC 2016
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
Install man-link from fonts-conf.5 --> fonts.conf.5 to deal with an
erroneous cross-ref in xclock's man-page. suggested by wiz@.
Fixes PR xsrc/49777
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.17 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.18
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.17 Wed Jul 16 14:05:04 2014
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Tue May 31 02:35:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/07/16 14:05:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.18 2016/05/31 02:35:49 pgoyette Exp $
.include
@@ -90,6 +90,8 @@ MAN= FcAtomicCreate.3 FcAtomicDeleteNew.
MAN+= fonts-conf.5
+MLINKS= fonts-conf.5 fonts.conf.5
+
LIBDPLIBS=\
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
freetype ${.CURDIR}/../../freetype
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: nakayama
Date: Wed Jul 16 14:05:04 UTC 2014
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
The placeholder name in fontconfig.pc.in has been changed.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.16 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.17
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.16 Sun Mar 23 20:40:18 2014
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Wed Jul 16 14:05:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/03/23 20:40:18 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2014/07/16 14:05:04 nakayama Exp $
.include bsd.own.mk
@@ -125,7 +125,7 @@ PKGCONFIG= fontconfig
PKGCONFIG_SED_FLAGS= \
-e s,@sysconfdir@,${X11ETCDIR},; \
s,@localstatedir@,/var,; \
- s,@baseconfigdir@,/etc/fonts,; \
+ s,@BASECONFIGDIR@,/etc/fonts,; \
s,@fc_cachedir@,${FONTCONFIG_PATH},
# XXX
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src Committed By: wiz Date: Thu Jun 27 12:44:58 UTC 2013 Modified Files: src/external/mit/xorg/lib/fontconfig/src: Makefile Log Message: Remove clang workaround, problem was fixed using upstream commit. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.14 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.15 --- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.14 Tue Jun 25 14:05:04 2013 +++ src/external/mit/xorg/lib/fontconfig/src/Makefile Thu Jun 27 12:44:58 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2013/06/25 14:05:04 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2013/06/27 12:44:58 wiz Exp $ .include bsd.own.mk @@ -126,7 +126,6 @@ PKGCONFIG= fontconfig CPPFLAGS.fcxml.c= -Wno-error CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-switch -CWARNFLAGS.clang+= -Wno-error=tautological-constant-out-of-range-compare .include bsd.x11.mk .include bsd.lib.mk
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src Committed By: wiz Date: Tue Jun 25 14:05:04 UTC 2013 Modified Files: src/external/mit/xorg/lib/fontconfig/src: Makefile Log Message: Add -Wno-error=tautological-constant-out-of-range-compare for clang, to avoid ../external/mit/fontconfig/dist/src/fcname.c:89:18: error: comparison of constant 4294967295 with expression of type 'const FcType' (aka 'const enum _FcType') is always false [-Werror,-Wtautological-constant-out-of-range-compare] if (t-type == (unsigned int) -1 || type == t-type) ~~~ ^ ~ 1 error generated. and a few others of the same type. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.13 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.14 --- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.13 Wed Jun 5 22:42:19 2013 +++ src/external/mit/xorg/lib/fontconfig/src/Makefile Tue Jun 25 14:05:04 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/06/05 22:42:19 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2013/06/25 14:05:04 wiz Exp $ .include bsd.own.mk @@ -126,6 +126,7 @@ PKGCONFIG= fontconfig CPPFLAGS.fcxml.c= -Wno-error CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-switch +CWARNFLAGS.clang+= -Wno-error=tautological-constant-out-of-range-compare .include bsd.x11.mk .include bsd.lib.mk
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: mrg
Date: Wed Jun 5 22:42:19 UTC 2013
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
remove hard coded version string now that fontconfig uses the
default match the normal code handles.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.12 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.13
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.12 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Wed Jun 5 22:42:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/05 22:42:19 mrg Exp $
.include bsd.own.mk
@@ -121,8 +121,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
CLEANFILES+= fcarch.h
PKGCONFIG= fontconfig
-# fontconfig uses VERSION and not PACKAGE_VERSION
-PKGCONFIG_VERSION.fontconfig= 2.6.0
# XXX
CPPFLAGS.fcxml.c= -Wno-error
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src Committed By: mrg Date: Mon Jun 3 07:21:32 UTC 2013 Modified Files: src/external/mit/xorg/lib/fontconfig/src: shlib_version Log Message: bump shlib version; some symbols were added. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/fontconfig/src/shlib_version 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/lib/fontconfig/src/shlib_version diff -u src/external/mit/xorg/lib/fontconfig/src/shlib_version:1.2 src/external/mit/xorg/lib/fontconfig/src/shlib_version:1.3 --- src/external/mit/xorg/lib/fontconfig/src/shlib_version:1.2 Sun Jan 11 03:10:10 2009 +++ src/external/mit/xorg/lib/fontconfig/src/shlib_version Mon Jun 3 07:21:32 2013 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:10 christos Exp $ +# $NetBSD: shlib_version,v 1.3 2013/06/03 07:21:32 mrg Exp $ # major=2 -minor=0 +minor=1
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: mrg
Date: Mon Jun 3 07:23:02 UTC 2013
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
don't build fcarch.c into the library!
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.10 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.11
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.10 Mon Jun 3 06:46:54 2013
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Mon Jun 3 07:23:02 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/06/03 06:46:54 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2013/06/03 07:23:02 mrg Exp $
.include bsd.own.mk
@@ -29,8 +29,6 @@ SRCS= fcatomic.c \
fcxml.c \
ftglue.c
-SRCS+= fcarch.c
-
.PATH: ${X11SRCDIR.${LIB}}/doc
MAN= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 FcAtomicLock.3 \
FcAtomicNewFile.3 FcAtomicOrigFile.3 FcAtomicReplaceOrig.3 \
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: mrg
Date: Sun Nov 21 07:45:36 UTC 2010
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
update this for fontconfig 2.8.0. ugh.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.5 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.6
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.5 Sat Nov 1 21:38:14 2008
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Sun Nov 21 07:45:36 2010
@@ -1,14 +1,32 @@
-# $NetBSD: Makefile,v 1.5 2008/11/01 21:38:14 cube Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/21 07:45:36 mrg Exp $
.include bsd.own.mk
LIB= fontconfig
.PATH: ${X11SRCDIR.${LIB}}/src
-SRCS= 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
+SRCS= fcatomic.c \
+ fcblanks.c \
+ fccache.c \
+ fccfg.c \
+ fccharset.c \
+ fcdbg.c \
+ fcdefault.c \
+ fcdir.c \
+ fcformat.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.c
.PATH: ${X11SRCDIR.${LIB}}/doc
MAN= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 FcAtomicLock.3 \
@@ -98,5 +116,8 @@
# fontconfig uses VERSION and not PACKAGE_VERSION
PKGCONFIG_VERSION.fontconfig= 2.6.0
+# XXX
+CPPFLAGS.fcxml.c= -Wno-error
+
.include bsd.x11.mk
.include bsd.lib.mk
