Ticket #12341: Portfile.revision2.diff

Portfile

@@ -1 +1 @@
 # $Id$
 PortSystem      1.0
 name            plplot
-version         5.7.2
-revision        1
+version         5.7.3
+revision        2
 platforms       darwin 
 maintainers     takeshi@mac.com
 categories      science
 description     Scientific plotting package
 master_sites    sourceforge
-checksums       md5 33e43d26df05bcb8a91c3ec769dcc81c
+checksums       md5 8c5ed411bc63a4fd07b362a1b9a3e46c
 homepage        http://plplot.sourceforge.net/
 long_description  { \
                 PLplot is relatively small, portable, freely distributable, \
@@ -20 +20 @@
                 only a handful of function calls is typically required. \
                 For more advanced use, virtually all aspects of plotting are configurable.}
 
-depends_lib     port:aquaterm \
-                port:cmake \
+depends_lib     port:cmake \
                 port:expat \
                 port:fontconfig \
                 port:freefont-ttf \
                 port:freetype \
-                port:g95 \
                 port:gd2 \
                 port:libiconv \
                 port:jpeg \
@@ -53 +51 @@
 configure.env           HOME=${workpath}
 configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}
 configure.args          -DCMAKE_VERBOSE_MAKEFILE=ON \
-                        -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/g95\" \
                         -DCMAKE_Fortran_FLAGS=-O2 \
                         -DCMAKE_C_COMPILER=/usr/bin/cc \
                         -DCMAKE_C_FLAGS=\"-O2 -I${prefix}/include\" \
@@ -71 +68 @@
                         -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
                         -DPL_FREETYPE_FONT_PATH=${prefix}/share/fonts/freefont-ttf \
                         -DWITH_FREETYPE=ON \
-                        -DPLD_tkwin=OFF \
+                        -DPLD_aqt=OFF \
+                        -DPLD_tkwin=ON \
                         -DPLD_wxwidgets=OFF \
                         -DPLD_gnome=OFF \
                         -DPLD_gcw=OFF \
@@ -85 +83 @@
 #                       -DSWIG_DIR=${prefix}/bin
 configure.post_args     ../${distname}
 
+pre-configure {
+    if {[file exists ${prefix}/lib/libplplotd.dylib]} {
+        return -code error "Before upgrading plplot, please uninstall (or deactivate) the old version of plplot."
+    }
+}
+
 build.dir               ${workpath}/build
 
 platform i386 {
@@ -92 +96 @@
                             -DCMAKE_EXE_LINKER_FLAGS=\"-undefined dynamic_lookup\"
 }
 
-# To use Gnome Canvas Widget
-variant gcw {
+variant gcw description {Add support for Gnome Canvas Widget} {
     depends_lib-append      port:atk \
                             port:cairo \
                             port:gettext \
@@ -110 +113 @@
     configure.args-delete   -DPLD_gcw=OFF
     configure.args-append   -DPLD_gcw=ON
 }
+
+if {![variant_isset g95]} {
+    default_variants +gcc42
+}
+variant gcc42 conflicts g95 description {Build using gcc42 (default)} {
+    depends_lib-append      port:gcc42
+    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/gfortran-mp-4.2\"
+}
+variant g95 conflicts gcc42 description {Build using g95} {
+    depends_lib-append      port:g95
+    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/g95\"
+}
+
+variant octave description {Add support for Octave} {
+    depends_lib-append       port:octave
+    configure.args-delete   -DENABLE_octave=OFF 
+    configure.args-append   -DENABLE_octave=ON
+}