[120891] trunk/dports/science/plplot/Portfile

[takeshi at macports.org]

Revision: 120891
          https://trac.macports.org/changeset/120891
Author:   takeshi at macports.org
Date:     2014-06-10 17:24:21 -0700 (Tue, 10 Jun 2014)
Log Message:
-----------
plplot: added patches for CMakeLists.txt and plConfig.h. deleted -DENABLE_f77. Use PortGroup compilers

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

Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile	2014-06-10 23:24:30 UTC (rev 120890)
+++ trunk/dports/science/plplot/Portfile	2014-06-11 00:24:21 UTC (rev 120891)
@@ -2,10 +2,15 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       compilers 1.0
 PortGroup       wxWidgets 1.0
 
+compilers.choose    fc f90
+compilers.setup
+
 name            plplot
 version         5.10.0
+revision        1
 platforms       darwin
 maintainers     takeshi openmaintainer
 categories      science
@@ -34,6 +39,8 @@
                 port:swig-tcl \
                 port:tcl
 
+patchfiles      patch-CMakeLists.txt.diff \
+                patch-plConfig.h.in.diff
 post-patch {
     reinplace "s|-ObjC|-ObjC -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
     reinplace "s|-framework AquaTerm|-F${frameworks_dir} -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
@@ -104,7 +111,6 @@
                         -DPLD_qtwidget=OFF \
                         -DENABLE_ada=OFF \
                         -DENABLE_d=OFF \
-                        -DENABLE_f77=OFF \
                         -DENABLE_f95=OFF \
                         -DENABLE_itcl=OFF \
                         -DENABLE_itk=OFF \
@@ -121,7 +127,8 @@
                         -DENABLE_wxwidgets=OFF \
                         -DBUILD_TEST=OFF \
                         -DHAVE_AGG=OFF \
-                        -DSWIG_DIR=${prefix}/bin
+                        -DSWIG_DIR=${prefix}/bin \
+                        -DPLPLOT_HAVE_CONFIG_H=ON
 configure.post_args     ../${distname}
 
 pre-configure {
@@ -129,7 +136,7 @@
 }
 
 if {[variant_isset universal]} {
-    configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\" -DENABLE_f77:BOOL=OFF -DENABLE_f95:BOOL=OFF
+    configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\" -DENABLE_f95:BOOL=OFF
 } else {
 # Adhoc fix
 # cmake passes -arch to Fortran compiler
@@ -182,65 +189,23 @@
 # * CMAKE_Fortran_COMPILER is used later in build.
 # * To avoid -arch ${build_arch} to be passed configure.ld_archflags is unset.
 
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-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}"
+if {[fortran_variant_isset]} {
+    configure.ld_archflags  ""
+    configure.args-delete   -DENABLE_f95=OFF
+    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${configure.fc}\"
+    if {[variant_isset g95]} {
+        configure.args-append   -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
+    } else {
+        configure.args-append   -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
     }
-    append variant_line { {}}
-
-    eval $variant_line
-
-    append g95_conflicts " conflicts gcc${ver_no_dot}"
 }
 
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-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}
-        configure.ld_archflags  ""
-        configure.args-delete   -DENABLE_f77=OFF \
-                                -DENABLE_f95=OFF
-        configure.args-append   -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
-                                -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
-    }
-}
-
 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
 # Ad hoc fix to enable build of f95 binding by disabling some features
     if {${os.major}<10} {
         patchfiles-append       patch-sfstubsf95.f90.diff
     }
-    configure.ld_archflags  ""
-    configure.args-delete   -DENABLE_f77=OFF \
-                            -DENABLE_f95=OFF
-    configure.args-append   -DCMAKE_OSX_DEPLOYMENT_TARGET=\"\" \
-                            -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
+    configure.args-append   -DCMAKE_OSX_DEPLOYMENT_TARGET=\"\"
 }
 
 variant octave description {Add support for Octave} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140610/6ca11828/attachment.html>