Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13746
Modified Files:
root5.info root5.patch
Log Message:
Upstream patch release.
Index: root5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- root5.patch 29 Oct 2012 14:08:31 -0000 1.10
+++ root5.patch 14 Jan 2013 12:53:31 -0000 1.11
@@ -1,71 +1,28 @@
-Index: root/configure
-===================================================================
---- 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
- 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
+Index: root/build/unix/makelib.sh
===================================================================
---- root/cint/configure (revision 46870)
-+++ root/cint/configure (working copy)
-@@ -155,7 +155,7 @@
- AR="ar -r -cs "
- IMPLIBEXT=.dylib
-
-- MAKEIMPLIB="ln -sf @so@ @imp@"
-+ MAKEIMPLIB="ln -sf `basename @so@` @imp@"
-
- EXPLLINK=1
-
+--- root/build/unix/makelib.sh (revision 48280)
++++ root/build/unix/makelib.sh (working copy)
+@@ -34,7 +34,7 @@
+ if [ $PLATFORM = "macosx" ]; then
+ macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
+ if [ $macosx_minor -ge 5 ] && [ $LD != "icpc" ]; then
+- soext="so"
++ soext="dylib"
+ else
+ soext="dylib"
+ fi
+@@ -220,7 +220,7 @@
+ ln -fs $SONAME.$MAJOR $LIB
+ elif [ -f $LIBVERS ]; then
+ # Versioned library has format foo.3.05.so
+- source_file=`echo $SONAME | sed "s/.*\./&${MINOR}./"`
++ source_file=`basename $SONAME | sed "s/.*\./&${MINOR}./"`
+ LIBNOMAJORMINOR=`echo $LIB|sed 's,\.'$MAJOR'\.'$MINOR',,'`
+ if [ $LIB != $LIBNOMAJORMINOR ]; then
+ LIBNOMINOR=`echo $LIB|sed 's,\.'$MINOR',,'`
Index: root/cint/ROOT/cintdlls.mk
===================================================================
---- root/cint/ROOT/cintdlls.mk (revision 46870)
+--- root/cint/ROOT/cintdlls.mk (revision 48280)
+++ root/cint/ROOT/cintdlls.mk (working copy)
@@ -146,7 +146,7 @@
else
@@ -101,31 +58,22 @@
$(CINTDLLSOEXTCMD)
core/metautils/src/stlLoader_%.cc:
$(ROOT_SRCDIR)/core/metautils/src/stlLoader.cc
-Index: root/build/unix/makelib.sh
+Index: root/cint/configure
===================================================================
---- root/build/unix/makelib.sh (revision 46870)
-+++ root/build/unix/makelib.sh (working copy)
-@@ -34,7 +34,7 @@
- if [ $PLATFORM = "macosx" ]; then
- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
- if [ $macosx_minor -ge 5 ] && [ $LD != "icpc" ]; then
-- soext="so"
-+ soext="dylib"
- else
- soext="dylib"
- fi
-@@ -220,7 +220,7 @@
- ln -fs $SONAME.$MAJOR $LIB
- elif [ -f $LIBVERS ]; then
- # Versioned library has format foo.3.05.so
-- source_file=`echo $SONAME | sed "s/.*\./&${MINOR}./"`
-+ source_file=`basename $SONAME | sed "s/.*\./&${MINOR}./"`
- LIBNOMAJORMINOR=`echo $LIB|sed 's,\.'$MAJOR'\.'$MINOR',,'`
- if [ $LIB != $LIBNOMAJORMINOR ]; then
- LIBNOMINOR=`echo $LIB|sed 's,\.'$MINOR',,'`
+--- root/cint/configure (revision 48280)
++++ root/cint/configure (working copy)
+@@ -155,7 +155,7 @@
+ AR="ar -r -cs "
+ IMPLIBEXT=.dylib
+
+- MAKEIMPLIB="ln -sf @so@ @imp@"
++ MAKEIMPLIB="ln -sf `basename @so@` @imp@"
+
+ EXPLLINK=1
+
Index: root/config/Makefile.macosx64
===================================================================
---- root/config/Makefile.macosx64 (revision 46870)
+--- root/config/Makefile.macosx64 (revision 48280)
+++ root/config/Makefile.macosx64 (working copy)
@@ -104,7 +104,7 @@
endif
@@ -136,9 +84,48 @@
else
SOEXT = dylib
endif
+Index: root/configure
+===================================================================
+--- root/configure (revision 48280)
++++ 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/etc/Makefile.arch
===================================================================
---- root/etc/Makefile.arch (revision 46870)
+--- root/etc/Makefile.arch (revision 48280)
+++ root/etc/Makefile.arch (working copy)
@@ -7,8 +7,9 @@
# Author: Fons Rademakers, 29/2/2000
@@ -161,3 +148,16 @@
endif
endif
+Index: root/proof/afdsmgrd/Module.mk
+===================================================================
+--- root/proof/afdsmgrd/Module.mk (revision 48280)
++++ 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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- root5.info 29 Oct 2012 14:08:31 -0000 1.14
+++ root5.info 14 Jan 2013 12:53:31 -0000 1.15
@@ -1,6 +1,6 @@
Info3: <<
Package: root5%type_pkg[-cernlib]%type_pkg[-pythia]
-Version: 5.34.03
+Version: 5.34.04
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: b732dab3abab6d2a223d278041b3e1fe
+Source-MD5: 7f6ff6937e74139fa414027faa21dc04
SourceDirectory: root
PatchFile: %{ni}.patch
-PatchFile-MD5: 25940c31e59a4f9f2e801bf283b06ca9
+PatchFile-MD5: e0b88eca13022a07746f76205362cb01
PatchScript: <<
patch -p1 < %{PatchFile}
/usr/bin/sed -i '.bak' -e 's:python :%p/bin/python2.7 :'
bindings/pyroot/Module.mk cint/cintex/Module.mk
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122412
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
