Update avahi to 0.6.30.

while here, simplify package (not using patches for handling config files).

= 0.6.30
This is a bugfix release.
 * Make IPv6 work again
 * i18n updates
 * Minor other updates

= 0.6.29
This is a bugfix release.
 * Updates regarding systemd integration
 * Compatibility with newer gtk3 and gobject introspection
 * i18n updates
 * Minor other updates
 * Fix CVE-2011-1002, fixing the fix for CVE-2010-2244

= 0.6.28
This is a bugfix release.
 * Updates regarding systemd integration
 * Properly avoid bus activation on non-systemd systems
 * Compatibility with newer gtk3 and gobject introspection
 * i18n updates
 * Minor other updates

9 files changed, 23 insertions, 143 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index f4c02be4939..dbc8ee96adb 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2011/04/22 13:42:12 obache Exp $
+# $NetBSD: Makefile,v 1.24 2011/05/14 13:04:04 obache Exp $
 
-DISTNAME=		avahi-0.6.27
-PKGREVISION=		5
+DISTNAME=		avahi-0.6.30
 CATEGORIES=		net
 MASTER_SITES=		http://avahi.org/download/
 
@@ -28,6 +27,7 @@ PKGCONFIG_OVERRIDE+=	avahi-gobject.pc.in
 PKGCONFIG_OVERRIDE+=	avahi-qt3.pc.in
 PKGCONFIG_OVERRIDE+=	avahi-qt4.pc.in
 PKGCONFIG_OVERRIDE+=	avahi-sharp.pc.in
+PKGCONFIG_OVERRIDE+=	avahi-ui-gtk3.pc.in
 PKGCONFIG_OVERRIDE+=	avahi-ui-sharp.pc.in
 PKGCONFIG_OVERRIDE+=	avahi-ui.pc.in
 
@@ -38,7 +38,6 @@ BUILD_DEFS+=		VARBASE PKG_SYSCONFBASE
 PLIST_SRC=		${PKGDIR}/PLIST
 PKG_SYSCONFSUBDIR=	avahi
 USE_LANGUAGES=		c c++
-MAKE_DIRS=		${PKG_SYSCONFDIR}/services
 
 PKG_USERS=		${AVAHI_USER}:${AVAHI_GROUP}
 PKG_GROUPS=		${AVAHI_GROUP}
@@ -60,7 +59,9 @@ CONF_FILES+=		${PREFIX}/share/examples/avahi/hosts \
 			${PKG_SYSCONFDIR}/hosts
 CONF_FILES+=		${PREFIX}/share/examples/avahi/avahi-dnsconfd.action \
 			${PKG_SYSCONFDIR}/avahi-dnsconfd.action
