[124014] trunk/dports/science/root6

[cal at macports.org]

Revision: 124014
          https://trac.macports.org/changeset/124014
Author:   cal at macports.org
Date:     2014-08-17 04:51:24 -0700 (Sun, 17 Aug 2014)
Log Message:
-----------
root6: new variants, python 3.x support, new root_select locations, maintainer, closes #44678

Modified Paths:
--------------
    trunk/dports/science/root6/Portfile
    trunk/dports/science/root6/files/root6

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2014-08-17 11:48:13 UTC (rev 124013)
+++ trunk/dports/science/root6/Portfile	2014-08-17 11:51:24 UTC (rev 124014)
@@ -13,7 +13,7 @@
 # don't forget to update both the git tag and the version
 github.setup        root-mirror root 6-00-02 v
 version             6.00.02
-revision            1
+revision            2
 # this could be a better way to set the version (unless we use a sha sum for the git tag ;)
 # version           [string map {- .} $version]
 set version_major   [lindex [split ${version} .] 0]
@@ -116,6 +116,8 @@
                     -Dunuran=ON \
                     -Dtable=ON \
                     -Dgdml=ON \
+                    -Dhttp=OFF \
+                    -Dvc=OFF \
                     -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
                     -DPNG_PNG_INCLUDE_DIR=${prefix}/include
 
@@ -213,7 +215,7 @@
 
 universal_variant   no
 
-default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
+default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
 
 # Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
 # We also make it default on 10.7
@@ -223,6 +225,22 @@
     set default_gui_variant +x11
 }
 
+variant valgrind description {Build internal LLVM library with valgrind support} {
+    depends_lib-append      port:valgrind
+}
+
+variant http description {Build with HTTP Server library support} {
+    configure.args-replace -Dhttp=OFF -Dhttp=ON
+}
+
+variant vc description {Build with Vc library support} {
+    configure.args-replace -Dvc=OFF -Dvc=ON
+}
+
+variant debug description {Enable a debug build} {
+    configure.args-append -DCMAKE_BUILD_TYPE=Debug
+}
+
 variant xrootd description {Build with XRootD support} {
     configure.args-replace  -Dxrootd=OFF -Dxrootd=ON
 #   configure.args-append   -Dbuiltin_xrootd=ON
@@ -312,8 +330,8 @@
 # Setup various python variants
 # ========================================================================================
 
-# List of possible python versions ( Versions 3.x do not seem to work yet )
-set python_versions { 2.6 2.7 }
+# List of possible python versions
+set python_versions { 2.6 2.7 3.1 3.2 3.3 3.4 }
 set default_python_variant +python27
 
 # Define the available variants
@@ -362,8 +380,13 @@
         set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${py_ver}
         configure.args-replace  -Dpython=OFF -Dpython=ON
         configure.args-append   -DPYTHON_INCLUDE_DIR="${mypydir}/Headers" \
-                                -DPYTHON_LIBRARY="${prefix}/lib/libpython${py_ver}.dylib" \
-                                -DPYTHON_EXECUTABLE="${prefix}/bin/python${py_ver}"
+                                -DPYTHON_EXECUTABLE="${mypydir}/bin/python${py_ver}"
+        # Explicitly set python library
+        if       { [ file exists "${mypydir}/lib/libpython${py_ver}.dylib" ] } {
+            configure.args-append -DPYTHON_LIBRARY="${mypydir}/lib/libpython${py_ver}.dylib"
+        } elseif { [ file exists "${prefix}/lib/libpython${py_ver}.dylib" ] } {
+            configure.args-append -DPYTHON_LIBRARY="${prefix}/lib/libpython${py_ver}.dylib"
+        }
         depends_lib-append      port:python${py_ver_no_dot}
         
         post-destroot {

Modified: trunk/dports/science/root6/files/root6
===================================================================
--- trunk/dports/science/root6/files/root6	2014-08-17 11:48:13 UTC (rev 124013)
+++ trunk/dports/science/root6/files/root6	2014-08-17 11:51:24 UTC (rev 124014)
@@ -70,3 +70,6 @@
 libexec/root6/share/man/man1/xpdtest.1.gz
 libexec/root6/share/man/man1/xproofd.1.gz
 libexec/root6/share/man/man1/rootcling.1.gz
+libexec/root6/etc/root
+libexec/root6/include/root
+libexec/root6/share
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140817/f84555a5/attachment.html>