[144255] trunk/dports/math

5 Jan 2016

Revision: 144255
          https://trac.macports.org/changeset/144255
Author:   dstrubbe@macports.org
Date:     2016-01-05 09:32:49 -0800 (Tue, 05 Jan 2016)
Log Message:
-----------
blitz, blitz-devel: Use compilers portgroup for Fortran variants. Add conflict between them as they try to install common files.

Modified Paths:
--------------
    trunk/dports/math/blitz/Portfile
    trunk/dports/math/blitz-devel/Portfile

Modified: trunk/dports/math/blitz/Portfile
===================================================================

--- trunk/dports/math/blitz/Portfile	2016-01-05 16:56:13 UTC (rev 144254)
+++ trunk/dports/math/blitz/Portfile	2016-01-05 17:32:49 UTC (rev 144255)
@@ -3,6 +3,7 @@
 
 PortSystem          1.0
 PortGroup           muniversal 1.0
+PortGroup           compilers 1.0
 
 name                blitz
 version             0.10
@@ -11,6 +12,7 @@
 license             {LGPL-3+ BSD Artistic-2}
 platforms           darwin
 maintainers         nomaintainer
+conflicts           blitz-devel
 
 description         a C++ class library for scientific computing
 
@@ -27,6 +29,9 @@
 checksums           rmd160  c48e8a01ebfb8ae907a8a2c2c8d345b1625b4ad5 \
                     sha256  804ef0e6911d43642a2ea1894e47c6007e4c185c866a7d68bad1e4c8ac4e6f94
 
+compilers.choose    fc f77 f90
+compilers.setup     require_fortran
+
 configure.args      --enable-shared \
                     --disable-doxygen \
                     --disable-dot \
@@ -35,68 +40,4 @@
 
 destroot.args       docdir=${prefix}/share/doc/${name}
 
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc49
-set g95_conflicts {}
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
-
-    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
-
-    foreach over ${gcc_versions} {
-        if {${ver} == ${over}} {
-            continue
-        }
-
-        set over_no_dot [join [split ${over} "."] ""]
-        append variant_line " conflicts gcc${over_no_dot}"
-    }
-    append variant_line { {}}
-
-    eval $variant_line
-
-    append g95_conflicts " conflicts gcc${ver_no_dot}"
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
-            set default_fortran_variant ""
-        }
-    }
-}
-
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-if {[variant_isset g95]} {
-    if {${default_fortran_variant} != "+g95"} {
-        set default_fortran_variant ""
-    }
-}
-
-if {${default_fortran_variant} != ""} {
-    default_variants "${default_fortran_variant}"
-}
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-        depends_build-append port:gcc${ver_no_dot}
-
-        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-        configure.f77 ${prefix}/bin/gfortran-mp-${ver}
-        configure.f90 ${prefix}/bin/gfortran-mp-${ver}
-    }
-}
-
-if {[variant_isset g95]} {
-    depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-    depends_build-append port:g95
-
-    configure.fc ${prefix}/bin/g95
-    configure.f77 ${prefix}/bin/g95
-    configure.f90 ${prefix}/bin/g95
-}
-
 livecheck.regex     /${name}-(\[0-9.\]+)${extract.suffix}

Modified: trunk/dports/math/blitz-devel/Portfile
===================================================================
--- trunk/dports/math/blitz-devel/Portfile	2016-01-05 16:56:13 UTC (rev 144254)
+++ trunk/dports/math/blitz-devel/Portfile	2016-01-05 17:32:49 UTC (rev 144255)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           compilers 1.0
 
 name                blitz-devel
 version             0.10-20151126
@@ -9,6 +10,7 @@
 platforms           darwin
 license             {LGPL-3+ BSD Artistic-2}
 maintainers         nomaintainer
+conflicts           blitz
 
 fetch.type          hg
 hg.url              http://blitz.hg.sourceforge.net:8000/hgroot/blitz/blitz
@@ -52,69 +54,8 @@
                         --enable-dot
 }
 
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc49
-set g95_conflicts {}
+compilers.choose    fc f77 f90
+compilers.setup     require_fortran
 
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
-
-    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
-
-    foreach over ${gcc_versions} {
-        if {${ver} == ${over}} {
-            continue
-        }
-
-        set over_no_dot [join [split ${over} "."] ""]
-        append variant_line " conflicts gcc${over_no_dot}"
-    }
-    append variant_line { {}}
-
-    eval $variant_line
-
-    append g95_conflicts " conflicts gcc${ver_no_dot}"
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
-            set default_fortran_variant ""
-        }
-    }
-}
-
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-if {[variant_isset g95]} {
-    if {${default_fortran_variant} != "+g95"} {
-        set default_fortran_variant ""
-    }
-}
-
-if {${default_fortran_variant} != ""} {
-    default_variants "${default_fortran_variant}"
-}
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-        depends_build-append port:gcc${ver_no_dot}
-
-        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-        configure.f77 ${prefix}/bin/gfortran-mp-${ver}
-        configure.f90 ${prefix}/bin/gfortran-mp-${ver}
-    }
-}
-
-if {[variant_isset g95]} {
-    depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-    depends_build-append port:g95
-
-    configure.fc ${prefix}/bin/g95
-    configure.f77 ${prefix}/bin/g95
-    configure.f90 ${prefix}/bin/g95
-}
-
 # does not do any live check
 livecheck.type sourceforge

    

dstrubbe＠macports.org

tags

participants (1)