Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9620
Modified Files:
fontconfig-path-10.5.info fontconfig-path-10.5.patch
Log Message:
Adjust path for original config file
Index: fontconfig-path-10.5.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig-path-10.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fontconfig-path-10.5.patch 4 Nov 2007 00:32:40 -0000 1.1
+++ fontconfig-path-10.5.patch 31 Dec 2008 02:56:51 -0000 1.2
@@ -21,7 +21,7 @@
diff -ruN fontconfig-path-orig/fontconfig-path.conf
fontconfig-path/fontconfig-path.conf
--- fontconfig-path-orig/fontconfig-path.conf Wed Dec 31 16:00:00 1969
+++ fontconfig-path/fontconfig-path.conf Fri Jan 28 23:52:42 2005
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts.conf file to configure system font access -->
@@ -29,9 +29,14 @@
+ <dir>@PREFIX@/share/fontconfig-path</dir>
+
+<!--
-+ Load regular configuration file
++ Load regular configuration file (New style)
+-->
-+ <include>/usr/X11/lib/X11/fonts/fonts.conf</include>
++ <include
ignore_missing="yes">/usr/X11/lib/X11/fontconfig/fonts.conf</include>
++
++<!--
++ Load regular configuration file (Old style)
++-->
++ <include
ignore_missing="yes">/usr/X11/lib/X11/fonts/fonts.conf</include>
+
+</fontconfig>
diff -ruN fontconfig-path-orig/fontconfig-path.csh
fontconfig-path/fontconfig-path.csh
Index: fontconfig-path-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig-path-10.5.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fontconfig-path-10.5.info 13 Jul 2008 17:14:23 -0000 1.3
+++ fontconfig-path-10.5.info 31 Dec 2008 02:56:51 -0000 1.4
@@ -1,12 +1,12 @@
Package: fontconfig-path
-Version: 20071103
-Revision: 2
+Version: 20081230
+Revision: 1
Distribution: 10.5
Type: nosource
NoSourceDirectory: true
BuildDepends: fink (>= 0.24.12)
PatchFile: %n-10.5.patch
-PatchFile-MD5: 5e61e8e0c904d13b8c4c50f106fcc96c
+PatchFile-MD5: ff06c0474731a669b64bf95c4d79a1d6
PatchScript: sed 's|@PREFIX@|%p|' %{PatchFile} | patch -p1
CompileScript: echo "No compile needed"
InstallScript: <<
@@ -17,10 +17,16 @@
cp %n.*sh %i/etc/profile.d
<<
PostRmScript: <<
- if [[ "$1" == "remove" || "$1" == "purge" ]]; then
- rm -rf %p/share/fontconfig-path
- FONTCONFIG_FILE=/usr/X11/lib/X11/fonts/fonts.conf fc-cache || echo
Ignoring errors...
- fi
+#!/bin/sh -ev
+ OLD_FONTCONFIG_FILE=/usr/X11/lib/X11/fonts/fonts.conf
+ NEW_FONTCONFIG_FILE=/usr/X11/lib/X11/fontconfig/fonts.conf
+ if [[ "$1" == "remove" || "$1" == "purge" ]]; then
+ rm -rf %p/share/fontconfig-path
+ if [ -e $NEW_FONTCONFIG_FILE ] ; then
+ FONTCONFIG_FILE=$NEW_FONTCONFIG_FILE fc-cache || echo Ignoring errors...
+ else FONTCONFIG_FILE=$OLD_FONTCONFIG_FILE fc-cache || echo Ignoring
errors...
+ fi
+ fi
<<
DocFiles: README
Description: Add custom directories to fontconfig search
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
