[87844] trunk/dports/science/root
pixilla at macports.org
pixilla at macports.org
Thu Dec 8 12:33:56 PST 2011
Revision: 87844
http://trac.macports.org/changeset/87844
Author: pixilla at macports.org
Date: 2011-12-08 12:33:56 -0800 (Thu, 08 Dec 2011)
Log Message:
-----------
science/root:
- Maintainer patches.
- Update version to 5.32.00.
- If clang use llvm-gcc-4.2.
- Add variant python32.
- Add variant gcc46.
Modified Paths:
--------------
trunk/dports/science/root/Portfile
trunk/dports/science/root/files/patch-configure.diff
Modified: trunk/dports/science/root/Portfile
===================================================================
--- trunk/dports/science/root/Portfile 2011-12-08 20:25:15 UTC (rev 87843)
+++ trunk/dports/science/root/Portfile 2011-12-08 20:33:56 UTC (rev 87844)
@@ -4,12 +4,12 @@
PortSystem 1.0
name root
-version 5.30.03
+version 5.32.00
revision 0
categories science
maintainers gmail.com:mattiafrancescomoro hep.phy.cam.ac.uk:jonesc
license LGPL-2.1+
-description Root cern data analysis framework
+description ROOT is a data analysis framework from CERN
long_description The ROOT system provides a set of frameworks with all \
the functionality needed to handle and analyze large amounts \
of data in a very efficient way
@@ -19,8 +19,8 @@
master_sites http://root.cern.ch/download/ \
ftp://root.cern.ch/root/
-checksums sha1 d2cd2855905a7f2f63366e0fc38f15a49881b792 \
- rmd160 b85ad6f248d94755aa9ce6a872ea6ce4d90d8373
+checksums sha1 b7375d53dd845505196d12a7d66c3b2d8e1b0336 \
+ rmd160 e8b0c9b4e60334fb9f01b4cf70cdaed518c62bae
worksrcdir root
@@ -40,6 +40,10 @@
patchfiles patch-configure.diff
+if {${configure.compiler} == "clang"} {
+ configure.compiler llvm-gcc-4.2
+}
+
post-patch {
reinplace "s|-lfreetype| \`freetype-config --libs\`|g" ${worksrcpath}/config/root-config.in
reinplace "s|\"/usr/include\"|\"${prefix}/include/\" \"/usr/include\"|g" ${worksrcpath}/configure
@@ -108,7 +112,7 @@
universal_variant no
-default_variants +ssl +xml +opengl +gsl +minuit2 +tmva +roofit
+default_variants +ssl +xml +gsl +minuit2 +tmva +roofit
variant fftw3 description {Builds port with fftw3 support} {
configure.args-delete --disable-fftw3
@@ -156,12 +160,12 @@
depends_lib-append port:openldap
}
-variant roofit description { Build the libRooFit advanced fitting package} {
+variant roofit description {Build the libRooFit advanced fitting package} {
configure.args-delete --disable-roofit
configure.args-append --enable-roofit
}
-variant tmva description { Build the TMVA package} {
+variant tmva description {Build the TMVA package} {
configure.args-delete --disable-tmva
configure.args-append --enable-tmva
}
@@ -181,7 +185,7 @@
depends_lib-append port:glew port:mesa
}
-variant python26 conflicts python31 python27 description {Builds port with python 2.6 support} {
+variant python26 conflicts python32 python31 python27 description {Builds port with python 2.6 support} {
set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/2.6
configure.args-delete --disable-python
configure.args-append --enable-python --with-python-incdir="${mypydir}/Headers" --with-python-libdir="${mypydir}"
@@ -194,7 +198,7 @@
}
}
-variant python27 conflicts python31 python26 description {Builds port with python 2.7 support} {
+variant python27 conflicts python32 python31 python26 description {Builds port with python 2.7 support} {
set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/2.7
configure.args-delete --disable-python
configure.args-append --enable-python --with-python-incdir="${mypydir}/Headers" --with-python-libdir="${mypydir}"
@@ -207,7 +211,7 @@
}
}
-variant python31 conflicts python27 python26 description {Builds port with python 3.1 support} {
+variant python31 conflicts python32 python27 python26 description {Builds port with python 3.1 support} {
set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/3.1
configure.args-delete --disable-python
configure.args-append --enable-python --with-python-incdir="${mypydir}/Headers" --with-python-libdir="${mypydir}"
@@ -220,6 +224,19 @@
}
}
+variant python32 conflicts python31 python27 python26 description {Builds port with python 3.2 support} {
+ set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/3.2
+ configure.args-delete --disable-python
+ configure.args-append --enable-python --with-python-incdir="${mypydir}/Headers" --with-python-libdir="${mypydir}"
+ depends_lib-append port:python32
+ post-destroot {
+ set mypysitedir ${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/site-packages/
+ file mkdir ${mypysitedir}
+ foreach pyfile [glob ${destroot}${prefix}/lib/root/*.py*] { move $pyfile ${mypysitedir} }
+ move ${destroot}${prefix}/lib/root/python/genreflex ${mypysitedir}
+ }
+}
+
variant ruby description {Builds port with ruby support} {
configure.args-delete --disable-ruby
configure.args-append --enable-ruby
@@ -314,21 +331,20 @@
depends_lib-append port:pythia
}
-variant gcc44 conflicts gcc45 description {Compile using MacPorts gcc 4.4} {
+variant gcc44 conflicts gcc45 gcc46 description {Compile using MacPorts gcc 4.4} {
configure.compiler macports-gcc-4.4
depends_lib-append port:gcc44
}
-variant gcc45 conflicts gcc44 description {Compile using MacPorts gcc 4.5} {
+variant gcc45 conflicts gcc44 gcc46 description {Compile using MacPorts gcc 4.5} {
configure.compiler macports-gcc-4.5
depends_lib-append port:gcc45
}
-# Build issues
-#variant gcc46 conflicts gcc44 gcc45 description {Compile using MacPorts gcc 4.6} {
-# configure.compiler macports-gcc-4.6
-# depends_lib-append port:gcc46
-#}
+variant gcc46 conflicts gcc44 gcc45 description {Compile using MacPorts gcc 4.6} {
+ configure.compiler macports-gcc-4.6
+ depends_lib-append port:gcc46
+}
# Build issues.
# variant kerberos5 description {Builds port with kerberos5 support} {
Modified: trunk/dports/science/root/files/patch-configure.diff
===================================================================
--- trunk/dports/science/root/files/patch-configure.diff 2011-12-08 20:25:15 UTC (rev 87843)
+++ trunk/dports/science/root/files/patch-configure.diff 2011-12-08 20:33:56 UTC (rev 87844)
@@ -1,37 +1,27 @@
---- configure.orig 2011-08-18 09:46:14.000000000 -0500
-+++ configure 2011-09-14 17:42:51.000000000 -0500
-@@ -356,14 +356,14 @@
-
- case $arch in
- macosx)
-- logmsg " file -L $chklibcompat | grep 'i386'"
-- if file -L $chklibcompat | grep 'i386' > /dev/null 2>& 1 ; then
-+ logmsg " /usr/bin/file -L $chklibcompat | grep 'i386'"
-+ if /usr/bin/file -L $chklibcompat | grep 'i386' > /dev/null 2>& 1 ; then
- ret=1
+--- /opt/local/var/macports/build/_Users_chris_Projects_MacPorts_portfiles_science_root/root/work/root/configure 2011-12-02 11:42:22.000000000 +0000
++++ configure 2011-12-04 13:57:40.000000000 +0000
+@@ -433,19 +433,19 @@
+ chklib64file=`ar t $chklib64 | awk '{if (NR == 2) print $1}'`
+ logmsg " ar x $chklib64 $chklib64file"
+ ar x $chklib64 $chklib64file
+- logmsg " file $filearg $chklib64file | grep '64-bit'"
+- if file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then
++ logmsg " /usr/bin/file $filearg $chklib64file | grep '64-bit'"
++ if /usr/bin/file $filearg $chklib64file | grep '64-bit' > /dev/null 2>& 1 ; then
+ ret=1
+ fi
+ rm -f $chklib64file
fi
- ;;
- macosx64)
-- logmsg " file -L $chklibcompat | grep 'x86_64'"
-- if file -L $chklibcompat | grep 'x86_64' > /dev/null 2>& 1 ; then
-+ logmsg " /usr/bin/file -L $chklibcompat | grep 'x86_64'"
-+ if /usr/bin/file -L $chklibcompat | grep 'x86_64' > /dev/null 2>& 1 ; then
- ret=1
- fi
- ;;
-@@ -403,12 +403,12 @@
- ret=1
- fi
else
-- if file -L $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
-+ if /usr/bin/file -L $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
+- if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
++ if /usr/bin/file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
check_link $chklib64
ret=$link_result
else
-- logmsg " file -L $chklib64 | grep '64-bit'"
-- if file -L $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
-+ logmsg " /usr/bin/file -L $chklib64 | grep '64-bit'"
-+ if /usr/bin/file -L $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
+- logmsg " file $filearg $chklib64 | grep '64-bit'"
+- if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
++ logmsg " /usr/bin/file $filearg $chklib64 | grep '64-bit'"
++ if /usr/bin/file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
ret=1
fi
fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111208/dbd6beac/attachment.html>
More information about the macports-changes
mailing list