Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21762
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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- root5.patch 29 Apr 2013 08:45:05 -0000 1.13
+++ root5.patch 5 Jun 2013 10:10:06 -0000 1.14
@@ -1,8 +1,8 @@
-Index: root/build/unix/makelib.sh
-===================================================================
---- root/build/unix/makelib.sh (revision 49365)
-+++ root/build/unix/makelib.sh (working copy)
-@@ -34,7 +34,7 @@
+diff --git a/build/unix/makelib.sh b/build/unix/makelib.sh
+index d4b3833..593e96b 100755
+--- a/build/unix/makelib.sh
++++ b/build/unix/makelib.sh
+@@ -34,7 +34,7 @@ rm -f $LIB
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
@@ -11,7 +11,7 @@
else
soext="dylib"
fi
-@@ -220,7 +220,7 @@
+@@ -220,7 +220,7 @@ if [ "x$MAJOR" != "x" ]; then
ln -fs $SONAME.$MAJOR $LIB
elif [ -f $LIBVERS ]; then
# Versioned library has format foo.3.05.so
@@ -20,11 +20,11 @@
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 49365)
-+++ root/cint/ROOT/cintdlls.mk (working copy)
-@@ -146,7 +146,7 @@
+diff --git a/cint/ROOT/cintdlls.mk b/cint/ROOT/cintdlls.mk
+index 185ee61..b7d11a3 100644
+--- a/cint/ROOT/cintdlls.mk
++++ b/cint/ROOT/cintdlls.mk
+@@ -146,7 +146,7 @@ ifeq ($(subst $(MACOSX_MINOR),,456789),456789)
else
# On macosx one should change the install_name as well.
# FIXME: not tested on 10.4, should be the same also there?
@@ -33,7 +33,7 @@
CINTDLLSOEXTCMD += ;rm -f $(@:.dll=.so)
endif
endif # macosx
-@@ -163,21 +163,21 @@
+@@ -163,21 +163,21 @@ endif
$(ALLCINTDLLS): $(ORDER_) $(MAINLIBS)
$(CINTDLLDIRSTL)/%.dll: $(CINTDLLDIRDLLSTL)/G__cpp_%.o
@@ -58,11 +58,11 @@
$(CINTDLLSOEXTCMD)
core/metautils/src/stlLoader_%.cc:
$(ROOT_SRCDIR)/core/metautils/src/stlLoader.cc
-Index: root/cint/configure
-===================================================================
---- root/cint/configure (revision 49365)
-+++ root/cint/configure (working copy)
-@@ -155,7 +155,7 @@
+diff --git a/cint/configure b/cint/configure
+index 55f6d35..bed095e 100755
+--- a/cint/configure
++++ b/cint/configure
+@@ -155,7 +155,7 @@ function config_macos {
AR="ar -r -cs "
IMPLIBEXT=.dylib
@@ -71,11 +71,11 @@
EXPLLINK=1
-Index: root/config/Makefile.macosx64
-===================================================================
---- root/config/Makefile.macosx64 (revision 49365)
-+++ root/config/Makefile.macosx64 (working copy)
-@@ -104,7 +104,7 @@
+diff --git a/config/Makefile.macosx64 b/config/Makefile.macosx64
+index 59c32b5..2b94c84 100644
+--- a/config/Makefile.macosx64
++++ b/config/Makefile.macosx64
+@@ -104,7 +104,7 @@ endif
endif
endif
ifeq ($(subst $(MACOSX_MINOR),,1234),1234)
@@ -84,11 +84,11 @@
else
SOEXT = dylib
endif
-Index: root/configure
-===================================================================
---- root/configure (revision 49365)
-+++ root/configure (working copy)
-@@ -2463,12 +2463,6 @@
+diff --git a/configure b/configure
+index 4381f45..61ab2e5 100755
+--- a/configure
++++ b/configure
+@@ -2465,12 +2465,6 @@ if test ! "x$enable_x11" = "xno" ; then
result "See http://root.cern.ch/drupal/content/build-prerequisites";
exit 1
fi
@@ -101,7 +101,7 @@
check_library "libXext" "$enable_shared" "$xextlibdir" \
${finkdir:+$finkdir/lib} \
-@@ -2481,12 +2475,6 @@
+@@ -2483,12 +2477,6 @@ if test ! "x$enable_x11" = "xno" ; then
result "See http://root.cern.ch/drupal/content/build-prerequisites";
exit 1
fi
@@ -114,7 +114,7 @@
else
x11libdir=""
xpmlibdir=""
-@@ -3568,7 +3556,7 @@
+@@ -3582,7 +3570,7 @@ if test ! "x$enable_fftw3" = "xno"; then
# At this time, libfftw3.a should always be prefered over .so,
# to avoid forcing users to install fftw3.
@@ -123,10 +123,10 @@
$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 49365)
-+++ root/etc/Makefile.arch (working copy)
+diff --git a/etc/Makefile.arch b/etc/Makefile.arch
+index e3f0767..cf6d966 100644
+--- a/etc/Makefile.arch
++++ b/etc/Makefile.arch
@@ -7,8 +7,9 @@
# Author: Fons Rademakers, 29/2/2000
@@ -139,7 +139,7 @@
RC1 := $(ROOTSYS)/bin/root-config
ifneq ($(shell which $(RC1) 2>&1 | sed -ne "s@.*/$(RC)@$(RC)@p"),$(RC))
$(error Please make sure $(RC1) can be found in path)
-@@ -16,7 +17,7 @@
+@@ -16,7 +17,7 @@ else
RC := $(RC1)
endif
else
@@ -148,11 +148,11 @@
endif
endif
-Index: root/proof/afdsmgrd/Module.mk
-===================================================================
---- root/proof/afdsmgrd/Module.mk (revision 49365)
-+++ root/proof/afdsmgrd/Module.mk (working copy)
-@@ -8,7 +8,7 @@
+diff --git a/proof/afdsmgrd/Module.mk b/proof/afdsmgrd/Module.mk
+index 9333c9e..3d92790 100644
+--- a/proof/afdsmgrd/Module.mk
++++ b/proof/afdsmgrd/Module.mk
+@@ -8,7 +8,7 @@ MODDIR := $(ROOT_SRCDIR)/proof/$(MODNAME)
AFDSMGRDDIR := $(MODDIR)
AFDSMGRDBIN := bin/afdsmgrd
Index: root5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- root5.info 29 Apr 2013 08:45:05 -0000 1.17
+++ root5.info 5 Jun 2013 10:10:06 -0000 1.18
@@ -1,6 +1,6 @@
Info3: <<
Package: root5%type_pkg[-cernlib]%type_pkg[-pythia]
-Version: 5.34.07
+Version: 5.34.08
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: 1b8b0734a1bc149a2ea5682f6edb4a71
-SourceDirectory: root
+Source-MD5: 458c732c2216b3a59f1272568e6da5cc
+SourceDirectory: root-v5-34-00-patches
PatchFile: %{ni}.patch
-PatchFile-MD5: 520a615fa2d60a6e9446ca3b20783947
+PatchFile-MD5: 44fd2aa28f33bf5993f9e663dc4377d5
PatchScript: <<
patch -p1 < %{PatchFile}
/usr/bin/sed -i '.bak' -e 's:python :%p/bin/python2.7 :'
bindings/pyroot/Module.mk cint/cintex/Module.mk
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
