Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv24080
Modified Files: root5.info root5.patch Log Message: Latest upstream patch release. Index: root5.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- root5.patch 22 Sep 2012 19:56:21 -0000 1.9 +++ root5.patch 29 Oct 2012 14:08:31 -0000 1.10 @@ -1,19 +1,58 @@ -Index: root/config/Makefile.macosx64 +Index: root/configure =================================================================== ---- root/config/Makefile.macosx64 (revision 46119) -+++ root/config/Makefile.macosx64 (working copy) -@@ -104,7 +104,7 @@ - endif - endif - ifeq ($(subst $(MACOSX_MINOR),,1234),1234) --SOEXT = so -+SOEXT = dylib +--- root/configure (revision 46870) ++++ root/configure (working copy) +@@ -2452,12 +2452,6 @@ + result "See http://root.cern.ch/drupal/content/build-prerequisites" + exit 1 + fi +- if test "x$platform" = "xmacosx" && +- test ! "x$x11libdir" = "x$found_dir" ; then +- result "`basename $0`: libXft not in same directory as libX11" +- result "For consistency they should be in the same directory" +- exit 1 +- fi + + check_library "libXext" "$enable_shared" "$xextlibdir" \ + ${finkdir:+$finkdir/lib} \ +@@ -2470,12 +2464,6 @@ + result "See http://root.cern.ch/drupal/content/build-prerequisites" + exit 1 + fi +- if test "x$platform" = "xmacosx" && +- test ! "x$x11libdir" = "x$found_dir" ; then +- result "`basename $0`: libXext not in same directory as libX11" +- result "For consistency they should be in the same directory" +- exit 1 +- fi else - SOEXT = dylib - endif + x11libdir="" + xpmlibdir="" +@@ -3551,7 +3539,7 @@ + + # At this time, libfftw3.a should always be prefered over .so, + # to avoid forcing users to install fftw3. +- check_library "libfftw3 libfftw3-3" "no" "$fftw3libdir" \ ++ check_library "libfftw3 libfftw3-3" "yes" "$fftw3libdir" \ + $FFTW3 ${FFTW3:+$FFTW3/lib} ${FFTW3:+$FFTW3/.libs} \ + ${finkdir:+$finkdir/lib} \ + /usr/local/lib /usr/lib /opt/fftw3/lib +Index: root/proof/afdsmgrd/Module.mk +=================================================================== +--- root/proof/afdsmgrd/Module.mk (revision 46870) ++++ root/proof/afdsmgrd/Module.mk (working copy) +@@ -8,7 +8,7 @@ + + AFDSMGRDDIR := $(MODDIR) + AFDSMGRDBIN := bin/afdsmgrd +-AFDSMGRDTAR := $(shell cd $(AFDSMGRDDIR) && ls -1 afdsmgrd-v*.tar.gz | tail -1) ++AFDSMGRDTAR := $(shell cd $(AFDSMGRDDIR) && ls -1 afdsmgrd-v*.tar.gz | tail -n 1) + + AFDSMGRDPREP := $(AFDSMGRDDIR)/afdsmgrdPrepare + AFDSMGRDINST := $(AFDSMGRDDIR)/afdsmgrdInstall Index: root/cint/configure =================================================================== ---- root/cint/configure (revision 46119) +--- root/cint/configure (revision 46870) +++ root/cint/configure (working copy) @@ -155,7 +155,7 @@ AR="ar -r -cs " @@ -26,7 +65,7 @@ Index: root/cint/ROOT/cintdlls.mk =================================================================== ---- root/cint/ROOT/cintdlls.mk (revision 46119) +--- root/cint/ROOT/cintdlls.mk (revision 46870) +++ root/cint/ROOT/cintdlls.mk (working copy) @@ -146,7 +146,7 @@ else @@ -64,7 +103,7 @@ core/metautils/src/stlLoader_%.cc: $(ROOT_SRCDIR)/core/metautils/src/stlLoader.cc Index: root/build/unix/makelib.sh =================================================================== ---- root/build/unix/makelib.sh (revision 46119) +--- root/build/unix/makelib.sh (revision 46870) +++ root/build/unix/makelib.sh (working copy) @@ -34,7 +34,7 @@ if [ $PLATFORM = "macosx" ]; then @@ -84,9 +123,22 @@ LIBNOMAJORMINOR=`echo $LIB|sed 's,\.'$MAJOR'\.'$MINOR',,'` if [ $LIB != $LIBNOMAJORMINOR ]; then LIBNOMINOR=`echo $LIB|sed 's,\.'$MINOR',,'` +Index: root/config/Makefile.macosx64 +=================================================================== +--- root/config/Makefile.macosx64 (revision 46870) ++++ root/config/Makefile.macosx64 (working copy) +@@ -104,7 +104,7 @@ + endif + endif + ifeq ($(subst $(MACOSX_MINOR),,1234),1234) +-SOEXT = so ++SOEXT = dylib + else + SOEXT = dylib + endif Index: root/etc/Makefile.arch =================================================================== ---- root/etc/Makefile.arch (revision 46119) +--- root/etc/Makefile.arch (revision 46870) +++ root/etc/Makefile.arch (working copy) @@ -7,8 +7,9 @@ # Author: Fons Rademakers, 29/2/2000 @@ -109,55 +161,3 @@ endif endif -Index: root/configure -=================================================================== ---- root/configure (revision 46119) -+++ root/configure (working copy) -@@ -2452,12 +2452,6 @@ - result "See http://root.cern.ch/drupal/content/build-prerequisites" - exit 1 - fi -- if test "x$platform" = "xmacosx" && -- test ! "x$x11libdir" = "x$found_dir" ; then -- result "`basename $0`: libXft not in same directory as libX11" -- result "For consistency they should be in the same directory" -- exit 1 -- fi - - check_library "libXext" "$enable_shared" "$xextlibdir" \ - ${finkdir:+$finkdir/lib} \ -@@ -2470,12 +2464,6 @@ - result "See http://root.cern.ch/drupal/content/build-prerequisites" - exit 1 - fi -- if test "x$platform" = "xmacosx" && -- test ! "x$x11libdir" = "x$found_dir" ; then -- result "`basename $0`: libXext not in same directory as libX11" -- result "For consistency they should be in the same directory" -- exit 1 -- fi - else - x11libdir="" - xpmlibdir="" -@@ -3551,7 +3539,7 @@ - - # At this time, libfftw3.a should always be prefered over .so, - # to avoid forcing users to install fftw3. -- check_library "libfftw3 libfftw3-3" "no" "$fftw3libdir" \ -+ check_library "libfftw3 libfftw3-3" "yes" "$fftw3libdir" \ - $FFTW3 ${FFTW3:+$FFTW3/lib} ${FFTW3:+$FFTW3/.libs} \ - ${finkdir:+$finkdir/lib} \ - /usr/local/lib /usr/lib /opt/fftw3/lib -Index: root/proof/afdsmgrd/Module.mk -=================================================================== ---- root/proof/afdsmgrd/Module.mk (revision 46119) -+++ root/proof/afdsmgrd/Module.mk (working copy) -@@ -8,7 +8,7 @@ - - AFDSMGRDDIR := $(MODDIR) - AFDSMGRDBIN := bin/afdsmgrd --AFDSMGRDTAR := $(shell cd $(AFDSMGRDDIR) && ls -1 afdsmgrd-v*.tar.gz | tail -1) -+AFDSMGRDTAR := $(shell cd $(AFDSMGRDDIR) && ls -1 afdsmgrd-v*.tar.gz | tail -n 1) - - AFDSMGRDPREP := $(AFDSMGRDDIR)/afdsmgrdPrepare - AFDSMGRDINST := $(AFDSMGRDDIR)/afdsmgrdInstall Index: root5.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.info,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- root5.info 22 Sep 2012 19:56:21 -0000 1.13 +++ root5.info 29 Oct 2012 14:08:31 -0000 1.14 @@ -1,6 +1,6 @@ Info3: << Package: root5%type_pkg[-cernlib]%type_pkg[-pythia] -Version: 5.34.02 +Version: 5.34.03 Revision: 11 Type: << -cernlib (boolean), @@ -53,10 +53,10 @@ root5-cernlib-pythia << Source: ftp://root.cern.ch/root/root_v%v.source.tar.gz -Source-MD5: 4ec4f64943e791da8fdaf662a7e17693 +Source-MD5: b732dab3abab6d2a223d278041b3e1fe SourceDirectory: root PatchFile: %{ni}.patch -PatchFile-MD5: 191e0fb6bcfffa90c38dfa2009d04c3a +PatchFile-MD5: 25940c31e59a4f9f2e801bf283b06ca9 PatchScript: << patch -p1 < %{PatchFile} /usr/bin/sed -i '.bak' -e 's:python :%p/bin/python2.7 :' bindings/pyroot/Module.mk cint/cintex/Module.mk ------------------------------------------------------------------------------ The Windows 8 Center - In partnership with Sourceforge Your idea - your app - 30 days. Get started! http://windows8center.sourceforge.net/ what-html-developers-need-to-know-about-coding-windows-8-metro-style-apps/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs