Author: ranger
Date: Fri Nov  9 19:46:45 2007
New Revision: 1053

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1053&repname=user%3a+ranger
Log:
fix for the unstable upgrade

Modified:
    trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info
    trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info
    trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info
    trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev.info

Modified: trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info&rev=1053&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info 
(original)
+++ trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info Fri Nov 
 9 19:46:45 2007
@@ -1,6 +1,6 @@
 Package: fontconfig2-dev
 Version: 2.4.1
-Revision: 4
+Revision: 5
 Distribution: 10.5
 Description: Font configuration library
 Type: nosource
@@ -39,7 +39,26 @@
                lib/fontconfig2/bin
                lib/fontconfig2/lib/libfontconfig.1*dylib
        <<
+       PreInstScript: <<
+for file in "%p/lib/fontconfig2/include/fontconfig" 
"%p/lib/fontconfig2/lib/pkgconfig/fontconfig.pc" \
+       "%p/lib/fontconfig2/lib"/libfontconfig.*.dylib \
+       "%p/lib/fontconfig2/lib"/libfontconfig.la; do
+       if [ ! -L "$file" ]; then
+               rm -rf "$file"
+       fi
+done
+       <<
        PostInstScript: %p/lib/fontconfig2/bin/fc-cache --force 
>/tmp/fc-cache.log 2>&1 || :
+<<
+
+PreInstScript: <<
+       for file in "%p/lib/fontconfig2/include/fontconfig" 
"%p/lib/fontconfig2/lib/pkgconfig/fontconfig.pc" \
+               "%p/lib/fontconfig2/lib"/libfontconfig.*.dylib \
+               "%p/lib/fontconfig2/lib"/libfontconfig.la; do
+               if [ ! -L "$file" ]; then
+                       rm -rf "$file"
+               fi
+       done
 <<
 
 Homepage: http://www.fontconfig.org

Modified: trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info&rev=1053&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info (original)
+++ trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info Fri Nov  9 
19:46:45 2007
@@ -21,7 +21,7 @@
 Source-MD5: 108f9a03fa9ed9dd779cc7ca236da557
 Patch: %n.patch
 
-SetCFLAGS: -fno-common -Os
+SetCFLAGS: -fno-common -g -Os
 ConfigureParams: 
--with-freetype-config="%p/lib/freetype219/bin/freetype-config" 
--prefix=%p/lib/fontconfig2 --with-confdir=%p/etc/fonts --disable-docs 
--disable-dependency-tracking --with-cache-dir=%p/var/cache/fontconfig-2.4 
--with-default-fonts=/System/Library/Fonts 
--with-add-fonts=/Library/Fonts,/Network/Library/Fonts,/System/Library/Fonts,/usr/X11/lib/X11/fonts,/usr/X11R6/lib/X11/fonts,/usr/share/fonts
 
 InstallScript: make -j1 install DESTDIR=%d

Modified: trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info&rev=1053&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info 
(original)
+++ trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info Fri 
Nov  9 19:46:45 2007
@@ -1,6 +1,6 @@
 Package: fontconfig2-dev
 Version: 2.4.1
-Revision: 4
+Revision: 5
 Distribution: 10.5
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 BuildDependsOnly: true
@@ -23,6 +23,15 @@
                ln -sfh "$X11_ROOT/bin/$file" "$FC_ROOT/bin/$file"
        done
 <<
+PreInstScript: <<
+       for file in "%p/lib/fontconfig2/include/fontconfig" 
"%p/lib/fontconfig2/lib/pkgconfig/fontconfig.pc" \
+               "%p/lib/fontconfig2/lib"/libfontconfig.*.dylib \
+               "%p/lib/fontconfig2/lib"/libfontconfig.la; do
+               if [ ! -L "$file" ]; then
+                       rm -rf "$file"
+               fi
+       done
+<<
 
 SplitOff: <<
        Package: fontconfig2-shlibs
@@ -35,6 +44,15 @@
                lib/fontconfig2/lib/libfontconfig.1*dylib
        <<
        Description: Fontconfig 2, shared libs (dummy)
+       PreInstScript: <<
+               for file in "%p/lib/fontconfig2/include/fontconfig" 
"%p/lib/fontconfig2/lib/pkgconfig/fontconfig.pc" \
+                       "%p/lib/fontconfig2/lib"/libfontconfig.*.dylib \
+                       "%p/lib/fontconfig2/lib"/libfontconfig.la; do
+                       if [ ! -L "$file" ]; then
+                               rm -rf "$file"
+                       fi
+               done
+       <<
        PostInstScript: %p/lib/fontconfig2/bin/fc-cache --force 
>/tmp/fc-cache.log 2>&1 || :
 <<
 Description: Font configuration library

Modified: trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev.info&rev=1053&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev.info (original)
+++ trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev.info Fri Nov  9 
19:46:45 2007
@@ -9,7 +9,7 @@
 Patch: %n.patch
 BuildDepends: expat1, x11-dev, freetype219
 Depends: expat1-shlibs, fontconfig2-shlibs (= %v-%r)
-SetCFLAGS: -fno-common -Os
+SetCFLAGS: -fno-common -g -Os
 ConfigureParams: 
--with-freetype-config="%p/lib/freetype219/bin/freetype-config" 
--prefix=%p/lib/fontconfig2 --with-confdir=%p/etc/fonts --disable-docs 
--disable-dependency-tracking --with-cache-dir=%p/var/cache/fontconfig-2.4 
--with-default-fonts=/System/Library/Fonts 
--with-add-fonts=/Library/Fonts,/Network/Library/Fonts,/System/Library/Fonts,/usr/X11/lib/X11/fonts,/usr/X11R6/lib/X11/fonts,/usr/share/fonts
 InstallScript: make -j1 install DESTDIR=%d
 SplitOff: <<


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to