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

[devans at macports.org]

Revision: 132122
          https://trac.macports.org/changeset/132122
Author:   devans at macports.org
Date:     2015-01-23 13:51:12 -0800 (Fri, 23 Jan 2015)
Log Message:
-----------
avahi: use gobject_introspection portgroup, drop python variants and just configure for python27, increment revision.

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

Modified: trunk/dports/net/avahi/Portfile
===================================================================
--- trunk/dports/net/avahi/Portfile	2015-01-23 21:29:36 UTC (rev 132121)
+++ trunk/dports/net/avahi/Portfile	2015-01-23 21:51:12 UTC (rev 132122)
@@ -3,10 +3,11 @@
 
 PortSystem          1.0
 PortGroup           active_variants 1.1
+PortGroup           gobject_introspection 1.0
 
 name                avahi
 version             0.6.31
-revision            12
+revision            13
 categories          net devel
 maintainers         nomaintainer
 license             LGPL-2.1+
@@ -55,9 +56,10 @@
 depends_lib         port:expat \
                     port:gdbm \
                     port:gettext \
-                    port:gobject-introspection \
                     port:libdaemon
 
+gobject_introspection yes
+
 set avahiuser       avahi
 
 configure.args      --disable-autoipd \
@@ -69,15 +71,11 @@
                     --enable-compat-libdns_sd \
                     --disable-gtk3 \
                     --disable-xmltoman \
-                    --enable-introspection \
                     --disable-gtk \
                     --disable-pygtk \
                     --disable-tests \
                     --with-avahi-priv-access-group=${avahiuser}
 
-# gobject-introspection uses g-ir-scanner, which uses $CC from env
-build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
-
 # __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
 
@@ -147,32 +145,24 @@
     configure.args-delete   --disable-gtk3
 }
 
+default_variants +gtk +gtk3
+
 variant qt4 description {Build with Qt4} {
     depends_lib-append      port:qt4-mac
 
     configure.args-delete   --disable-qt4
 }
 
-variant python26 conflicts python27 description {Use python 2.6} {
-    configure.python        ${prefix}/bin/python2.6
+# just use python27 with no python variants
 
-    depends_lib-append      port:dbus-python26 \
-                            port:py26-gdbm
-    if [variant_isset gtk] {
-        depends_lib-append      port:py26-pygtk
-        configure.args-delete   --disable-pygtk
-    }
-}
+configure.python        ${prefix}/bin/python2.7
 
-variant python27 conflicts python26 description {Use python 2.7} {
-    configure.python        ${prefix}/bin/python2.7
+depends_lib-append      port:dbus-python27 \
+                        port:py27-gdbm
 
-    depends_lib-append      port:dbus-python27 \
-                            port:py27-gdbm
-    if [variant_isset gtk] {
-        depends_lib-append      port:py27-pygtk
-        configure.args-delete   --disable-pygtk
-    }
+if [variant_isset gtk] {
+    depends_lib-append      port:py27-pygtk
+    configure.args-delete   --disable-pygtk
 }
 
 variant x11 {
@@ -183,11 +173,6 @@
     require_active_variants gtk2 quartz x11
 }
 
-default_variants    +gtk +gtk3
-
-if {![variant_isset python26]} {
-    default_variants-append +python27
-}
 catch {
     if {[active_variants gtk2 quartz x11]} {
         default_variants-append +quartz
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150123/a844d60b/attachment-0001.html>