Update net/avahi to 0.6.24

Changelog:
* A huge number of bug fixes, including a security relavant one (CVE-2008-5081,
  low risk)
* Add two new configuration directives "allow-interfaces" and "deny-interfaces"
  which can be used to make Avahi ignore certain network interfaces or only use
  certain network interfaces.
* A lot of translation updates

Fix PR pkg/40281, by defining _DARWIN_C_SOURCE under darwin

6 files changed, 37 insertions, 42 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 4e2397ffe87..43bd7933f84 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2009/01/08 01:00:15 obache Exp $
+# $NetBSD: Makefile,v 1.7 2009/01/16 22:25:04 tonio Exp $
 
-DISTNAME=		avahi-0.6.23
-PKGREVISION=		2
+DISTNAME=		avahi-0.6.24
 CATEGORIES=		net
 MASTER_SITES=		http://avahi.org/download/
 
@@ -32,7 +31,7 @@ PKGCONFIG_OVERRIDE+=	avahi-ui.pc.in
 AVAHI_USER=		avahi
 AVAHI_GROUP=		avahi
 RCD_SCRIPTS=		avahidaemon
-BUILD_DEFS=		VARBASE PKG_SYSCONFBASE
+BUILD_DEFS+=		VARBASE PKG_SYSCONFBASE
 PLIST_SRC=		${PKGDIR}/PLIST
 PKG_SYSCONFSUBDIR=	avahi
 USE_LANGUAGES=		c c++