-CONF_FILES+=		${PREFIX}/share/examples/avahi/ssh.service \
+CONF_FILES+=		${PREFIX}/share/examples/avahi/services/sftp-ssh.service \
+			${PKG_SYSCONFDIR}/services/sftp-ssh.service
+CONF_FILES+=		${PREFIX}/share/examples/avahi/services/ssh.service \
 			${PKG_SYSCONFDIR}/services/ssh.service
 CONF_FILES+=		${PREFIX}/share/examples/avahi/avahi-dbus.conf \
 			${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf
@@ -82,27 +83,16 @@ 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
-.endif
 
-INSTALLATION_DIRS+=	share/examples/avahi
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
+INSTALL_MAKE_FLAGS+=	dbusservicedir=${PREFIX}/share/examples/avahi
+
 INSTALLATION_DIRS+=	share/doc/avahi
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/services
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/avahi-daemon.conf \
-		${DESTDIR}${PREFIX}/share/examples/avahi
-	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/hosts \
-		${DESTDIR}${PREFIX}/share/examples/avahi
-	${INSTALL_DATA} ${WRKSRC}/avahi-dnsconfd/avahi-dnsconfd.action \
-		${DESTDIR}${PREFIX}/share/examples/avahi
-	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/ssh.service \
-		${DESTDIR}${PREFIX}/share/examples/avahi
-	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/avahi-dbus.conf \
-		${DESTDIR}${PREFIX}/share/examples/avahi/avahi-dbus.conf
 	${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${DESTDIR}${PREFIX}/share/doc/avahi
 	${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${PREFIX}/share/doc/avahi
 	${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DESTDIR}${PREFIX}/share/doc/avahi
@@ -111,10 +101,12 @@ post-install:
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libdaemon+=	libdaemon>=0.14
 .include "../../devel/libdaemon/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/expat/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/avahi/PLIST b/net/avahi/PLIST
index d71c0598e74..573b84d3d40 100644
--- a/net/avahi/PLIST
+++ b/net/avahi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/07/24 13:42:12 obache Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/05/14 13:04:04 obache Exp $
 bin/avahi-browse
 bin/avahi-browse-domains
 bin/avahi-discover-standalone
@@ -98,11 +98,13 @@ share/examples/avahi/avahi-daemon.conf
 share/examples/avahi/avahi-dbus.conf
 share/examples/avahi/avahi-dnsconfd.action
 share/examples/avahi/hosts
-share/examples/avahi/ssh.service
+share/examples/avahi/services/sftp-ssh.service
+share/examples/avahi/services/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/da/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
@@ -111,9 +113,12 @@ share/locale/en_GB/LC_MESSAGES/avahi.mo
 share/locale/en_NZ/LC_MESSAGES/avahi.mo
 share/locale/es/LC_MESSAGES/avahi.mo
 share/locale/fi/LC_MESSAGES/avahi.mo
+share/locale/fo/LC_MESSAGES/avahi.mo
 share/locale/fr/LC_MESSAGES/avahi.mo
 share/locale/gl/LC_MESSAGES/avahi.mo
+share/locale/he/LC_MESSAGES/avahi.mo
 share/locale/hu/LC_MESSAGES/avahi.mo
+share/locale/id/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
@@ -122,6 +127,7 @@ share/locale/pl/LC_MESSAGES/avahi.mo
 share/locale/pt_BR/LC_MESSAGES/avahi.mo
 share/locale/ro/LC_MESSAGES/avahi.mo
 share/locale/ru/LC_MESSAGES/avahi.mo
+share/locale/sl/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
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
index 17c72163a7d..35f3cf01cf9 100644
--- a/net/avahi/distinfo
+++ b/net/avahi/distinfo
@@ -1,15 +1,9 @@
-$NetBSD: distinfo,v 1.9 2010/11/18 13:56:05 wiz Exp $
+$NetBSD: distinfo,v 1.10 2011/05/14 13:04:04 obache Exp $
 
-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 (avahi-0.6.30.tar.gz) = 5b77443537600a00770e4c77e3c443eeb5861d06
+RMD160 (avahi-0.6.30.tar.gz) = 99dbc4f5711fd2962ac657811bebdb63947bd2c1
+Size (avahi-0.6.30.tar.gz) = 1243534 bytes
 SHA1 (patch-aa) = 9d48b8358ed5dac5edb379c998d1c907feaf76ed
 SHA1 (patch-ab) = aca73131b1a1df97dab6f221c59bd5e21136f816
-SHA1 (patch-ac) = f506e4f7839ca7201abfc0fe22120993e9a2279d
-SHA1 (patch-ad) = 0777139388729f5a8a1aa8dffd602f3c34c9f61b
-SHA1 (patch-ae) = d0db18ff6c830da992510465df53d0bc0433d2a1
-SHA1 (patch-af) = c8d0ea175abfc25c5d55e51fc00cb86ecdb8574c
-SHA1 (patch-ag) = f729ef5b61ffaa641fe5abe78b42c4f6316569b7
 SHA1 (patch-ah) = 4b3ffdb927daef8c939527fd5c5893f9f88b3ff3
 SHA1 (patch-ai) = 406b314c8105e28cffb83a92bb80f2dc1b264c3f
-SHA1 (patch-aj) = 3ba6328814d26098cba16f49c2b60b6640d15718
diff --git a/net/avahi/patches/patch-ac b/net/avahi/patches/patch-ac
deleted file mode 100644
index 09d09aa6456..00000000000
--- a/net/avahi/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2010/07/24 13:42:12 obache Exp $
-
---- avahi-daemon/Makefile.in.orig	2010-07-13 03:06:35.000000000 +0000
-+++ avahi-daemon/Makefile.in
-@@ -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@pkgsysconf_DATA = \
--@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	avahi-daemon.conf \
--@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	hosts
--
--@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@dist_service_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@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
deleted file mode 100644
index 55904edddb6..00000000000
--- a/net/avahi/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2010/07/24 13:42:12 obache Exp $
-
---- avahi-dnsconfd/Makefile.in.orig	2010-07-13 03:06:36.000000000 +0000
-+++ avahi-dnsconfd/Makefile.in
-@@ -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 =
- @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
deleted file mode 100644
index f1a94713c87..00000000000
--- a/net/avahi/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2010/07/24 13:42:12 obache Exp $
-
---- Makefile.in.orig	2010-07-13 03:06:40.000000000 +0000
-+++ Makefile.in
-@@ -557,7 +557,6 @@ SUBDIRS = \
- 	avahi-discover-standalone \
- 	avahi-daemon \
- 	avahi-sharp \
--	initscript \
- 	avahi-dnsconfd \
- 	avahi-utils \
- 	avahi-python \
diff --git a/net/avahi/patches/patch-af b/net/avahi/patches/patch-af
deleted file mode 100644
index 2a9d6580106..00000000000
--- a/net/avahi/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.3 2010/11/18 13:56:05 wiz Exp $
-
-PR 43815:
-net/avahi fails on my Linux system:
-
-   ...
-     CC     avahi_daemon-sd-daemon.o
-   sd-daemon.c: In function 'sd_notify':
-   sd-daemon.c:356: error: 'SOCK_CLOEXEC' undeclared (first use in this function)
-   sd-daemon.c:356: error: (Each undeclared identifier is reported only once
-   sd-daemon.c:356: error: for each function it appears in.)
-   gmake[2]: *** [avahi_daemon-sd-daemon.o] Error 1
-
-This is because my glibc and Kernel is not modern enough for this
-version of avahi.
-
-http://avahi.org/ticket/316
-
---- avahi-daemon/sd-daemon.c.orig	2010-07-13 00:45:20.000000000 +0000
-+++ avahi-daemon/sd-daemon.c
-@@ -41,6 +41,10 @@
- #include <stdarg.h>
- #include <stdio.h>
- 
-+#if !defined(SOCK_CLOEXEC) && !defined(DISABLE_SYSTEMD)
-+#define DISABLE_SYSTEMD 1
-+#endif
-+
- #include "sd-daemon.h"
- 
- int sd_listen_fds(int unset_environment) {
diff --git a/net/avahi/patches/patch-ag b/net/avahi/patches/patch-ag
deleted file mode 100644
index 464ff0e88e5..00000000000
--- a/net/avahi/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2010/07/24 13:42:12 obache Exp $
-
---- configure.orig	2010-07-13 03:06:31.000000000 +0000
-+++ configure
-@@ -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:${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;}
-      ;;
diff --git a/net/avahi/patches/patch-aj b/net/avahi/patches/patch-aj
deleted file mode 100644
index 2bea201ae65..00000000000
--- a/net/avahi/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2010/07/24 13:42:12 obache Exp $
-
---- configure.ac.orig	2010-07-13 03:05:05.000000000 +0000
-+++ configure.ac
-@@ -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)
-      ;;
--    netbsd)
-+    netbsd|dragonfly)
-      AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)])
-      ;;
-     linux)