[pkgsrc/trunk]: pkgsrc/fonts/fontconfig Honour VARBASE for the fontconfig cac...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ebcd47104d66
branches:  trunk
changeset: 518785:ebcd47104d66
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Sep 17 18:20:20 2006 +0000

description:
Honour VARBASE for the fontconfig cache. Use INSTALL script to create it
if necessary and run fc-cache to set up the initial database.
Remove the cache at DEINSTALL time. Bump revision for this.

diffstat:

 fonts/fontconfig/DEINSTALL |   9 +++++++++
 fonts/fontconfig/INSTALL   |  10 ++++++++++
 fonts/fontconfig/Makefile  |   6 +++++-
 fonts/fontconfig/PLIST     |   6 +-----
 4 files changed, 25 insertions(+), 6 deletions(-)

diffs (76 lines):

diff -r 778387dbbb10 -r ebcd47104d66 fonts/fontconfig/DEINSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/fontconfig/DEINSTALL        Sun Sep 17 18:20:20 2006 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/09/17 18:20:20 joerg Exp $
+
+VARBASE="@VARBASE@"
+
+case ${STAGE} in
+DEINSTALL)
+       ${RM} -rf ${VARBASE}/cache/fontconfig
+       ;;
+esac
diff -r 778387dbbb10 -r ebcd47104d66 fonts/fontconfig/INSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/fontconfig/INSTALL  Sun Sep 17 18:20:20 2006 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2006/09/17 18:20:20 joerg Exp $
+
+VARBASE="@VARBASE@"
+
+case ${STAGE} in
+POST-INSTALL)
+       ${MKDIR} ${VARBASE}/cache/fontconfig
+       ${PREFIX}/bin/fc-cache
+       ;;
+esac
diff -r 778387dbbb10 -r ebcd47104d66 fonts/fontconfig/Makefile
--- a/fonts/fontconfig/Makefile Sun Sep 17 17:36:35 2006 +0000
+++ b/fonts/fontconfig/Makefile Sun Sep 17 18:20:20 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2006/09/14 15:07:12 tron Exp $
+# $NetBSD: Makefile,v 1.57 2006/09/17 18:20:20 joerg Exp $
 
 DISTNAME=      fontconfig-2.4.0
+PKGREVISION=   1
 CATEGORIES=    fonts
 MASTER_SITES=  http://www.fontconfig.org/release/
 
@@ -23,6 +24,7 @@
 CONFIGURE_ARGS+=       --with-expat-includes=${BUILDLINK_PREFIX.expat}/include
 CONFIGURE_ARGS+=       --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
 CONFIGURE_ARGS+=       --with-confdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --with-cache-dir=${VARBASE:Q}/cache/fontconfig
 CONFIGURE_ARGS+=       --with-x
 CONFIGURE_ARGS+=       --enable-docs
 CONFIGURE_ENV+=                HASDOCBOOK=no
@@ -57,6 +59,8 @@
 CONF_FILES+=   ${EGDIR}/conf.d/80-delicious.conf ${PKG_SYSCONFDIR}/conf.d/80-delicious.conf
 CONF_FILES+=   ${EGDIR}/conf.d/90-synthetic.conf ${PKG_SYSCONFDIR}/conf.d/90-synthetic.conf
 
+MAKE_DIRS+=    ${VARBASE}/cache
+
 LIBS+=         ${BUILDLINK_LDADD.iconv}
 
 TEST_TARGET=   check
diff -r 778387dbbb10 -r ebcd47104d66 fonts/fontconfig/PLIST
--- a/fonts/fontconfig/PLIST    Sun Sep 17 17:36:35 2006 +0000
+++ b/fonts/fontconfig/PLIST    Sun Sep 17 18:20:20 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/09/11 18:53:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/09/17 18:20:20 joerg Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-list
@@ -318,10 +318,6 @@
 share/examples/fontconfig/conf.d/90-synthetic.conf
 share/examples/fontconfig/fonts.conf
 share/examples/fontconfig/fonts.dtd
-@exec ${MKDIR} %D/var/cache/fontconfig
-@unexec ${RMDIR} %D/var/cache/fontconfig 2> /dev/null || ${TRUE}
-@unexec ${RMDIR} %D/var/cache 2> /dev/null || ${TRUE}
-@unexec ${RMDIR} %D/var 2> /dev/null || ${TRUE}
 @dirrm share/examples/fontconfig/conf.d
 @dirrm share/examples/fontconfig/conf.avail
 @dirrm share/examples/fontconfig