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

takeshi at macports.org takeshi at macports.org
Sat Jul 27 05:26:33 PDT 2013


Revision: 108600
          https://trac.macports.org/changeset/108600
Author:   takeshi at macports.org
Date:     2013-07-27 05:26:33 -0700 (Sat, 27 Jul 2013)
Log Message:
-----------
plplot: removed no_x11 (#39383). added gcc48 variant. Two more Qt drivers (jpgqt, tiffqt).

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

Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile	2013-07-27 11:58:56 UTC (rev 108599)
+++ trunk/dports/science/plplot/Portfile	2013-07-27 12:26:33 UTC (rev 108600)
@@ -5,7 +5,7 @@
 
 name            plplot
 version         5.9.9
-revision        13
+revision        14
 platforms       darwin
 maintainers     takeshi openmaintainer
 categories      science
@@ -98,10 +98,12 @@
                         -DPLD_xfig=OFF \
                         -DPLD_tkwin=OFF \
                         -DPLD_bmpqt=OFF \
+                        -DPLD_jpgqt=OFF \
                         -DPLD_pngqt=OFF \
                         -DPLD_ppmqt=OFF \
                         -DPLD_epsqt=OFF \
                         -DPLD_pdfqt=OFF \
+                        -DPLD_tiffqt=OFF \
                         -DPLD_qtwidget=OFF \
                         -DPLD_svgqt=OFF \
                         -DPLD_extqt=OFF \
@@ -187,60 +189,46 @@
 # * 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
+if {[variant_isset gcc43] || [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] || [variant_isset gcc48]} {
     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=\"${configure.fc}\" \
                             -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
-}
-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
+} elseif {[variant_isset g95]} {
     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}\"
+    configure.args-append   -DCMAKE_OSX_DEPLOYMENT_TARGET=\"\" \
+                            -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
 }
-variant gcc45 conflicts g95 gcc43 gcc44 gcc46 gcc47 universal description {Add support for fortran using gfortran-mp-4.5} {
+variant gcc43 conflicts g95 gcc44 gcc45 gcc46 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.3} {
+    depends_lib-append      port:gcc43
+    configure.fc            ${prefix}/bin/gfortran-mp-4.3
+}
+variant gcc44 conflicts g95 gcc43 gcc45 gcc46 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.4} {
+    depends_lib-append      port:gcc44
+    configure.fc            ${prefix}/bin/gfortran-mp-4.4
+}
+variant gcc45 conflicts g95 gcc43 gcc44 gcc46 gcc47 gcc48 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=\"${configure.fc}\" \
-                            -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
 }
-variant gcc46 conflicts g95 gcc43 gcc44 gcc45 gcc47 universal description {Add support for fortran using gfortran-mp-4.6} {
+variant gcc46 conflicts g95 gcc43 gcc44 gcc45 gcc47 gcc48 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} {
+variant gcc47 conflicts g95 gcc43 gcc44 gcc45 gcc46 gcc48 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} {
+variant gcc48 conflicts g95 gcc43 gcc44 gcc45 gcc46 gcc47 universal description {Add support for fortran using gfortran-mp-4.8} {
+    depends_lib-append      port:gcc48
+    configure.fc            ${prefix}/bin/gfortran-mp-4.8
+}
+variant g95 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 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=\"${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
     if {${os.major}<10} {
         patchfiles-append       patch-sfstubsf95.f90.diff
@@ -321,10 +309,12 @@
     depends_lib-append  bin:qmake:qt4-mac
     configure.args-delete   -DENABLE_qt=OFF \
                             -DPLD_bmpqt=OFF \
+                            -DPLD_jpgqt=OFF \
                             -DPLD_pngqt=OFF \
                             -DPLD_ppmqt=OFF \
                             -DPLD_epsqt=OFF \
                             -DPLD_pdfqt=OFF \
+                            -DPLD_tiffqt=OFF \
                             -DPLD_qtwidget=OFF \
                             -DPLD_svgqt=OFF \
                             -DPLD_extqt=OFF \
@@ -332,10 +322,12 @@
                             -DPLD_qtwidget=OFF
     configure.args-append   -DENABLE_qt=ON \
                             -DPLD_bmpqt=ON \
+                            -DPLD_jpgqt=ON \
                             -DPLD_pngqt=ON \
                             -DPLD_ppmqt=ON \
                             -DPLD_epsqt=ON \
                             -DPLD_pdfqt=ON \
+                            -DPLD_tiffqt=ON \
                             -DPLD_qtwidget=ON \
                             -DPLD_svgqt=ON \
                             -DPLD_extqt=ON \
@@ -343,10 +335,7 @@
                             -DPLD_qtwidget=ON
 }
 
-variant no_x11 conflicts x11 description {Deprecated dummy variant} {
-}
-
-variant x11 conflicts no_x11 {
+variant x11 {
     configure.args-append   -DPLD_xcairo=ON  \
                             -DPLD_xwin=ON \
                             -DPLD_xfig=ON
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130727/63c4eda5/attachment-0001.html>


More information about the macports-changes mailing list