[142121] trunk/dports/devel/gtk2hs/Portfile

[mojca at macports.org]

Revision: 142121
          https://trac.macports.org/changeset/142121
Author:   mojca at macports.org
Date:     2015-11-04 00:08:38 -0800 (Wed, 04 Nov 2015)
Log Message:
-----------
gtk2hs: replace no_x11 by x11 (#39383), but the port is broken anyway (#43583), so no need to bother about transition

Modified Paths:
--------------
    trunk/dports/devel/gtk2hs/Portfile

Modified: trunk/dports/devel/gtk2hs/Portfile
===================================================================
--- trunk/dports/devel/gtk2hs/Portfile	2015-11-04 07:55:17 UTC (rev 142120)
+++ trunk/dports/devel/gtk2hs/Portfile	2015-11-04 08:08:38 UTC (rev 142121)
@@ -28,7 +28,6 @@
                     path:lib/pkgconfig/cairo.pc:cairo \
                     port:librsvg \
                     port:libglade2 \
-                    port:gtkglext \
                     port:gtksourceview2
 
 configure.args      --with-hc=${prefix}/bin/ghc   \
@@ -42,24 +41,15 @@
                     --enable-gtksourceview2       \
                     --enable-cairo                \
                     --enable-svg                  \
-                    --enable-opengl               \
                     --without-pkgreg
 
-# https://trac.macports.org/ticket/39383
-variant no_x11 {
-    depends_lib-delete      port:gtkglext
-    configure.args-delete   --enable-opengl
+variant x11 {
+    depends_lib-append      port:gtkglext
+    configure.args-append   --enable-opengl
 }
 
-# Use the same rules as GTK Portfile for setting the default variants
-if {[variant_isset no_x11]} {
-    default_variants    +quartz
-}
+default_variants    +x11
 
-if {![variant_isset quartz]} {
-    default_variants    +x11
-}
-
 use_parallel_build  no
 
 # Fix gtk.package.conf to allow interoperating with non-MacPorts
@@ -68,7 +58,7 @@
 
 post-destroot {
     set pkgs {glib gio cairo svgcairo gtk gconf glade gtkglext gtksourceview2 soegtk}
-    if {[variant_isset no_x11]} {
+    if {![variant_isset x11]} {
         set pkgs {glib gio cairo svgcairo gtk gconf glade gtksourceview2 soegtk}
     }
     foreach pkg ${pkgs} {
@@ -82,7 +72,7 @@
 
 post-activate {
     set pkgs {glib gio cairo svgcairo gtk gconf glade gtkglext gtksourceview2 soegtk}
-    if {[variant_isset no_x11]} {
+    if {![variant_isset x11]} {
         set pkgs {glib gio cairo svgcairo gtk gconf glade gtksourceview2 soegtk}
     }
     foreach pkg ${pkgs} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/f475fc29/attachment.html>