@@ -61,9 +60,9 @@ CONF_FILES+=		${PREFIX}/share/examples/avahi/ssh.service \
 CONF_FILES+=		${PREFIX}/share/examples/avahi/avahi-dbus.conf \
 			${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf
 
-CONFIGURE_ARGS+=	--with-avahi-user=${AVAHI_USER:Q}
-CONFIGURE_ARGS+=	--with-avahi-group=${AVAHI_GROUP:Q}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--with-avahi-user=${AVAHI_USER}
+CONFIGURE_ARGS+=	--with-avahi-group=${AVAHI_GROUP}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--disable-qt3
 CONFIGURE_ARGS+=	--disable-qt4
@@ -75,9 +74,10 @@ CONFIGURE_ARGS+=	--disable-doxygen-html
 CONFIGURE_ARGS+=	--disable-xmltoman
 CONFIGURE_ARGS+=	--disable-autoipd
 
+INSTALLATION_DIRS+=	share/examples/avahi
+INSTALLATION_DIRS+=	share/doc/avahi
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/avahi
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avahi
 	${MKDIR} ${PKG_SYSCONFDIR}/services
 
 	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/avahi-daemon.conf \
diff --git a/net/avahi/PLIST b/net/avahi/PLIST
index ad3bed908f6..81410b5822e 100644
--- a/net/avahi/PLIST
+++ b/net/avahi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/16 22:25:04 tonio Exp $
 bin/avahi-browse
 bin/avahi-browse-domains
 bin/avahi-discover-standalone
@@ -100,18 +100,25 @@ share/examples/avahi/avahi-dnsconfd.action
 share/examples/avahi/hosts
 share/examples/avahi/ssh.service
 share/examples/rc.d/avahidaemon
+share/locale/ca/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
 share/locale/en_CA/LC_MESSAGES/avahi.mo
 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/fr/LC_MESSAGES/avahi.mo
+share/locale/hu/LC_MESSAGES/avahi.mo
 share/locale/it/LC_MESSAGES/avahi.mo
+share/locale/ms/LC_MESSAGES/avahi.mo
 share/locale/pl/LC_MESSAGES/avahi.mo
 share/locale/pt_BR/LC_MESSAGES/avahi.mo
 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/zh_CN/LC_MESSAGES/avahi.mo
 @dirrm share/doc/avahi
 @dirrm share/avahi/introspection
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
index 0ad063e9141..871cb796b07 100644
--- a/net/avahi/distinfo
+++ b/net/avahi/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.3 2008/12/23 12:08:17 adrianp Exp $
+$NetBSD: distinfo,v 1.4 2009/01/16 22:25:04 tonio Exp $
 
-SHA1 (avahi-0.6.23.tar.gz) = 54a0d1944e43805886aafccaf5cc3ec567f5cc9e
-RMD160 (avahi-0.6.23.tar.gz) = cdb24199bb9d48eba0a98097b4fe5aee94b8367c
-Size (avahi-0.6.23.tar.gz) = 1104410 bytes
+SHA1 (avahi-0.6.24.tar.gz) = a187af361fefc8bda026936bb07ccdeb41dc74bc
+RMD160 (avahi-0.6.24.tar.gz) = 94f59ccbd14d99e91e259b27dd7f03404c6691e6
+Size (avahi-0.6.24.tar.gz) = 1115626 bytes
 SHA1 (patch-aa) = a7ef1cd3ad4ecdbb0668b544f7ea1fc4497c4dce
 SHA1 (patch-ab) = 8e29c8b2b9a1d52fba97360c30bb3ba26f657198
 SHA1 (patch-ac) = 0484dc5e663fd299f46d15c283fb6fde4aab3537
 SHA1 (patch-ad) = 9966ae9fd0d715fa735efc3b92b2cabe6de53b48
-SHA1 (patch-ae) = ec99b721253b0181ae12ab392d98e79ede30ddba
-SHA1 (patch-af) = 57a788ca492f15c0e05870ea5eb6c4048b30b9c5
 SHA1 (patch-ag) = ddfcb74e5e34619245ad230a73c732261c2250ea
 SHA1 (patch-ah) = 63758f0e5ca24a1570c0c8dfea05836d6cce73f0
 SHA1 (patch-ai) = 658dae685c3542c5d7f15cc8865e90a0292e4ad0
+SHA1 (patch-aj) = 9e41e3c06f375fb160366427e451cd1196a75b79
diff --git a/net/avahi/patches/patch-ae b/net/avahi/patches/patch-ae
deleted file mode 100644
index dff5a62f9a9..00000000000
--- a/net/avahi/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
-
---- initscript/fedora/avahi-dnsconfd.in.orig	2008-06-18 00:13:44.000000000 +0100
-+++ initscript/fedora/avahi-dnsconfd.in
-@@ -12,7 +12,7 @@
- 
- AVAHI_BIN=@sbindir@/avahi-dnsconfd
- 
--if [ "$1" == 'status' ]; then
-+if [ "$1" = 'status' ]; then
-     test -x $AVAHI_BIN || exit 4
- else
-     test -x $AVAHI_BIN || exit 5
diff --git a/net/avahi/patches/patch-af b/net/avahi/patches/patch-af
deleted file mode 100644
index d5290e0e652..00000000000
--- a/net/avahi/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
-
---- initscript/fedora/avahi-daemon.in.orig	2008-06-18 00:13:44.000000000 +0100
-+++ initscript/fedora/avahi-daemon.in
-@@ -12,7 +12,7 @@
- 
- AVAHI_BIN=@sbindir@/avahi-daemon
- 
--if [ "$1" == 'status' ]; then
-+if [ "$1" = 'status' ]; then
-     test -x $AVAHI_BIN || exit 4
- else 
-     test -x $AVAHI_BIN || exit 5
diff --git a/net/avahi/patches/patch-aj b/net/avahi/patches/patch-aj
new file mode 100644
index 00000000000..eab692005bc
--- /dev/null
+++ b/net/avahi/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2009/01/16 22:25:04 tonio Exp $
+
+--- config.h.in.orig	2008-12-12 21:57:30.000000000 +0100
++++ config.h.in
+@@ -384,6 +384,10 @@
+ /* Define to 1 if you need to in order for `stat' and other things to work. */
+ #undef _POSIX_SOURCE
+ 
++#ifdef __APPLE__
++#define _DARWIN_C_SOURCE 1
++#endif
++
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+