[89045] trunk/dports/net/avahi/Portfile

[pixilla at macports.org]

Revision: 89045
          http://trac.macports.org/changeset/89045
Author:   pixilla at macports.org
Date:     2012-01-18 09:32:38 -0800 (Wed, 18 Jan 2012)
Log Message:
-----------
net/avahi:
- Fix pyxx-gdbm depends_lib in pythonxx variants.

Modified Paths:
--------------
    trunk/dports/net/avahi/Portfile

Modified: trunk/dports/net/avahi/Portfile
===================================================================
--- trunk/dports/net/avahi/Portfile	2012-01-18 16:28:05 UTC (rev 89044)
+++ trunk/dports/net/avahi/Portfile	2012-01-18 17:32:38 UTC (rev 89045)
@@ -5,7 +5,7 @@
 
 name                avahi
 version             0.6.30
-revision            2
+revision            3
 categories          net devel
 maintainers         pixilla openmaintainer
 license             LGPL-2.1+
@@ -42,7 +42,6 @@
 depends_run         port:intltool
 
 depends_lib         port:libdaemon \
-                    port:libglade2 \
                     port:expat \
                     port:gdbm \
                     port:gettext
@@ -56,7 +55,9 @@
                     --enable-compat-libdns_sd \
                     --disable-gtk3 \
                     --disable-xmltoman \
-                    --enable-introspection=no
+                    --enable-introspection=no \
+                    --disable-gtk \
+                    --disable-pygtk
 
 # __APPLE_USE_RFC_2292 should be removed once avhi is updated to support RFC 3542
 configure.cppflags-append   -L${prefix}/lib -D__APPLE_USE_RFC_2292
@@ -65,24 +66,33 @@
     configure.python        ${prefix}/bin/python2.5
 
     depends_lib-append      port:dbus-python25 \
-                            port:py25-gtk \
                             port:py25-gdbm
+    if [variant_isset +gtk] {
+        depends_lib-append      port:py25-gtk
+        configure.args-delete   --disable-pygtk
+    }
 }
 
 variant python26 conflicts python25 python27 description {Use python 2.6} {
     configure.python        ${prefix}/bin/python2.6
 
     depends_lib-append      port:dbus-python26 \
-                            port:py26-gtk \
                             port:py26-gdbm
+    if [variant_isset +gtk] {
+        depends_lib-append      port:py26-gtk
+        configure.args-delete   --disable-pygtk
+    }
 }
 
 variant python27 conflicts python25 python26 description {Use python 2.7} {
     configure.python        ${prefix}/bin/python2.7
 
     depends_lib-append      port:dbus-python27 \
-                            port:py27-gtk \
                             port:py27-gdbm
+    if [variant_isset +gtk] {
+        depends_lib-append      port:py27-gtk
+        configure.args-delete   --disable-pygtk
+    }
 }
 
 if {![variant_isset python25] && ![variant_isset python26]} {
@@ -135,16 +145,14 @@
     configure.args-append   --enable-tests
 }
 
-variant no_gtk description {Build without GTK2} {
-    depends_lib-delete      port:libglade2 \
-                            port:py25-gtk \
-                            port:py26-gtk \
-                            port:py27-gtk
+variant gtk description {Build with GTK2} {
+    depends_lib-append      port:libglade2
 
-    configure.args-append   --disable-gtk \
-                            --disable-pygtk
+    configure.args-delete   --disable-gtk
 }
 
+default_variants    +gtk
+
 livecheck.type      regex
 livecheck.url       [lindex ${master_sites} 0]
 livecheck.regex     ${name}-(\[0-9.\]+)\\.tar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120118/3e4edaa3/attachment.html>