Ticket #37035: plplot.diff

Portfile

@@ -6 +6 @@
 
 name            plplot
 version         5.9.9
-revision        8
+revision        9
 platforms       darwin
 maintainers     takeshi openmaintainer
 categories      science
@@ -34 +34 @@
                 port:libiconv \
                 port:libLASi \
                 port:libpng \
-                path:lib/pkgconfig/pango.pc:pango \
                 port:swig-tcl \
                 port:tcl \
-                port:tk \
                 port:zlib
 
 post-patch {
@@ -121 +119 @@
 if {${os.platform}=="darwin"} {
     default_variants    +aquaterm
 }
-default_variants-append +x11
 
 subport ${name}-single {
     configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}/lib/${subport}
@@ -201 +198 @@
                             -DAQT_FRAMEWORK=${frameworks_dir}/AquaTerm.framework
 }
 
-variant no_x11 conflicts x11 description {Deprecated dummy variant} {
-}
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
 
 variant x11 conflicts no_x11 {
+    depends_lib-append      path:lib/pkgconfig/pango.pc:pango \
+                            port:tk
     configure.args-append   -DPLD_xcairo=ON  \
                             -DPLD_xwin=ON \
                             -DPLD_xfig=ON
@@ -212 +210 @@
                             -DPLD_xwin=OFF \
                             -DPLD_xfig=OFF
 }
+
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
+}