diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -2,6 +2,7 @@ PORTNAME= fontconfig DISTVERSION= 2.13.94 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= https://www.freedesktop.org/software/fontconfig/release/ @@ -25,6 +26,7 @@ fc-lang/fc-lang.py TEST_TARGET= test +PKGINSTALL= ${WRKDIR}/pkg-install # Custom configuration variables FCDEFAULTFONTS= ${PREFIX}/share/fonts @@ -66,6 +68,9 @@ post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample @${MKDIR} ${STAGEDIR}/var/db/fontconfig + @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ + s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \ + > ${PKGINSTALL} 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 diff --git a/x11-fonts/fontconfig/files/patch-fc-cache_meson.build b/x11-fonts/fontconfig/files/patch-fc-cache_meson.build new file mode 100644 --- /dev/null +++ b/x11-fonts/fontconfig/files/patch-fc-cache_meson.build @@ -0,0 +1,12 @@ +--- fc-cache/meson.build.orig 2021-08-18 08:08:43 UTC ++++ fc-cache/meson.build +@@ -8,6 +8,6 @@ fccache = executable('fc-cache', ['fc-cache.c', fcstdi + tools_man_pages += ['fc-cache'] + + # Do not try to execute target's fc-cache on host when cross compiling +-if not meson.is_cross_build() +- meson.add_install_script(fccache, '-s', '-f', '-v') +-endif ++# if not meson.is_cross_build() ++# meson.add_install_script(fccache, '-s', '-f', '-v') ++# endif