[121122] trunk/dports/science/root6/Portfile

[mojca at macports.org]

Revision: 121122
          https://trac.macports.org/changeset/121122
Author:   mojca at macports.org
Date:     2014-06-18 00:01:50 -0700 (Wed, 18 Jun 2014)
Log Message:
-----------
root6: no cppflags (#42872), use proper clang variant (#43917), set version_major automatically

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

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2014-06-18 04:26:00 UTC (rev 121121)
+++ trunk/dports/science/root6/Portfile	2014-06-18 07:01:50 UTC (rev 121122)
@@ -13,11 +13,12 @@
 github.setup        root-mirror root aaf9b65
 #github.setup       root-mirror root 6-00-00 v
 version             6.00.00
+set version_major   [lindex [split ${version} .] 0]
+revision            1
 checksums           rmd160  e0b7080d897469f421dd5ee44ca570a4774dc5d4 \
                     sha256  58692b7e2c970df5eac0dd298ab7d1ac5352e4ed549d61c29578d71915e831be
 
-name                root6
-set version_major   6
+name                root${version_major}
 categories          science
 maintainers         hep.phy.cam.ac.uk:jonesc mojca
 license             LGPL-2.1+
@@ -117,10 +118,6 @@
 
 configure.post_args ${worksrcpath}
 
-# TODO: temporary:
-configure.args-append       -DCMAKE_INCLUDE_PATH=${prefix}/include
-configure.cppflags-delete   -I${prefix}/include
-
 platform darwin {
     # Note that we are forcing this choice.  This means that anything linking
     # against root6 needs to also be using libc++.  This is possibly
@@ -454,6 +451,18 @@
     eval $variant_line
 }
 
+# make sure that the proper variant is automatically selected
+# (ROOT crashes if the compiler it was built with doesn't exist)
+if {![variant_isset clang33] && ![variant_isset clang34] && ![variant_isset clang35]} {
+    if { ${configure.compiler} eq "macports-clang-3.3" } {
+        default_variants-append +clang33
+    } elseif { ${configure.compiler} eq "macports-clang-3.4" } {
+        default_variants-append +clang34
+    } elseif { ${configure.compiler} eq "macports-clang-3.5" } {
+        default_variants-append +clang35
+    }
+}
+
 # Is a variant active ?
 set active_clang_variant ""
 foreach ver ${clang_versions} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140618/3f05aa63/attachment.html>