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

[a_o_m at users.sourceforge.net]

Revision: 8140
          http://gar.svn.sourceforge.net/gar/?rev=8140&view=rev
Author:   a_o_m
Date:     2010-01-24 10:19:30 +0000 (Sun, 24 Jan 2010)

Log Message:
-----------
fontconfig: conf migrated to /etc/opt/csw

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

Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile	2010-01-24 10:18:20 UTC (rev 8139)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile	2010-01-24 10:19:30 UTC (rev 8140)
@@ -27,10 +27,12 @@
 
 SPKG_SOURCEURL = http://www.fontconfig.org/
 
+MIGRATE_FILES = 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,/opt/csw/share/fonts
 CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig
-CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig
+CONFIGURE_ARGS += --with-confdir=/etc/opt/csw/fontconfig
 
 include gar/category.mk

Modified: csw/mgar/pkg/fontconfig/trunk/checksums
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/checksums	2010-01-24 10:18:20 UTC (rev 8139)
+++ csw/mgar/pkg/fontconfig/trunk/checksums	2010-01-24 10:19:30 UTC (rev 8140)
@@ -1,3 +1,3 @@
-8749af801a9e33c61092da59354bbceb  CSWfconfig.postinstall
+0d3f1e7200a203a89dee4324a421e275  CSWfconfig.postinstall
 bbdb45396408c48d50c7db5747dfae4e  fix-zerowidth-struct.patch
 77e15a92006ddc2adbb06f840d591c0e  fontconfig-2.8.0.tar.gz

Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall	2010-01-24 10:18:20 UTC (rev 8139)
+++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall	2010-01-24 10:19:30 UTC (rev 8140)
@@ -8,6 +8,7 @@
 echo
 
 ${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s
+touch ${BASEDIR}/var/opt/csw/cache/fontconfig/.fc-cache_done 2>/dev/null
 
 ${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-list 2>&1 >/dev/null &
 
@@ -15,8 +16,8 @@
 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 {} \;
-# removing ancient *.cache-csw-2 files
-rm "${BASEDIR}/opt/csw/var/cache/fontconfig/*.cache-csw-2" 2>/dev/null
+# removing ancient *.cache-2 files
+rm ${BASEDIR}/var/opt/csw/cache/fontconfig/*.cache-2 2>/dev/null
 # remove obsolete cache dir
 [ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null
 


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