Revision: 79737 http://trac.macports.org/changeset/79737 Author: jeremyhu@macports.org Date: 2011-06-24 10:06:13 -0700 (Fri, 24 Jun 2011) Log Message: ----------- avahi: darwin11 build fix, added +python25 +python26 +python27 variants Modified Paths: -------------- trunk/dports/net/avahi/Portfile Modified: trunk/dports/net/avahi/Portfile =================================================================== --- trunk/dports/net/avahi/Portfile 2011-06-24 17:06:04 UTC (rev 79736) +++ trunk/dports/net/avahi/Portfile 2011-06-24 17:06:13 UTC (rev 79737) @@ -46,10 +46,8 @@ depends_lib port:libdaemon \ port:libglade2 \ - port:dbus-python26 \ port:expat \ port:gdbm \ - port:py26-gtk \ port:gettext configure.args --disable-autoipd \ @@ -63,9 +61,35 @@ --disable-xmltoman \ --enable-introspection=no -configure.cppflags-append -L${prefix}/lib -configure.python ${prefix}/bin/python2.6 +# __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 +variant python25 conflicts python26 python27 description {Use python 2.5} { + configure.python ${prefix}/bin/python2.5 + + depends_lib-append port:dbus-python25 \ + port:py25-gtk \ +} + +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 \ +} + +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 \ +} + +if {![variant_isset python25] && ![variant_isset python26]} { + default_variants +python27 +} + + test.run yes test.target check @@ -113,7 +137,9 @@ variant no_gtk description {Build without GTK2} { depends_lib-delete port:libglade2 \ - port:py26-gtk + port:py25-gtk \ + port:py26-gtk \ + port:py27-gtk configure.args-append --disable-gtk \ --disable-pygtk