Update avahi to 0.6.27.

0.6.27
some build fixes

0.6.26
This is mostly a bugfix release but also fixes a low risk security issue and
adds a couple of minor new features.
 * Fix CVE-2010-2244 (Ludwig Nussel)
 * Support for Gtk+ 3 and Gtk+ Introspection
 * Native systemd socket activation support
 * Add systemd service files
 * Add various resource control options, for traffic rate limiting as well as
   cache size and D-Bus client object limits.
 * i18n updates
 * Minor other updates

15 files changed, 89 insertions, 104 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 8a2ce04c247..945e9f16f8a 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:08 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/07/24 13:42:12 obache Exp $
 
-DISTNAME=		avahi-0.6.25
-PKGREVISION=		3
+DISTNAME=		avahi-0.6.27
 CATEGORIES=		net
 MASTER_SITES=		http://avahi.org/download/
 
@@ -69,6 +68,7 @@ CONFIGURE_ARGS+=	--with-avahi_priv_access_group=${REAL_ROOT_GROUP}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--disable-gtk3
 CONFIGURE_ARGS+=	--disable-qt3
 CONFIGURE_ARGS+=	--disable-qt4
 CONFIGURE_ARGS+=	--disable-mono
@@ -78,6 +78,7 @@ CONFIGURE_ARGS+=	--disable-doxygen-dot
 CONFIGURE_ARGS+=	--disable-doxygen-html
 CONFIGURE_ARGS+=	--disable-xmltoman
 CONFIGURE_ARGS+=	--disable-autoipd
+CONFIGURE_ARGS+=	--enable-tests
 
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=	--with-distro=none
@@ -108,7 +109,6 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libdaemon/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/net/avahi/PLIST b/net/avahi/PLIST
index 86e9004b6f1..d71c0598e74 100644
--- a/net/avahi/PLIST
+++ b/net/avahi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:09:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/07/24 13:42:12 obache Exp $
 bin/avahi-browse
 bin/avahi-browse-domains
 bin/avahi-discover-standalone
@@ -78,17 +78,17 @@ sbin/avahi-dnsconfd
 share/applications/bssh.desktop
 share/applications/bvnc.desktop
 share/avahi/avahi-service.dtd
-share/avahi/interfaces/avahi-discover.glade
-share/avahi/introspection/AddressResolver.introspect
-share/avahi/introspection/DomainBrowser.introspect
-share/avahi/introspection/EntryGroup.introspect
-share/avahi/introspection/HostNameResolver.introspect
-share/avahi/introspection/RecordBrowser.introspect
-share/avahi/introspection/Server.introspect
-share/avahi/introspection/ServiceBrowser.introspect
-share/avahi/introspection/ServiceResolver.introspect
-share/avahi/introspection/ServiceTypeBrowser.introspect
+share/avahi/interfaces/avahi-discover.ui
 share/avahi/service-types
+share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
+share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
+share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
+share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
+share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
+share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
+share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
+share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
+share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
 share/doc/avahi/HACKING
 share/doc/avahi/INSTALL
 share/doc/avahi/NEWS
@@ -100,7 +100,9 @@ share/examples/avahi/avahi-dnsconfd.action
 share/examples/avahi/hosts
 share/examples/avahi/ssh.service
 share/examples/rc.d/avahidaemon
+share/locale/bg/LC_MESSAGES/avahi.mo
 share/locale/ca/LC_MESSAGES/avahi.mo
+share/locale/cs/LC_MESSAGES/avahi.mo
 share/locale/de/LC_MESSAGES/avahi.mo
 share/locale/el/LC_MESSAGES/avahi.mo
 share/locale/en_AU/LC_MESSAGES/avahi.mo
@@ -110,9 +112,12 @@ share/locale/en_NZ/LC_MESSAGES/avahi.mo
 share/locale/es/LC_MESSAGES/avahi.mo
 share/locale/fi/LC_MESSAGES/avahi.mo
 share/locale/fr/LC_MESSAGES/avahi.mo
+share/locale/gl/LC_MESSAGES/avahi.mo
 share/locale/hu/LC_MESSAGES/avahi.mo
 share/locale/it/LC_MESSAGES/avahi.mo
+share/locale/ja/LC_MESSAGES/avahi.mo
 share/locale/ms/LC_MESSAGES/avahi.mo
