[96459] trunk/dports/math/gnuplot/Portfile

[macsforever2000 at macports.org]

Revision: 96459
          https://trac.macports.org/changeset/96459
Author:   macsforever2000 at macports.org
Date:     2012-08-10 08:39:28 -0700 (Fri, 10 Aug 2012)
Log Message:
-----------
gnuplot: Add x11 variant and deprecate no_x11 variant. (#35615)

Modified Paths:
--------------
    trunk/dports/math/gnuplot/Portfile

Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile	2012-08-10 14:06:57 UTC (rev 96458)
+++ trunk/dports/math/gnuplot/Portfile	2012-08-10 15:39:28 UTC (rev 96459)
@@ -20,7 +20,7 @@
 long_description            Gnuplot is a command-driven interactive function \
                             plotting program. Plots any number of functions, \
                             built up of C operators, C library functions, and \
-                            some things C doesn't have like **, sgn(), etc. \
+                            some things C does not have like **, sgn(), etc. \
                             Also support for plotting data files, to compare \
                             actual data to theoretical curves.
 
@@ -46,7 +46,6 @@
                             port:libpng \
                             port:ncurses \
                             port:readline \
-                            port:xpm \
                             port:zlib
 
 patchfiles                  patch-src-variable.c.diff \
@@ -74,7 +73,7 @@
                             --with-gd=${prefix} \
                             --with-pdf=${prefix} \
                             --with-png=${prefix} \
-                            --with-x \
+                            --without-x \
                             --enable-datastrings \
                             --enable-histograms \
                             --infodir='\${prefix}/share/info' \
@@ -87,11 +86,18 @@
 
 configure.ccache            no
 
-variant no_x11 description "Disable X11 terminal" {
-    depends_lib-delete      port:xpm
-    configure.args-delete   --with-x
-    configure.args-append   --without-x
+variant x11 conflicts no_x11 "Enable X11 terminal" {
+    configure.args-delete   --without-x
+    configure.args-append   --with-x
+    depends_lib-append      port:xpm
 }
+# remove this in August 2013
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
+}
 
 variant luaterm description "Enable lua-based terminals" {
     depends_lib-append      port:lua
@@ -136,7 +142,7 @@
     configure.args-append   --with-tutorial
 }
 
-default_variants            +luaterm +pangocairo
+default_variants            +luaterm +pangocairo +x11
 
 destroot.destdir            prefix=${destroot}${prefix}
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120810/8ab7f1a5/attachment.html>