Author: ranger
Date: Thu Sep 7 18:19:04 2006
New Revision: 370
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=370&repname=user%3a+ranger>
Log:
more robust fc-cache stuff (hopefully)
Modified:
trunk/experimental/10.3/main/finkinfo/x11-system/xfree86.info
trunk/experimental/10.3/main/finkinfo/x11-system/xorg.info
trunk/experimental/10.4/main/finkinfo/x11-system/xfree86.info
trunk/experimental/10.4/main/finkinfo/x11-system/xorg.info
trunk/experimental/common/main/finkinfo/x11-system/xfree86.info
trunk/experimental/common/main/finkinfo/x11-system/xorg.info
Modified: trunk/experimental/10.3/main/finkinfo/x11-system/xfree86.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/x11-system/xfree86.info&rev=370&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/x11-system/xfree86.info (original)
+++ trunk/experimental/10.3/main/finkinfo/x11-system/xfree86.info Thu Sep 7
18:19:04 2006
@@ -203,7 +203,14 @@
<<
PostInstScript: <<
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e /usr/X11R6/lib/libfontconfig.1.dylib
]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e 's,.*<dir>,,' -e
's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
<<
@@ -259,7 +266,14 @@
fi
done
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e
/usr/X11R6/lib/libfontconfig.1.dylib ]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e
's,.*<dir>,,' -e 's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
PreRmScript: <<
Modified: trunk/experimental/10.3/main/finkinfo/x11-system/xorg.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/x11-system/xorg.info&rev=370&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/x11-system/xorg.info (original)
+++ trunk/experimental/10.3/main/finkinfo/x11-system/xorg.info Thu Sep 7
18:19:04 2006
@@ -196,7 +196,14 @@
<<
PostInstScript: <<
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e /usr/X11R6/lib/libfontconfig.1.dylib
]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e 's,.*<dir>,,' -e
's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
<<
@@ -252,7 +259,14 @@
fi
done
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e
/usr/X11R6/lib/libfontconfig.1.dylib ]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e
's,.*<dir>,,' -e 's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
PreRmScript: <<
Modified: trunk/experimental/10.4/main/finkinfo/x11-system/xfree86.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11-system/xfree86.info&rev=370&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/x11-system/xfree86.info (original)
+++ trunk/experimental/10.4/main/finkinfo/x11-system/xfree86.info Thu Sep 7
18:19:04 2006
@@ -203,7 +203,14 @@
<<
PostInstScript: <<
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e /usr/X11R6/lib/libfontconfig.1.dylib
]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e 's,.*<dir>,,' -e
's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
<<
@@ -259,7 +266,14 @@
fi
done
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e
/usr/X11R6/lib/libfontconfig.1.dylib ]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e
's,.*<dir>,,' -e 's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
PreRmScript: <<
Modified: trunk/experimental/10.4/main/finkinfo/x11-system/xorg.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11-system/xorg.info&rev=370&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/x11-system/xorg.info (original)
+++ trunk/experimental/10.4/main/finkinfo/x11-system/xorg.info Thu Sep 7
18:19:04 2006
@@ -196,7 +196,14 @@
<<
PostInstScript: <<
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e /usr/X11R6/lib/libfontconfig.1.dylib
]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e 's,.*<dir>,,' -e
's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
<<
@@ -252,7 +259,14 @@
fi
done
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e
/usr/X11R6/lib/libfontconfig.1.dylib ]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e
's,.*<dir>,,' -e 's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
PreRmScript: <<
Modified: trunk/experimental/common/main/finkinfo/x11-system/xfree86.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11-system/xfree86.info&rev=370&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11-system/xfree86.info (original)
+++ trunk/experimental/common/main/finkinfo/x11-system/xfree86.info Thu Sep 7
18:19:04 2006
@@ -189,7 +189,14 @@
<<
PostInstScript: <<
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e
/usr/X11R6/lib/libfontconfig.1.dylib ]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e
's,.*<dir>,,' -e 's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR"
|| :
+ fi
+ done
+ fi
fi
<<
<<
@@ -252,7 +259,14 @@
fi
done
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e
/usr/X11R6/lib/libfontconfig.1.dylib ]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e
's,.*<dir>,,' -e 's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
PreRmScript: <<
Modified: trunk/experimental/common/main/finkinfo/x11-system/xorg.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11-system/xorg.info&rev=370&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11-system/xorg.info (original)
+++ trunk/experimental/common/main/finkinfo/x11-system/xorg.info Thu Sep 7
18:19:04 2006
@@ -177,7 +177,14 @@
<<
PostInstScript: <<
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e
/usr/X11R6/lib/libfontconfig.1.dylib ]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e
's,.*<dir>,,' -e 's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR"
|| :
+ fi
+ done
+ fi
fi
<<
<<
@@ -244,7 +251,14 @@
fi
done
if [ -x /usr/X11R6/bin/fc-cache ] && [ -e
/usr/X11R6/lib/libfontconfig.1.dylib ]; then
- /usr/X11R6/bin/fc-cache || :
+ if [ -r /etc/fonts/fonts.conf ]; then
+ grep '<dir>' /etc/fonts/fonts.conf | sed -e
's,.*<dir>,,' -e 's,</dir>,,' | while read DIR; do
+ if [ -d "$DIR" ]; then
+ rm -rf "$DIR/fonts.cache"*
+ /usr/X11R6/bin/fc-cache "$DIR" || :
+ fi
+ done
+ fi
fi
<<
PreRmScript: <<
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
