Ticket #39818: pgplot-x11.patch

Portfile

@@ -41 +41 @@
                     port:pkgconfig
 
 depends_lib         port:libpng \
-                    port:zlib \
-                    port:xorg-libX11
+                    port:zlib
 
 patchfiles          patch-makemake.diff \
                     patch-drivers.list.patch \
@@ -72 +71 @@
 
     set drivers "GIF VGIF LATEX PNG TPNG PS VPS CPS VCPS"
 
-    if {![variant_isset no_x11]} {
+    if {[variant_isset x11]} {
         # XDISP does not work because the program figdisp can not be found.
         lappend drivers XWINDOW XSERVE
     }
@@ -90 +89 @@
     set shlib_opts \
         "-dynamiclib -single_module -current_version ${version} -compatibility_version ${compat_version}"
 
-    if {![variant_isset no_x11]} {
+    if {[variant_isset x11]} {
         # XQuartz or MacPorts X11 (pkg-config gives precedence to MacPorts X11)
         eval configure.ldflags-append   [exec pkg-config x11 --libs-only-L]
         set x11Libs                     [exec pkg-config x11 --libs-only-l]
@@ -210 +209 @@
 
 universal_variant   no
 
-variant no_x11 {
-    depends_lib-delete      port:xorg-libX11
-    depends_build-delete    port:pkgconfig
+variant x11 conflicts no_x11 {
+    depends_lib-append      port:xorg-libX11
+    depends_build-append    port:pkgconfig
 }
 
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+
+if {[variant_isset no_x11]} {
+    default_variants    -x11
+} else {
+    default_variants    +x11
+}
+
 variant aquaterm description {install driver for aquaterm} {
     depends_lib-append  port:aquaterm
 
@@ -254 +261 @@
 }
 
 if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
-    default_variants +gcc47
+    default_variants-append +gcc47
 }
 
 variant docs description {Create and install docs} {