Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22148

Modified Files:
        tkimg.info 
Log Message:
'make install' recompiles some .dylib, so need to hack the install_name *after* 
that (in the %i) rather than before (in the %b); fix dependencies (based on 
otool-L on 10.8); lots of weird artifacts in the installed files (*Config.sh 
point to %b) but at least now it actually compiles and passes -m


Index: tkimg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/tkimg.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tkimg.info  23 Jan 2012 23:54:00 -0000      1.1
+++ tkimg.info  7 Jul 2013 06:11:37 -0000       1.2
@@ -1,7 +1,7 @@
 Info2: <<
 Package: tkimg 
 Version: 1.3 
-Revision: 4
+Revision: 5
 Description: Adds a lot of image formats to Tcl/Tk 
 DescDetail: <<
 <<
@@ -10,7 +10,13 @@
 Maintainer: Steffen Schmidt <steffen.schm...@tuebingen.mpg.de>
 Source: mirror:sourceforge:%n/%n%v.tar.gz
 Source-MD5: 964a692db8a120dc5ed8779521a70bc8 
-BuildDepends: tcltk-dev, libjpeg8
+BuildDepends: <<
+    fontconfig2-dev (>= 2.10.0-1),
+    freetype219 (>= 2.4.11-1),
+    tcltk-dev,
+    xft2-dev (>= 2.2.0-1),
+    x11-dev
+<<
 Depends: tcltk, %N-shlibs (= %v-%r)
 SourceDirectory: %n%v
 SetCPP: /usr/bin/cpp
@@ -23,17 +29,28 @@
 fi
 ./configure --prefix=%i --exec-prefix=%i --mandir=%p/share/man 
--infodir=%p/share/info --with-tcl=%p/lib --with-tk=%p/lib
 make
+
 <<
 InstallScript:<<
 #!/bin/zsh -evf
-foreach dylib in $( /bin/ls **/*.dylib ) 
-    install_name_tool -id  %p/lib/Img%v/$(basename $dylib)   $dylib
-end
 make install  
+pushd %i/lib
+    # 'foreach ... ls %i/lib/**/*.dylib' risky if %i has whitespace
+    foreach dylib in $( /bin/ls **/*.dylib ) 
+        # 'make install' might recompile .dylib, so have to fix afterwards
+        install_name_tool -id  %p/lib/Img%v/$(basename $dylib)   $dylib
+    end
+popd
 <<
 DocFiles: README ANNOUNCE license.terms  
 SplitOff: <<
     Package: %N-shlibs
+    Depends: <<
+        fontconfig2-shlibs (>= 2.10.0-1),
+       freetype219-shlibs (>= 2.4.11-1),
+       xft2-shlibs (>= 2.2.0-1),
+       x11-shlibs
+    <<
     Files:<<
         lib/Img%v/libjpegtcl1.0.dylib   
         lib/Img%v/libpngtcl1.2.6.dylib  


------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to