Ticket #35615: gnuplot-remove-no_x11.patch

Portfile

@@ -46 +46 @@
                             port:libpng \
                             port:ncurses \
                             port:readline \
-                            port:xpm \
                             port:zlib
 
 patchfiles                  patch-src-variable.c.diff \
@@ -74 +73 @@
                             --with-gd=${prefix} \
                             --with-pdf=${prefix} \
                             --with-png=${prefix} \
-                            --with-x \
+                            --without-x \
                             --enable-datastrings \
                             --enable-histograms \
                             --infodir='\${prefix}/share/info' \
@@ -87 +86 @@
 
 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" {
@@ -136 +142 @@
     configure.args-append   --with-tutorial
 }
 
-default_variants            +luaterm +pangocairo
+default_variants            +luaterm +pangocairo +x11
 
 destroot.destdir            prefix=${destroot}${prefix}