+share/locale/nl/LC_MESSAGES/avahi.mo
 share/locale/pl/LC_MESSAGES/avahi.mo
 share/locale/pt_BR/LC_MESSAGES/avahi.mo
 share/locale/ro/LC_MESSAGES/avahi.mo
@@ -120,4 +125,8 @@ share/locale/ru/LC_MESSAGES/avahi.mo
 share/locale/sr/LC_MESSAGES/avahi.mo
 share/locale/sr@latin/LC_MESSAGES/avahi.mo
 share/locale/sv/LC_MESSAGES/avahi.mo
+share/locale/uk/LC_MESSAGES/avahi.mo
 share/locale/zh_CN/LC_MESSAGES/avahi.mo
+share/locale/zh_TW/LC_MESSAGES/avahi.mo
+@pkgdir share/dbus-1/system-services
+@pkgdir lib/avahi
diff --git a/net/avahi/PLIST.pygdbm b/net/avahi/PLIST.pygdbm
index 03c90cda14f..6eec3b6383f 100644
--- a/net/avahi/PLIST.pygdbm
+++ b/net/avahi/PLIST.pygdbm
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST.pygdbm,v 1.2 2009/10/16 07:45:47 obache Exp $
+@comment $NetBSD: PLIST.pygdbm,v 1.3 2010/07/24 13:42:12 obache Exp $
 bin/avahi-discover
 lib/avahi/service-types.db
 ${PYSITELIB}/avahi/ServiceTypeDatabase.py
 ${PYSITELIB}/avahi_discover/__init__.py
 ${PYSITELIB}/avahi_discover/__init__.pyc
 ${PYSITELIB}/avahi_discover/__init__.pyo
-${PYSITELIB}/avahi_discover/SimpleGladeApp.py
-${PYSITELIB}/avahi_discover/SimpleGladeApp.pyc
-${PYSITELIB}/avahi_discover/SimpleGladeApp.pyo
 share/applications/avahi-discover.desktop
-share/avahi/interfaces/avahi-discover.glade
diff --git a/net/avahi/PLIST.python b/net/avahi/PLIST.python
index 2f987ea18e3..52e87d1868c 100644
--- a/net/avahi/PLIST.python
+++ b/net/avahi/PLIST.python
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST.python,v 1.3 2009/10/16 07:45:47 obache Exp $
+@comment $NetBSD: PLIST.python,v 1.4 2010/07/24 13:42:12 obache Exp $
 ${PYSITELIB}/avahi/__init__.py
 ${PYSITELIB}/avahi/__init__.pyc
 ${PYSITELIB}/avahi/__init__.pyo
 bin/avahi-bookmarks
-bin/avahi-set-host-name
 man/man1/avahi-bookmarks.1
 man/man1/avahi-discover.1
-man/man1/avahi-set-host-name.1
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
index 0bce6ac045a..39549fbea28 100644
--- a/net/avahi/distinfo
+++ b/net/avahi/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.7 2009/06/09 13:07:13 wiz Exp $
+$NetBSD: distinfo,v 1.8 2010/07/24 13:42:12 obache Exp $
 
