Update to 0.6.25, set LICENSE.

This is a bugfix release and fixes a minor security issue.

5 files changed, 23 insertions, 22 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 48610c03ead..236adc050d5 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2009/03/08 10:08:16 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/06/09 13:07:13 wiz Exp $
 
-DISTNAME=		avahi-0.6.24
-PKGREVISION=		1
+DISTNAME=		avahi-0.6.25
 CATEGORIES=		net
 MASTER_SITES=		http://avahi.org/download/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://avahi.org/
 COMMENT=		Facilitate service discovery on a local network
+LICENSE=		gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/net/avahi/PLIST b/net/avahi/PLIST
index 81410b5822e..0f63e240f06 100644
--- a/net/avahi/PLIST
+++ b/net/avahi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/01/16 22:25:04 tonio Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/09 13:07:13 wiz Exp $
 bin/avahi-browse
 bin/avahi-browse-domains
 bin/avahi-discover-standalone
@@ -115,6 +115,7 @@ 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/ro/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
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
index 2f0e167a104..0bce6ac045a 100644
--- a/net/avahi/distinfo
+++ b/net/avahi/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.6 2009/03/05 09:40:34 wiz Exp $
+$NetBSD: distinfo,v 1.7 2009/06/09 13:07:13 wiz Exp $
 
-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 (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) = 7d93a060fa3885bd862136ae218cbef6ce3c5685
+SHA1 (patch-ag) = f4de3c49900d5f603a0791be75591268aa326d93
 SHA1 (patch-ah) = 63758f0e5ca24a1570c0c8dfea05836d6cce73f0
 SHA1 (patch-ai) = 658dae685c3542c5d7f15cc8865e90a0292e4ad0
-SHA1 (patch-aj) = ab0d279dd40ef5c94969a082678bfad87c92a5ef
+SHA1 (patch-aj) = fc4c21a21154a5dbbd17dd8eb906d829e11568de
diff --git a/net/avahi/patches/patch-ag b/net/avahi/patches/patch-ag
index 3ec1ccd8dd9..5b01047ed1a 100644
--- a/net/avahi/patches/patch-ag
+++ b/net/avahi/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.2 2009/02/04 07:07:18 dbj Exp $
+$NetBSD: patch-ag,v 1.3 2009/06/09 13:07:13 wiz Exp $
 
---- configure.orig	2008-12-12 12:56:20.000000000 -0800
-+++ configure	2009-02-03 22:49:47.000000000 -0800
-@@ -18055,7 +18055,7 @@ with_distro=`echo ${with_distro} | tr '[
+--- configure.orig	2009-04-14 01:57:18.000000000 +0000
++++ configure
+@@ -18064,7 +18064,7 @@ with_distro=`echo ${with_distro} | tr '[
  case $with_distro in
-     debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|slackware|none)
+     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: WARNING: Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)" >&2;}
       ;;
-@@ -19348,7 +19348,8 @@ _ACEOF
+@@ -19365,7 +19365,8 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
diff --git a/net/avahi/patches/patch-aj b/net/avahi/patches/patch-aj
index d663c8d9dcd..42e3849e9fa 100644
--- a/net/avahi/patches/patch-aj
+++ b/net/avahi/patches/patch-aj
@@ -1,17 +1,17 @@
-$NetBSD: patch-aj,v 1.2 2009/02/04 07:07:18 dbj Exp $
+$NetBSD: patch-aj,v 1.3 2009/06/09 13:07:13 wiz Exp $
 
---- configure.ac.orig	2008-06-23 16:17:27.000000000 -0700
-+++ configure.ac	2009-02-03 22:23:51.000000000 -0800
-@@ -266,7 +266,7 @@ with_distro=`echo ${with_distro} | tr '[
+--- configure.ac.orig	2009-04-14 01:55:55.000000000 +0000
++++ configure.ac
+@@ -267,7 +267,7 @@ with_distro=`echo ${with_distro} | tr '[
  case $with_distro in
-     debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|slackware|none)
+     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)
-@@ -348,7 +348,7 @@ AC_HEADER_SYS_WAIT
+@@ -350,7 +350,7 @@ AC_HEADER_SYS_WAIT
   # Solaris stuff
   AC_SEARCH_LIBS([inet_ntop],[nsl])
   AC_SEARCH_LIBS([recv],[socket])