Date: Wed, 1 Feb 2017 20:10:41 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433087 - in head/x11-fonts: linux-c6-fontconfig linux-c7-fontconfig Message-ID: <201702012010.v11KAfjg059841@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Feb 1 20:10:41 2017 New Revision: 433087 URL: https://svnweb.freebsd.org/changeset/ports/433087 Log: Generate fontconfig cache on installation. This prevents cache creation in every user's home directory when they first run an X11 Linux program. Modified: head/x11-fonts/linux-c6-fontconfig/Makefile head/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64 head/x11-fonts/linux-c6-fontconfig/pkg-plist.i386 head/x11-fonts/linux-c7-fontconfig/Makefile head/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64 head/x11-fonts/linux-c7-fontconfig/pkg-plist.i386 Modified: head/x11-fonts/linux-c6-fontconfig/Makefile ============================================================================== --- head/x11-fonts/linux-c6-fontconfig/Makefile Wed Feb 1 19:59:44 2017 (r433086) +++ head/x11-fonts/linux-c6-fontconfig/Makefile Wed Feb 1 20:10:41 2017 (r433087) @@ -3,7 +3,7 @@ PORTNAME= fontconfig PORTVERSION= 2.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts linux MAINTAINER= emulation@FreeBSD.org @@ -16,15 +16,12 @@ USE_LDCONFIG= yes USE_LINUX= expat USE_LINUX_RPM= yes -# We will use some other configuration file, so delete a linux one -# Don't let the linux fc-cache mess up the native cache file post-patch: - @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts ${WRKSRC}/var \ - ${WRKSRC}/usr/bin/fc-cache \ - ${WRKSRC}/usr/share/man/man1/fc-cache.1.gz + @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts ${WRKSRC}/var post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc ${LN} -s ${LOCALBASE}/etc/fonts ${STAGEDIR}${PREFIX}/etc/ + ${MKDIR} ${STAGEDIR}${PREFIX}/var/db/fontconfig .include <bsd.port.mk> Modified: head/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64 ============================================================================== --- head/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64 Wed Feb 1 19:59:44 2017 (r433086) +++ head/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64 Wed Feb 1 20:10:41 2017 (r433087) @@ -1,4 +1,5 @@ etc/fonts +usr/bin/fc-cache usr/bin/fc-cat usr/bin/fc-list usr/bin/fc-match @@ -13,9 +14,13 @@ usr/lib64/libfontconfig.so.1.4.4 %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt +usr/share/man/man1/fc-cache.1.gz usr/share/man/man1/fc-cat.1.gz usr/share/man/man1/fc-list.1.gz usr/share/man/man1/fc-match.1.gz usr/share/man/man1/fc-query.1.gz usr/share/man/man1/fc-scan.1.gz usr/share/man/man5/fonts-conf.5.gz +@rmtry var/db/fontconfig/*-le64.cache-3 +@dir var/db/fontconfig +@postexec %D/usr/bin/fc-cache -f -s Modified: head/x11-fonts/linux-c6-fontconfig/pkg-plist.i386 ============================================================================== --- head/x11-fonts/linux-c6-fontconfig/pkg-plist.i386 Wed Feb 1 19:59:44 2017 (r433086) +++ head/x11-fonts/linux-c6-fontconfig/pkg-plist.i386 Wed Feb 1 20:10:41 2017 (r433087) @@ -1,4 +1,5 @@ etc/fonts +usr/bin/fc-cache usr/bin/fc-cat usr/bin/fc-list usr/bin/fc-match @@ -11,9 +12,13 @@ usr/lib/libfontconfig.so.1.4.4 %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt +usr/share/man/man1/fc-cache.1.gz usr/share/man/man1/fc-cat.1.gz usr/share/man/man1/fc-list.1.gz usr/share/man/man1/fc-match.1.gz usr/share/man/man1/fc-query.1.gz usr/share/man/man1/fc-scan.1.gz usr/share/man/man5/fonts-conf.5.gz +@rmtry var/db/fontconfig/*-le32d4.cache-3 +@dir var/db/fontconfig +@postexec %D/usr/bin/fc-cache -f -s Modified: head/x11-fonts/linux-c7-fontconfig/Makefile ============================================================================== --- head/x11-fonts/linux-c7-fontconfig/Makefile Wed Feb 1 19:59:44 2017 (r433086) +++ head/x11-fonts/linux-c7-fontconfig/Makefile Wed Feb 1 20:10:41 2017 (r433087) @@ -3,7 +3,7 @@ PORTNAME= fontconfig PORTVERSION= 2.10.95 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts linux MAINTAINER= emulation@FreeBSD.org @@ -18,16 +18,13 @@ USE_LDCONFIG= yes USE_LINUX= expat USE_LINUX_RPM= yes -# We will use some other configuration file, so delete a linux one -# Don't let the linux fc-cache mess up the native cache file post-patch: @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts \ - ${WRKSRC}/usr/share/fontconfig ${WRKSRC}/var \ - ${WRKSRC}/usr/bin/fc-cache \ - ${WRKSRC}/usr/share/man/man1/fc-cache.1.gz + ${WRKSRC}/usr/share/fontconfig ${WRKSRC}/var post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc ${LN} -s ${LOCALBASE}/etc/fonts ${STAGEDIR}${PREFIX}/etc/ + ${MKDIR} ${STAGEDIR}${PREFIX}/var/db/fontconfig .include <bsd.port.mk> Modified: head/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64 ============================================================================== --- head/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64 Wed Feb 1 19:59:44 2017 (r433086) +++ head/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64 Wed Feb 1 20:10:41 2017 (r433087) @@ -1,4 +1,5 @@ etc/fonts +usr/bin/fc-cache usr/bin/fc-cat usr/bin/fc-list usr/bin/fc-match @@ -15,6 +16,7 @@ usr/lib64/libfontconfig.so.1.7.0 %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt +usr/share/man/man1/fc-cache.1.gz usr/share/man/man1/fc-cat.1.gz usr/share/man/man1/fc-list.1.gz usr/share/man/man1/fc-match.1.gz @@ -24,3 +26,7 @@ usr/share/man/man1/fc-scan.1.gz usr/share/man/man1/fc-validate.1.gz usr/share/man/man5/fonts-conf.5.gz usr/share/xml/fontconfig/fonts.dtd +@rmtry var/db/fontconfig/*-le64.cache-4 +@rmtry var/db/fontconfig/CACHEDIR.TAG +@dir var/db/fontconfig +@postexec %D/usr/bin/fc-cache -f -s Modified: head/x11-fonts/linux-c7-fontconfig/pkg-plist.i386 ============================================================================== --- head/x11-fonts/linux-c7-fontconfig/pkg-plist.i386 Wed Feb 1 19:59:44 2017 (r433086) +++ head/x11-fonts/linux-c7-fontconfig/pkg-plist.i386 Wed Feb 1 20:10:41 2017 (r433087) @@ -1,4 +1,5 @@ etc/fonts +usr/bin/fc-cache usr/bin/fc-cat usr/bin/fc-list usr/bin/fc-match @@ -13,6 +14,7 @@ usr/lib/libfontconfig.so.1.7.0 %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html %%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt +usr/share/man/man1/fc-cache.1.gz usr/share/man/man1/fc-cat.1.gz usr/share/man/man1/fc-list.1.gz usr/share/man/man1/fc-match.1.gz @@ -22,3 +24,7 @@ usr/share/man/man1/fc-scan.1.gz usr/share/man/man1/fc-validate.1.gz usr/share/man/man5/fonts-conf.5.gz usr/share/xml/fontconfig/fonts.dtd +@rmtry var/db/fontconfig/*-le32d4.cache-4 +@rmtry var/db/fontconfig/CACHEDIR.TAG +@dir var/db/fontconfig +@postexec %D/usr/bin/fc-cache -f -s
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702012010.v11KAfjg059841>