From owner-svn-ports-all@freebsd.org Mon Feb 15 19:09:16 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C596E53665F; Mon, 15 Feb 2021 19:09:16 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DfYYm54wfz3DG9; Mon, 15 Feb 2021 19:09:16 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A13F122E88; Mon, 15 Feb 2021 19:09:16 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11FJ9GG7057633; Mon, 15 Feb 2021 19:09:16 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11FJ9FTj057626; Mon, 15 Feb 2021 19:09:15 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202102151909.11FJ9FTj057626@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Mon, 15 Feb 2021 19:09:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565327 - in head/x11-fonts/fontconfig: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/x11-fonts/fontconfig: . files X-SVN-Commit-Revision: 565327 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2021 19:09:16 -0000 Author: tcberner Date: Mon Feb 15 19:09:14 2021 New Revision: 565327 URL: https://svnweb.freebsd.org/changeset/ports/565327 Log: x11-fonts/fontconfig: Update to 2.13.93 Changelog: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/master/README - Switch to meson build system PR: 253212 Exp-run by: antoine Submitted by: daniel.engberg.lists@pyret.net Added: head/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf (contents, props changed) head/x11-fonts/fontconfig/files/patch-conf.d_meson.build (contents, props changed) head/x11-fonts/fontconfig/files/patch-meson.build (contents, props changed) head/x11-fonts/fontconfig/files/patch-src_meson.build (contents, props changed) Deleted: head/x11-fonts/fontconfig/files/patch-2.13.92.diff head/x11-fonts/fontconfig/files/patch-Makefile.in head/x11-fonts/fontconfig/files/patch-configure head/x11-fonts/fontconfig/files/patch-src__fccompat.c head/x11-fonts/fontconfig/files/patch-src_fcatomic.h Modified: head/x11-fonts/fontconfig/Makefile head/x11-fonts/fontconfig/distinfo head/x11-fonts/fontconfig/files/patch-src_fclang.c head/x11-fonts/fontconfig/pkg-plist Modified: head/x11-fonts/fontconfig/Makefile ============================================================================== --- head/x11-fonts/fontconfig/Makefile Mon Feb 15 18:56:11 2021 (r565326) +++ head/x11-fonts/fontconfig/Makefile Mon Feb 15 19:09:14 2021 (r565327) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= fontconfig -PORTVERSION= 2.13.92 -PORTREVISION?= 2 -PORTEPOCH?= 1 +DISTVERSION= 2.13.93 +PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= https://www.freedesktop.org/software/fontconfig/release/ @@ -14,76 +13,66 @@ COMMENT= XML-based font configuration API for X Window LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= gperf tar:xz - -.if !defined(REFERENCE_PORT) - LIB_DEPENDS= libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 -USES+= cpe gmake libtool pathfix pkgconfig +USES= cpe gperf meson pkgconfig python:3.6+,build shebangfix tar:xz 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 +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 -PKGINSTALL= ${WRKDIR}/pkg-install -INSTALL_TARGET=install-strip +TEST_TARGET= test +# Custom configuration variables +FCDEFAULTFONTS= ${PREFIX}/share/fonts +FCADDFONTS= ${LOCALBASE}/lib/X11/fonts + +# To avoid circular depdency docs (including manpages) needs to be disabled as +# they depend on textproc/docbook-utils which requires fontconfig +MESON_ARGS= -Ddefault_library=both -Ddoc=disabled + PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING} -PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt -OPTIONS_DEFINE= DOCS NLS NO_BITMAPS -OPTIONS_DEFAULT=HINTING_SLIGHT +OPTIONS_DEFINE= NLS BITMAPS TEST +OPTIONS_DEFAULT=BITMAPS 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 -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls +BITMAPS_DESC= Enable bitmap fonts by default +HINTING_DESC= Preferred pixel hinting configuration -post-patch-NO_BITMAPS-on: - @${REINPLACE_CMD} -i '.bitmaps.bak' -e \ - '/^CONF_LINKS =/s|$$|\${.newline} 70-no-bitmaps.conf \\|' \ - ${WRKSRC}/conf.d/Makefile.in +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/*.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} + ${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 -.include +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 -.endif +.include Modified: head/x11-fonts/fontconfig/distinfo ============================================================================== --- head/x11-fonts/fontconfig/distinfo Mon Feb 15 18:56:11 2021 (r565326) +++ head/x11-fonts/fontconfig/distinfo Mon Feb 15 19:09:14 2021 (r565327) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565349179 -SHA256 (fontconfig-2.13.92.tar.xz) = 506e61283878c1726550bc94f2af26168f1e9f2106eac77eaaf0b2cdfad66e4e -SIZE (fontconfig-2.13.92.tar.xz) = 1413128 +TIMESTAMP = 1612204906 +SHA256 (fontconfig-2.13.93.tar.xz) = ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0 +SIZE (fontconfig-2.13.93.tar.xz) = 1418288 Added: head/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf Mon Feb 15 19:09:14 2021 (r565327) @@ -0,0 +1,62 @@ +--- 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 + + +