Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv14228

Modified Files:
        fontconfig2-dev.info 
Log Message:
unbury (leaving buried original for compatibility, with mainspace symlinks)


Index: fontconfig2-dev.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig2-dev.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- fontconfig2-dev.info        23 Apr 2011 18:25:17 -0000      1.17
+++ fontconfig2-dev.info        23 Apr 2011 19:14:59 -0000      1.18
@@ -1,6 +1,6 @@
 Package: fontconfig2-dev
 Version: 2.8.0
-Revision: 5
+Revision: 6
 Description: Font configuration library
 License: Restrictive/Distributable
 Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
@@ -27,20 +27,45 @@
 PatchFile-MD5: b016bb5e79e60d05dcfdd964c0ed68a7
 
 SetCFLAGS: -fno-common -g -Os
-ConfigureParams: --prefix=%p/lib/fontconfig2 --with-confdir=%p/etc/fonts 
--disable-docs --enable-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
 --disable-silent-rules --disable-static
+ConfigureParams: --prefix=%p/lib/fontconfig2 --with-confdir=%p/etc/fonts 
--disable-docs --enable-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
 --disable-silent-rules --disable-static --mandir=%p/share/man
 CompileScript: <<
        %{default_script}
        fink-package-precedence --prohibit-bdep %n .
 <<
 
 InstallScript: <<
+#!/bin/sh -ev
        make -j1 install DESTDIR=%d
-       mkdir -p %i/lib/fontconfig2/share/man/man1
-       install -m 0644 fc-*/*.1 %i/lib/fontconfig2/share/man/man1
-       mkdir -p %i/lib/fontconfig2/share/man/man3
-       install -m 0644 doc/*.3 %i/lib/fontconfig2/share/man/man3
-       mkdir -p %i/lib/fontconfig2/share/man/man5
-       install -m 0644 doc/*.5 %i/lib/fontconfig2/share/man/man5
+       mkdir -p %i/share/man/man1
+       install -m 0644 fc-*/*.1 %i/share/man/man1
+       mkdir -p %i/share/man/man3
+       install -m 0644 doc/*.3 %i/share/man/man3
+       mkdir -p %i/share/man/man5
+       install -m 0644 doc/*.5 %i/share/man/man5
+
+       # everything is buried in a private hierarchy...
+       # now symlink from the default places
+       # must not symlink dirs...risk of confusing dpkg
+
+       pushd %i/lib/fontconfig2
+
+               # 1. clone actual directory structure
+               # NB: will fail miserably if space in %i or %p
+               # but fink hopelessly can't handle that anyway
+               /usr/bin/find . -type d -print0 | /usr/bin/xargs -0 -n 1 -I" " 
mkdir -pv "%i/ "
+               # 2. sylink the individual files
+               /usr/bin/find . \( -type f -o -type l \) -print0 | 
/usr/bin/xargs -0 -n 1 -I" " ln -sv "%p/lib/fontconfig2/ " "%i/ "
+
+               # adjust to emit paths pointing to the default places
+               #must edit actual files...perl-pie replaces symlink
+               #with actual file (!= acting through the symlink)
+               perl -pi -e 's,%p/lib/fontconfig2,%p,g' bin/* lib/pkgconfig/*
+               # lib/*.la #Scared of libtool!
+
+       popd
+
+       # only keep the main ld file, not all the underlying pieces
+       rm %i/lib/libfontconfig.1.*
 <<
 DocFiles: AUTHORS COPYING ChangeLog NEWS README
 SplitOff: <<
@@ -54,11 +79,13 @@
        <<
        DocFiles: AUTHORS COPYING ChangeLog NEWS README
        Files: <<
+               bin
                lib/fontconfig2/bin
                lib/fontconfig2/lib/libfontconfig.1*dylib
+               share/man/man1
        <<
        Shlibs: %p/lib/fontconfig2/lib/libfontconfig.1.dylib 6.0.0 %n (>= 
2.8.0-1)
-       PostInstScript: %p/lib/fontconfig2/bin/fc-cache --force 
>/tmp/fc-cache.log 2>&1 || :
+       PostInstScript: %p/bin/fc-cache --force >/tmp/fc-cache.log 2>&1 || :
 <<
 SplitOff2: <<
        Package: fontconfig-config
@@ -105,14 +132,14 @@
 A library for font customization and configuration.
 
 This version is meant to coexist peacefully with the libfontconfig
-provided in Apple's X11.  It has it's own configuration files in
+provided in Apple's X11.  It has its own configuration files in
 %p/etc/fonts, but is also configured to use a configuration in
 /usr/X11/lib/X11/fonts/local.conf and /etc/fonts/local.conf if they
 exist.
 <<
 DescPackaging: <<
 This package is not intended to replace the system fontconfig.  It is,
-however, patched to use it's own cache and configuration directories,
+however, patched to use its own cache and configuration directories,
 but to still be capable of loading the user font configuration, as
 well as /etc/fonts/local.conf on 10.4 (or Leopard upgrades), which is
 the accepted way of modifying the behavior of /etc/fonts/fonts.conf.


------------------------------------------------------------------------------
Fulfilling the Lean Software Promise
Lean software platforms are now widely adopted and the benefits have been 
demonstrated beyond question. Learn why your peers are replacing JEE 
containers with lightweight application servers - and what you can gain 
from the move. http://p.sf.net/sfu/vmware-sfemails
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to