aboutsummaryrefslogtreecommitdiffstats
path: root/x11-fonts/linux-fontconfig
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2006-05-13 23:48:28 +0800
committernetchild <netchild@FreeBSD.org>2006-05-13 23:48:28 +0800
commitc1fb2ccfc68bff99541bf10c02bcfb436026eb59 (patch)
tree7377245b86f047a499fac1d2661a852eb20dfc7e /x11-fonts/linux-fontconfig
parent5512019360a0ad3985326c3380547c452648dbe4 (diff)
downloadfreebsd-ports-gnome-c1fb2ccfc68bff99541bf10c02bcfb436026eb59.tar.gz
freebsd-ports-gnome-c1fb2ccfc68bff99541bf10c02bcfb436026eb59.tar.zst
freebsd-ports-gnome-c1fb2ccfc68bff99541bf10c02bcfb436026eb59.zip
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.
Diffstat (limited to 'x11-fonts/linux-fontconfig')
-rw-r--r--x11-fonts/linux-fontconfig/Makefile10
-rw-r--r--x11-fonts/linux-fontconfig/pkg-install6
2 files changed, 4 insertions, 12 deletions
diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile
index 8aeecf9b59ae..c01253be6796 100644
--- a/x11-fonts/linux-fontconfig/Makefile
+++ b/x11-fonts/linux-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 <bsd.port.mk>
diff --git a/x11-fonts/linux-fontconfig/pkg-install b/x11-fonts/linux-fontconfig/pkg-install
deleted file mode 100644
index ec594298d788..000000000000
--- a/x11-fonts/linux-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