Ticket #44678: root6.diff

science/root6/Portfile

@@ -13 +13 @@
 # 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 +116 @@
                     -Dunuran=ON \
                     -Dtable=ON \
                     -Dgdml=ON \
+                    -Dhttp=OFF \
+                    -Dvc=OFF \
                     -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
                     -DPNG_PNG_INCLUDE_DIR=${prefix}/include
 
@@ -213 +215 @@
 
 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 +225 @@
     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 +330 @@
 # 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 +380 @@
         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 {

science/root6/files/root6

@@ -70 +70 @@
 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