From c1fb2ccfc68bff99541bf10c02bcfb436026eb59 Mon Sep 17 00:00:00 2001 From: netchild Date: Sat, 13 May 2006 15:48:28 +0000 Subject: Don't run fc-cache, we're using the fonts of the X server and the native fontconfig (or the fonts ports/packages) are supposed to run fc-cache. I also noticed it has problems with some fonts, so we may end up with a not complete cache in this version. This should fix the build on pointyhat (cache files left after pkg_delete). While I'm here use a link to the native fonts.conf, we don't need our own here. --- x11-fonts/linux-f10-fontconfig/Makefile | 10 ++++------ x11-fonts/linux-f10-fontconfig/pkg-install | 6 ------ 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 x11-fonts/linux-f10-fontconfig/pkg-install (limited to 'x11-fonts/linux-f10-fontconfig') diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile index 8aeecf9..c01253b 100644 --- a/x11-fonts/linux-f10-fontconfig/Makefile +++ b/x11-fonts/linux-f10-fontconfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts linux DISTNAME= ${PORTNAME}-${PORTVERSION}-5 @@ -23,12 +23,10 @@ INSTALLS_SHLIB= yes BRANDELF_DIRS= usr/bin -post-patch: - @${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \ - s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \ - ${WRKSRC}/etc/fonts/fonts.conf +post-extract: + ${RM} ${WRKSRC}/etc/fonts/fonts.conf post-install: - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${LN} -s ${X11BASE}/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/fonts.conf .include diff --git a/x11-fonts/linux-f10-fontconfig/pkg-install b/x11-fonts/linux-f10-fontconfig/pkg-install deleted file mode 100644 index ec59429..0000000 --- a/x11-fonts/linux-f10-fontconfig/pkg-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$2" = "POST-INSTALL" ]; then - echo "Running fc-cache to build fontconfig cache..." - ${PKG_PREFIX}/usr/bin/fc-cache -f -v -fi -- cgit v1.1