[72722] trunk/dports/gnome/gnome-desktop

[devans at macports.org]

Revision: 72722
          http://trac.macports.org/changeset/72722
Author:   devans at macports.org
Date:     2010-10-24 20:41:04 -0700 (Sun, 24 Oct 2010)
Log Message:
-----------
gnome-desktop: remove +no_x11 +quartz variants, current version will not build without X11 support.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-desktop/Portfile

Removed Paths:
-------------
    trunk/dports/gnome/gnome-desktop/files/patch-configure.diff

Modified: trunk/dports/gnome/gnome-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-desktop/Portfile	2010-10-25 02:00:51 UTC (rev 72721)
+++ trunk/dports/gnome/gnome-desktop/Portfile	2010-10-25 03:41:04 UTC (rev 72722)
@@ -51,36 +51,6 @@
     system "${prefix}/bin/scrollkeeper-update"
 }
 
-if {[variant_isset no_x11]} {
-    default_variants    +quartz
-}
-
-pre-configure {
-    if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
-        set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
-        set gtk_not_x11 [catch {exec grep -q GDK_WINDOWING_X11 ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
-        if {[variant_isset quartz] && ${gtk_not_quartz}} {
-            error "+quartz variant selected, but gtk2+x11 is installed"
-        } elseif {! [variant_isset quartz] && ${gtk_not_x11}} {
-            error "-quartz variant selected, but gtk2+quartz is installed"
-        }
-    } else {
-        error "Cannot find gdkconfig.h"
-    }
-}
-
-variant quartz requires no_x11 {
-    depends_lib-delete      port:xorg-libXrandr
-    depends_lib-delete      port:startup-notification
-    patchfiles-append       patch-configure.diff
-}
-
-variant no_x11 {
-    configure.args-delete   --x-includes=${prefix}/include
-    configure.args-delete   --x-libraries=${prefix}/lib
-    configure.args-append   --without-x
-}
-
 livecheck.type  regex
 livecheck.url   http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
 livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}

Deleted: trunk/dports/gnome/gnome-desktop/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gnome-desktop/files/patch-configure.diff	2010-10-25 02:00:51 UTC (rev 72721)
+++ trunk/dports/gnome/gnome-desktop/files/patch-configure.diff	2010-10-25 03:41:04 UTC (rev 72722)
@@ -1,23 +0,0 @@
---- configure.orig	2008-11-01 14:55:28.000000000 +0100
-+++ configure	2008-11-01 14:55:52.000000000 +0100
-@@ -22241,20 +22241,8 @@
- 
- 
- 
--if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then
--  echo "Building with libstartup-notification"
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STARTUP_NOTIFICATION 1
--_ACEOF
--
--  with_startup_notification=yes
--  STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
--else
--  echo "***** WARNING: Building without libstartup-notification"
-   with_startup_notification=no
-   STARTUP_NOTIFICATION_PACKAGE=
--fi
- 
- 
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101024/12f5c7fc/attachment.html>