-SHA1 (avahi-0.6.25.tar.gz) = 7ce8ed5a494d72401dd81f64594fda59d2ec91fd
-RMD160 (avahi-0.6.25.tar.gz) = 3025f774360a8ea3b9de87e2df0b00387569aaf2
-Size (avahi-0.6.25.tar.gz) = 1103653 bytes
-SHA1 (patch-aa) = a7ef1cd3ad4ecdbb0668b544f7ea1fc4497c4dce
-SHA1 (patch-ab) = 8e29c8b2b9a1d52fba97360c30bb3ba26f657198
-SHA1 (patch-ac) = 0484dc5e663fd299f46d15c283fb6fde4aab3537
-SHA1 (patch-ad) = 9966ae9fd0d715fa735efc3b92b2cabe6de53b48
-SHA1 (patch-ae) = 51cc2d3138cb8cd10bbf7cee425577dd685b57ff
-SHA1 (patch-ag) = f4de3c49900d5f603a0791be75591268aa326d93
-SHA1 (patch-ah) = 63758f0e5ca24a1570c0c8dfea05836d6cce73f0
-SHA1 (patch-ai) = 658dae685c3542c5d7f15cc8865e90a0292e4ad0
-SHA1 (patch-aj) = fc4c21a21154a5dbbd17dd8eb906d829e11568de
+SHA1 (avahi-0.6.27.tar.gz) = e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b
+RMD160 (avahi-0.6.27.tar.gz) = 36e6a242f0c926351e31871d8a4f8a52a501fdc3
+Size (avahi-0.6.27.tar.gz) = 1217974 bytes
+SHA1 (patch-aa) = 9d48b8358ed5dac5edb379c998d1c907feaf76ed
+SHA1 (patch-ab) = aca73131b1a1df97dab6f221c59bd5e21136f816
+SHA1 (patch-ac) = f506e4f7839ca7201abfc0fe22120993e9a2279d
+SHA1 (patch-ad) = 0777139388729f5a8a1aa8dffd602f3c34c9f61b
+SHA1 (patch-ae) = d0db18ff6c830da992510465df53d0bc0433d2a1
+SHA1 (patch-ag) = f729ef5b61ffaa641fe5abe78b42c4f6316569b7
+SHA1 (patch-ah) = 4b3ffdb927daef8c939527fd5c5893f9f88b3ff3
+SHA1 (patch-ai) = 406b314c8105e28cffb83a92bb80f2dc1b264c3f
+SHA1 (patch-aj) = 3ba6328814d26098cba16f49c2b60b6640d15718
diff --git a/net/avahi/options.mk b/net/avahi/options.mk
index ee14f9fb522..0e80d725a93 100644
--- a/net/avahi/options.mk
+++ b/net/avahi/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2010/07/24 13:42:12 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.avahi
 
@@ -28,9 +28,8 @@ CONFIGURE_ARGS+=	--disable-gdbm
 ###
 .if !empty(PKG_OPTIONS:Mpython)
 .  include "../../lang/python/application.mk"
+PY_PATCHPLIST=		yes
 .  include "../../lang/python/extension.mk"
