Index: head/x11-fonts/fontconfig/Makefile =================================================================== --- head/x11-fonts/fontconfig/Makefile (revision 469427) +++ head/x11-fonts/fontconfig/Makefile (revision 469428) @@ -1,88 +1,88 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= fontconfig -PORTVERSION= 2.12.1 -PORTREVISION?= 3 +PORTVERSION= 2.12.6 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-fonts MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/ MAINTAINER= gnome@FreeBSD.org COMMENT= XML-based font configuration API for X Windows LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:bzip2 +USES= gperf tar:bzip2 .if !defined(REFERENCE_PORT) LIB_DEPENDS= libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 USES+= cpe gmake libtool pathfix pkgconfig CPE_VENDOR= fontconfig_project USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.d \ --with-templatedir=${PREFIX}/etc/fonts/conf.avail \ --with-xmldir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ --with-expat-lib=${LOCALBASE}/lib \ --with-default-hinting=${PREFERRED_HINTING} \ --with-default-fonts=${PREFIX}/share/fonts \ --with-add-fonts=${LOCALBASE}/lib/X11/fonts \ --with-cache-dir=/var/db/fontconfig \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --disable-docs # D6155: static linked library linking added to support statically linked # applications, e.g. x11/xforward static option CONFIGURE_ARGS+= --enable-static # Python is not required, because fc-blanks.h is available in distfile CONFIGURE_ENV= PYTHON=":" PKGINSTALL= ${WRKDIR}/pkg-install INSTALL_TARGET=install-strip PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING} PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt OPTIONS_DEFINE= DOCS NO_BITMAPS OPTIONS_DEFAULT=HINTING_SLIGHT OPTIONS_SUB= yes NO_BITMAPS_DESC= Reject bitmap fonts by default OPTIONS_SINGLE= HINTING HINTING_DESC= Preferred pixel hinting configuration .for opt in NONE SLIGHT MEDIUM FULL OPTIONS_SINGLE_HINTING+= HINTING_${opt} HINTING_${opt}_DESC= ${opt:tl} HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl} .endfor post-patch-NO_BITMAPS-on: @${REINPLACE_CMD} -i '.bitmaps.bak' -e \ '/^CONF_LINKS =/s|$$|\${.newline} 70-no-bitmaps.conf \\|' \ ${WRKSRC}/conf.d/Makefile.in post-install: ${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 \ ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/*.5 \ ${STAGEDIR}${PREFIX}/man/man5 ${INSTALL_DATA} ${WRKSRC}/fonts.conf \ ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .include .endif Index: head/x11-fonts/fontconfig/distinfo =================================================================== --- head/x11-fonts/fontconfig/distinfo (revision 469427) +++ head/x11-fonts/fontconfig/distinfo (revision 469428) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470376167 -SHA256 (fontconfig-2.12.1.tar.bz2) = b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 -SIZE (fontconfig-2.12.1.tar.bz2) = 1608901 +TIMESTAMP = 1505981313 +SHA256 (fontconfig-2.12.6.tar.bz2) = cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017 +SIZE (fontconfig-2.12.6.tar.bz2) = 1624683 Index: head/x11-fonts/fontconfig/files/patch-src_fclang.c =================================================================== --- head/x11-fonts/fontconfig/files/patch-src_fclang.c (revision 469427) +++ head/x11-fonts/fontconfig/files/patch-src_fclang.c (revision 469428) @@ -1,50 +1,51 @@ ---- src/fclang.c.orig 2014-01-20 08:14:20 UTC +--- src/fclang.c.orig 2017-09-21 04:44:27 UTC +++ src/fclang.c @@ -183,6 +183,7 @@ FcLangNormalize (const FcChar8 *lang) { FcChar8 *result = NULL, *s, *orig; char *territory, *encoding, *modifier; + char *script; size_t llen, tlen = 0, mlen = 0; if (!lang || !*lang) -@@ -241,26 +242,32 @@ FcLangNormalize (const FcChar8 *lang) +@@ -246,27 +247,33 @@ FcLangNormalize (const FcChar8 *lang) modifier = encoding; } } - territory = strchr ((const char *) s, '_'); - if (!territory) - territory = strchr ((const char *) s, '-'); + territory = strrchr ((const char *) s, '_'); if (territory) { *territory = 0; territory++; tlen = strlen (territory); } + /* There might by a script component, e.g. sr_Cyrl_RS@UTF-8. We can't assume all legal locale + names are in the form _.. If the script component is here, + skip it to define the language properly (e.g. "sr" instead of "sr_Cyrl") */ + script = strchr ((const char *) s, '_'); + if (script) + { + *script = 0; + } llen = strlen ((const char *) s); if (llen < 2 || llen > 3) { - fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid language tag\n", - lang); + fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid language tag (%s)\n", + s, lang); goto bail0; } - if (territory && (tlen < 2 || tlen > 3)) + if (territory && (tlen < 2 || tlen > 3) && + !(territory[0] == 'z' && tlen < 5)) { - fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag\n", - lang); + fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag (%s)\n", + territory, lang); goto bail0; } if (territory) Index: head/x11-fonts/fontconfig/pkg-plist =================================================================== --- head/x11-fonts/fontconfig/pkg-plist (revision 469427) +++ head/x11-fonts/fontconfig/pkg-plist (revision 469428) @@ -1,79 +1,81 @@ bin/fc-cache bin/fc-cat bin/fc-list bin/fc-match bin/fc-pattern bin/fc-query bin/fc-scan bin/fc-validate etc/fonts/conf.avail/10-autohint.conf etc/fonts/conf.avail/10-hinting-full.conf etc/fonts/conf.avail/10-hinting-medium.conf etc/fonts/conf.avail/10-hinting-none.conf etc/fonts/conf.avail/10-hinting-slight.conf etc/fonts/conf.avail/10-no-sub-pixel.conf etc/fonts/conf.avail/10-scale-bitmap-fonts.conf etc/fonts/conf.avail/10-sub-pixel-bgr.conf etc/fonts/conf.avail/10-sub-pixel-rgb.conf etc/fonts/conf.avail/10-sub-pixel-vbgr.conf etc/fonts/conf.avail/10-sub-pixel-vrgb.conf etc/fonts/conf.avail/10-unhinted.conf etc/fonts/conf.avail/11-lcdfilter-default.conf etc/fonts/conf.avail/11-lcdfilter-legacy.conf etc/fonts/conf.avail/11-lcdfilter-light.conf etc/fonts/conf.avail/20-unhint-small-vera.conf etc/fonts/conf.avail/25-unhint-nonlatin.conf etc/fonts/conf.avail/30-metric-aliases.conf -etc/fonts/conf.avail/30-urw-aliases.conf etc/fonts/conf.avail/40-nonlatin.conf +etc/fonts/conf.avail/45-generic.conf etc/fonts/conf.avail/45-latin.conf etc/fonts/conf.avail/49-sansserif.conf etc/fonts/conf.avail/50-user.conf etc/fonts/conf.avail/51-local.conf +etc/fonts/conf.avail/60-generic.conf etc/fonts/conf.avail/60-latin.conf etc/fonts/conf.avail/65-fonts-persian.conf etc/fonts/conf.avail/65-khmer.conf etc/fonts/conf.avail/65-nonlatin.conf etc/fonts/conf.avail/69-unifont.conf etc/fonts/conf.avail/70-no-bitmaps.conf etc/fonts/conf.avail/70-yes-bitmaps.conf etc/fonts/conf.avail/80-delicious.conf etc/fonts/conf.avail/90-synthetic.conf etc/fonts/conf.d/10-hinting-%%PREFERRED_HINTING%%.conf etc/fonts/conf.d/10-scale-bitmap-fonts.conf etc/fonts/conf.d/20-unhint-small-vera.conf etc/fonts/conf.d/30-metric-aliases.conf -etc/fonts/conf.d/30-urw-aliases.conf etc/fonts/conf.d/40-nonlatin.conf +etc/fonts/conf.d/45-generic.conf etc/fonts/conf.d/45-latin.conf etc/fonts/conf.d/49-sansserif.conf etc/fonts/conf.d/50-user.conf etc/fonts/conf.d/51-local.conf +etc/fonts/conf.d/60-generic.conf etc/fonts/conf.d/60-latin.conf etc/fonts/conf.d/65-fonts-persian.conf etc/fonts/conf.d/65-nonlatin.conf etc/fonts/conf.d/69-unifont.conf %%NO_BITMAPS%%etc/fonts/conf.d/70-no-bitmaps.conf etc/fonts/conf.d/80-delicious.conf etc/fonts/conf.d/90-synthetic.conf etc/fonts/conf.d/README @sample etc/fonts/fonts.conf.sample etc/fonts/fonts.dtd include/fontconfig/fcfreetype.h include/fontconfig/fcprivate.h include/fontconfig/fontconfig.h lib/libfontconfig.a lib/libfontconfig.so lib/libfontconfig.so.1 -lib/libfontconfig.so.1.9.2 +lib/libfontconfig.so.1.10.1 libdata/pkgconfig/fontconfig.pc man/man1/fc-cache.1.gz man/man1/fc-cat.1.gz man/man1/fc-list.1.gz man/man1/fc-match.1.gz man/man1/fc-pattern.1.gz man/man1/fc-query.1.gz man/man1/fc-scan.1.gz man/man1/fc-validate.1.gz man/man5/fonts-conf.5.gz @dir /var/db/fontconfig Index: head/x11-fonts/fontconfig-reference/pkg-plist =================================================================== --- head/x11-fonts/fontconfig-reference/pkg-plist (revision 469427) +++ head/x11-fonts/fontconfig-reference/pkg-plist (revision 469428) @@ -1,197 +1,199 @@ man/man3/FcAtomicCreate.3.gz man/man3/FcAtomicDeleteNew.3.gz man/man3/FcAtomicDestroy.3.gz man/man3/FcAtomicLock.3.gz man/man3/FcAtomicNewFile.3.gz man/man3/FcAtomicOrigFile.3.gz man/man3/FcAtomicReplaceOrig.3.gz man/man3/FcAtomicUnlock.3.gz man/man3/FcBlanksAdd.3.gz man/man3/FcBlanksCreate.3.gz man/man3/FcBlanksDestroy.3.gz man/man3/FcBlanksIsMember.3.gz man/man3/FcCacheCopySet.3.gz man/man3/FcCacheCreateTagFile.3.gz man/man3/FcCacheDir.3.gz man/man3/FcCacheNumFont.3.gz man/man3/FcCacheNumSubdir.3.gz man/man3/FcCacheSubdir.3.gz man/man3/FcCharSetAddChar.3.gz man/man3/FcCharSetCopy.3.gz man/man3/FcCharSetCount.3.gz man/man3/FcCharSetCoverage.3.gz man/man3/FcCharSetCreate.3.gz man/man3/FcCharSetDelChar.3.gz man/man3/FcCharSetDestroy.3.gz man/man3/FcCharSetEqual.3.gz man/man3/FcCharSetFirstPage.3.gz man/man3/FcCharSetHasChar.3.gz man/man3/FcCharSetIntersect.3.gz man/man3/FcCharSetIntersectCount.3.gz man/man3/FcCharSetIsSubset.3.gz man/man3/FcCharSetMerge.3.gz man/man3/FcCharSetNew.3.gz man/man3/FcCharSetNextPage.3.gz man/man3/FcCharSetSubtract.3.gz man/man3/FcCharSetSubtractCount.3.gz man/man3/FcCharSetUnion.3.gz man/man3/FcConfigAppFontAddDir.3.gz man/man3/FcConfigAppFontAddFile.3.gz man/man3/FcConfigAppFontClear.3.gz man/man3/FcConfigBuildFonts.3.gz man/man3/FcConfigCreate.3.gz man/man3/FcConfigDestroy.3.gz man/man3/FcConfigEnableHome.3.gz man/man3/FcConfigFilename.3.gz man/man3/FcConfigGetBlanks.3.gz man/man3/FcConfigGetCache.3.gz man/man3/FcConfigGetCacheDirs.3.gz man/man3/FcConfigGetConfigDirs.3.gz man/man3/FcConfigGetConfigFiles.3.gz man/man3/FcConfigGetCurrent.3.gz man/man3/FcConfigGetFontDirs.3.gz man/man3/FcConfigGetFonts.3.gz man/man3/FcConfigGetRescanInterval.3.gz man/man3/FcConfigGetSysRoot.3.gz man/man3/FcConfigHome.3.gz man/man3/FcConfigParseAndLoad.3.gz +man/man3/FcConfigParseAndLoadFromMemory.3.gz man/man3/FcConfigReference.3.gz man/man3/FcConfigSetCurrent.3.gz man/man3/FcConfigSetRescanInterval.3.gz man/man3/FcConfigSetSysRoot.3.gz man/man3/FcConfigSubstitute.3.gz man/man3/FcConfigSubstituteWithPat.3.gz man/man3/FcConfigUptoDate.3.gz man/man3/FcDefaultSubstitute.3.gz man/man3/FcDirCacheClean.3.gz man/man3/FcDirCacheLoad.3.gz man/man3/FcDirCacheLoadFile.3.gz man/man3/FcDirCacheRead.3.gz man/man3/FcDirCacheRescan.3.gz man/man3/FcDirCacheUnlink.3.gz man/man3/FcDirCacheUnload.3.gz man/man3/FcDirCacheValid.3.gz man/man3/FcDirSave.3.gz man/man3/FcDirScan.3.gz man/man3/FcFileIsDir.3.gz man/man3/FcFileScan.3.gz man/man3/FcFini.3.gz man/man3/FcFontList.3.gz man/man3/FcFontMatch.3.gz man/man3/FcFontRenderPrepare.3.gz man/man3/FcFontSetAdd.3.gz man/man3/FcFontSetCreate.3.gz man/man3/FcFontSetDestroy.3.gz man/man3/FcFontSetList.3.gz man/man3/FcFontSetMatch.3.gz man/man3/FcFontSetPrint.3.gz man/man3/FcFontSetSort.3.gz man/man3/FcFontSetSortDestroy.3.gz man/man3/FcFontSort.3.gz man/man3/FcFreeTypeCharIndex.3.gz man/man3/FcFreeTypeCharSet.3.gz man/man3/FcFreeTypeCharSetAndSpacing.3.gz man/man3/FcFreeTypeQuery.3.gz man/man3/FcFreeTypeQueryFace.3.gz man/man3/FcGetDefaultLangs.3.gz man/man3/FcGetLangs.3.gz man/man3/FcGetVersion.3.gz man/man3/FcInit.3.gz man/man3/FcInitBringUptoDate.3.gz man/man3/FcInitLoadConfig.3.gz man/man3/FcInitLoadConfigAndFonts.3.gz man/man3/FcInitReinitialize.3.gz man/man3/FcIsLower.3.gz man/man3/FcIsUpper.3.gz man/man3/FcLangGetCharSet.3.gz man/man3/FcLangNormalize.3.gz man/man3/FcLangSetAdd.3.gz man/man3/FcLangSetCompare.3.gz man/man3/FcLangSetContains.3.gz man/man3/FcLangSetCopy.3.gz man/man3/FcLangSetCreate.3.gz man/man3/FcLangSetDel.3.gz man/man3/FcLangSetDestroy.3.gz man/man3/FcLangSetEqual.3.gz man/man3/FcLangSetGetLangs.3.gz man/man3/FcLangSetHasLang.3.gz man/man3/FcLangSetHash.3.gz man/man3/FcLangSetSubtract.3.gz man/man3/FcLangSetUnion.3.gz man/man3/FcMatrixCopy.3.gz man/man3/FcMatrixEqual.3.gz man/man3/FcMatrixInit.3.gz man/man3/FcMatrixMultiply.3.gz man/man3/FcMatrixRotate.3.gz man/man3/FcMatrixScale.3.gz man/man3/FcMatrixShear.3.gz man/man3/FcNameConstant.3.gz man/man3/FcNameGetConstant.3.gz man/man3/FcNameGetObjectType.3.gz man/man3/FcNameParse.3.gz man/man3/FcNameRegisterConstants.3.gz man/man3/FcNameRegisterObjectTypes.3.gz man/man3/FcNameUnparse.3.gz man/man3/FcNameUnregisterConstants.3.gz man/man3/FcNameUnregisterObjectTypes.3.gz man/man3/FcObjectSetAdd.3.gz man/man3/FcObjectSetBuild.3.gz man/man3/FcObjectSetCreate.3.gz man/man3/FcObjectSetDestroy.3.gz man/man3/FcPatternAdd-Type.3.gz man/man3/FcPatternAdd.3.gz man/man3/FcPatternAddWeak.3.gz man/man3/FcPatternBuild.3.gz man/man3/FcPatternCreate.3.gz man/man3/FcPatternDel.3.gz man/man3/FcPatternDestroy.3.gz man/man3/FcPatternDuplicate.3.gz man/man3/FcPatternEqual.3.gz man/man3/FcPatternEqualSubset.3.gz man/man3/FcPatternFilter.3.gz man/man3/FcPatternFormat.3.gz man/man3/FcPatternGet-Type.3.gz man/man3/FcPatternGet.3.gz +man/man3/FcPatternGetWithBinding.3.gz man/man3/FcPatternHash.3.gz man/man3/FcPatternPrint.3.gz man/man3/FcPatternReference.3.gz man/man3/FcPatternRemove.3.gz man/man3/FcRangeCopy.3.gz man/man3/FcRangeCreateDouble.3.gz man/man3/FcRangeCreateInteger.3.gz man/man3/FcRangeDestroy.3.gz man/man3/FcRangeGetDouble.3.gz man/man3/FcStrBasename.3.gz man/man3/FcStrCmp.3.gz man/man3/FcStrCmpIgnoreCase.3.gz man/man3/FcStrCopy.3.gz man/man3/FcStrCopyFilename.3.gz man/man3/FcStrDirname.3.gz man/man3/FcStrDowncase.3.gz man/man3/FcStrFree.3.gz man/man3/FcStrListCreate.3.gz man/man3/FcStrListDone.3.gz man/man3/FcStrListFirst.3.gz man/man3/FcStrListNext.3.gz man/man3/FcStrPlus.3.gz man/man3/FcStrSetAdd.3.gz man/man3/FcStrSetAddFilename.3.gz man/man3/FcStrSetCreate.3.gz man/man3/FcStrSetDel.3.gz man/man3/FcStrSetDestroy.3.gz man/man3/FcStrSetEqual.3.gz man/man3/FcStrSetMember.3.gz man/man3/FcStrStr.3.gz man/man3/FcStrStrIgnoreCase.3.gz man/man3/FcToLower.3.gz man/man3/FcUcs4ToUtf8.3.gz man/man3/FcUtf16Len.3.gz man/man3/FcUtf16ToUcs4.3.gz man/man3/FcUtf8Len.3.gz man/man3/FcUtf8ToUcs4.3.gz man/man3/FcValueDestroy.3.gz man/man3/FcValueEqual.3.gz man/man3/FcValuePrint.3.gz man/man3/FcValueSave.3.gz man/man3/FcWeightFromOpenType.3.gz man/man3/FcWeightToOpenType.3.gz