Module Name: src
Committed By: mrg
Date: Fri Mar 8 09:58:24 UTC 2019
Modified Files:
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xdebug: mi
src/distrib/sets/lists/xetc: mi
src/external/bsd/libuuid_ul/lib/libuuid_ul: Makefile
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/fontconfig: Makefile
src/external/mit/xorg/lib/fontconfig/etc/conf.d: Makefile
src/external/mit/xorg/lib/fontconfig/src: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
Added Files:
src/external/bsd/libuuid_ul/lib/libuuid_ul: srcs.mk
src/external/mit/xorg/bin/fc-conflist: Makefile
Log Message:
- install fontconfig 2.13.1 files and new fc-conflist
- move libuuid_ul stuff into its srcs.mk and link directly into libfontconfig.
- update reachover
- update man page list
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.201 -r1.202 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libuuid_ul/lib/libuuid_ul/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/libuuid_ul/lib/libuuid_ul/srcs.mk
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/fc-conflist/Makefile
cvs rdiff -u -r1.43 -r1.44 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/fontconfig/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.15 -r1.16 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.147 src/distrib/sets/lists/xbase/mi:1.148
--- src/distrib/sets/lists/xbase/mi:1.147 Sun Mar 3 17:52:32 2019
+++ src/distrib/sets/lists/xbase/mi Fri Mar 8 09:58:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.147 2019/03/03 17:52:32 maya Exp $
+# $NetBSD: mi,v 1.148 2019/03/08 09:58:23 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -21,6 +21,7 @@
./usr/X11R7/bin/editres -unknown- xorg
./usr/X11R7/bin/fc-cache -unknown- xorg
./usr/X11R7/bin/fc-cat -unknown- xorg
+./usr/X11R7/bin/fc-conflist -unknown- xorg
./usr/X11R7/bin/fc-list -unknown- xorg
./usr/X11R7/bin/fc-match -unknown- xorg
./usr/X11R7/bin/fc-pattern -unknown- xorg
@@ -1272,6 +1273,7 @@
./usr/X11R7/man/cat1/editres.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-cache.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-cat.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/fc-conflist.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-list.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-match.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-pattern.0 -unknown- .cat,xorg
@@ -1416,6 +1418,7 @@
./usr/X11R7/man/html1/editres.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-cache.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-cat.html -unknown- html,xorg
+./usr/X11R7/man/html1/fc-conflist.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-list.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-match.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-pattern.html -unknown- html,xorg
@@ -1560,6 +1563,7 @@
./usr/X11R7/man/man1/editres.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-cache.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-cat.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/fc-conflist.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-list.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-match.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-pattern.1 -unknown- .man,xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.201 src/distrib/sets/lists/xcomp/mi:1.202
--- src/distrib/sets/lists/xcomp/mi:1.201 Wed Jan 2 00:46:34 2019
+++ src/distrib/sets/lists/xcomp/mi Fri Mar 8 09:58:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.201 2019/01/02 00:46:34 christos Exp $
+# $NetBSD: mi,v 1.202 2019/03/08 09:58:23 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3304,6 +3304,7 @@
./usr/X11R7/man/man3/FcCharSetIntersect.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetIntersectCount.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetIsSubset.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcCharSetMerge.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetNew.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetNextPage.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetSubtract.3 -unknown- .man,xorg
@@ -3316,6 +3317,9 @@
./usr/X11R7/man/man3/FcConfigCreate.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigDestroy.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigEnableHome.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigFileInfoIterGet.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigFileInfoIterInit.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigFileInfoIterNext.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigFilename.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigGetBlanks.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigGetCache.3 -unknown- .man,xorg
@@ -3326,17 +3330,25 @@
./usr/X11R7/man/man3/FcConfigGetFontDirs.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigGetFonts.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigGetRescanInterval.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigGetSysRoot.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigHome.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigParseAndLoad.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigParseAndLoadFromMemory.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigReference.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigSetCurrent.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigSetRescanInterval.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigSetSysRoot.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigSubstitute.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigSubstituteWithPat.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigUptoDate.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDefaultSubstitute.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcDirCacheClean.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcDirCacheCreateUUID.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcDirCacheDeleteUUID.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheLoad.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheLoadFile.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheRead.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcDirCacheRescan.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheUnlink.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheUnload.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheValid.3 -unknown- .man,xorg
@@ -3361,6 +3373,7 @@
./usr/X11R7/man/man3/FcFreeTypeCharSet.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcFreeTypeCharSetAndSpacing.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcFreeTypeQuery.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcFreeTypeQueryAll.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcFreeTypeQueryFace.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcGetDefaultLangs.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcGetLangs.3 -unknown- .man,xorg
@@ -3373,6 +3386,7 @@
./usr/X11R7/man/man3/FcIsLower.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcIsUpper.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangGetCharSet.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcLangNormalize.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetAdd.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetCompare.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetContains.3 -unknown- .man,xorg
@@ -3381,6 +3395,7 @@
./usr/X11R7/man/man3/FcLangSetDel.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetDestroy.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetEqual.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcLangSetGetLangs.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetHasLang.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetHash.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetSubtract.3 -unknown- .man,xorg
@@ -3415,12 +3430,29 @@
./usr/X11R7/man/man3/FcPatternDuplicate.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternEqual.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternEqualSubset.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternFilter.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternFindIter.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternFormat.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternGet-Type.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternGet.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternGetWithBinding.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternHash.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterEqual.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterGetObject.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterGetValue.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterIsValid.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterNext.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterStart.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterValueCount.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternObjectCount.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternPrint.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternReference.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternRemove.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeCopy.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeCreateDouble.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeCreateInteger.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeDestroy.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeGetDouble.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrBasename.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrCmp.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrCmpIgnoreCase.3 -unknown- .man,xorg
@@ -3431,6 +3463,7 @@
./usr/X11R7/man/man3/FcStrFree.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrListCreate.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrListDone.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcStrListFirst.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrListNext.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrPlus.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrSetAdd.3 -unknown- .man,xorg
@@ -3452,6 +3485,10 @@
./usr/X11R7/man/man3/FcValueEqual.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcValuePrint.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcValueSave.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcWeightFromOpenType.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcWeightFromOpenTypeDouble.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcWeightToOpenType.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcWeightToOpenTypeDouble.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FontCacheChangeCacheSettings.3 -unknown- obsolete
./usr/X11R7/man/man3/FontCacheGetCacheSettings.3 -unknown- obsolete
./usr/X11R7/man/man3/FontCacheGetCacheStatistics.3 -unknown- obsolete
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.28 src/distrib/sets/lists/xdebug/mi:1.29
--- src/distrib/sets/lists/xdebug/mi:1.28 Sun Mar 11 09:43:39 2018
+++ src/distrib/sets/lists/xdebug/mi Fri Mar 8 09:58:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.28 2018/03/11 09:43:39 mrg Exp $
+# $NetBSD: mi,v 1.29 2019/03/08 09:58:23 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R7/lib -unknown- debuglib,xorg,compatx11dir
./usr/X11R7/lib/libFS_g.a -unknown- debuglib,xorg,compatx11file
@@ -118,6 +118,7 @@
./usr/libdata/debug/usr/X11R7/bin/editres.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-cache.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-cat.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/fc-conflist.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-list.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-match.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-pattern.debug -unknown- debug,xorg
Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.31 src/distrib/sets/lists/xetc/mi:1.32
--- src/distrib/sets/lists/xetc/mi:1.31 Thu Aug 30 05:39:21 2018
+++ src/distrib/sets/lists/xetc/mi Fri Mar 8 09:58:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.31 2018/08/30 05:39:21 maya Exp $
+# $NetBSD: mi,v 1.32 2019/03/08 09:58:23 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -66,10 +66,12 @@
./etc/fonts/conf.d/30-metric-aliases.conf -unknown- xorg
./etc/fonts/conf.d/30-urw-aliases.conf -unknown- xorg
./etc/fonts/conf.d/40-nonlatin.conf -unknown- xorg
+./etc/fonts/conf.d/45-generic.conf -unknown- xorg
./etc/fonts/conf.d/45-latin.conf -unknown- xorg
./etc/fonts/conf.d/49-sansserif.conf -unknown- xorg
./etc/fonts/conf.d/50-user.conf -unknown- xorg
./etc/fonts/conf.d/51-local.conf -unknown- xorg
+./etc/fonts/conf.d/60-generic.conf -unknown- xorg
./etc/fonts/conf.d/60-latin.conf -unknown- xorg
./etc/fonts/conf.d/65-fonts-persian.conf -unknown- xorg
./etc/fonts/conf.d/65-nonlatin.conf -unknown- xorg
Index: src/external/bsd/libuuid_ul/lib/libuuid_ul/Makefile
diff -u src/external/bsd/libuuid_ul/lib/libuuid_ul/Makefile:1.1 src/external/bsd/libuuid_ul/lib/libuuid_ul/Makefile:1.2
--- src/external/bsd/libuuid_ul/lib/libuuid_ul/Makefile:1.1 Thu Mar 7 03:53:51 2019
+++ src/external/bsd/libuuid_ul/lib/libuuid_ul/Makefile Fri Mar 8 09:58:23 2019
@@ -1,35 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2019/03/07 03:53:51 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/08 09:58:23 mrg Exp $
# Makefile to build minimal util-linux libuuid locally, with special
# prefix on all functions to avoid conflicts with libc uuid_compare(3).
#
LIB= uuid_ul
-SRCS= compare.c copy.c \
- gen_uuid.c \
- pack.c parse.c \
- unpack.c unparse.c
-
-CPPFLAGS+= \
- -DHAVE_UNISTD_H \
- -DHAVE_STDLIB_H \
- -DHAVE_SYS_TIME_H \
- -DHAVE_SYS_FILE_H \
- -DHAVE_SYS_IOCTL_H \
- -DHAVE_SYS_SOCKET_H \
- -DHAVE_SYS_SOCKIO_H \
- -DHAVE_SYS_SOCKIO_H \
- -DHAVE_NETINET_IN_H \
- -DHAVE_SYS_UN_H \
- -DHAVE_TLS \
- -DHAVE_NET_IF_H \
- -DHAVE_NET_IF_DL_H \
- -DHAVE_SA_LEN
-
-CPPFLAGS+= \
- -I${.CURDIR} \
- -DUL_CLOEXECSTR=\"e\" \
- -DUUIDD_OP_BULK_TIME_UUID=0
+
+.include "srcs.mk"
+SRCS= ${UUID_UL_SRCS}
.include "libuuid_ul-rename.mk"
@@ -37,4 +15,3 @@ LIBISPRIVATE= yes
.include <bsd.lib.mk>
-.PATH: ${X11SRCDIR}/external/bsd/libuuid_ul/dist
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.43 src/external/mit/xorg/lib/Makefile:1.44
--- src/external/mit/xorg/lib/Makefile:1.43 Thu Mar 7 03:56:15 2019
+++ src/external/mit/xorg/lib/Makefile Fri Mar 8 09:58:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/03/07 03:56:15 mrg Exp $
+# $NetBSD: Makefile,v 1.44 2019/03/08 09:58:24 mrg Exp $
# build libraries for xorg
@@ -16,7 +16,8 @@ SUBDIR+=libdrm_radeon pixman
.if !defined(MLIBDIR)
SUBDIR+=xkeyboard-config
.endif
-SUBDIR+=libxcb ../../../bsd/libuuid_ul/lib/libuuid_ul \
+SUBDIR+=libxcb \
+#SUBDIR+=../../../bsd/libuuid_ul/lib/libuuid_ul \
.WAIT
.if !defined(MLIBDIR)
SUBDIR+=dri7 dri gallium
Index: src/external/mit/xorg/lib/fontconfig/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/Makefile:1.3 src/external/mit/xorg/lib/fontconfig/Makefile:1.4
--- src/external/mit/xorg/lib/fontconfig/Makefile:1.3 Sat Nov 1 21:38:14 2008
+++ src/external/mit/xorg/lib/fontconfig/Makefile Fri Mar 8 09:58:24 2019
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2008/11/01 21:38:14 cube Exp $
+# $NetBSD: Makefile,v 1.4 2019/03/08 09:58:24 mrg Exp $
.include <bsd.own.mk>
SUBDIR= fontconfig src etc
+#SUBDIR+= its
+# share/gettext/its/fontconfig.its
+# share/gettext/its/fontconfig.loc
+
.include <bsd.x11.mk>
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.6 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.7
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.6 Thu Aug 30 05:39:21 2018
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Fri Mar 8 09:58:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/08/30 05:39:21 maya Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/08 09:58:24 mrg Exp $
.include <bsd.own.mk>
@@ -7,13 +7,14 @@ FONTCONFIG_LINKS= \
10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
20-unhint-small-vera.conf \
- 30-urw-aliases.conf \
30-metric-aliases.conf \
40-nonlatin.conf \
+ 45-generic.conf \
45-latin.conf \
49-sansserif.conf \
50-user.conf \
51-local.conf \
+ 60-generic.conf \
60-latin.conf \
65-fonts-persian.conf \
65-nonlatin.conf \
@@ -30,3 +31,5 @@ CONFIGSYMLINKS+=${CONFAVAILDIR}/${_conff
.include <bsd.x11.mk>
.include <bsd.prog.mk>
+
+# obsolete 30-urw-aliases.conf
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.22 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.23
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.22 Thu Mar 7 03:56:15 2019
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Fri Mar 8 09:58:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/03/07 03:56:15 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2019/03/08 09:58:24 mrg Exp $
.include <bsd.own.mk>
@@ -6,7 +6,6 @@ LIB= fontconfig
.PATH: ${X11SRCDIR.${LIB}}/src
SRCS= fcatomic.c \
- fcblanks.c \
fccache.c \
fccfg.c \
fccharset.c \
@@ -17,6 +16,7 @@ SRCS= fcatomic.c \
fcformat.c \
fcfreetype.c \
fcfs.c \
+ fchash.c \
fcinit.c \
fclang.c \
fclist.c \
@@ -25,6 +25,7 @@ SRCS= fcatomic.c \
fcname.c \
fcobjs.c \
fcpat.c \
+ fcptrlist.c \
fcrange.c \
fcserialize.c \
fcstat.c \
@@ -34,60 +35,223 @@ SRCS= fcatomic.c \
ftglue.c
.PATH: ${X11SRCDIR.${LIB}}/doc
-MAN= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 FcAtomicLock.3 \
- FcAtomicNewFile.3 FcAtomicOrigFile.3 FcAtomicReplaceOrig.3 \
- FcAtomicUnlock.3 FcBlanksAdd.3 FcBlanksCreate.3 FcBlanksDestroy.3 \
- FcBlanksIsMember.3 FcCacheCopySet.3 FcCacheDir.3 FcCacheNumFont.3 \
- FcCacheNumSubdir.3 FcCacheSubdir.3 FcCharSetAddChar.3 FcCharSetCopy.3 \
- FcCharSetCount.3 FcCharSetCoverage.3 FcCharSetCreate.3 \
- FcCharSetDestroy.3 FcCharSetEqual.3 FcCharSetFirstPage.3 \
- FcCharSetHasChar.3 FcCharSetIntersect.3 FcCharSetIntersectCount.3 \
- FcCharSetIsSubset.3 FcCharSetNew.3 FcCharSetNextPage.3 \
- FcCharSetSubtract.3 FcCharSetSubtractCount.3 FcCharSetUnion.3 \
- FcConfigAppFontAddDir.3 FcConfigAppFontAddFile.3 \
- FcConfigAppFontClear.3 FcConfigBuildFonts.3 FcConfigCreate.3 \
- FcConfigDestroy.3 FcConfigEnableHome.3 FcConfigFilename.3 \
- FcConfigGetBlanks.3 FcConfigGetCache.3 FcConfigGetCacheDirs.3 \
- FcConfigGetConfigDirs.3 FcConfigGetConfigFiles.3 FcConfigGetCurrent.3 \
- FcConfigGetFontDirs.3 FcConfigGetFonts.3 FcConfigGetRescanInterval.3 \
- FcConfigHome.3 FcConfigParseAndLoad.3 FcConfigSetCurrent.3 \
- FcConfigSetRescanInterval.3 FcConfigSubstitute.3 \
- FcConfigSubstituteWithPat.3 FcConfigUptoDate.3 FcDefaultSubstitute.3 \
- FcDirCacheLoad.3 FcDirCacheLoadFile.3 FcDirCacheRead.3 \
- FcDirCacheUnlink.3 FcDirCacheUnload.3 FcDirCacheValid.3 FcDirSave.3 \
- FcDirScan.3 FcFileIsDir.3 FcFileScan.3 FcFini.3 FcFontList.3 \
- FcFontMatch.3 FcFontRenderPrepare.3 FcFontSetAdd.3 FcFontSetCreate.3 \
- FcFontSetDestroy.3 FcFontSetList.3 FcFontSetMatch.3 FcFontSetPrint.3 \
- FcFontSetSort.3 FcFontSetSortDestroy.3 FcFontSort.3 \
- FcFreeTypeCharIndex.3 FcFreeTypeCharSet.3 \
- FcFreeTypeCharSetAndSpacing.3 FcFreeTypeQuery.3 \
- FcFreeTypeQueryFace.3 FcGetLangs.3 FcGetVersion.3 FcInit.3 \
- FcInitBringUptoDate.3 FcInitLoadConfig.3 FcInitLoadConfigAndFonts.3 \
- FcInitReinitialize.3 FcIsLower.3 FcIsUpper.3 FcLangGetCharSet.3 \
- FcLangSetAdd.3 FcLangSetCompare.3 FcLangSetContains.3 FcLangSetCopy.3 \
- FcLangSetCreate.3 FcLangSetDestroy.3 FcLangSetEqual.3 \
- FcLangSetHasLang.3 FcLangSetHash.3 FcMatrixCopy.3 FcMatrixEqual.3 \
- FcMatrixInit.3 FcMatrixMultiply.3 FcMatrixRotate.3 FcMatrixScale.3 \
- FcMatrixShear.3 FcNameConstant.3 FcNameGetConstant.3 \
- FcNameGetObjectType.3 FcNameParse.3 FcNameRegisterConstants.3 \
- FcNameRegisterObjectTypes.3 FcNameUnparse.3 \
- FcNameUnregisterConstants.3 FcNameUnregisterObjectTypes.3 \
- FcObjectSetAdd.3 FcObjectSetBuild.3 FcObjectSetCreate.3 \
- FcObjectSetDestroy.3 FcPatternAdd-Type.3 FcPatternAdd.3 \
- FcPatternAddWeak.3 FcPatternBuild.3 FcPatternCreate.3 FcPatternDel.3 \
- FcPatternDestroy.3 FcPatternDuplicate.3 FcPatternEqual.3 \
- FcPatternEqualSubset.3 FcPatternGet-Type.3 FcPatternGet.3 \
- FcPatternHash.3 FcPatternPrint.3 FcPatternReference.3 \
- FcPatternRemove.3 FcStrBasename.3 FcStrCmp.3 FcStrCmpIgnoreCase.3 \
- FcStrCopy.3 FcStrCopyFilename.3 FcStrDirname.3 FcStrDowncase.3 \
- FcStrFree.3 FcStrListCreate.3 FcStrListDone.3 FcStrListNext.3 \
- FcStrPlus.3 FcStrSetAdd.3 FcStrSetAddFilename.3 FcStrSetCreate.3 \
- FcStrSetDel.3 FcStrSetDestroy.3 FcStrSetEqual.3 FcStrSetMember.3 \
- FcStrStr.3 FcStrStrIgnoreCase.3 FcToLower.3 FcUcs4ToUtf8.3 \
- FcUtf16Len.3 FcUtf16ToUcs4.3 FcUtf8Len.3 FcUtf8ToUcs4.3 \
- FcValueDestroy.3 FcValueEqual.3 FcValuePrint.3 FcValueSave.3 \
- FcCacheCreateTagFile.3 FcCharSetDelChar.3 FcGetDefaultLangs.3 \
- FcLangSetDel.3 FcLangSetSubtract.3 FcLangSetUnion.3
+MAN= \
+ FcAtomicCreate.3 \
+ FcAtomicDeleteNew.3 \
+ FcAtomicDestroy.3 \
+ FcAtomicLock.3 \
+ FcAtomicNewFile.3 \
+ FcAtomicOrigFile.3 \
+ FcAtomicReplaceOrig.3 \
+ FcAtomicUnlock.3 \
+ FcBlanksAdd.3 \
+ FcBlanksCreate.3 \
+ FcBlanksDestroy.3 \
+ FcBlanksIsMember.3 \
+ FcCacheCopySet.3 \
+ FcCacheCreateTagFile.3 \
+ FcCacheDir.3 \
+ FcCacheNumFont.3 \
+ FcCacheNumSubdir.3 \
+ FcCacheSubdir.3 \
+ FcCharSetAddChar.3 \
+ FcCharSetCopy.3 \
+ FcCharSetCount.3 \
+ FcCharSetCoverage.3 \
+ FcCharSetCreate.3 \
+ FcCharSetDelChar.3 \
+ FcCharSetDestroy.3 \
+ FcCharSetEqual.3 \
+ FcCharSetFirstPage.3 \
+ FcCharSetHasChar.3 \
+ FcCharSetIntersect.3 \
+ FcCharSetIntersectCount.3 \
+ FcCharSetIsSubset.3 \
+ FcCharSetMerge.3 \
+ FcCharSetNew.3 \
+ FcCharSetNextPage.3 \
+ FcCharSetSubtract.3 \
+ FcCharSetSubtractCount.3 \
+ FcCharSetUnion.3 \
+ FcConfigAppFontAddDir.3 \
+ FcConfigAppFontAddFile.3 \
+ FcConfigAppFontClear.3 \
+ FcConfigBuildFonts.3 \
+ FcConfigCreate.3 \
+ FcConfigDestroy.3 \
+ FcConfigEnableHome.3 \
+ FcConfigFileInfoIterGet.3 \
+ FcConfigFileInfoIterInit.3 \
+ FcConfigFileInfoIterNext.3 \
+ FcConfigFilename.3 \
+ FcConfigGetBlanks.3 \
+ FcConfigGetCache.3 \
+ FcConfigGetCacheDirs.3 \
+ FcConfigGetConfigDirs.3 \
+ FcConfigGetConfigFiles.3 \
+ FcConfigGetCurrent.3 \
+ FcConfigGetFontDirs.3 \
+ FcConfigGetFonts.3 \
+ FcConfigGetRescanInterval.3 \
+ FcConfigGetSysRoot.3 \
+ FcConfigHome.3 \
+ FcConfigParseAndLoad.3 \
+ FcConfigParseAndLoadFromMemory.3 \
+ FcConfigReference.3 \
+ FcConfigSetCurrent.3 \
+ FcConfigSetRescanInterval.3 \
+ FcConfigSetSysRoot.3 \
+ FcConfigSubstitute.3 \
+ FcConfigSubstituteWithPat.3 \
+ FcConfigUptoDate.3 \
+ FcDefaultSubstitute.3 \
+ FcDirCacheClean.3 \
+ FcDirCacheCreateUUID.3 \
+ FcDirCacheDeleteUUID.3 \
+ FcDirCacheLoad.3 \
+ FcDirCacheLoadFile.3 \
+ FcDirCacheRead.3 \
+ FcDirCacheRescan.3 \
+ FcDirCacheUnlink.3 \
+ FcDirCacheUnload.3 \
+ FcDirCacheValid.3 \
+ FcDirSave.3 \
+ FcDirScan.3 \
+ FcFileIsDir.3 \
+ FcFileScan.3 \
+ FcFini.3 \
+ FcFontList.3 \
+ FcFontMatch.3 \
+ FcFontRenderPrepare.3 \
+ FcFontSetAdd.3 \
+ FcFontSetCreate.3 \
+ FcFontSetDestroy.3 \
+ FcFontSetList.3 \
+ FcFontSetMatch.3 \
+ FcFontSetPrint.3 \
+ FcFontSetSort.3 \
+ FcFontSetSortDestroy.3 \
+ FcFontSort.3 \
+ FcFreeTypeCharIndex.3 \
+ FcFreeTypeCharSet.3 \
+ FcFreeTypeCharSetAndSpacing.3 \
+ FcFreeTypeQuery.3 \
+ FcFreeTypeQueryAll.3 \
+ FcFreeTypeQueryFace.3 \
+ FcGetDefaultLangs.3 \
+ FcGetLangs.3 \
+ FcGetVersion.3 \
+ FcInit.3 \
+ FcInitBringUptoDate.3 \
+ FcInitLoadConfig.3 \
+ FcInitLoadConfigAndFonts.3 \
+ FcInitReinitialize.3 \
+ FcIsLower.3 \
+ FcIsUpper.3 \
+ FcLangGetCharSet.3 \
+ FcLangNormalize.3 \
+ FcLangSetAdd.3 \
+ FcLangSetCompare.3 \
+ FcLangSetContains.3 \
+ FcLangSetCopy.3 \
+ FcLangSetCreate.3 \
+ FcLangSetDel.3 \
+ FcLangSetDestroy.3 \
+ FcLangSetEqual.3 \
+ FcLangSetGetLangs.3 \
+ FcLangSetHasLang.3 \
+ FcLangSetHash.3 \
+ FcLangSetSubtract.3 \
+ FcLangSetUnion.3 \
+ FcMatrixCopy.3 \
+ FcMatrixEqual.3 \
+ FcMatrixInit.3 \
+ FcMatrixMultiply.3 \
+ FcMatrixRotate.3 \
+ FcMatrixScale.3 \
+ FcMatrixShear.3 \
+ FcNameConstant.3 \
+ FcNameGetConstant.3 \
+ FcNameGetObjectType.3 \
+ FcNameParse.3 \
+ FcNameRegisterConstants.3 \
+ FcNameRegisterObjectTypes.3 \
+ FcNameUnparse.3 \
+ FcNameUnregisterConstants.3 \
+ FcNameUnregisterObjectTypes.3 \
+ FcObjectSetAdd.3 \
+ FcObjectSetBuild.3 \
+ FcObjectSetCreate.3 \
+ FcObjectSetDestroy.3 \
+ FcPatternAdd-Type.3 \
+ FcPatternAdd.3 \
+ FcPatternAddWeak.3 \
+ FcPatternBuild.3 \
+ FcPatternCreate.3 \
+ FcPatternDel.3 \
+ FcPatternDestroy.3 \
+ FcPatternDuplicate.3 \
+ FcPatternEqual.3 \
+ FcPatternEqualSubset.3 \
+ FcPatternFilter.3 \
+ FcPatternFindIter.3 \
+ FcPatternFormat.3 \
+ FcPatternGet-Type.3 \
+ FcPatternGet.3 \
+ FcPatternGetWithBinding.3 \
+ FcPatternHash.3 \
+ FcPatternIterEqual.3 \
+ FcPatternIterGetObject.3 \
+ FcPatternIterGetValue.3 \
+ FcPatternIterIsValid.3 \
+ FcPatternIterNext.3 \
+ FcPatternIterStart.3 \
+ FcPatternIterValueCount.3 \
+ FcPatternObjectCount.3 \
+ FcPatternPrint.3 \
+ FcPatternReference.3 \
+ FcPatternRemove.3 \
+ FcRangeCopy.3 \
+ FcRangeCreateDouble.3 \
+ FcRangeCreateInteger.3 \
+ FcRangeDestroy.3 \
+ FcRangeGetDouble.3 \
+ FcStrBasename.3 \
+ FcStrCmp.3 \
+ FcStrCmpIgnoreCase.3 \
+ FcStrCopy.3 \
+ FcStrCopyFilename.3 \
+ FcStrDirname.3 \
+ FcStrDowncase.3 \
+ FcStrFree.3 \
+ FcStrListCreate.3 \
+ FcStrListDone.3 \
+ FcStrListFirst.3 \
+ FcStrListNext.3 \
+ FcStrPlus.3 \
+ FcStrSetAdd.3 \
+ FcStrSetAddFilename.3 \
+ FcStrSetCreate.3 \
+ FcStrSetDel.3 \
+ FcStrSetDestroy.3 \
+ FcStrSetEqual.3 \
+ FcStrSetMember.3 \
+ FcStrStr.3 \
+ FcStrStrIgnoreCase.3 \
+ FcToLower.3 \
+ FcUcs4ToUtf8.3 \
+ FcUtf16Len.3 \
+ FcUtf16ToUcs4.3 \
+ FcUtf8Len.3 \
+ FcUtf8ToUcs4.3 \
+ FcValueDestroy.3 \
+ FcValueEqual.3 \
+ FcValuePrint.3 \
+ FcValueSave.3 \
+ FcWeightFromOpenType.3 \
+ FcWeightFromOpenTypeDouble.3 \
+ FcWeightToOpenType.3 \
+ FcWeightToOpenTypeDouble.3
MAN+= fonts-conf.5
@@ -99,9 +263,12 @@ LIBDPLIBS=\
# XXX FONTCONFIG_PATH was arbitrarily chosen
FONTCONFIG_PATH=/etc/fonts
+TEMPLATEDIR=${FONTCONFIG_PATH}/fontconfig/conf.avail
+
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -DFONTCONFIG_PATH='"${FONTCONFIG_PATH}"' \
-DFC_DEFAULT_FONTS='"${X11FONTDIR}"' \
+ -DFC_TEMPLATEDIR='"${X11FONTDIR}"' \
-DFC_CACHEDIR='"/var/cache/fontconfig"' \
-DHAVE_FT_BITMAP_SIZE_Y_PPEM \
-DHAVE_FT_GET_BDF_PROPERTY \
@@ -129,15 +296,10 @@ PKGCONFIG= fontconfig
PKGCONFIG_SED_FLAGS= \
-e "s,@sysconfdir@,${X11ETCDIR},; \
s,@localstatedir@,/var,; \
- s,@BASECONFIGDIR@,/etc/fonts,; \
+ s,@BASECONFIGDIR@,${FONTCONFIG_PATH},; \
+ s,@TEMPLATEDIR@,${TEMPLATEDIR},; \
s,@fc_cachedir@,${FONTCONFIG_PATH},"
-LIBUUID_DIST= ${NETBSDSRCDIR}/external/bsd/libuuid_ul/lib/libuuid_ul
-.include "${LIBUUID_DIST}/libuuid_ul-rename.mk"
-LIBUUID_ULDIR!= cd ${LIBUUID_DIST} && ${PRINTOBJDIR}
-LDADD+= ${LIBUUID_ULDIR}/libuuid_ul.a
-DPADD+= ${LIBUUID_ULDIR}/libuuid_ul.a
-
# XXX
CPPFLAGS.fcxml.c= -Wno-error
@@ -152,5 +314,17 @@ COPTS.fcpat.c+= ${${ACTIVE_CC} == "clang
COPTS.fcstr.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
.endif
+LIBUUID_DIST= ${NETBSDSRCDIR}/external/bsd/libuuid_ul/lib/libuuid_ul
+.include "${LIBUUID_DIST}/srcs.mk"
+.include "${LIBUUID_DIST}/libuuid_ul-rename.mk"
+SRCS+= ${UUID_UL_SRCS}
+
+depend dependall all: uuid/uuid.h
+includes uuid/uuid.h:
+ @-mkdir -p uuid
+ ln -s ${X11SRCDIR}/external/bsd/libuuid_ul/dist/uuid.h uuid/uuid.h
+
+CLEANFILES+= uuid/uuid.h
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.15 src/external/mit/xorg/tools/fc-cache/Makefile:1.16
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.15 Wed May 9 08:13:23 2018
+++ src/external/mit/xorg/tools/fc-cache/Makefile Fri Mar 8 09:58:24 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/05/09 08:13:23 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2019/03/08 09:58:24 mrg Exp $
.include <bsd.hostinit.mk>
@@ -12,11 +12,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 \
+SRCS.fontconfig= fcatomic.c fccache.c fccfg.c \
fccharset.c fcdbg.c fccompat.c fcdefault.c fcdir.c \
- fcfreetype.c fcfs.c fcinit.c fclang.c \
+ fcfreetype.c fcfs.c fchash.c fcinit.c fclang.c \
fclist.c fcmatch.c fcmatrix.c fcname.c fcobjs.c \
- fcpat.c fcrange.c fcserialize.c fcstat.c fcstr.c \
+ fcpat.c fcptrlist.c \
+ fcrange.c fcserialize.c fcstat.c fcstr.c \
fcweight.c fcxml.c \
ftglue.c
@@ -91,6 +92,7 @@ SRCS= ${SRCS.fc-cache} ${SRCS.fontconfig
# XXX ALIGNOF_VOID_P=8 not valid for 32 bit, but probably ok?
HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DESTDIR}/etc/X11/fonts"' \
-DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' \
+ -DFC_TEMPLATEDIR='"${DESTDIR}${X11FONTDIR}"' \
-DFC_CACHEDIR='"${DESTDIR}/var/cache/fontconfig"' \
-DFC_GPERF_SIZE_T=unsigned \
-DFC_NO_MT=1 \
@@ -114,7 +116,10 @@ HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREE
-I${FREETYPE}/include -I${FREETYPE}/include/freetype \
-I${EXPAT}/lib \
-I${FONTCONFIG}/../include \
- -I${DESTDIR}${X11INCDIR} -I.
+ -I${DESTDIR}${X11INCDIR} -I. \
+ -I${FONTCONFIG}/../include
+
+HOST_CPPFLAGS+= -DTOOL_FCCACHE
LDADD= -lz
#LDADD+= -lbz2
Added files:
Index: src/external/bsd/libuuid_ul/lib/libuuid_ul/srcs.mk
diff -u /dev/null src/external/bsd/libuuid_ul/lib/libuuid_ul/srcs.mk:1.1
--- /dev/null Fri Mar 8 09:58:24 2019
+++ src/external/bsd/libuuid_ul/lib/libuuid_ul/srcs.mk Fri Mar 8 09:58:23 2019
@@ -0,0 +1,40 @@
+# $NetBSD: srcs.mk,v 1.1 2019/03/08 09:58:23 mrg Exp $
+
+# Sources and flags for libuuid_ul.
+
+UUID_UL_SRCS= \
+ compare.c \
+ copy.c \
+ gen_uuid.c \
+ pack.c \
+ parse.c \
+ unpack.c \
+ unparse.c
+
+UUID_UL_CPPFLAGS+= \
+ -DHAVE_UNISTD_H \
+ -DHAVE_STDLIB_H \
+ -DHAVE_SYS_TIME_H \
+ -DHAVE_SYS_FILE_H \
+ -DHAVE_SYS_IOCTL_H \
+ -DHAVE_SYS_SOCKET_H \
+ -DHAVE_SYS_SOCKIO_H \
+ -DHAVE_SYS_SOCKIO_H \
+ -DHAVE_NETINET_IN_H \
+ -DHAVE_SYS_UN_H \
+ -DHAVE_TLS \
+ -DHAVE_NET_IF_H \
+ -DHAVE_NET_IF_DL_H \
+ -DHAVE_SA_LEN
+
+UUID_UL_CPPFLAGS+= \
+ -I. \
+ -I${NETBSDSRCDIR}/external/bsd/libuuid_ul/lib/libuuid_ul \
+ -DUL_CLOEXECSTR=\"e\" \
+ -DUUIDD_OP_BULK_TIME_UUID=0
+
+.for _s in ${UUID_UL_SRCS}
+CPPFLAGS.${_s}+= ${UUID_UL_CPPFLAGS}
+.endfor
+
+.PATH: ${X11SRCDIR}/external/bsd/libuuid_ul/dist
Index: src/external/mit/xorg/bin/fc-conflist/Makefile
diff -u /dev/null src/external/mit/xorg/bin/fc-conflist/Makefile:1.1
--- /dev/null Fri Mar 8 09:58:24 2019
+++ src/external/mit/xorg/bin/fc-conflist/Makefile Fri Mar 8 09:58:24 2019
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2019/03/08 09:58:24 mrg Exp $
+
+.include <bsd.own.mk>
+
+PROG= fc-conflist
+
+CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
+CPPFLAGS+= -DHAVE_GETOPT_LONG=1
+
+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>
