Index: head/x11-fonts/linux-c6-fontconfig/Makefile =================================================================== --- head/x11-fonts/linux-c6-fontconfig/Makefile (revision 433086) +++ head/x11-fonts/linux-c6-fontconfig/Makefile (revision 433087) @@ -1,30 +1,27 @@ # Created by: Artyom Mirgorodskiy # $FreeBSD$ PORTNAME= fontconfig PORTVERSION= 2.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts linux MAINTAINER= emulation@FreeBSD.org COMMENT= XML-based font configuration API for X Windows (Linux CentOS ${LINUX_DIST_VER}) DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr RPMVERSION= 5.el6 USES= linux:c6 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 Index: head/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64 =================================================================== --- head/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64 (revision 433086) +++ head/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64 (revision 433087) @@ -1,21 +1,26 @@ etc/fonts +usr/bin/fc-cache usr/bin/fc-cat usr/bin/fc-list usr/bin/fc-match usr/bin/fc-query usr/bin/fc-scan usr/lib/libfontconfig.so.1 usr/lib/libfontconfig.so.1.4.4 usr/lib64/libfontconfig.so.1 usr/lib64/libfontconfig.so.1.4.4 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%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 Index: head/x11-fonts/linux-c6-fontconfig/pkg-plist.i386 =================================================================== --- head/x11-fonts/linux-c6-fontconfig/pkg-plist.i386 (revision 433086) +++ head/x11-fonts/linux-c6-fontconfig/pkg-plist.i386 (revision 433087) @@ -1,19 +1,24 @@ etc/fonts +usr/bin/fc-cache usr/bin/fc-cat usr/bin/fc-list usr/bin/fc-match usr/bin/fc-query usr/bin/fc-scan usr/lib/libfontconfig.so.1 usr/lib/libfontconfig.so.1.4.4 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%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 Index: head/x11-fonts/linux-c7-fontconfig/Makefile =================================================================== --- head/x11-fonts/linux-c7-fontconfig/Makefile (revision 433086) +++ head/x11-fonts/linux-c7-fontconfig/Makefile (revision 433087) @@ -1,33 +1,30 @@ # Created by: Piotr Kubaj # $FreeBSD$ PORTNAME= fontconfig PORTVERSION= 2.10.95 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts linux MAINTAINER= emulation@FreeBSD.org COMMENT= XML-based font configuration API for X Windows (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr RPMVERSION= 10.el7 USES= linux:c7 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 Index: head/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64 =================================================================== --- head/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64 (revision 433086) +++ head/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64 (revision 433087) @@ -1,26 +1,32 @@ etc/fonts +usr/bin/fc-cache usr/bin/fc-cat usr/bin/fc-list usr/bin/fc-match usr/bin/fc-pattern usr/bin/fc-query usr/bin/fc-scan usr/bin/fc-validate usr/lib/libfontconfig.so.1 usr/lib/libfontconfig.so.1.7.0 usr/lib64/libfontconfig.so.1 usr/lib64/libfontconfig.so.1.7.0 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%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-pattern.1.gz usr/share/man/man1/fc-query.1.gz 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 Index: head/x11-fonts/linux-c7-fontconfig/pkg-plist.i386 =================================================================== --- head/x11-fonts/linux-c7-fontconfig/pkg-plist.i386 (revision 433086) +++ head/x11-fonts/linux-c7-fontconfig/pkg-plist.i386 (revision 433087) @@ -1,24 +1,30 @@ etc/fonts +usr/bin/fc-cache usr/bin/fc-cat usr/bin/fc-list usr/bin/fc-match usr/bin/fc-pattern usr/bin/fc-query usr/bin/fc-scan usr/bin/fc-validate usr/lib/libfontconfig.so.1 usr/lib/libfontconfig.so.1.7.0 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%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-pattern.1.gz usr/share/man/man1/fc-query.1.gz 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