-PYTHON_VERSIONS_ACCEPTED=	25 24
-PLIST_SUBST+=			PYSITELIB=${PYSITELIB}
 .  include "../../sysutils/py-dbus/buildlink3.mk"
 .  include "../../x11/py-gtk2/buildlink3.mk"
 DEPENDS+=		${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
diff --git a/net/avahi/patches/patch-aa b/net/avahi/patches/patch-aa
index c042ba110eb..90355d4c7ca 100644
--- a/net/avahi/patches/patch-aa
+++ b/net/avahi/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2010/07/24 13:42:12 obache Exp $
 
---- avahi-core/iface-pfroute.c.orig	2006-06-21 22:35:00.000000000 +0100
+--- avahi-core/iface-pfroute.c.orig	2010-06-26 00:14:35.000000000 +0000
 +++ avahi-core/iface-pfroute.c
-@@ -48,6 +48,13 @@
+@@ -46,6 +46,13 @@
  #include "iface-pfroute.h"
  #include "util.h"
  
@@ -13,6 +13,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
 +#define SIOCGLIFFLAGS SIOCGIFFLAGS
 +#endif
 +
- static int bitcount (unsigned int n)  
- {  
+ static int bitcount (unsigned int n)
+ {
    int count=0 ;
diff --git a/net/avahi/patches/patch-ab b/net/avahi/patches/patch-ab
index 3ac652bdcb8..53f2eba1528 100644
--- a/net/avahi/patches/patch-ab
+++ b/net/avahi/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2010/07/24 13:42:12 obache Exp $
 
---- avahi-common/Makefile.in.orig	2008-12-04 12:00:32.000000000 +0000
+--- avahi-common/Makefile.in.orig	2010-07-13 03:06:34.000000000 +0000
 +++ avahi-common/Makefile.in
-@@ -601,7 +601,7 @@ clean-libLTLIBRARIES:
+@@ -629,7 +629,7 @@ clean-libLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  libavahi-common.la: $(libavahi_common_la_OBJECTS) $(libavahi_common_la_DEPENDENCIES) 
--	$(libavahi_common_la_LINK) -rpath $(libdir) $(libavahi_common_la_OBJECTS) $(libavahi_common_la_LIBADD) $(LIBS)
-+	$(libavahi_common_la_LINK) -rpath $(libdir) $(libavahi_common_la_OBJECTS) $(libavahi_common_la_LIBADD) $(LIBS) $(INTLLIBS)
+-	$(AM_V_CCLD)$(libavahi_common_la_LINK) -rpath $(libdir) $(libavahi_common_la_OBJECTS) $(libavahi_common_la_LIBADD) $(LIBS)
++	$(AM_V_CCLD)$(libavahi_common_la_LINK) -rpath $(libdir) $(libavahi_common_la_OBJECTS) $(libavahi_common_la_LIBADD) $(LIBS) $(INTLLIBS)
  
  clean-noinstPROGRAMS:
- 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+ 	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
diff --git a/net/avahi/patches/patch-ac b/net/avahi/patches/patch-ac
index b292131ddba..09d09aa6456 100644
--- a/net/avahi/patches/patch-ac
+++ b/net/avahi/patches/patch-ac
@@ -1,28 +1,30 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2010/07/24 13:42:12 obache Exp $
 
---- avahi-daemon/Makefile.in.orig	2008-06-24 00:20:31.000000000 +0100
+--- avahi-daemon/Makefile.in.orig	2010-07-13 03:06:35.000000000 +0000
 +++ avahi-daemon/Makefile.in
-@@ -505,19 +505,15 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
+@@ -546,13 +546,9 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
  
  @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ini_file_parser_test_CFLAGS = $(AM_CFLAGS)
- @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ini_file_parser_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la 
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ini_file_parser_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la
 -@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@pkgsysconf_DATA = \
 -@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	avahi-daemon.conf \
 -@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	hosts
 -
--@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@service_DATA = \
+-@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dist_service_DATA = \
 -@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	ssh.service \
 -@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	sftp-ssh.service
 +@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@pkgsysconf_DATA =
 +
-+@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@service_DATA =
++@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dist_service_DATA =
  
- @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@pkgdata_DATA = \
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dist_pkgdata_DATA = \
  @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	avahi-service.dtd
+@@ -566,7 +562,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
  
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@CLEANFILES = $(systemdsystemunit_DATA)
  @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dbusservicedir = $(DBUS_SYS_DIR)
--@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dbusservice_DATA = avahi-dbus.conf
-+@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dbusservice_DATA =
- @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@introspection_DATA = \
- @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	Server.introspect \
- @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	EntryGroup.introspect \
+-@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dist_dbusservice_DATA = avahi-dbus.conf
++@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dist_dbusservice_DATA =
+ @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@dist_introspection_DATA = \
+ @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	org.freedesktop.Avahi.Server.xml \
+ @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	org.freedesktop.Avahi.EntryGroup.xml \
diff --git a/net/avahi/patches/patch-ad b/net/avahi/patches/patch-ad
index c036ecfdf60..55904edddb6 100644
--- a/net/avahi/patches/patch-ad
+++ b/net/avahi/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2010/07/24 13:42:12 obache Exp $
 
---- avahi-dnsconfd/Makefile.in.orig	2008-06-24 00:20:31.000000000 +0100
+--- avahi-dnsconfd/Makefile.in.orig	2010-07-13 03:06:36.000000000 +0000
 +++ avahi-dnsconfd/Makefile.in
-@@ -367,7 +367,7 @@ top_srcdir = @top_srcdir@
- @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@avahi_dnsconfd_SOURCES = main.c 
+@@ -400,7 +400,7 @@ EXTRA_DIST = avahi-dnsconfd.action avahi
+ @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@avahi_dnsconfd_SOURCES = main.c
  @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@avahi_dnsconfd_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS)
  @HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBDAEMON_LIBS)
 -@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@pkgsysconf_SCRIPTS = avahi-dnsconfd.action
 +@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@pkgsysconf_SCRIPTS =
- EXTRA_DIST = avahi-dnsconfd.action
- all: all-am
+ @HAVE_LIBDAEMON_TRUE@@HAVE_SYSTEMD_TRUE@@HAVE_XML_TRUE@systemdsystemunit_DATA = \
+ @HAVE_LIBDAEMON_TRUE@@HAVE_SYSTEMD_TRUE@@HAVE_XML_TRUE@	avahi-dnsconfd.service
  
diff --git a/net/avahi/patches/patch-ae b/net/avahi/patches/patch-ae
index 8c7f19d8425..f1a94713c87 100644
--- a/net/avahi/patches/patch-ae
+++ b/net/avahi/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2009/03/05 09:40:34 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2010/07/24 13:42:12 obache Exp $
 
---- Makefile.in.orig	2008-12-12 20:56:28.000000000 +0000
+--- Makefile.in.orig	2010-07-13 03:06:40.000000000 +0000
 +++ Makefile.in
-@@ -525,7 +525,6 @@ SUBDIRS = \
+@@ -557,7 +557,6 @@ SUBDIRS = \
  	avahi-discover-standalone \
  	avahi-daemon \
  	avahi-sharp \
diff --git a/net/avahi/patches/patch-ag b/net/avahi/patches/patch-ag
index 5b01047ed1a..464ff0e88e5 100644
--- a/net/avahi/patches/patch-ag
+++ b/net/avahi/patches/patch-ag
@@ -1,23 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2009/06/09 13:07:13 wiz Exp $
+$NetBSD: patch-ag,v 1.4 2010/07/24 13:42:12 obache Exp $
 
---- configure.orig	2009-04-14 01:57:18.000000000 +0000
+--- configure.orig	2010-07-13 03:06:31.000000000 +0000
 +++ configure
-@@ -18064,7 +18064,7 @@ with_distro=`echo ${with_distro} | tr '[
+@@ -16687,7 +16687,7 @@ with_distro=`echo ${with_distro} | tr '[
  case $with_distro in
      lfs|debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|slackware|none)
       ;;
 -    netbsd)
 +    netbsd|dragonfly)
