[53062] users/devans/GNOME_2_27/gnome/gnome-desktop

[devans at macports.org]

Revision: 53062
          http://trac.macports.org/changeset/53062
Author:   devans at macports.org
Date:     2009-06-28 16:53:53 -0700 (Sun, 28 Jun 2009)
Log Message:
-----------
GNOME_2_27/gnome/gnome-desktop: merge r53059 from trunk.

Modified Paths:
--------------
    users/devans/GNOME_2_27/gnome/gnome-desktop/Portfile

Property Changed:
----------------
    users/devans/GNOME_2_27/gnome/gnome-desktop/


Property changes on: users/devans/GNOME_2_27/gnome/gnome-desktop
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/gnome/gnome-desktop:53045,53059
/trunk/dports/gnome/gnome-desktop/gnome-desktop:53059

Modified: users/devans/GNOME_2_27/gnome/gnome-desktop/Portfile
===================================================================
--- users/devans/GNOME_2_27/gnome/gnome-desktop/Portfile	2009-06-28 23:53:03 UTC (rev 53061)
+++ users/devans/GNOME_2_27/gnome/gnome-desktop/Portfile	2009-06-28 23:53:53 UTC (rev 53062)
@@ -30,12 +30,10 @@
                 port:gnome-doc-utils \
                 port:gtk-doc
 
-depends_lib     port:libxml2 \
-                port:gconf \
-                port:libgnomecanvas \
-                port:libgnomeui \
+depends_lib     port:gconf \
                 port:startup-notification \
-                port:py25-gnome
+                port:xorg-libXrandr \
+                port:python25
 
 depends_run     port:gnome-themes
 
@@ -44,6 +42,8 @@
                 patch-libgnome-destop-gnome-rr-config.c.diff
 
 configure.args  --with-gnome-distributor=MacPorts \
+                --x-includes=${prefix}/include \
+                --x-libraries=${prefix}/lib \
                 --disable-scrollkeeper
 
 configure.python  ${prefix}/bin/python2.5
@@ -73,11 +73,15 @@
 }
 
 variant quartz requires no_x11 description {Enable Quartz rendering} {
+    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.check regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090628/82fcd5d9/attachment.html>