[119109] users/mojca/ports

mojca at macports.org mojca at macports.org
Thu Apr 17 09:26:03 PDT 2014


Revision: 119109
          https://trac.macports.org/changeset/119109
Author:   mojca at macports.org
Date:     2014-04-17 09:26:03 -0700 (Thu, 17 Apr 2014)
Log Message:
-----------
mojca/root: updates by Chris

Modified Paths:
--------------
    users/mojca/ports/science/root5/Portfile
    users/mojca/ports/science/root5/files/root5
    users/mojca/ports/science/root6/Portfile
    users/mojca/ports/science/root6/files/root6
    users/mojca/ports/sysutils/root_select/Portfile
    users/mojca/ports/sysutils/root_select/files/base
    users/mojca/ports/sysutils/root_select/files/none

Modified: users/mojca/ports/science/root5/Portfile
===================================================================
--- users/mojca/ports/science/root5/Portfile	2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/science/root5/Portfile	2014-04-17 16:26:03 UTC (rev 119109)
@@ -54,6 +54,9 @@
     reinplace "s|\"/usr/lib\"|\"${prefix}/lib /usr/lib\"|g" ${worksrcpath}/configure
 }
 
+# port specific location
+set install_prefix ${prefix}/libexec/root${version_major}
+
 pre-configure {
     configure.args-append \
         --with-cc=${configure.cc} \
@@ -62,25 +65,13 @@
         --with-f77=${configure.f77}
     # the build type (32 or 64 bit) -must- be for first argument
     if {${build_arch} eq "i386" || ${build_arch} eq "ppc"} {
-        configure.pre_args macosx --prefix=${prefix}
+        configure.pre_args macosx --prefix=${install_prefix}
     } else {
-        configure.pre_args macosx64 --prefix=${prefix}
+        configure.pre_args macosx64 --prefix=${install_prefix}
     }
 }
 
-# port specific location. For 'port select'
-set install_bindir  "libexec/root${version_major}/bin"
-set install_mandir  "libexec/root${version_major}/share/man"
-
-configure.args      --bindir=${prefix}/${install_bindir}\
-                    --incdir=${prefix}/include/root${version_major}\
-                    --docdir=${prefix}/share/doc/root${version_major}\
-                    --libdir=${prefix}/lib/root${version_major} \
-                    --testdir=${prefix}/share/root${version_major}/test \
-                    --tutdir=${prefix}/share/root${version_major}/tutorials \
-                    --etcdir=${prefix}/etc/root${version_major} \
-                    --datadir=${prefix}/share/root${version_major} \
-                    --mandir=${prefix}/${install_mandir} \
+configure.args      --etcdir=${install_prefix}/etc/root \
                     --disable-builtin-glew \
                     --disable-builtin-pcre \
                     --disable-builtin-zlib \
@@ -114,6 +105,7 @@
                     --disable-soversion \
                     --disable-c++11 \
                     --disable-xrootd \
+                    --disable-oracle \
                     --enable-builtin-ftgl \
                     --enable-mathmore \
                     --enable-genvector \