-      { $as_echo "$as_me:$LINENO: WARNING: Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)" >&5
  $as_echo "$as_me: WARNING: Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)" >&2;}
       ;;
-@@ -19365,7 +19365,8 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_includes_default
-+#include<sys/socket.h>
-+
- int
- main ()
- {
diff --git a/net/avahi/patches/patch-ah b/net/avahi/patches/patch-ah
index 5fbe382caf7..db3f60ca236 100644
--- a/net/avahi/patches/patch-ah
+++ b/net/avahi/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2008/12/23 02:08:06 hasso Exp $
+$NetBSD: patch-ah,v 1.2 2010/07/24 13:42:12 obache Exp $
 
---- avahi-common/strlst.c.orig	2008-12-21 20:02:13 +0200
-+++ avahi-common/strlst.c	2008-12-21 20:02:39 +0200
-@@ -33,6 +33,14 @@
+--- avahi-common/strlst.c.orig	2010-06-26 00:14:35.000000000 +0000
++++ avahi-common/strlst.c
+@@ -31,6 +31,14 @@
  #include "malloc.h"
  #include "defs.h"
  
diff --git a/net/avahi/patches/patch-ai b/net/avahi/patches/patch-ai
index 4c9bb72124f..885e8d1405b 100644
--- a/net/avahi/patches/patch-ai
+++ b/net/avahi/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2008/12/23 12:08:17 adrianp Exp $
+$NetBSD: patch-ai,v 1.2 2010/07/24 13:42:12 obache Exp $
 
---- avahi-core/server.c.orig	2008-06-18 00:13:44.000000000 +0100
+--- avahi-core/server.c.orig	2010-06-29 18:51:53.000000000 +0000
 +++ avahi-core/server.c
-@@ -898,6 +898,11 @@ static void dispatch_packet(AvahiServer 
+@@ -903,6 +903,11 @@ static void dispatch_packet(AvahiServer 
          return;
      }
  
diff --git a/net/avahi/patches/patch-aj b/net/avahi/patches/patch-aj
index 42e3849e9fa..2bea201ae65 100644
--- a/net/avahi/patches/patch-aj
+++ b/net/avahi/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.3 2009/06/09 13:07:13 wiz Exp $
+$NetBSD: patch-aj,v 1.4 2010/07/24 13:42:12 obache Exp $
 
---- configure.ac.orig	2009-04-14 01:55:55.000000000 +0000
+--- configure.ac.orig	2010-07-13 03:05:05.000000000 +0000
 +++ configure.ac
-@@ -267,7 +267,7 @@ with_distro=`echo ${with_distro} | tr '[
+@@ -273,7 +273,7 @@ with_distro=`echo ${with_distro} | tr '[
  case $with_distro in
      lfs|debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|slackware|none)
       ;;
@@ -11,12 +11,3 @@ $NetBSD: patch-aj,v 1.3 2009/06/09 13:07:13 wiz Exp $
       AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)])
       ;;
      linux)
-@@ -350,7 +350,7 @@ AC_HEADER_SYS_WAIT
-  # Solaris stuff
-  AC_SEARCH_LIBS([inet_ntop],[nsl])
-  AC_SEARCH_LIBS([recv],[socket])
-- AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__")
-+ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__",[#include<sys/socket.h>])
- 
- # Checks for library functions.
- AC_FUNC_MEMCMP