Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv26003
Modified Files:
root5.info root5.patch
Log Message:
New upstream version.
Index: root5.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- root5.patch 14 Aug 2012 19:07:39 -0000 1.8
+++ root5.patch 22 Sep 2012 19:56:21 -0000 1.9
@@ -1,58 +1,19 @@
-Index: root/configure
+Index: root/config/Makefile.macosx64
===================================================================
---- root/configure (revision 45566)
-+++ root/configure (working copy)
-@@ -2429,12 +2429,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} \
-@@ -2447,12 +2441,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
+--- 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
else
- x11libdir=""
- xpmlibdir=""
-@@ -3519,7 +3507,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 45566)
-+++ 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)
-
- # This one triggers the build from ROOT
- ALLEXECS += $(AFDSMGRDBIN)
+ SOEXT = dylib
+ endif
Index: root/cint/configure
===================================================================
---- root/cint/configure (revision 45566)
+--- root/cint/configure (revision 46119)
+++ root/cint/configure (working copy)
@@ -155,7 +155,7 @@
AR="ar -r -cs "
@@ -65,7 +26,7 @@
Index: root/cint/ROOT/cintdlls.mk
===================================================================
---- root/cint/ROOT/cintdlls.mk (revision 45566)
+--- root/cint/ROOT/cintdlls.mk (revision 46119)
+++ root/cint/ROOT/cintdlls.mk (working copy)
@@ -146,7 +146,7 @@
else
@@ -103,7 +64,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 45566)
+--- root/build/unix/makelib.sh (revision 46119)
+++ root/build/unix/makelib.sh (working copy)
@@ -34,7 +34,7 @@
if [ $PLATFORM = "macosx" ]; then
@@ -123,35 +84,9 @@
LIBNOMAJORMINOR=`echo $LIB|sed 's,\.'$MAJOR'\.'$MINOR',,'`
if [ $LIB != $LIBNOMAJORMINOR ]; then
LIBNOMINOR=`echo $LIB|sed 's,\.'$MINOR',,'`
-Index: root/graf2d/asimage/Module.mk
-===================================================================
---- root/graf2d/asimage/Module.mk (revision 45566)
-+++ root/graf2d/asimage/Module.mk (working copy)
-@@ -295,7 +295,7 @@
-
- ##### extra rules ######
- $(ASIMAGEO): $(ASTEPDEP) $(FREETYPEDEP)
--$(ASIMAGEO): CXXFLAGS += $(FREETYPEINC) $(ASTEPDIRI)
-+$(ASIMAGEO): CXXFLAGS += $(FREETYPEINC) $(ASTEPDIRI) $(X11INCDIR:%=-I%)
-
- $(ASIMAGEGUIO) $(ASIMAGEGUIDO) $(ASIMAGEDO): $(ASTEPDEP)
- $(ASIMAGEGUIO) $(ASIMAGEGUIDO) $(ASIMAGEDO): CXXFLAGS += $(ASTEPDIRI)
-Index: root/config/Makefile.macosx64
-===================================================================
---- root/config/Makefile.macosx64 (revision 45566)
-+++ root/config/Makefile.macosx64 (working copy)
-@@ -102,7 +102,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 45566)
+--- root/etc/Makefile.arch (revision 46119)
+++ root/etc/Makefile.arch (working copy)
@@ -7,8 +7,9 @@
# Author: Fons Rademakers, 29/2/2000
@@ -174,3 +109,55 @@
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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- root5.info 14 Aug 2012 19:07:39 -0000 1.12
+++ root5.info 22 Sep 2012 19:56:21 -0000 1.13
@@ -1,6 +1,6 @@
Info3: <<
Package: root5%type_pkg[-cernlib]%type_pkg[-pythia]
-Version: 5.34.01
+Version: 5.34.02
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: 114ea7f18b48ed0b3bb0287f5a6d593f
+Source-MD5: 4ec4f64943e791da8fdaf662a7e17693
SourceDirectory: root
PatchFile: %{ni}.patch
-PatchFile-MD5: b916d5ab46ab9e1c1dbd7ad48d18c37e
+PatchFile-MD5: 191e0fb6bcfffa90c38dfa2009d04c3a
PatchScript: <<
patch -p1 < %{PatchFile}
/usr/bin/sed -i '.bak' -e 's:python :%p/bin/python2.7 :'
bindings/pyroot/Module.mk cint/cintex/Module.mk
@@ -75,6 +75,7 @@
--with-xml-incdir=%p/include/libxml2 --with-xml-libdir=%p/lib \
--with-python-incdir=%p/include/python2.7
--with-python-libdir=%p/lib/python2.7/config \
--with-xrootd=%p --with-finkdir=%p \
+ --fail-on-missing \
--disable-afs \
--disable-builtin-freetype \
--disable-builtin-glew \
------------------------------------------------------------------------------
How fast is your code?
3 out of 4 devs don\\\'t know how their code performs in production.
Find out how slow your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219672;13503038;z?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