@@ -147,18 +139,64 @@
 }
 
 post-destroot {
-    # create versioned symlinks for the content of libexec's bin dir.
-    foreach f [glob -directory ${destroot}${prefix}/${install_bindir} *] {
+    # create versioned symlinks for the content of libexec
+    # bin dir
+    foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
         set filename  [file tail $f]
         set extension [file extension $filename]
         set base      [file rootname $filename]
         set versioned_filename ${base}${version_major}${extension}
-        ln -s ${prefix}/${install_bindir}/${filename} ${destroot}${prefix}/bin/${versioned_filename}
+        ln -s ${install_prefix}/bin/${filename} ${destroot}${prefix}/bin/${versioned_filename}
     }
+    # lib dir
+    ln -s ${install_prefix}/lib/root ${destroot}${prefix}/lib/root${version_major}
+    # include dir
+    ln -s ${install_prefix}/include/root ${destroot}${prefix}/include/root${version_major}
+    # etc dir
+    ln -s ${install_prefix}/etc/root ${destroot}${prefix}/etc/root${version_major}
+    # share dir
+    ln -s ${install_prefix}/share ${destroot}${prefix}/share/root${version_major}
     # 'Fix' genreflex
-    reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${prefix}/${install_bindir}/genreflex
+    reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${install_prefix}/bin/genreflex
+    # Compress manpages in custom location (borrowed from mariadb)
+    set manpath ${install_prefix}/share/man
+    set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
+    foreach manpage [glob -type f ${destroot}${manpath}/man1/*] {
+        # Zip the man file
+        system "$gzip -9vf ${manpage}"
+        # Create man pages for versioned files
+        set filename  [file tail $manpage]
+        set extension [file extension $filename]
+        set base      [file rootname $filename]
+        set versioned_filename ${base}${version_major}${extension}.gz
+        set d [file tail $manpage]
+        ln -s ${manpath}/man1/${d}.gz ${destroot}${prefix}/share/man/man1/${versioned_filename}
+    }
 }
 
+set run_port_select "No"
+pre-activate {
+  if { ![file exists ${prefix}/bin/root]  &&
+       ![file exists ${prefix}/bin/root5] &&
+       ![file exists ${prefix}/bin/root6] } {
+     set run_port_select "Yes"
+     if { [file exists ${prefix}/etc/select/root/current] } {
+           delete ${prefix}/etc/select/root/current
+     }
+  }
+}
+
+post-activate {
+  ui_msg "======================================================================================"
+  if { ${run_port_select} == "Yes" } {
+      ui_msg "  Making root${version_major} your default root version. To change this run 'sudo port select root'"
+      catch { system "port select root root${version_major}" }
+  } else {
+      ui_msg "  To make root${version_major} your default root version, run 'sudo port select root root${version_major}'"
+  }
+  ui_msg "======================================================================================"
+}
+
 universal_variant   no
 
 default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
@@ -253,7 +291,7 @@
     configure.args-delete   --disable-tmva
     configure.args-append   --enable-tmva
     post-destroot {
-        set tmvaTuts ${destroot}${prefix}/share/root${version_major}/tutorials/tmva
+        set tmvaTuts ${destroot}${install_prefix}/share/root/tutorial/tmva
         file mkdir ${tmvaTuts}
         foreach f [glob ${worksrcpath}/tmva/test/*] { file copy $f ${tmvaTuts}/ }
     }
@@ -318,19 +356,13 @@
         set mypylibdir  ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}/lib/python${active_python_variant}
         set mypysitedir ${mypylibdir}/site-packages/
         file mkdir ${destroot}${mypysitedir}
-        foreach pyfile [glob ${destroot}${prefix}/lib/root${version_major}/*.py*] { move $pyfile ${destroot}${mypysitedir} }
-        ln -sf ${prefix}/lib/root${version_major}/libPyROOT.so ${destroot}${mypylibdir}/
+        foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
+        ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
     }
 }
 
 # ========================================================================================
 
-variant ruby description {Build with ruby support} {
-    configure.args-delete   --disable-ruby
-    configure.args-append   --enable-ruby
-    depends_lib-append      port:ruby
-}
-
 variant ssl description {Build with ssl support} {
     configure.args-delete   --disable-ssl
     configure.args-append   --enable-ssl \
@@ -412,6 +444,13 @@
     depends_lib-append      port:libpqxx port:postgresql92
 }
 
+# variant oracle description {Build with Oracle support} {
+#     configure.args-replace --disable-oracle --enable-oracle
+#     configure.args-append  --with-oracle-incdir="${prefix}/lib/oracle/sdk/include" \
+#                            --with-oracle-libdir="${prefix}/lib/oracle"
+#     depends_lib-append     port:oracle-instantclient
+# }
+
 variant pythia description {Pythia 8 support for root} {
     configure.args-delete   --disable-pythia8
     configure.args-append   --enable-pythia8 \
@@ -524,7 +563,7 @@
 # Note that g95 does not work here, so that variant is removed
 # ========================================================================================
 
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+set gcc_versions { 4.3 4.4 4.5 4.6 4.7 4.8 4.9 }
 set default_fortran_variant +gcc48
 
 foreach ver ${gcc_versions} {
@@ -578,6 +617,15 @@
 # The following have build issues, are obsolete or experimental.
 # ========================================================================================
 
+# Problems finding includes ...
+# variant ruby description {Build with ruby support} {
+#     configure.args-delete   --disable-ruby
+#     configure.args-append   --enable-ruby \
+#                             --with-ruby-incdir="${prefix}/include/ruby-1.9.1" \
+#                             --with-ruby-libdir="${prefix}/lib"
+#     depends_lib-append      port:ruby19
+# }
+
 # Intefers with builtin freetype build (enforced by cocoa variant)
 # Also do not seem to be actually needed any more
 #pre-build {

Modified: users/mojca/ports/science/root5/files/root5
===================================================================
--- users/mojca/ports/science/root5/files/root5	2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/science/root5/files/root5	2014-04-17 16:26:03 UTC (rev 119109)
@@ -1,2 +1,72 @@
+libexec/root5/bin/g2root
+libexec/root5/bin/genmap
+libexec/root5/bin/genreflex
+libexec/root5/bin/genreflex-rootcint
+libexec/root5/bin/h2root
+libexec/root5/bin/hadd
+libexec/root5/bin/hist2workspace
+libexec/root5/bin/memprobe
+libexec/root5/bin/pq2
+libexec/root5/bin/prepareHistFactory
+libexec/root5/bin/proofd
+libexec/root5/bin/proofserv
+libexec/root5/bin/proofserv.exe
+libexec/root5/bin/rlibmap
+libexec/root5/bin/rmkdepend
 libexec/root5/bin/root
 libexec/root5/bin/root-config
+libexec/root5/bin/root.exe
+libexec/root5/bin/rootcint
+libexec/root5/bin/rootd
+libexec/root5/bin/rootn.exe
+libexec/root5/bin/roots
+libexec/root5/bin/roots.exe
+libexec/root5/bin/setxrd.csh
+libexec/root5/bin/setxrd.sh
+libexec/root5/bin/ssh2rpd
+libexec/root5/bin/thisroot.csh
+libexec/root5/bin/thisroot.sh
+libexec/root5/bin/xpdtest
+-
+libexec/root5/share/man/man1/cint.1.gz
+libexec/root5/share/man/man1/g2root.1.gz
+libexec/root5/share/man/man1/g2rootold.1.gz
+libexec/root5/share/man/man1/genmap.1.gz
+libexec/root5/share/man/man1/genreflex-rootcint.1.gz
+libexec/root5/share/man/man1/genreflex.1.gz
+libexec/root5/share/man/man1/h2root.1.gz
+libexec/root5/share/man/man1/hadd.1.gz
+libexec/root5/share/man/man1/hist2workspace.1.gz
+libexec/root5/share/man/man1/makecint.1.gz
+libexec/root5/share/man/man1/memprobe.1.gz
+libexec/root5/share/man/man1/pq2-ana-dist.1.gz
+libexec/root5/share/man/man1/pq2-cache.1.gz
+libexec/root5/share/man/man1/pq2-info-server.1.gz
+libexec/root5/share/man/man1/pq2-ls-files-server.1.gz
+libexec/root5/share/man/man1/pq2-ls-files.1.gz
+libexec/root5/share/man/man1/pq2-ls.1.gz
+libexec/root5/share/man/man1/pq2-put.1.gz
+libexec/root5/share/man/man1/pq2-redistribute.1.gz
+libexec/root5/share/man/man1/pq2-rm.1.gz
+libexec/root5/share/man/man1/pq2-verify.1.gz
+libexec/root5/share/man/man1/pq2.1.gz
+libexec/root5/share/man/man1/prepareHistFactory.1.gz
+libexec/root5/share/man/man1/proofd.1.gz
+libexec/root5/share/man/man1/proofserv.1.gz
+libexec/root5/share/man/man1/proofserva.1.gz
+libexec/root5/share/man/man1/rlibmap.1.gz
+libexec/root5/share/man/man1/rmkdepend.1.gz
+libexec/root5/share/man/man1/root-config.1.gz
+libexec/root5/share/man/man1/root.1.gz
+libexec/root5/share/man/man1/root.exe.1.gz
+libexec/root5/share/man/man1/roota.1.gz
+libexec/root5/share/man/man1/rootcint.1.gz
+libexec/root5/share/man/man1/rootd.1.gz
+libexec/root5/share/man/man1/rootn.exe.1.gz
+libexec/root5/share/man/man1/roots.exe.1.gz
+libexec/root5/share/man/man1/setup-pq2.1.gz
+libexec/root5/share/man/man1/ssh2rpd.1.gz
+libexec/root5/share/man/man1/system.rootdaemonrc.1.gz
+libexec/root5/share/man/man1/xpdtest.1.gz
+libexec/root5/share/man/man1/xproofd.1.gz
+-

Modified: users/mojca/ports/science/root6/Portfile
===================================================================
--- users/mojca/ports/science/root6/Portfile	2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/science/root6/Portfile	2014-04-17 16:26:03 UTC (rev 119109)
@@ -9,19 +9,20 @@
 PortGroup           github 1.0
 PortGroup           select 1.0
 
-# TODO: try to figure out if one could also build root6 on < 10.9
-# if {(${os.major} < 13 && ! [info exists configure.cxx_stdlib]) || (! [file exists /usr/lib/libc++.dylib])} {
-if {${os.major} < 13 } {
-    github.setup    root-mirror root e3dec6e203
-    version         5.99.05-beta
-    checksums       rmd160  69f6a99413908eed7789bc30939a621f45eac7a2 \
+# TODO:
+# - try to figure out if one could also build root6 on < 10.9
+# - version 5.99.06-beta is broken also on 10.9
+#if {${os.major} < 13 } {
+github.setup        root-mirror root e3dec6e203
+version             5.99.05-beta
+checksums           rmd160  69f6a99413908eed7789bc30939a621f45eac7a2 \
                     sha256  10f2956cd821471477a351c01355c2eb802c01e046764d18865e7416dfa810f8
-} else {
-    github.setup    root-mirror root 5-99-06 v
-    version         5.99.06-beta
-    checksums       rmd160  b8b5ae705aae185c0d6ed097a5efa6fbeb961bfb \
-                    sha256  c873d536769ff06616c0a9981e7f1db2414eaca0a1bcab045d4073b36644981a
-}
+#} else {
+#   github.setup    root-mirror root 5-99-06 v
+#   version         5.99.06-beta
+#   checksums       rmd160  b8b5ae705aae185c0d6ed097a5efa6fbeb961bfb \
+#                   sha256  c873d536769ff06616c0a9981e7f1db2414eaca0a1bcab045d4073b36644981a
+#}
 
 name                root6
 set version_major   6
@@ -69,19 +70,13 @@
 compiler.blacklist-append {clang < 425} macports-clang-2.9
 compiler.fallback-append macports-clang-3.5 macports-clang-3.4 macports-clang-3.3
 
-set install_bindir  "libexec/root${version_major}/bin"
-set install_mandir  "libexec/root${version_major}/share/man"
+# port specific location
+set install_prefix ${prefix}/libexec/root${version_major}
 
 configure.args-append \
                     -Dgnuinstall=ON \
-                    -DCMAKE_INSTALL_BINDIR="${install_bindir}" \
-                    -DCMAKE_INSTALL_LIBDIR="lib/root${version_major}" \
-                    -DCMAKE_INSTALL_INCLUDEDIR="include/root${version_major}" \
-                    -DCMAKE_INSTALL_SYSCONFDIR="etc/root${version_major}" \
-                    -DCMAKE_INSTALL_DATAROOTDIR="share/root${version_major}" \
-                    -DCMAKE_INSTALL_DATADIR="share/root${version_major}" \
-                    -DCMAKE_INSTALL_DOCDIR="share/doc/root${version_major}" \
-                    -DCMAKE_INSTALL_MANDIR="${install_mandir}" \
+                    -DCMAKE_INSTALL_PREFIX="${install_prefix}" \
+                    -DCMAKE_INSTALL_SYSCONFDIR="${install_prefix}/etc/root" \
                     -Dfortran=OFF \
                     -Dbuiltin_freetype=ON \
                     -Dbuiltin_glew=OFF \
@@ -130,8 +125,13 @@
 configure.post_args ${worksrcpath}
 
 # TODO: temporary:
+configure.args-append       -DCMAKE_INCLUDE_PATH=${install_prefix}/include
+configure.cppflags-delete   -I${install_prefix}/include
+
 configure.args-append       -DCMAKE_INCLUDE_PATH=${prefix}/include
 configure.cppflags-delete   -I${prefix}/include
++configure.args-append       -DCMAKE_INCLUDE_PATH=${install_prefix}/include
++configure.cppflags-delete   -I${install_prefix}/include
 
 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
 platform darwin {
@@ -153,18 +153,64 @@
 }
 
 post-destroot {
-    # create versioned symlinks for the content of libexec's bin dir.
-    foreach f [glob -directory ${destroot}${prefix}/${install_bindir} *] {
+    # create versioned symlinks for the content of libexec
+    # bin dir
+    foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
         set filename  [file tail $f]
         set extension [file extension $filename]
         set base      [file rootname $filename]
         set versioned_filename ${base}${version_major}${extension}
-        ln -s ${prefix}/${install_bindir}/${filename} ${destroot}${prefix}/bin/${versioned_filename}
+        ln -s ${install_prefix}/bin/${filename} ${destroot}${prefix}/bin/${versioned_filename}
     }
+    # lib dir
+    ln -s ${install_prefix}/lib/root ${destroot}${prefix}/lib/root${version_major}
+    # include dir
+    ln -s ${install_prefix}/include/root ${destroot}${prefix}/include/root${version_major}
+    # etc dir
+    ln -s ${install_prefix}/etc/root ${destroot}${prefix}/etc/root${version_major}
+    # share dir
+    ln -s ${install_prefix}/share ${destroot}${prefix}/share/root${version_major}
     # 'Fix' genreflex
-    #reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${prefix}/${install_bindir}/genreflex
+    #reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${install_prefix}/bin/genreflex
+    # Compress manpages in custom location (borrowed from mariadb)
+    set manpath ${install_prefix}/share/man
+    set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
+    foreach manpage [glob -type f ${destroot}${manpath}/man1/*] {
+        # Zip the man file
+        system "$gzip -9vf ${manpage}"
+        # Create man pages for versioned files
+        set filename  [file tail $manpage]
+        set extension [file extension $filename]
+        set base      [file rootname $filename]
+        set versioned_filename ${base}${version_major}${extension}.gz
+        set d [file tail $manpage]
+        ln -s ${manpath}/man1/${d}.gz ${destroot}${prefix}/share/man/man1/${versioned_filename}
+    }
 }
 
+set run_port_select "No"
+pre-activate {
+  if { ![file exists ${prefix}/bin/root]  &&
+       ![file exists ${prefix}/bin/root5] &&
+       ![file exists ${prefix}/bin/root6] } {
+     set run_port_select "Yes"
+     if { [file exists ${prefix}/etc/select/root/current] } {
+           delete ${prefix}/etc/select/root/current
+     }
+  }
+}
+
+post-activate {
+  ui_msg "======================================================================================"
+  if { ${run_port_select} == "Yes" } {
+      ui_msg "  Making root${version_major} your default root version. To change this run 'sudo port select root'"
+      catch { system "port select root root${version_major}" }
+  } else {
+      ui_msg "  To make root${version_major} your default root version, run 'sudo port select root root${version_major}'"
+  }
+  ui_msg "======================================================================================"
+}
+
 universal_variant   no
 
 default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion
@@ -177,12 +223,13 @@
     set default_gui_variant +x11
 }
 
-# Currently giving problems
+# TODO - Doesn't seem to work. To be reported upstream..
 # variant xrootd description {Build with XRootD support} {
-#     configure.args-replace  -Dxrootd=OFF -Dxrootd=ON
-#     configure.args-append   -Dbuiltin_xrootd=ON
-#     #configure.args-append   -DXROOTD_INCLUDE_DIR="${prefix}/include/xrootd"
-#     #depends_lib-append      port:xrootd
+#   system "export XRDSYS=${prefix}/lib"
+#   configure.args-replace  -Dxrootd=OFF -Dxrootd=ON
+#  #configure.args-append   -Dbuiltin_xrootd=ON
+#   configure.args-append   -DXROOTD_INCLUDE_DIR="${prefix}/include/xrootd"
+#   depends_lib-append      port:xrootd
 # }
 
 variant soversion description {Build with soversion support} {
@@ -191,7 +238,7 @@
 
 variant graphviz description {Build with graphviz support} {
     configure.args-replace  -Dgviz=OFF -Dgviz=ON
-#   configure.args-append   -DGRAPHVIZ_INCLUDE_DIR="${prefix}/include" \
+    configure.args-append   -DGRAPHVIZ_INCLUDE_DIR="${prefix}/include"
 #                           -DGRAPHVIZ_CDT_LIBRARY="${prefix}/lib/libcdt.dylib" \
 #                           -DGRAPHVIZ_GRAPH_LIBRARY="${prefix}/lib/libcgraph.dylib" \
 #                           -DGRAPHVIZ_GVC_LIBRARY="${prefix}/lib/libgvc.dylib" \
@@ -208,8 +255,8 @@
 
 variant fftw3 description {Build with fftw3 support} {
     configure.args-replace  -Dfftw3=OFF -Dfftw3=ON
-#   configure.args-append   -DFFTW_INCLUDE_DIR="${prefix}/include" \
-#                           -DFFTW_LIBRARY="${prefix}/lib"
+    configure.args-append   -DFFTW_INCLUDE_DIR="${prefix}/include" \
+                            -DFFTW_LIBRARY="${prefix}/lib/libfftw3.dylib"
     depends_lib-append      port:fftw-3
 }
 
@@ -221,15 +268,15 @@
 
 variant fitsio description {Build with fitsio support} {
     configure.args-replace  -Dfitsio=OFF -Dfitsio=ON
-#   configure.args-append   -DCFITSIO_INCLUDE_DIR="${prefix}/include" \
-#                           -DCFITSIO_LIBRARIES="${prefix}/lib"
+    configure.args-append   -DCFITSIO_INCLUDE_DIR="${prefix}/include" \
+                            -DCFITSIO_LIBRARIES="${prefix}/lib"
     depends_lib-append      port:cfitsio
 }
 
 variant odbc description {Build with odbc support} {
     configure.args-replace  -Dodbc=OFF -Dodbc=ON
-#   configure.args-append   -DODBC_INCLUDE_DIR="${prefix}/include" \
-#                           -DODBC_LIBRARY="${prefix}/lib"
+    configure.args-append   -DODBC_INCLUDE_DIR="${prefix}/include" \
+                            -DODBC_LIBRARY="${prefix}/lib/libiodbc.dylib"
     depends_lib-append      port:libiodbc
 }
 
@@ -247,7 +294,7 @@
 variant tmva description {Build the TMVA package} {
     configure.args-replace  -Dtmva=OFF -Dtmva=ON
     post-destroot {
-        set tmvaTuts ${destroot}${prefix}/share/root${version_major}/tutorials/tmva
+        set tmvaTuts ${destroot}${install_prefix}/share/root/tutorial/tmva
         file mkdir ${tmvaTuts}
         foreach f [glob ${worksrcpath}/tmva/test/*] { file copy $f ${tmvaTuts}/ }
     }
@@ -267,8 +314,8 @@
 # Setup various python variants
 # ========================================================================================
 
-# List of possible python versions
-set python_versions { 2.6 2.7 3.1 3.2 3.3 3.4 }
+# List of possible python versions ( 3.x does not seem to work yet )
+set python_versions { 2.6 2.7 }
 
 # Define the available variants
 foreach ver ${python_versions} {
@@ -304,24 +351,21 @@
     }
     set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}
     configure.args-replace  -Dpython=OFF -Dpython=ON
-    configure.args-append   -DPYTHON_INCLUDE_DIR="${mypydir}/Headers"
+    configure.args-append   -DPYTHON_INCLUDE_DIR="${mypydir}/Headers" \
+                            -DPYTHON_LIBRARY="${prefix}/lib/libpython${active_python_variant}.dylib" \
+                            -DPYTHON_EXECUTABLE="${prefix}/bin/python${active_python_variant}"
     depends_lib-append      port:python${ver_no_dot}
     post-destroot {
         set mypylibdir  ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}/lib/python${active_python_variant}
         set mypysitedir ${mypylibdir}/site-packages/
         file mkdir ${destroot}${mypysitedir}
-        foreach pyfile [glob ${destroot}${prefix}/lib/root${version_major}/*.py*] { move $pyfile ${destroot}${mypysitedir} }
-        ln -sf ${prefix}/lib/root${version_major}/libPyROOT.so ${destroot}${mypylibdir}/
+        foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
+        ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
     }
 }
 
 # ========================================================================================
 
-variant ruby description {Build with ruby support} {
-    configure.args-replace  -Druby=OFF -Druby=ON
-    depends_lib-append      port:ruby
-}
-
 variant ssl description {Build with ssl support} {
     configure.args-replace  -Dssl=OFF -Dssl=ON 
 #   configure.args-append   -DOPENSSL_INCLUDE_DIR="${prefix}/include" \
@@ -368,6 +412,7 @@
     depends_lib-append      port:percona
 }
 
+# TODO - Doesn't seem to work. To be reported upstream..
 # variant postgresql90 conflicts postgresql92 description {Build with PostgreSQL 9.0 support} {
 #     configure.args-replace -Dpgsql=OFF -Dpgsql=ON
 #     configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql90" \
@@ -375,6 +420,7 @@
 #     depends_lib-append      port:libpqxx port:postgresql90
 # }
 
+# TODO - Doesn't seem to work. To be reported upstream..
 # variant postgresql92 conflicts postgresql90 description {Build with PostgreSQL 9.2 support} {
 #     configure.args-replace -Dpgsql=OFF -Dpgsql=ON
 #     configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql92" \
@@ -382,13 +428,22 @@
 #     depends_lib-append      port:libpqxx port:postgresql92
 # }
 
-variant pythia description {Pythia 8 support for root} {
-    configure.args-replace  -Dpythia8=OFF -Dpythia8=ON
-#   configure.args-append   -DPYTHIA8_INCLUDE_DIR=${prefix}/include \
-#                           -DPYTHIA8_LIBRARY=${prefix}/lib
-    depends_lib-append      port:pythia
-}
+# variant oracle description {Build with Oracle support} {
+#     configure.args-replace --disable-oracle --enable-oracle
+#     configure.args-append  -DORACLE_PATH_INCLUDES="${prefix}/lib/oracle/sdk/include" \
+#                            -DORACLE_PATH_LIB="${prefix}/lib/oracle" \
+#                            -DORACLE_OCI_VERSION=8
+#     depends_lib-append     port:oracle-instantclient
+# }
 
+# TODO - Doesn't seem to work. To be reported upstream..
+# variant pythia description {Pythia 8 support for root} {
+#     configure.args-replace  -Dpythia8=OFF -Dpythia8=ON
+#     configure.args-append   -DPYTHIA8_INCLUDE_DIR=${prefix}/include \
+#                             -DPYTHIA8_LIBRARY=${prefix}/lib/libpythia8.dylib
+#     depends_lib-append      port:pythia
+# }
+
 variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
     # Enable cocoa support in configure
     configure.args-append   -Dcocoa=ON
@@ -452,8 +507,7 @@
 # Note that g95 does not work here, so that variant is removed
 # ========================================================================================
 
-# https://trac.macports.org/ticket/37732
-set gcc_versions {4.7 4.8 4.9}
+set gcc_versions { 4.7 4.8 4.9 }
 set default_fortran_variant +gcc48
 
 foreach ver ${gcc_versions} {
@@ -501,6 +555,12 @@
 
 # ========================================================================================
 
+# Problems finding includes ...
+# variant ruby description {Build with ruby support} {
+#     configure.args-replace  -Druby=OFF -Druby=ON
+#     depends_lib-append      port:ruby
+# }
+
 # TODO
 # livecheck.type              regex
 # livecheck.url               http://root.cern.ch/svn/root/trunk

Modified: users/mojca/ports/science/root6/files/root6
===================================================================
--- users/mojca/ports/science/root6/files/root6	2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/science/root6/files/root6	2014-04-17 16:26:03 UTC (rev 119109)
@@ -1,2 +1,72 @@
+libexec/root6/bin/g2root
+-
+-
+-
+libexec/root6/bin/h2root
+libexec/root6/bin/hadd
+libexec/root6/bin/hist2workspace
+libexec/root6/bin/memprobe
+-
+-
+-
+libexec/root6/bin/proofserv
+libexec/root6/bin/proofserv.exe
+-
+libexec/root6/bin/rmkdepend
 libexec/root6/bin/root
 libexec/root6/bin/root-config
+libexec/root6/bin/root.exe
+-
+-
+libexec/root6/bin/rootn.exe
+libexec/root6/bin/roots
+libexec/root6/bin/roots.exe
+libexec/root6/bin/setxrd.csh
+libexec/root6/bin/setxrd.sh
+libexec/root6/bin/ssh2rpd
+libexec/root6/bin/thisroot.csh
+libexec/root6/bin/thisroot.sh
+-
+libexec/root6/bin/rootcling
+-
+libexec/root6/share/man/man1/g2root.1.gz
+libexec/root6/share/man/man1/g2rootold.1.gz
+libexec/root6/share/man/man1/genmap.1.gz
+libexec/root6/share/man/man1/genreflex-rootcint.1.gz
+libexec/root6/share/man/man1/genreflex.1.gz
+libexec/root6/share/man/man1/h2root.1.gz
+libexec/root6/share/man/man1/hadd.1.gz
+libexec/root6/share/man/man1/hist2workspace.1.gz
+-
+libexec/root6/share/man/man1/memprobe.1.gz
+libexec/root6/share/man/man1/pq2-ana-dist.1.gz
+libexec/root6/share/man/man1/pq2-cache.1.gz
+libexec/root6/share/man/man1/pq2-info-server.1.gz
+libexec/root6/share/man/man1/pq2-ls-files-server.1.gz
+libexec/root6/share/man/man1/pq2-ls-files.1.gz
+libexec/root6/share/man/man1/pq2-ls.1.gz
+libexec/root6/share/man/man1/pq2-put.1.gz
+libexec/root6/share/man/man1/pq2-redistribute.1.gz
+libexec/root6/share/man/man1/pq2-rm.1.gz
+libexec/root6/share/man/man1/pq2-verify.1.gz
+libexec/root6/share/man/man1/pq2.1.gz
+libexec/root6/share/man/man1/prepareHistFactory.1.gz
+libexec/root6/share/man/man1/proofd.1.gz
+libexec/root6/share/man/man1/proofserv.1.gz
+libexec/root6/share/man/man1/proofserva.1.gz
+libexec/root6/share/man/man1/rlibmap.1.gz
+libexec/root6/share/man/man1/rmkdepend.1.gz
+libexec/root6/share/man/man1/root-config.1.gz
+libexec/root6/share/man/man1/root.1.gz
+libexec/root6/share/man/man1/root.exe.1.gz
+libexec/root6/share/man/man1/roota.1.gz
+-
+libexec/root6/share/man/man1/rootd.1.gz
+libexec/root6/share/man/man1/rootn.exe.1.gz
+libexec/root6/share/man/man1/roots.exe.1.gz
+libexec/root6/share/man/man1/setup-pq2.1.gz
+libexec/root6/share/man/man1/ssh2rpd.1.gz
+libexec/root6/share/man/man1/system.rootdaemonrc.1.gz
+libexec/root6/share/man/man1/xpdtest.1.gz
+libexec/root6/share/man/man1/xproofd.1.gz
+libexec/root6/share/man/man1/rootcling.1.gz

Modified: users/mojca/ports/sysutils/root_select/Portfile
===================================================================
--- users/mojca/ports/sysutils/root_select/Portfile	2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/sysutils/root_select/Portfile	2014-04-17 16:26:03 UTC (rev 119109)
@@ -5,8 +5,8 @@
 PortGroup           select 1.0
 
 name                root_select
-conflicts           root
 version             1.0
+
 categories          sysutils science
 platforms           darwin
 maintainers         hep.phy.cam.ac.uk:jonesc mojca

Modified: users/mojca/ports/sysutils/root_select/files/base
===================================================================
--- users/mojca/ports/sysutils/root_select/files/base	2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/sysutils/root_select/files/base	2014-04-17 16:26:03 UTC (rev 119109)
@@ -1,2 +1,72 @@
+bin/g2root
+bin/genmap
+bin/genreflex
+bin/genreflex-rootcint
+bin/h2root
+bin/hadd
+bin/hist2workspace
+bin/memprobe
+bin/pq2
+bin/prepareHistFactory
+bin/proofd
+bin/proofserv
+bin/proofserv.exe
+bin/rlibmap
+bin/rmkdepend
 bin/root
 bin/root-config
+bin/root.exe
+bin/rootcint
+bin/rootd
+bin/rootn.exe
+bin/roots
+bin/roots.exe
+bin/setxrd.csh
+bin/setxrd.sh
+bin/ssh2rpd
+bin/thisroot.csh
+bin/thisroot.sh
+bin/xpdtest
+bin/rootcling
+share/man/man1/cint.1.gz
+share/man/man1/g2root.1.gz
+share/man/man1/g2rootold.1.gz
+share/man/man1/genmap.1.gz
+share/man/man1/genreflex-rootcint.1.gz
+share/man/man1/genreflex.1.gz
+share/man/man1/h2root.1.gz
+share/man/man1/hadd.1.gz
+share/man/man1/hist2workspace.1.gz
+share/man/man1/makecint.1.gz
+share/man/man1/memprobe.1.gz
+share/man/man1/pq2-ana-dist.1.gz
+share/man/man1/pq2-cache.1.gz
+share/man/man1/pq2-info-server.1.gz
+share/man/man1/pq2-ls-files-server.1.gz
+share/man/man1/pq2-ls-files.1.gz
+share/man/man1/pq2-ls.1.gz
+share/man/man1/pq2-put.1.gz
+share/man/man1/pq2-redistribute.1.gz
+share/man/man1/pq2-rm.1.gz
+share/man/man1/pq2-verify.1.gz
+share/man/man1/pq2.1.gz
+share/man/man1/prepareHistFactory.1.gz
+share/man/man1/proofd.1.gz
+share/man/man1/proofserv.1.gz
+share/man/man1/proofserva.1.gz
+share/man/man1/rlibmap.1.gz
+share/man/man1/rmkdepend.1.gz
+share/man/man1/root-config.1.gz
+share/man/man1/root.1.gz
+share/man/man1/root.exe.1.gz
+share/man/man1/roota.1.gz
+share/man/man1/rootcint.1.gz
+share/man/man1/rootd.1.gz
+share/man/man1/rootn.exe.1.gz
+share/man/man1/roots.exe.1.gz
+share/man/man1/setup-pq2.1.gz
+share/man/man1/ssh2rpd.1.gz
+share/man/man1/system.rootdaemonrc.1.gz
+share/man/man1/xpdtest.1.gz
+share/man/man1/xproofd.1.gz
+share/man/man1/rootcling.1.gz

Modified: users/mojca/ports/sysutils/root_select/files/none
===================================================================
--- users/mojca/ports/sysutils/root_select/files/none	2014-04-17 16:25:59 UTC (rev 119108)
+++ users/mojca/ports/sysutils/root_select/files/none	2014-04-17 16:26:03 UTC (rev 119109)
@@ -1,2 +1,72 @@
 -
 -
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140417/4b1326ab/attachment-0001.html>


More information about the macports-changes mailing list