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

[takeshi at macports.org]

Revision: 100757
          https://trac.macports.org/changeset/100757
Author:   takeshi at macports.org
Date:     2012-12-22 18:33:02 -0800 (Sat, 22 Dec 2012)
Log Message:
-----------
plplot: fixed Fortran compiler detection. added gcc46 and gcc47 variants. Closing #36982

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

Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile	2012-12-23 01:45:54 UTC (rev 100756)
+++ trunk/dports/science/plplot/Portfile	2012-12-23 02:33:02 UTC (rev 100757)
@@ -5,7 +5,7 @@
 
 name            plplot
 version         5.9.9
-revision        10
+revision        11
 platforms       darwin
 maintainers     takeshi openmaintainer
 categories      science
@@ -113,9 +113,6 @@
 
 pre-configure {
     file mkdir ${workpath}/build
-#    if {[file exists ${prefix}/lib/libplplotd.dylib]} {
-#        return -code error "Before upgrading plplot, please uninstall (or deactivate) the old version of plplot."
-#    }
 }
 
 if {[variant_isset universal]} {
@@ -160,32 +157,63 @@
 # variant gcw is deleted since it has been deprecated
 # gd driver (gif, jpeg, png, svg) has been deprecated
 
-variant gcc43 conflicts g95 gcc44 gcc45 universal description {Add support for fortran using gfortran-mp-4.3} {
+# Fortran notes:
+# * In build/language_tests/Fortran, FC and LDFLAGS are used.
+# * CMAKE_Fortran_COMPILER is used later in build.
+# * To avoid -arch ${build_arch} to be passed configure.ld_archflags is unset.
+
+variant gcc43 conflicts g95 gcc44 gcc45 gcc46 gcc47 universal description {Add support for fortran using gfortran-mp-4.3} {
     depends_lib-append      port:gcc43
+    configure.ld_archflags  ""
+    configure.fc            ${prefix}/bin/gfortran-mp-4.3
     configure.args-delete   -DENABLE_f77=OFF \
                             -DENABLE_f95=OFF
-    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/gfortran-mp-4.3\" \
+    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
                             -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
 }
-variant gcc44 conflicts g95 gcc43 gcc45 universal description {Add support for fortran using gfortran-mp-4.4} {
+variant gcc44 conflicts g95 gcc43 gcc45 gcc46 gcc47 universal description {Add support for fortran using gfortran-mp-4.4} {
     depends_lib-append      port:gcc44
+    configure.fc            ${prefix}/bin/gfortran-mp-4.4
+    configure.ld_archflags  ""
     configure.args-delete   -DENABLE_f77=OFF \
                             -DENABLE_f95=OFF
-    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/gfortran-mp-4.4\" \
+    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
                             -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
 }
-variant gcc45 conflicts g95 gcc43 gcc44 universal description {Add support for fortran using gfortran-mp-4.5} {
+variant gcc45 conflicts g95 gcc43 gcc44 gcc46 gcc47 universal description {Add support for fortran using gfortran-mp-4.5} {
     depends_lib-append      port:gcc45
+    configure.fc            ${prefix}/bin/gfortran-mp-4.5
+    configure.ld_archflags  ""
     configure.args-delete   -DENABLE_f77=OFF \
                             -DENABLE_f95=OFF
-    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/gfortran-mp-4.5\" \
+    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
                             -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
 }
-variant g95 conflicts gcc43 gcc44 gcc45 universal description {Add support for fortran using g95} {
+variant gcc46 conflicts g95 gcc43 gcc44 gcc45 gcc47 universal description {Add support for fortran using gfortran-mp-4.6} {
+    depends_lib-append      port:gcc46
+    configure.ld_archflags  ""
+    configure.fc            ${prefix}/bin/gfortran-mp-4.6
+    configure.args-delete   -DENABLE_f77=OFF \
+                            -DENABLE_f95=OFF
+    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
+                            -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
+}
+variant gcc47 conflicts g95 gcc43 gcc44 gcc45 gcc46 universal description {Add support for fortran using gfortran-mp-4.7} {
+    depends_lib-append      port:gcc47
+    configure.fc            ${prefix}/bin/gfortran-mp-4.7
+    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}\"
+}
+variant g95 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 universal description {Add support for fortran using g95} {
     depends_lib-append      port:g95
+    configure.fc            ${prefix}/bin/g95
+    configure.ld_archflags  ""
     configure.args-delete   -DENABLE_f77=OFF \
                             -DENABLE_f95=OFF
-    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/g95\" \
+    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
                             -DCMAKE_OSX_DEPLOYMENT_TARGET=\"\" \
                             -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
 # Ad hoc fix to enable build of f95 binding by disabling some features
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121222/bc5e8dc2/attachment.html>