diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index f5f265a660b5..59f91a98e2db 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -1,85 +1,84 @@ PORTNAME= fontconfig -DISTVERSION= 2.13.94 -PORTREVISION= 2 +DISTVERSION= 2.14.0 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= https://www.freedesktop.org/software/fontconfig/release/ MAINTAINER= desktop@FreeBSD.org COMMENT= XML-based font configuration API for X Windows LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 USES= cpe gperf meson pkgconfig python:3.6+,build shebangfix tar:xz \ trigger CPE_VENDOR= fontconfig_project USE_LDCONFIG= yes SHEBANG_FILES= conf.d/link_confs.py \ conf.d/write-35-lang-normalize-conf.py \ fc-case/fc-case.py \ fc-lang/fc-lang.py TEST_TARGET= test # Custom configuration variables FCDEFAULTFONTS= ${PREFIX}/share/fonts FCADDFONTS= ${LOCALBASE}/lib/X11/fonts # To avoid circular dependency rebuild of docs (including manpages) needs to be # disabled as they depend on textproc/docbook-utils which requires fontconfig -MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dfc-cache=disabled +MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING} PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt OPTIONS_DEFINE= DOCS NLS BITMAPS TEST OPTIONS_DEFAULT=BITMAPS HINTING_SLIGHT OPTIONS_SUB= yes OPTIONS_SINGLE= HINTING .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 BITMAPS_DESC= Enable bitmap fonts by default HINTING_DESC= Preferred pixel hinting configuration NLS_USES= gettext-tools NLS_MESON_ENABLED= nls TEST_MESON_ENABLED= tests post-patch: @${REINPLACE_CMD} -e 's|%%FCDEFAULTFONTS%%|${FCDEFAULTFONTS}|g' \ ${PATCH_WRKSRC}/meson.build @${REINPLACE_CMD} -e 's|%%FCADDFONTS%%|${FCADDFONTS}|g' \ ${PATCH_WRKSRC}/meson.build @${REINPLACE_CMD} -e 's|%%FCPREFERREDHINTING%%|${PREFERRED_HINTING}|g' \ ${PATCH_WRKSRC}/conf.d/meson.build post-install: ${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${PREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5 ${MV} ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample @${MKDIR} ${STAGEDIR}/var/db/fontconfig post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} post-install-BITMAPS-off: ${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-no-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf post-install-BITMAPS-on: ${RM} ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf ${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-yes-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-yes-bitmaps.conf .include diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo index 7d2eb30f06d8..03f760779f37 100644 --- a/x11-fonts/fontconfig/distinfo +++ b/x11-fonts/fontconfig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625421212 -SHA256 (fontconfig-2.13.94.tar.xz) = a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c -SIZE (fontconfig-2.13.94.tar.xz) = 1416832 +TIMESTAMP = 1661936025 +SHA256 (fontconfig-2.14.0.tar.xz) = dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac +SIZE (fontconfig-2.14.0.tar.xz) = 1431056 diff --git a/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf b/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf deleted file mode 100644 index 77f4f997d846..000000000000 --- a/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf +++ /dev/null @@ -1,62 +0,0 @@ ---- conf.d/60-latin.conf.orig 2020-11-28 01:56:42 UTC -+++ conf.d/60-latin.conf -@@ -5,44 +5,47 @@ - - serif - -+ Liberation Serif - DejaVu Serif - Times New Roman -- Thorndale AMT - Luxi Serif - Nimbus Roman No9 L - Nimbus Roman - Times -+ Thorndale AMT - - - - sans-serif - -+ Liberation Sans - DejaVu Sans -- Verdana - Arial -- Albany AMT - Luxi Sans - Nimbus Sans L - Nimbus Sans - Helvetica - Lucida Sans Unicode - BPG Glaho International -+ Verdana - Tahoma -+ Albany AMT - - - - monospace - -+ Liberation Mono - DejaVu Sans Mono - Inconsolata - Andale Mono - Courier New -- Cumberland AMT - Luxi Mono - Nimbus Mono L - Nimbus Mono - Nimbus Mono PS - Courier -+ Cumberland AMT - - -