Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28675

Modified Files:
        freetype2-hinting.info freetype2.info 
Log Message:
- fix the symlinks so that all libraries also exist in
  %p/lib/freetype2/lib (since some versions of libtool expect that
  the directory libfreetype.la is in is also the directory  all of
  the libraries are in)
- fix the libfreetype.la so that the "libdir" variable points to
  %p/lib/freetype2/lib instead of %p/lib (since some versions of
  libtool expect the directory listed there is also the directory
  all of the libraries are in)


Index: freetype2-hinting.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/freetype2-hinting.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freetype2-hinting.info      11 Jan 2005 08:55:27 -0000      1.5
+++ freetype2-hinting.info      28 Jan 2005 14:54:56 -0000      1.6
@@ -1,6 +1,6 @@
 Package: freetype2-hinting
 Version: 2.1.3
-Revision: 22
+Revision: 23
 Depends: %N-shlibs (= %v-%r)
 Conflicts: freetype2
 Replaces: freetype2
@@ -16,15 +16,22 @@
  make
 <<
 InstallScript: <<
+#!/bin/sh -e
+
  make install prefix=%i
  install -d -m 755 %i/lib/freetype2/lib
  mv %i/bin %i/lib/freetype2
  mv %i/lib/libfreetype.a %i/lib/freetype2/lib
  mv %i/lib/libfreetype.dylib %i/lib/freetype2/lib
  ln -sf %p/lib/libfreetype.6.dylib %i/lib/freetype2/lib/libfreetype.dylib
- mv %i/lib/libfreetype.la %i/lib/freetype2/lib
+ perl -p -e 's,%p/lib,%p/lib/freetype2/lib,g' %i/lib/libfreetype.la > 
%i/lib/freetype2/lib/libfreetype.la
+ rm -rf %i/lib/libfreetype.la
  mv %i/include %i/lib/freetype2
  rm -rf %i/share/aclocal
+ for file in %i/lib/libfreetype*.dylib; do
+   REALFILE=`echo "$file" | sed -e 's,^%d,,'`
+   ln -sf "$REALFILE" %i/lib/freetype2/lib/
+ done
 <<
 SplitOff: <<
   Package: %N-shlibs

Index: freetype2.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/freetype2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freetype2.info      11 Jan 2005 08:55:27 -0000      1.3
+++ freetype2.info      28 Jan 2005 14:54:56 -0000      1.4
@@ -1,6 +1,6 @@
 Package: freetype2
 Version: 2.1.3
-Revision: 22
+Revision: 23
 Depends: %N-shlibs (= %v-%r)
 Conflicts: freetype2-hinting
 Replaces: freetype2-hinting
@@ -15,15 +15,22 @@
  make
 <<
 InstallScript: <<
+#!/bin/sh -e
+
  make install prefix=%i
  install -d -m 755 %i/lib/freetype2/lib
  mv %i/bin %i/lib/freetype2
  mv %i/lib/libfreetype.a %i/lib/freetype2/lib
  mv %i/lib/libfreetype.dylib %i/lib/freetype2/lib
  ln -sf %p/lib/libfreetype.6.dylib %i/lib/freetype2/lib/libfreetype.dylib
- mv %i/lib/libfreetype.la %i/lib/freetype2/lib
+ perl -p -e 's,%p/lib,%p/lib/freetype2/lib,g' %i/lib/libfreetype.la > 
%i/lib/freetype2/lib/libfreetype.la
+ rm -rf %i/lib/libfreetype.la
  mv %i/include %i/lib/freetype2
  rm -rf %i/share/aclocal
+ for file in %i/lib/libfreetype*.dylib; do
+   REALFILE=`echo "$file" | sed -e 's,^%d,,'`
+   ln -sf "$REALFILE" %i/lib/freetype2/lib/
+ done
 <<
 SplitOff: <<
   Package: %N-shlibs



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to