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

Modified Files:
        tcltk-x86_64.info tcltk.info 
Log Message:
majorversion portability


Index: tcltk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- tcltk.info  25 Jul 2011 23:06:52 -0000      1.17
+++ tcltk.info  27 Jul 2011 12:39:30 -0000      1.18
@@ -29,22 +29,25 @@
        popd
 <<
 InstallScript: <<
+#!/bin/sh -ev
+       MAJORVER=8.4
+
        mkdir -p %i/share/doc/%n
        make -C tcl%v/unix INSTALL_ROOT=%d install
        make -C tk%v/unix  INSTALL_ROOT=%d install
 
-       ln -s wish8.4 %i/bin/wish
-       ln -s tclsh8.4 %i/bin/tclsh
+       ln -s wish${MAJORVER} %i/bin/wish
+       ln -s tclsh${MAJORVER} %i/bin/tclsh
 
-       ln -s tk8.4 %i/lib/tk
-       ln -s libtk8.4.dylib %i/lib/libtk.dylib
-       ln -s libtkstub8.4.a %i/lib/libtkstub.a
-       /usr/bin/ranlib %i/lib/libtclstub8.4.a
+       ln -s tk${MAJORVER} %i/lib/tk
+       ln -s libtk${MAJORVER}.dylib %i/lib/libtk.dylib
+       ln -s libtkstub${MAJORVER}.a %i/lib/libtkstub.a
+       /usr/bin/ranlib %i/lib/libtclstub${MAJORVER}.a
 
-       ln -s tcl8.4 %i/lib/tcl
-       ln -s libtcl8.4.dylib %i/lib/libtcl.dylib
-       ln -s libtclstub8.4.a %i/lib/libtclstub.a
-       /usr/bin/ranlib %i/lib/libtkstub8.4.a
+       ln -s tcl${MAJORVER} %i/lib/tcl
+       ln -s libtcl${MAJORVER}.dylib %i/lib/libtcl.dylib
+       ln -s libtclstub${MAJORVER}.a %i/lib/libtclstub.a
+       /usr/bin/ranlib %i/lib/libtkstub${MAJORVER}.a
 
        perl -ni -e 'print unless /# FINK REMOVE THIS/' %i/lib/tclConfig.sh 
%i/lib/tkConfig.sh
 <<

Index: tcltk-x86_64.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk-x86_64.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tcltk-x86_64.info   25 Jul 2011 23:06:52 -0000      1.9
+++ tcltk-x86_64.info   27 Jul 2011 12:39:30 -0000      1.10
@@ -47,22 +47,25 @@
        fink-package-precedence --depfile-ext='\.d' --prohibit-bdep=%n-dev .
 <<
 InstallScript: <<
+#!/bin/sh -ev
+       MAJORVER=8.5
+
        mkdir -p %i/share/doc/%n
        make -C tcl%v/unix INSTALL_ROOT=%d install
        make -C tk%v/unix  INSTALL_ROOT=%d install
 
-       ln -s wish8.5 %i/bin/wish
-       ln -s tclsh8.5 %i/bin/tclsh
+       ln -s wish${MAJORVER} %i/bin/wish
+       ln -s tclsh${MAJORVER} %i/bin/tclsh
 
-       ln -s tk8.5 %i/lib/tk
-       ln -s libtk8.5.dylib %i/lib/libtk.dylib
-       ln -s libtkstub8.5.a %i/lib/libtkstub.a
-       /usr/bin/ranlib %i/lib/libtclstub8.5.a
+       ln -s tk${MAJORVER} %i/lib/tk
+       ln -s libtk${MAJORVER}.dylib %i/lib/libtk.dylib
+       ln -s libtkstub${MAJORVER}.a %i/lib/libtkstub.a
+       /usr/bin/ranlib %i/lib/libtclstub${MAJORVER}.a
 
-       ln -s tcl8.5 %i/lib/tcl
-       ln -s libtcl8.5.dylib %i/lib/libtcl.dylib
-       ln -s libtclstub8.5.a %i/lib/libtclstub.a
-       /usr/bin/ranlib %i/lib/libtkstub8.5.a
+       ln -s tcl${MAJORVER} %i/lib/tcl
+       ln -s libtcl${MAJORVER}.dylib %i/lib/libtcl.dylib
+       ln -s libtclstub${MAJORVER}.a %i/lib/libtclstub.a
+       /usr/bin/ranlib %i/lib/libtkstub${MAJORVER}.a
 
        perl -ni -e 'print unless /# FINK REMOVE THIS/' %i/lib/tclConfig.sh 
%i/lib/tkConfig.sh
 <<


------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to