[118691] users/mojca/ports

[mojca at macports.org]

Revision: 118691
          https://trac.macports.org/changeset/118691
Author:   mojca at macports.org
Date:     2014-04-07 23:15:50 -0700 (Mon, 07 Apr 2014)
Log Message:
-----------
mojca/root: add root-config to port select, minor changes

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/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-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/science/root5/Portfile	2014-04-08 06:15:50 UTC (rev 118691)
@@ -69,10 +69,10 @@
 }
 
 # port specific location. For 'port select'
-set install_bindir  "${prefix}/libexec/root${version_major}/bin"
-set install_mandir  "${prefix}/libexec/root${version_major}/share/man"
+set install_bindir  "libexec/root${version_major}/bin"
+set install_mandir  "libexec/root${version_major}/share/man"
 
-configure.args      --bindir=${install_bindir}\
+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} \
@@ -80,7 +80,7 @@
                     --tutdir=${prefix}/share/root${version_major}/tutorials \
                     --etcdir=${prefix}/etc/root${version_major} \
                     --datadir=${prefix}/share/root${version_major} \
-                    --mandir=${install_mandir} \
+                    --mandir=${prefix}/${install_mandir} \
                     --disable-builtin-glew \
                     --disable-builtin-pcre \
                     --disable-builtin-zlib \
@@ -164,7 +164,7 @@
 }
 
 post-destroot {
-    reinplace "s|lib/python/genreflex|lib/root5/python/genreflex|g" ${destroot}${install_bindir}/genreflex
+    reinplace "s|lib/python/genreflex|lib/root${version_major}/python/genreflex|g" ${destroot}${install_bindir}/genreflex
 }
 
 variant debug description {Enable a debug build} {
@@ -301,7 +301,7 @@
     if {![catch {set result [active_variants root6 python${ver_no_dot}]}]} {
         if {$result} {
             ui_error "Cannot install ${name} with +python${ver_no_dot} variant"
-            return -code error "root5 port is already installed with +python${ver_no_dot} and both cannot be active at once. Pick a different python variant."
+            return -code error "root6 port is already installed with +python${ver_no_dot} and both cannot be active at once. Pick a different python variant."
         }
     }
     set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}

Modified: users/mojca/ports/science/root5/files/root5
===================================================================
--- users/mojca/ports/science/root5/files/root5	2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/science/root5/files/root5	2014-04-08 06:15:50 UTC (rev 118691)
@@ -1 +1,2 @@
 libexec/root5/bin/root
+libexec/root5/bin/root-config

Modified: users/mojca/ports/science/root6/Portfile
===================================================================
--- users/mojca/ports/science/root6/Portfile	2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/science/root6/Portfile	2014-04-08 06:15:50 UTC (rev 118691)
@@ -5,10 +5,10 @@
 
 PortGroup           active_variants 1.1
 PortGroup           cmake 1.0
+PortGroup           compiler_blacklist_versions 1.0
 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 } {
@@ -377,10 +377,10 @@
 }
 
 variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
+    # TODO: exact compiler fallback list
     # Force a compatible clang compiler
-    PortGroup compiler_blacklist_versions 1.0
-    compiler.blacklist-append {clang < 425} *gcc* macports-clang-2.9
-    compiler.fallback-append macports-clang-3.4 macports-clang-3.3 macports-clang-3.2 macports-clang-3.1 macports-clang-3.0
+    compiler.blacklist-append {clang < 425} macports-clang-2.9
+    compiler.fallback-append macports-clang-3.4 macports-clang-3.3
     # Enable cocoa support in configure
     configure.args-append   -Dcocoa=ON
 }
@@ -404,7 +404,7 @@
 # ========================================================================================
 
 # List of possible clang versions that work
-set clang_versions { 3.0 3.1 3.2 3.3 3.4 3.5 }
+set clang_versions { 3.3 3.4 3.5 }
 
 # Define the available variants
 foreach ver ${clang_versions} {

Modified: users/mojca/ports/science/root6/files/root6
===================================================================
--- users/mojca/ports/science/root6/files/root6	2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/science/root6/files/root6	2014-04-08 06:15:50 UTC (rev 118691)
@@ -1 +1,2 @@
 libexec/root6/bin/root
+libexec/root6/bin/root-config

Modified: users/mojca/ports/sysutils/root_select/files/base
===================================================================
--- users/mojca/ports/sysutils/root_select/files/base	2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/sysutils/root_select/files/base	2014-04-08 06:15:50 UTC (rev 118691)
@@ -1 +1,2 @@
 bin/root
+bin/root-config

Modified: users/mojca/ports/sysutils/root_select/files/none
===================================================================
--- users/mojca/ports/sysutils/root_select/files/none	2014-04-08 05:14:16 UTC (rev 118690)
+++ users/mojca/ports/sysutils/root_select/files/none	2014-04-08 06:15:50 UTC (rev 118691)
@@ -1 +1,2 @@
 -
+-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140407/59e8c2de/attachment.html>