Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7684
Modified Files: root5.info root5.patch Log Message: Always build against ruby/python from the system regardless of corresponding installed fink packages, add missing dependency on gcc42-shlibs, and fix GSL version detection Index: root5.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/root5.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- root5.patch 3 Aug 2007 23:13:08 -0000 1.5 +++ root5.patch 10 Nov 2007 17:31:18 -0000 1.6 @@ -35,6 +35,15 @@ if test "x$k" = "xlibz" ; then found_libz=$found_lib found_dirz=$found_dir +@@ -3635,7 +3756,7 @@ + # check for gsl version >= 1.8 + if test ! "x$found_dir" = "x"; then + message "Checking for GSL version >= 1.8" +- gsl_version=`grep "define GSL" $found_dir/gsl/gsl_version.h | sed 's/^.*"\([0-9]\.[0-9]\)"/\1/' | awk 'BEGIN { FS="." } { printf "%d", $1 * 1000 + $2 }'` ++ gsl_version=`grep "define GSL" $found_dir/gsl/gsl_version.h | sed 's/^.*"\([0-9]\..*[0-9]\)"/\1/' | awk 'BEGIN { FS="." } { printf "%d", $1 * 1000 + $2 }'` + if test $gsl_version -lt 1008; then + gslskip="skip" + result "no" --- build/unix/makelib.sh 29 Jan 2007 10:34:36 -0000 1.53 +++ build/unix/makelib.sh 2 Jul 2007 22:24:27 -0000 @@ -201,7 +201,7 @@ Index: root5.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/root5.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- root5.info 14 Oct 2007 00:00:07 -0000 1.8 +++ root5.info 10 Nov 2007 17:31:18 -0000 1.9 @@ -1,7 +1,7 @@ Info3: << Package: root5%type_pkg[-cernlib]%type_pkg[-geant4]%type_pkg[-qt] Version: 5.16.00 -Revision: 1 +Revision: 2 Distribution: 10.4 Type: -cernlib (boolean), -geant4 (boolean), -qt (boolean) GCC: 4.0 @@ -56,10 +56,12 @@ Source-MD5: 737171be851219ecbeaa03f178d96094 SourceDirectory: root PatchFile: root5.patch -PatchFile-MD5: fafe300dff08b304330d21314f5f38ad +PatchFile-MD5: c861eaa18a0338a9ddcc05ba4c19869b PatchScript: << #!/bin/sh -ev /usr/bin/patch -p0 < %{PatchFile} + /usr/bin/sed -i '.bak' "s:python -c:/usr/bin/python -c:" configure + /usr/bin/sed -i '.bak' "s:ruby -rrbconfig:/usr/bin/ruby -rrbconfig:" configure /usr/bin/sed -i '.bak' "s:-Iinclude:-Iinclude -I/usr/X11R6/include:" config/Makefile.in /usr/bin/sed -i '.bak' "s/-lfreetype/\`freetype-config --libs\`/" config/root-config.in /usr/bin/sed -i '.bak' 's/$(notdir $(@:.dll=.$(SOEXT)))/$(@:.dll=.$(SOEXT))/' cint/cintdlls.mk @@ -198,6 +200,7 @@ (%type_pkg[-geant4]) geant4.8-shlibs | (%type_pkg[-geant4]) geant4.8-cernlib-gfortran-shlibs | (%type_pkg[-geant4]) geant4.8-cernlib-g77-shlibs, + (%type_pkg[-cernlib]) gcc42-shlibs, (%type_pkg[-cernlib]) root-pythia-shlibs (>= 3-11), (%type_pkg[-qt]) qt3-shlibs << ------------------------------------------------------------------------- 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 Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs