[csw-devel] SF.net SVN: gar:[4070] csw/mgar/pkg/fontconfig/trunk

a_o_m at users.sourceforge.net a_o_m at users.sourceforge.net
Mon Mar 30 10:39:04 CEST 2009


Revision: 4070
          http://gar.svn.sourceforge.net/gar/?rev=4070&view=rev
Author:   a_o_m
Date:     2009-03-30 08:39:03 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
fontconfig: moved cache-dir to /var/opt/csw

Modified Paths:
--------------
    csw/mgar/pkg/fontconfig/trunk/Makefile
    csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall

Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile	2009-03-30 01:34:49 UTC (rev 4069)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile	2009-03-30 08:39:03 UTC (rev 4070)
@@ -24,7 +24,11 @@
 PACKAGES = CSWfconfig
 CATALOGNAME_CSWfconfig = fontconfig
 
-CONFIGURE_ARGS = $(DIRPATHS) --with-default-fonts=/usr/openwin/lib/X11/fonts --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts --with-cache-dir=/opt/csw/var/cache-fontconfig --with-confdir=/opt/csw/etc/fontconfig
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts
+CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts
+CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig
+CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig
 
 pre-package:
 	@rm -f $(DESTDIR)$(libdir)/libfontconfig.la*

Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall	2009-03-30 01:34:49 UTC (rev 4069)
+++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall	2009-03-30 08:39:03 UTC (rev 4070)
@@ -9,9 +9,13 @@
 
 ${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s
 
+${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-list 2>&1 >/dev/null &
+
 # removing ancient fonts.cache-csw-1 files from fontconfig-2.3.2
-find /usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \;
-find /usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \;
-find /opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \;
- 
+find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \;
+find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \;
+find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \;
+# remove obsolete cache dir
+[ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null
+
 exit 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list