[121932] trunk/dports/graphics

[mojca at macports.org]

Revision: 121932
          https://trac.macports.org/changeset/121932
Author:   mojca at macports.org
Date:     2014-07-11 12:45:41 -0700 (Fri, 11 Jul 2014)
Log Message:
-----------
graphviz(-devel): remove legacy variants no_x11, no_pangocairo (#39383)

Modified Paths:
--------------
    trunk/dports/graphics/graphviz/Portfile
    trunk/dports/graphics/graphviz-devel/Portfile

Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile	2014-07-11 19:41:04 UTC (rev 121931)
+++ trunk/dports/graphics/graphviz/Portfile	2014-07-11 19:45:41 UTC (rev 121932)
@@ -283,9 +283,7 @@
     configure.args-replace      --without-ming --with-ming
 }
 
-# Legacy no_pangocairo variant to be removed after February 2014
-variant no_pangocairo conflicts pangocairo description {Legacy compatibility variant} {}
-variant pangocairo conflicts no_pangocairo description {Add pangocairo support (antialiased bitmapped output; PDF output)} {
+variant pangocairo description {Add pangocairo support (antialiased bitmapped output; PDF output)} {
     depends_lib-append          path:lib/pkgconfig/pango.pc:pango \
                                 port:libLASi
 
@@ -293,24 +291,12 @@
     configure.args-replace      --without-pangocairo --with-pangocairo
 }
 
-if {[variant_isset no_pangocairo]} {
-    default_variants -pangocairo
-} else {
-    default_variants +pangocairo
-}
-
-# Legacy no_x11 variant to be removed after February 2014
-variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
-variant x11 conflicts no_x11 {
+variant x11 {
     depends_lib-append          port:xorg-libXaw
     configure.args-delete       --without-x
 }
 
-if {[variant_isset no_x11]} {
-    default_variants -x11
-} else {
-    default_variants +x11
-}
+default_variants                +pangocairo +x11
 
 post-destroot {
     if {![variant_isset smyrna]} {

Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile	2014-07-11 19:41:04 UTC (rev 121931)
+++ trunk/dports/graphics/graphviz-devel/Portfile	2014-07-11 19:45:41 UTC (rev 121932)
@@ -283,9 +283,7 @@
     configure.args-replace      --without-ming --with-ming
 }
 
-# Legacy no_pangocairo variant to be removed after February 2014
-variant no_pangocairo conflicts pangocairo description {Legacy compatibility variant} {}
-variant pangocairo conflicts no_pangocairo description {Add pangocairo support (antialiased bitmapped output; PDF output)} {
+variant pangocairo description {Add pangocairo support (antialiased bitmapped output; PDF output)} {
     depends_lib-append          path:lib/pkgconfig/pango.pc:pango \
                                 port:libLASi
 
@@ -293,24 +291,12 @@
     configure.args-replace      --without-pangocairo --with-pangocairo
 }
 
-if {[variant_isset no_pangocairo]} {
-    default_variants -pangocairo
-} else {
-    default_variants +pangocairo
-}
-
-# Legacy no_x11 variant to be removed after February 2014
-variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
-variant x11 conflicts no_x11 {
+variant x11 {
     depends_lib-append          port:xorg-libXaw
     configure.args-delete       --without-x
 }
 
-if {[variant_isset no_x11]} {
-    default_variants -x11
-} else {
-    default_variants +x11
-}
+default_variants                +pangocairo +x11
 
 post-destroot {
     if {![variant_isset smyrna]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140711/04c53985/attachment.html>