Generate fontconfig cache on installation. This prevents cache creation

in every user's home directory when they first run an X11 Linux program.

6 files changed, 28 insertions, 12 deletions

diff --git a/x11-fonts/linux-c6-fontconfig/Makefile b/x11-fonts/linux-c6-fontconfig/Makefile
index 85b50bf1a867..4190670ac93c 100644
--- a/x11-fonts/linux-c6-fontconfig/Makefile
+++ b/x11-fonts/linux-c6-fontconfig/Makefile
@@ -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>
diff --git a/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64 b/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64
index 97bb8e12348d..57c9895b8b3e 100644
--- a/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64
+++ b/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64
@@ -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
diff --git a/x11-fonts/linux-c6-fontconfig/pkg-plist.i386 b/x11-fonts/linux-c6-fontconfig/pkg-plist.i386
index 73ed84405aa5..5fa29d53c83e 100644
--- a/x11-fonts/linux-c6-fontconfig/pkg-plist.i386
+++ b/x11-fonts/linux-c6-fontconfig/pkg-plist.i386
@@ -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
diff --git a/x11-fonts/linux-c7-fontconfig/Makefile b/x11-fonts/linux-c7-fontconfig/Makefile
index 3551c7bb16c7..891ade792db2 100644
--- a/x11-fonts/linux-c7-fontconfig/Makefile
+++ b/x11-fonts/linux-c7-fontconfig/Makefile
@@ -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>
diff --git a/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64 b/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64
index 223c75c84885..42afbf387c7b 100644
--- a/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64
+++ b/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64
@@ -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
diff --git a/x11-fonts/linux-c7-fontconfig/pkg-plist.i386 b/x11-fonts/linux-c7-fontconfig/pkg-plist.i386
index f905849e0aea..f4d8416b016d 100644
--- a/x11-fonts/linux-c7-fontconfig/pkg-plist.i386
+++ b/x11-fonts/linux-c7-fontconfig/pkg-plist.i386
@@ -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