[36184] trunk/dports/x11/gtk2/Portfile

[nox at macports.org]

Revision: 36184
          http://trac.macosforge.org/projects/macports/changeset/36184
Author:   nox at macports.org
Date:     2008-04-21 07:08:28 -0700 (Mon, 21 Apr 2008)

Log Message:
-----------
gtk2:
 * Added dummy variant +no_x11 (closes #14305).
 * Fixed livecheck.

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2008-04-21 07:43:33 UTC (rev 36183)
+++ trunk/dports/x11/gtk2/Portfile	2008-04-21 14:08:28 UTC (rev 36184)
@@ -24,6 +24,10 @@
                 ftp://ftp.gtk.org/pub/gtk/v${branch}/ \
                 http://ftp.gtk.org/pub/gtk/v${branch}/
 
+if {[variant_isset no_x11]} {
+    default_variants    +quartz
+}
+
 if {![variant_isset quartz]} {
     default_variants    +x11
 }
@@ -98,8 +102,17 @@
     depends_build-append    port:cups-headers
 }
 
-variant quartz conflicts x11 description {Enable Quartz rendering} {
+variant no_x11 description {Same as +quartz} {
     pre-fetch {
+        if {[file exists ${prefix}/lib/libpangox-1.0.dylib]} {
+            ui_error "Please uninstall or deactivate the pango port and reinstall it by running `port install pango +no_x11`."
+        }
+        error "pango must be installed with the no_x11 variant enabled."
+    }
+}
+
+variant quartz requires no_x11 conflicts x11 description {Enable Quartz rendering} {
+    pre-fetch {
         if {![file exists ${prefix}/include/cairo/cairo-quartz.h]} {
             ui_error "Please uninstall or deactivate the cairo port and reinstall it by running `port install cairo +quartz`."
             error "cairo must be installed with the quartz variant enabled."
@@ -117,5 +130,5 @@
 }
 
 livecheck.check regex
-livecheck.url   ftp://ftp.gtk.org/pub/gtk/${branch}/
-livecheck.regex {LATEST-(\d+(?:\.\d+)*)}
+livecheck.url   ftp://ftp.gnome.org/pub/gnome/sources/gtk+/${branch}/
+livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080421/3a978b79/attachment.html