Module Name: src Committed By: msaitoh Date: Sun Dec 21 19:12:10 UTC 2014
Modified Files: src/external/mit/xorg/lib/fontconfig/etc [netbsd-6]: fonts.conf src/external/mit/xorg/lib/fontconfig/etc/conf.avail [netbsd-6]: Makefile src/external/mit/xorg/lib/fontconfig/etc/conf.d [netbsd-6]: Makefile src/external/mit/xorg/lib/fontconfig/src [netbsd-6]: Makefile Makefile.fcarch shlib_version src/external/mit/xorg/tools/fc-cache [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by mrg in ticket #1178): external/mit/xorg/lib/fontconfig/etc/fonts.conf patch external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile patch external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile patch external/mit/xorg/lib/fontconfig/src/Makefile patch external/mit/xorg/lib/fontconfig/src/Makefile.fcarch patch external/mit/xorg/lib/fontconfig/src/shlib_version patch external/mit/xorg/tools/fc-cache/Makefile patch xsrc/external/mit/fontconfig/Makefile.am patch xsrc/external/mit/fontconfig/Makefile.in patch xsrc/external/mit/fontconfig/ac_check_symbol.m4 patch xsrc/external/mit/fontconfig/ax_cc_for_build.m4 patch xsrc/external/mit/fontconfig/ax_create_stdint_h.m4 patch xsrc/external/mit/fontconfig/ax_pthread.m4 patch xsrc/external/mit/fontconfig/fc-pattern.1 patch xsrc/external/mit/fontconfig/fc-pattern.c patch xsrc/external/mit/fontconfig/fc-pattern.sgml patch xsrc/external/mit/fontconfig/fc-validate.1 patch xsrc/external/mit/fontconfig/fc-validate.c patch xsrc/external/mit/fontconfig/fc-validate.sgml patch xsrc/external/mit/fontconfig/libtool.m4 patch xsrc/external/mit/fontconfig/ltoptions.m4 patch xsrc/external/mit/fontconfig/ltsugar.m4 patch xsrc/external/mit/fontconfig/ltversion.m4 patch xsrc/external/mit/fontconfig/lt~obsolete.m4 patch xsrc/external/mit/fontconfig/dist/Tools.mk patch xsrc/external/mit/fontconfig/dist/compile patch xsrc/external/mit/fontconfig/dist/config-fixups.h patch xsrc/external/mit/fontconfig/dist/configure.ac patch xsrc/external/mit/fontconfig/dist/test-driver patch xsrc/external/mit/fontconfig/dist/conf.d/10-scale-bitmap-fonts.conf patch xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-default.conf patch xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-legacy.conf patch xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-light.conf patch xsrc/external/mit/fontconfig/dist/conf.d/README.in patch xsrc/external/mit/fontconfig/dist/doc/FcCacheCreateTagFile.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetDelChar.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetSysRoot.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigSetSysRoot.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheClean.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheRescan.3 patch xsrc/external/mit/fontconfig/dist/doc/FcGetDefaultLangs.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangNormalize.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetDel.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetSubtract.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetUnion.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrListFirst.3 patch xsrc/external/mit/fontconfig/dist/doc/fcatomic.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcblanks.sgml patch xsrc/external/mit/fontconfig/dist/doc/fccache.sgml patch xsrc/external/mit/fontconfig/dist/doc/fccharset.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcconfig.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcconstant.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcdircache.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcfile.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcfontset.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcformat.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcfreetype.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcinit.sgml patch xsrc/external/mit/fontconfig/dist/doc/fclangset.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcmatrix.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcobjectset.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcobjecttype.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcpattern.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcstring.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcstrset.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcvalue.sgml patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccachecreatetagfile.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetdelchar.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetsysroot.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigsetsysroot.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdircacheclean.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdircacherescan.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcgetdefaultlangs.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangnormalize.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetdel.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetsubtract.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetunion.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrlistfirst.html patch xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.h patch xsrc/external/mit/fontconfig/dist/fc-lang/README patch xsrc/external/mit/fontconfig/dist/fc-lang/brx.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/doi.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/fclang.h patch xsrc/external/mit/fontconfig/dist/fc-lang/mni.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/nqo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/quz.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sat.orth patch xsrc/external/mit/fontconfig/dist/src/fcarch.c patch xsrc/external/mit/fontconfig/dist/src/fcarch.h patch xsrc/external/mit/fontconfig/dist/src/fcatomic.h patch xsrc/external/mit/fontconfig/dist/src/fccompat.c patch xsrc/external/mit/fontconfig/dist/src/fchash.c patch xsrc/external/mit/fontconfig/dist/src/fcmutex.h patch xsrc/external/mit/fontconfig/dist/src/fcobjs.c patch xsrc/external/mit/fontconfig/dist/src/fcobjs.h patch xsrc/external/mit/fontconfig/dist/src/fcobjshash.gperf patch xsrc/external/mit/fontconfig/dist/src/fcobjshash.gperf.h patch xsrc/external/mit/fontconfig/dist/src/fcobjshash.h patch xsrc/external/mit/fontconfig/dist/src/fcstat.c patch xsrc/external/mit/fontconfig/dist/src/fcstdint.h patch xsrc/external/mit/fontconfig/dist/src/fcwindows.h patch xsrc/external/mit/fontconfig/dist/test/test-migration.c patch xsrc/external/mit/fontconfig/dist/test/test-pthread.c patch xsrc/external/mit/fontconfig/include/config.h patch xsrc/external/mit/fontconfig/dist/COPYING patch xsrc/external/mit/fontconfig/dist/ChangeLog patch xsrc/external/mit/fontconfig/dist/INSTALL patch xsrc/external/mit/fontconfig/dist/Makefile.am patch xsrc/external/mit/fontconfig/dist/Makefile.in patch xsrc/external/mit/fontconfig/dist/README patch xsrc/external/mit/fontconfig/dist/acinclude.m4 patch xsrc/external/mit/fontconfig/dist/aclocal.m4 patch xsrc/external/mit/fontconfig/dist/config.guess patch xsrc/external/mit/fontconfig/dist/config.h.in patch xsrc/external/mit/fontconfig/dist/config.sub patch xsrc/external/mit/fontconfig/dist/configure patch xsrc/external/mit/fontconfig/dist/configure.in patch xsrc/external/mit/fontconfig/dist/depcomp patch xsrc/external/mit/fontconfig/dist/fontconfig.pc.in patch xsrc/external/mit/fontconfig/dist/fontconfig.spec patch xsrc/external/mit/fontconfig/dist/fonts.conf.in patch xsrc/external/mit/fontconfig/dist/fonts.dtd patch xsrc/external/mit/fontconfig/dist/install-sh patch xsrc/external/mit/fontconfig/dist/ltmain.sh patch xsrc/external/mit/fontconfig/dist/missing patch xsrc/external/mit/fontconfig/dist/conf.d/10-autohint.conf patch xsrc/external/mit/fontconfig/dist/conf.d/10-no-sub-pixel.conf patch xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-bgr.conf patch xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-rgb.conf patch xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vbgr.conf patch xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vrgb.conf patch xsrc/external/mit/fontconfig/dist/conf.d/10-unhinted.conf patch xsrc/external/mit/fontconfig/dist/conf.d/20-fix-globaladvance.conf patch xsrc/external/mit/fontconfig/dist/conf.d/20-unhint-small-vera.conf patch xsrc/external/mit/fontconfig/dist/conf.d/25-unhint-nonlatin.conf patch xsrc/external/mit/fontconfig/dist/conf.d/30-metric-aliases.conf patch xsrc/external/mit/fontconfig/dist/conf.d/30-urw-aliases.conf patch xsrc/external/mit/fontconfig/dist/conf.d/40-nonlatin.conf patch xsrc/external/mit/fontconfig/dist/conf.d/45-latin.conf patch xsrc/external/mit/fontconfig/dist/conf.d/50-user.conf patch xsrc/external/mit/fontconfig/dist/conf.d/65-fonts-persian.conf patch xsrc/external/mit/fontconfig/dist/conf.d/65-nonlatin.conf patch xsrc/external/mit/fontconfig/dist/conf.d/80-delicious.conf patch xsrc/external/mit/fontconfig/dist/conf.d/Makefile.am patch xsrc/external/mit/fontconfig/dist/conf.d/Makefile.in patch xsrc/external/mit/fontconfig/dist/conf.d/README patch xsrc/external/mit/fontconfig/dist/doc/FcAtomicCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcAtomicDeleteNew.3 patch xsrc/external/mit/fontconfig/dist/doc/FcAtomicDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcAtomicLock.3 patch xsrc/external/mit/fontconfig/dist/doc/FcAtomicNewFile.3 patch xsrc/external/mit/fontconfig/dist/doc/FcAtomicOrigFile.3 patch xsrc/external/mit/fontconfig/dist/doc/FcAtomicReplaceOrig.3 patch xsrc/external/mit/fontconfig/dist/doc/FcAtomicUnlock.3 patch xsrc/external/mit/fontconfig/dist/doc/FcBlanksAdd.3 patch xsrc/external/mit/fontconfig/dist/doc/FcBlanksCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcBlanksDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcBlanksIsMember.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCacheCopySet.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCacheDir.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCacheNumFont.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCacheNumSubdir.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCacheSubdir.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetAddChar.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetCopy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetCount.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetCoverage.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetEqual.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetFirstPage.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetHasChar.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetIntersect.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetIntersectCount.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetIsSubset.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetMerge.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetNew.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetNextPage.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetSubtract.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetSubtractCount.3 patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetUnion.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigAppFontAddDir.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigAppFontAddFile.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigAppFontClear.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigBuildFonts.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigEnableHome.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigFilename.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetBlanks.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetCache.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetCacheDirs.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetConfigDirs.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetConfigFiles.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetCurrent.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetFontDirs.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetFonts.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetRescanInterval.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigHome.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigParseAndLoad.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigReference.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigSetCurrent.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigSetRescanInterval.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigSubstitute.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigSubstituteWithPat.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigUptoDate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDefaultSubstitute.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheLoad.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheLoadFile.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheRead.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheUnlink.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheUnload.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheValid.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirSave.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirScan.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFileIsDir.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFileScan.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFini.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontList.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontMatch.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontRenderPrepare.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontSetAdd.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontSetCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontSetDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontSetList.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontSetMatch.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontSetPrint.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontSetSort.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontSetSortDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFontSort.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFreeTypeCharIndex.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFreeTypeCharSet.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFreeTypeCharSetAndSpacing.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFreeTypeQuery.3 patch xsrc/external/mit/fontconfig/dist/doc/FcFreeTypeQueryFace.3 patch xsrc/external/mit/fontconfig/dist/doc/FcGetLangs.3 patch xsrc/external/mit/fontconfig/dist/doc/FcGetVersion.3 patch xsrc/external/mit/fontconfig/dist/doc/FcInit.3 patch xsrc/external/mit/fontconfig/dist/doc/FcInitBringUptoDate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcInitLoadConfig.3 patch xsrc/external/mit/fontconfig/dist/doc/FcInitLoadConfigAndFonts.3 patch xsrc/external/mit/fontconfig/dist/doc/FcInitReinitialize.3 patch xsrc/external/mit/fontconfig/dist/doc/FcIsLower.3 patch xsrc/external/mit/fontconfig/dist/doc/FcIsUpper.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangGetCharSet.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetAdd.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetCompare.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetContains.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetCopy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetEqual.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetHasLang.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetHash.3 patch xsrc/external/mit/fontconfig/dist/doc/FcMatrixCopy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcMatrixEqual.3 patch xsrc/external/mit/fontconfig/dist/doc/FcMatrixInit.3 patch xsrc/external/mit/fontconfig/dist/doc/FcMatrixMultiply.3 patch xsrc/external/mit/fontconfig/dist/doc/FcMatrixRotate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcMatrixScale.3 patch xsrc/external/mit/fontconfig/dist/doc/FcMatrixShear.3 patch xsrc/external/mit/fontconfig/dist/doc/FcNameConstant.3 patch xsrc/external/mit/fontconfig/dist/doc/FcNameGetConstant.3 patch xsrc/external/mit/fontconfig/dist/doc/FcNameGetObjectType.3 patch xsrc/external/mit/fontconfig/dist/doc/FcNameParse.3 patch xsrc/external/mit/fontconfig/dist/doc/FcNameRegisterConstants.3 patch xsrc/external/mit/fontconfig/dist/doc/FcNameRegisterObjectTypes.3 patch xsrc/external/mit/fontconfig/dist/doc/FcNameUnparse.3 patch xsrc/external/mit/fontconfig/dist/doc/FcNameUnregisterConstants.3 patch xsrc/external/mit/fontconfig/dist/doc/FcNameUnregisterObjectTypes.3 patch xsrc/external/mit/fontconfig/dist/doc/FcObjectSetAdd.3 patch xsrc/external/mit/fontconfig/dist/doc/FcObjectSetBuild.3 patch xsrc/external/mit/fontconfig/dist/doc/FcObjectSetCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcObjectSetDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternAdd-Type.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternAdd.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternAddWeak.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternBuild.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternDel.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternDuplicate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternEqual.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternEqualSubset.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternFilter.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternFormat.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternGet-Type.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternGet.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternHash.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternPrint.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternReference.3 patch xsrc/external/mit/fontconfig/dist/doc/FcPatternRemove.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrBasename.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrCmp.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrCmpIgnoreCase.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrCopy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrCopyFilename.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrDirname.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrDowncase.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrFree.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrListCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrListDone.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrListNext.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrPlus.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrSetAdd.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrSetAddFilename.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrSetCreate.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrSetDel.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrSetDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrSetEqual.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrSetMember.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrStr.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrStrIgnoreCase.3 patch xsrc/external/mit/fontconfig/dist/doc/FcToLower.3 patch xsrc/external/mit/fontconfig/dist/doc/FcUcs4ToUtf8.3 patch xsrc/external/mit/fontconfig/dist/doc/FcUtf16Len.3 patch xsrc/external/mit/fontconfig/dist/doc/FcUtf16ToUcs4.3 patch xsrc/external/mit/fontconfig/dist/doc/FcUtf8Len.3 patch xsrc/external/mit/fontconfig/dist/doc/FcUtf8ToUcs4.3 patch xsrc/external/mit/fontconfig/dist/doc/FcValueDestroy.3 patch xsrc/external/mit/fontconfig/dist/doc/FcValueEqual.3 patch xsrc/external/mit/fontconfig/dist/doc/FcValuePrint.3 patch xsrc/external/mit/fontconfig/dist/doc/FcValueSave.3 patch xsrc/external/mit/fontconfig/dist/doc/Makefile.am patch xsrc/external/mit/fontconfig/dist/doc/Makefile.in patch xsrc/external/mit/fontconfig/dist/doc/confdir.sgml.in patch xsrc/external/mit/fontconfig/dist/doc/edit-sgml.c patch xsrc/external/mit/fontconfig/dist/doc/fcatomic.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcblanks.fncs patch xsrc/external/mit/fontconfig/dist/doc/fccache.fncs patch xsrc/external/mit/fontconfig/dist/doc/fccharset.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcconfig.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcconstant.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcdircache.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcfile.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcfontset.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcformat.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcfreetype.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcinit.fncs patch xsrc/external/mit/fontconfig/dist/doc/fclangset.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcmatrix.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcobjectset.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcobjecttype.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcpattern.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcstring.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcstrset.fncs patch xsrc/external/mit/fontconfig/dist/doc/fcvalue.fncs patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel.sgml patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel.txt patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-user.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-user.sgml patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-user.txt patch xsrc/external/mit/fontconfig/dist/doc/fonts-conf.5 patch xsrc/external/mit/fontconfig/dist/doc/func.sgml patch xsrc/external/mit/fontconfig/dist/doc/version.sgml.in patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcatomiccreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcatomicdeletenew.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcatomicdestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcatomiclock.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcatomicnewfile.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcatomicorigfile.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcatomicreplaceorig.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcatomicunlock.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcblanksadd.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcblankscreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcblanksdestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcblanksismember.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccachecopyset.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccachedir.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccachenumfont.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccachenumsubdir.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccachesubdir.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetaddchar.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetcopy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetcount.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetcoverage.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetcreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetdestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetequal.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetfirstpage.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsethaschar.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetintersect.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetintersectcount.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetissubset.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetmerge.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetnew.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetnextpage.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetsubtract.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetsubtractcount.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetunion.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigappfontadddir.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigappfontaddfile.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigappfontclear.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigbuildfonts.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigcreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigdestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigenablehome.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigfilename.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetblanks.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetcache.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetcachedirs.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetconfigdirs.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetconfigfiles.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetcurrent.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetfontdirs.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetfonts.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiggetrescaninterval.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfighome.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigparseandload.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigreference.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigsetcurrent.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigsetrescaninterval.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigsubstitute.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfigsubstitutewithpat.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcconfiguptodate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdefaultsubstitute.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdircacheload.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdircacheloadfile.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdircacheread.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdircacheunlink.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdircacheunload.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdircachevalid.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdirsave.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcdirscan.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfileisdir.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfilescan.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfini.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontlist.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontmatch.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontrenderprepare.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontsetadd.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontsetcreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontsetdestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontsetlist.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontsetmatch.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontsetprint.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontsetsort.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontsetsortdestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfontsort.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfreetypecharindex.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfreetypecharset.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfreetypecharsetandspacing.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfreetypequery.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcfreetypequeryface.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcgetlangs.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcgetversion.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcinit.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcinitbringuptodate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcinitloadconfig.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcinitloadconfigandfonts.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcinitreinitialize.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcislower.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcisupper.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclanggetcharset.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetadd.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetcompare.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetcontains.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetcopy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetcreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetdestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetequal.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsethash.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsethaslang.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcmatrixcopy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcmatrixequal.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcmatrixinit.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcmatrixmultiply.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcmatrixrotate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcmatrixscale.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcmatrixshear.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcnameconstant.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcnamegetconstant.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcnamegetobjecttype.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcnameparse.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcnameregisterconstants.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcnameregisterobjecttypes.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcnameunparse.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcnameunregisterconstants.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcnameunregisterobjecttypes.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcobjectsetadd.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcobjectsetbuild.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcobjectsetcreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcobjectsetdestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternadd-type.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternadd.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternaddweak.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternbuild.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatterncreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatterndel.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatterndestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternduplicate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternequal.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternequalsubset.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternfilter.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternformat.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternget-type.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternget.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternhash.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternprint.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternreference.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcpatternremove.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrbasename.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrcmp.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrcmpignorecase.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrcopy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrcopyfilename.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrdirname.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrdowncase.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrfree.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrlistcreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrlistdone.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrlistnext.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrplus.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrsetadd.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrsetaddfilename.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrsetcreate.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrsetdel.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrsetdestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrsetequal.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrsetmember.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrstr.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcstrstrignorecase.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fctolower.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcucs4toutf8.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcutf16len.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcutf16toucs4.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcutf8len.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcutf8toucs4.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcvaluedestroy.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcvalueequal.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcvalueprint.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fcvaluesave.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/ln12.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/t1.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/x102.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/x19.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/x31.html patch xsrc/external/mit/fontconfig/dist/fc-cache/Makefile.am patch xsrc/external/mit/fontconfig/dist/fc-cache/Makefile.in patch xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.1 patch xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c patch xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.sgml patch xsrc/external/mit/fontconfig/dist/fc-case/CaseFolding.txt patch xsrc/external/mit/fontconfig/dist/fc-case/Makefile.am patch xsrc/external/mit/fontconfig/dist/fc-case/Makefile.in patch xsrc/external/mit/fontconfig/dist/fc-case/fc-case.c patch xsrc/external/mit/fontconfig/dist/fc-case/fccase.h patch xsrc/external/mit/fontconfig/dist/fc-case/fccase.tmpl.h patch xsrc/external/mit/fontconfig/dist/fc-cat/Makefile.am patch xsrc/external/mit/fontconfig/dist/fc-cat/Makefile.in patch xsrc/external/mit/fontconfig/dist/fc-cat/fc-cat.1 patch xsrc/external/mit/fontconfig/dist/fc-cat/fc-cat.c patch xsrc/external/mit/fontconfig/dist/fc-cat/fc-cat.sgml patch xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.am patch xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.in patch xsrc/external/mit/fontconfig/dist/fc-glyphname/fc-glyphname.c patch xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.tmpl.h patch xsrc/external/mit/fontconfig/dist/fc-lang/Makefile.am patch xsrc/external/mit/fontconfig/dist/fc-lang/Makefile.in patch xsrc/external/mit/fontconfig/dist/fc-lang/aa.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ab.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/af.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/am.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ar.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ast.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/av.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ay.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/az_ir.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ba.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/be.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/bg.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/bh.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/bho.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/bi.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/bin.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/bm.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/bo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/br.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/bs.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/bua.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ca.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ce.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ch.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/chm.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/chr.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/co.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/cs.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/cu.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/cv.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/cy.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/da.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/de.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/dz.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/el.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/en.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/eo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/es.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/et.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/eu.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/fa.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/fc-lang.c patch xsrc/external/mit/fontconfig/dist/fc-lang/fclang.tmpl.h patch xsrc/external/mit/fontconfig/dist/fc-lang/ff.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/fi.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/fj.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/fo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/fr.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/fur.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/fy.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ga.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/gd.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/gez.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/gl.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/gn.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/gu.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/gv.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ha.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/haw.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/he.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/hi.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ho.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/hr.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/hu.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/hy.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ia.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/id.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ie.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ig.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ik.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/io.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/is.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/it.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/iu.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ja.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ka.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/kaa.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ki.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/kk.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/kl.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/kn.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ko.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/kok.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ks.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ku_am.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ku_ir.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/kum.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/kv.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/kw.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ky.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/la.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/lb.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/lez.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ln.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/lo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/lt.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/lv.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/mai.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/mg.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/mh.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/mi.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/mk.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ml.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/mn_cn.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/mo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/mr.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/mt.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/my.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/nb.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/nds.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ne.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/nl.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/nn.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/no.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ny.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/oc.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/om.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/or.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/os.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/pl.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ps_af.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ps_pk.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/pt.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/rm.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ro.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ru.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sa.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sah.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sco.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/se.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sel.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sk.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sl.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sm.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sma.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/smj.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/smn.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sms.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/so.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sq.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sr.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sv.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/sw.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/syr.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ta.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/te.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/tg.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/th.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ti_er.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ti_et.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/tig.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/tn.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/to.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/tr.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ts.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/tt.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/tw.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/tyv.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ug.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/uk.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ur.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/ve.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/vi.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/vo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/vot.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/wa.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/wen.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/wo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/xh.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/yap.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/yi.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/yo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/zh_cn.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/zh_hk.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/zh_mo.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/zh_sg.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/zh_tw.orth patch xsrc/external/mit/fontconfig/dist/fc-lang/zu.orth patch xsrc/external/mit/fontconfig/dist/fc-list/Makefile.am patch xsrc/external/mit/fontconfig/dist/fc-list/Makefile.in patch xsrc/external/mit/fontconfig/dist/fc-list/fc-list.1 patch xsrc/external/mit/fontconfig/dist/fc-list/fc-list.c patch xsrc/external/mit/fontconfig/dist/fc-list/fc-list.sgml patch xsrc/external/mit/fontconfig/dist/fc-match/Makefile.am patch xsrc/external/mit/fontconfig/dist/fc-match/Makefile.in patch xsrc/external/mit/fontconfig/dist/fc-match/fc-match.1 patch xsrc/external/mit/fontconfig/dist/fc-match/fc-match.c patch xsrc/external/mit/fontconfig/dist/fc-match/fc-match.sgml patch xsrc/external/mit/fontconfig/dist/fc-query/Makefile.am patch xsrc/external/mit/fontconfig/dist/fc-query/Makefile.in patch xsrc/external/mit/fontconfig/dist/fc-query/fc-query.1 patch xsrc/external/mit/fontconfig/dist/fc-query/fc-query.c patch xsrc/external/mit/fontconfig/dist/fc-query/fc-query.sgml patch xsrc/external/mit/fontconfig/dist/fc-scan/Makefile.am patch xsrc/external/mit/fontconfig/dist/fc-scan/Makefile.in patch xsrc/external/mit/fontconfig/dist/fc-scan/fc-scan.1 patch xsrc/external/mit/fontconfig/dist/fc-scan/fc-scan.c patch xsrc/external/mit/fontconfig/dist/fc-scan/fc-scan.sgml patch xsrc/external/mit/fontconfig/dist/fontconfig/Makefile.am patch xsrc/external/mit/fontconfig/dist/fontconfig/Makefile.in patch xsrc/external/mit/fontconfig/dist/fontconfig/fcfreetype.h patch xsrc/external/mit/fontconfig/dist/fontconfig/fcprivate.h patch xsrc/external/mit/fontconfig/dist/fontconfig/fontconfig.h patch xsrc/external/mit/fontconfig/dist/src/Makefile.am patch xsrc/external/mit/fontconfig/dist/src/Makefile.in patch xsrc/external/mit/fontconfig/dist/src/fcatomic.c patch xsrc/external/mit/fontconfig/dist/src/fcblanks.c patch xsrc/external/mit/fontconfig/dist/src/fccache.c patch xsrc/external/mit/fontconfig/dist/src/fccfg.c patch xsrc/external/mit/fontconfig/dist/src/fccharset.c patch xsrc/external/mit/fontconfig/dist/src/fcdbg.c patch xsrc/external/mit/fontconfig/dist/src/fcdefault.c patch xsrc/external/mit/fontconfig/dist/src/fcdir.c patch xsrc/external/mit/fontconfig/dist/src/fcformat.c patch xsrc/external/mit/fontconfig/dist/src/fcfreetype.c patch xsrc/external/mit/fontconfig/dist/src/fcfs.c patch xsrc/external/mit/fontconfig/dist/src/fcftint.h patch xsrc/external/mit/fontconfig/dist/src/fcinit.c patch xsrc/external/mit/fontconfig/dist/src/fcint.h patch xsrc/external/mit/fontconfig/dist/src/fclang.c patch xsrc/external/mit/fontconfig/dist/src/fclist.c patch xsrc/external/mit/fontconfig/dist/src/fcmatch.c patch xsrc/external/mit/fontconfig/dist/src/fcmatrix.c patch xsrc/external/mit/fontconfig/dist/src/fcname.c patch xsrc/external/mit/fontconfig/dist/src/fcpat.c patch xsrc/external/mit/fontconfig/dist/src/fcserialize.c patch xsrc/external/mit/fontconfig/dist/src/fcstr.c patch xsrc/external/mit/fontconfig/dist/src/fcxml.c patch xsrc/external/mit/fontconfig/dist/src/ftglue.c patch xsrc/external/mit/fontconfig/dist/src/makealias patch xsrc/external/mit/fontconfig/dist/test/Makefile.am patch xsrc/external/mit/fontconfig/dist/test/Makefile.in patch xsrc/external/mit/fontconfig/dist/test/run-test.sh patch xsrc/external/mit/fontconfig/include/fcalias.h patch xsrc/external/mit/fontconfig/include/fcaliastail.h patch xsrc/external/mit/fontconfig/include/fcftaliastail.h patch Update fontconfig to version 2.11.1. To generate a diff of this commit: cvs rdiff -u -r1.5.6.1 -r1.5.6.2 \ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf cvs rdiff -u -r1.1 -r1.1.12.1 \ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile cvs rdiff -u -r1.1 -r1.1.12.1 \ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile cvs rdiff -u -r1.7.4.1 -r1.7.4.2 \ src/external/mit/xorg/lib/fontconfig/src/Makefile cvs rdiff -u -r1.2 -r1.2.24.1 \ src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch cvs rdiff -u -r1.2 -r1.2.10.1 \ src/external/mit/xorg/lib/fontconfig/src/shlib_version cvs rdiff -u -r1.5.4.1 -r1.5.4.2 \ 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/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5.6.1 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5.6.2 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5.6.1 Wed Jun 11 15:46:39 2014 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Sun Dec 21 19:12:10 2014 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<!-- $NetBSD: fonts.conf,v 1.5.6.1 2014/06/11 15:46:39 msaitoh Exp $ --> +<!-- $NetBSD: fonts.conf,v 1.5.6.2 2014/12/21 19:12:10 msaitoh Exp $ --> <!-- /etc/fonts/fonts.conf file to configure system font access --> <fontconfig> @@ -27,6 +27,8 @@ <dir>/usr/X11R7/lib/X11/fonts</dir> <dir>/usr/pkg/lib/X11/fonts</dir> <dir>/usr/pkg/share/fonts</dir> + <dir prefix="xdg">fonts</dir> + <!-- the following element will be removed in the future --> <dir>~/.fonts</dir> <!-- @@ -36,7 +38,7 @@ <test qual="any" name="family"> <string>mono</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>monospace</string> </edit> </match> @@ -48,7 +50,7 @@ <test qual="any" name="family"> <string>sans serif</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>sans-serif</string> </edit> </match> @@ -60,7 +62,7 @@ <test qual="any" name="family"> <string>sans</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>sans-serif</string> </edit> </match> @@ -73,6 +75,8 @@ <!-- Font cache directory list --> <cachedir>/var/cache/fontconfig</cachedir> + <cachedir prefix="xdg">fontconfig</cachedir> + <!-- the following element will be removed in the future --> <cachedir>~/.fontconfig</cachedir> <config> Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.1 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.1.12.1 --- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.1 Mon Sep 7 21:07:04 2009 +++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Sun Dec 21 19:12:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/09/07 21:07:04 mrg Exp $ +# $NetBSD: Makefile,v 1.1.12.1 2014/12/21 19:12:10 msaitoh Exp $ .include <bsd.own.mk> @@ -10,8 +10,11 @@ CONFIGFILES= \ 10-sub-pixel-rgb.conf \ 10-sub-pixel-vbgr.conf \ 10-sub-pixel-vrgb.conf \ + 10-scale-bitmap-fonts.conf \ 10-unhinted.conf \ - 20-fix-globaladvance.conf \ + 11-lcdfilter-default.conf \ + 11-lcdfilter-legacy.conf \ + 11-lcdfilter-light.conf \ 20-unhint-small-vera.conf \ 25-unhint-nonlatin.conf \ 30-metric-aliases.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.1 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.1.12.1 --- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.1 Mon Sep 7 21:07:04 2009 +++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Sun Dec 21 19:12:10 2014 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2009/09/07 21:07:04 mrg Exp $ +# $NetBSD: Makefile,v 1.1.12.1 2014/12/21 19:12:10 msaitoh Exp $ .include <bsd.own.mk> .PATH: ${X11SRCDIR.fontconfig}/conf.d FONTCONFIG_LINKS= \ - 20-fix-globaladvance.conf \ + 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.7.4.1 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7.4.2 --- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7.4.1 Fri Mar 2 18:27:43 2012 +++ src/external/mit/xorg/lib/fontconfig/src/Makefile Sun Dec 21 19:12:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7.4.1 2012/03/02 18:27:43 riz Exp $ +# $NetBSD: Makefile,v 1.7.4.2 2014/12/21 19:12:10 msaitoh Exp $ .include <bsd.own.mk> @@ -10,20 +10,24 @@ 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 \ fcstr.c \ fcxml.c \ ftglue.c @@ -80,7 +84,10 @@ MAN= FcAtomicCreate.3 FcAtomicDeleteNew. 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 + FcValueDestroy.3 FcValueEqual.3 FcValuePrint.3 FcValueSave.3 \ + FcCacheCreateTagFile.3 FcCharSetDelChar.3 FcGetDefaultLangs.3 \ + FcLangSetDel.3 FcLangSetSubtract.3 FcLangSetUnion.3 + MAN+= fonts-conf.5 LIBDPLIBS=\ @@ -88,7 +95,9 @@ LIBDPLIBS=\ freetype ${.CURDIR}/../../freetype # XXX FONTCONFIG_PATH was arbitrarily chosen -CPPFLAGS+= -DFONTCONFIG_PATH='"/etc/fonts"' \ +FONTCONFIG_PATH=/etc/fonts +CPPFLAGS+= -DHAVE_CONFIG_H +CPPFLAGS+= -DFONTCONFIG_PATH='"${FONTCONFIG_PATH}"' \ -DFC_DEFAULT_FONTS='"${X11FONTDIR}"' \ -DFC_CACHEDIR='"/var/cache/fontconfig"' \ -DHAVE_FT_BITMAP_SIZE_Y_PPEM \ @@ -105,21 +114,24 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free -I${X11SRCDIR.freetype}/src \ -I${X11SRCDIR.freetype}/include \ -I${X11SRCDIR.${LIB}}/../include \ - -I. + -I. \ + -I${X11SRCDIR.${LIB}} -FCARCH_DEPFILE= fccache.c .include "Makefile.fcarch" CLEANFILES+= fcarch.h PKGCONFIG= fontconfig -# fontconfig uses VERSION and not PACKAGE_VERSION -PKGCONFIG_VERSION.fontconfig= 2.6.0 +PKGCONFIG_SED_FLAGS= \ + -e "s,@sysconfdir@,${X11ETCDIR},; \ + s,@localstatedir@,/var,; \ + s,@BASECONFIGDIR@,/etc/fonts,; \ + s,@fc_cachedir@,${FONTCONFIG_PATH}," # XXX CPPFLAGS.fcxml.c= -Wno-error -CWARNFLAGS.clang+= -Wno-pointer-sign +CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-switch .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch:1.2 src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch:1.2.24.1 --- src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch:1.2 Sun Sep 7 14:37:45 2008 +++ src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch Sun Dec 21 19:12:10 2014 @@ -1,16 +1,8 @@ -# $NetBSD: Makefile.fcarch,v 1.2 2008/09/07 14:37:45 lukem Exp $ +# $NetBSD: Makefile.fcarch,v 1.2.24.1 2014/12/21 19:12:10 msaitoh Exp $ .ifndef _FONTCONFIG_FCARCH_MK_ _FONTCONFIG_FCARCH_MK_=1 -${FCARCH_DEPFILE}: fcarch.h - -fcarch.h: fcarch-netbsd.h -fcarch-netbsd.h: - ${_MKTARGET_CREATE} - @echo '#define FC_ARCHITECTURE "${MACHINE_ARCH}"' > ${.TARGET} - -CLEANFILES+= fcarch-netbsd.h - +CPPFLAGS+= -DFC_ARCHITECTURE="\"${MACHINE_ARCH}\"" .endif 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.2.10.1 --- 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 Sun Dec 21 19:12:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:10 christos Exp $ +# $NetBSD: shlib_version,v 1.2.10.1 2014/12/21 19:12:10 msaitoh Exp $ # major=2 -minor=0 +minor=2 Index: src/external/mit/xorg/tools/fc-cache/Makefile diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.5.4.1 src/external/mit/xorg/tools/fc-cache/Makefile:1.5.4.2 --- src/external/mit/xorg/tools/fc-cache/Makefile:1.5.4.1 Fri Mar 2 18:27:47 2012 +++ src/external/mit/xorg/tools/fc-cache/Makefile Sun Dec 21 19:12:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5.4.1 2012/03/02 18:27:47 riz Exp $ +# $NetBSD: Makefile,v 1.5.4.2 2014/12/21 19:12:10 msaitoh 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 \ - 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 \ @@ -99,7 +101,11 @@ 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 \ + -DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H \ + -DHAVE_MKSTEMP \ + -DHAVE_SCANDIR \ + -DFLEXIBLE_ARRAY_MEMBER="/**/" HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2 HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \ -I${FREETYPE}/include -I${EXPAT}/lib \ @@ -109,7 +115,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>