7 files changed, 23 insertions, 115 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 62a431aeba43..57edfd2129ba 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	avahi
-PORTVERSION=	0.6.23
+PORTVERSION=	0.6.24
 PORTREVISION?=	0
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
@@ -114,7 +114,7 @@ avahi-post-patch:
 	    	${WRKSRC}/avahi-client/client.c \
 		${WRKSRC}/avahi-daemon/dbus-protocol.c
 	@${REINPLACE_CMD} -e 's|^_||g' \
-		${WRKSRC}/avahi-ui/*.desktop.in
+		${WRKSRC}/avahi-ui/*.desktop.in.in
 
 post-build: avahi-post-build
 
diff --git a/net/avahi-app/distinfo b/net/avahi-app/distinfo
index 11fb8de045d0..77aa13f6178e 100644
--- a/net/avahi-app/distinfo
+++ b/net/avahi-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (avahi-0.6.23.tar.gz) = aab1a304851d8145ea5f6a85c10af9e9
-SHA256 (avahi-0.6.23.tar.gz) = dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d
-SIZE (avahi-0.6.23.tar.gz) = 1104410
+MD5 (avahi-0.6.24.tar.gz) = 068c1d220b07037e64caf87d4a7a0504
+SHA256 (avahi-0.6.24.tar.gz) = 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950
+SIZE (avahi-0.6.24.tar.gz) = 1115626
diff --git a/net/avahi-app/files/patch-avahi-common_Makefile.in b/net/avahi-app/files/patch-avahi-common_Makefile.in
deleted file mode 100644
index 6e020b0ade54..000000000000
--- a/net/avahi-app/files/patch-avahi-common_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- avahi-common/Makefile.in.orig	2008-07-03 14:21:02.000000000 -0500
-+++ avahi-common/Makefile.in	2008-07-03 14:22:16.000000000 -0500
-@@ -487,7 +487,7 @@
- 	i18n.c i18n.h
- 
- libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
--libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
-+libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
- libavahi_common_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
- strlst_test_SOURCES = \
- 	strlst.c strlst.h \
diff --git a/net/avahi-app/files/patch-avahi-core_iface-pfroute.c b/net/avahi-app/files/patch-avahi-core_iface-pfroute.c
deleted file mode 100644
index 7f1d180aa83e..000000000000
--- a/net/avahi-app/files/patch-avahi-core_iface-pfroute.c
+++ /dev/null
@@ -1,77 +0,0 @@
---- avahi-core/iface-pfroute.c.orig	2007-09-03 08:32:41.000000000 -0400
-+++ avahi-core/iface-pfroute.c	2008-04-06 15:06:36.000000000 -0400
-@@ -125,7 +125,7 @@ static void rtm_addr(struct rt_msghdr *r
-   int raddr_valid = 0;
-   struct ifa_msghdr *ifam = (struct ifa_msghdr *) rtm;
-   char *cp = (char *)(ifam + 1);
--  int addrs = ifam->ifam_addrs;
-+  char *cp0;
-   int i;
-   int prefixlen = 0;
-   struct sockaddr *sa  =NULL;
-@@ -135,17 +135,30 @@ static void rtm_addr(struct rt_msghdr *r
-     ((struct sockaddr *)cp)->sa_family = AF_INET;
- #endif
- 
--  if(((struct sockaddr *)cp)->sa_family != AF_INET && ((struct sockaddr *)cp)->sa_family != AF_INET6)
-+  for (cp0 = cp, i = 0; i < RTAX_MAX; i++) {
-+    if (!(ifam->ifam_addrs & (1<<i)))
-+      continue;
-+    sa = (struct sockaddr *)cp;
-+    if (i == RTAX_IFA)
-+      break;
-+#ifdef SA_SIZE
-+    cp += SA_SIZE(sa);
-+#else
-+    ADVANCE(cp, sa);
-+#endif
-+  }
-+
-+  if(sa->sa_family != AF_INET && sa->sa_family != AF_INET6)
-     return;
- 
--  if (!(iface = avahi_interface_monitor_get_interface(m, (AvahiIfIndex) ifam->ifam_index, avahi_af_to_proto(((struct sockaddr *)cp)->sa_family))))
-+  if (!(iface = avahi_interface_monitor_get_interface(m, (AvahiIfIndex) ifam->ifam_index, avahi_af_to_proto(sa->sa_family))))
-     return;
- 
--  raddr.proto = avahi_af_to_proto(((struct sockaddr *)cp)->sa_family);
-+  raddr.proto = avahi_af_to_proto(sa->sa_family);
-   
--  for(i = 0; addrs != 0 && i < RTAX_MAX; addrs &= ~(1<<i), i++)
-+  for(cp = cp0, i = 0; i < RTAX_MAX; i++)
-     {
--      if (!(addrs & 1<<i))
-+      if (!(ifam->ifam_addrs & (1<<i)))
- 	continue;
-       sa = (struct sockaddr *)cp;
- #ifdef HAVE_SYS_SYSCTL_H
-@@ -172,6 +185,13 @@ static void rtm_addr(struct rt_msghdr *r
- 	  break;
- 	case RTA_IFA:
- 	  memcpy(raddr.data.data, &((struct sockaddr_in6 *)sa)->sin6_addr,  sizeof(struct in6_addr));
-+#ifdef __KAME__
-+	  if (IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)raddr.data.data))
-+	    {
-+	      ((struct in6_addr *)raddr.data.data)->s6_addr[2] = 0;
-+	      ((struct in6_addr *)raddr.data.data)->s6_addr[3] = 0;
-+	    }
-+#endif
- 	  raddr_valid = 1;
- 	default:
- 	  break;
-@@ -196,9 +216,12 @@ static void rtm_addr(struct rt_msghdr *r
-       if (!(addriface = avahi_interface_monitor_get_address(m, iface, &raddr)))
- 	if (!(addriface = avahi_interface_address_new(m, iface, &raddr, prefixlen)))
- 	  return; /* OOM */
--      /*       FIXME */
--      /*       addriface->global_scope = ifaddrmsg->ifa_scope == RT_SCOPE_UNIVERSE || ifaddrmsg->ifa_scope == RT_SCOPE_SITE; */
--      addriface->global_scope = 1;
-+      if (raddr.proto == AVAHI_PROTO_INET6)
-+        {
-+	  addriface->global_scope = !(IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)raddr.data.data) || IN6_IS_ADDR_MULTICAST((struct in6_addr *)raddr.data.data));
-+	}
-+      else
-+        addriface->global_scope = 1;
-     }
-   else
-     {
diff --git a/net/avahi-app/files/patch-avahi-ui_Makefile.in b/net/avahi-app/files/patch-avahi-ui_Makefile.in
index 7b053ff1d712..42aa3d70387a 100644
--- a/net/avahi-app/files/patch-avahi-ui_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-ui_Makefile.in
@@ -1,6 +1,6 @@
---- avahi-ui/Makefile.in.orig	2008-07-03 14:43:40.000000000 -0500
-+++ avahi-ui/Makefile.in	2008-07-03 14:45:39.000000000 -0500
-@@ -92,9 +92,7 @@
+--- avahi-ui/Makefile.in.orig	2008-12-15 22:46:22.000000000 -0500
++++ avahi-ui/Makefile.in	2008-12-15 22:48:23.000000000 -0500
+@@ -99,9 +99,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -11,7 +11,7 @@
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1) \
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__DEPENDENCIES_1)
  am__libavahi_ui_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
-@@ -117,8 +115,6 @@
+@@ -124,8 +122,6 @@ am__bssh_SOURCES_DIST = bssh.c
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@am_bssh_OBJECTS = bssh-bssh.$(OBJEXT)
  bssh_OBJECTS = $(am_bssh_OBJECTS)
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -20,22 +20,22 @@
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	libavahi-ui.la
  bssh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -424,16 +420,13 @@
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__append_2) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__append_5)
+@@ -439,16 +435,13 @@ EXTRA_DIST = $(desktop_DATA_in_in)
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__append_3) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__append_6)
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LIBADD =  \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(AM_LDADD) \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-common/libavahi-common.la \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-client/libavahi-client.la \
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	../avahi-glib/libavahi-glib.la \
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(GTK20_LIBS) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__append_3)
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@	$(am__append_4)
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_SOURCES = bssh.c
  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
 +@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui.la
- CLEANFILES = $(desktop_DATA)
+ CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
  all: all-am
  
diff --git a/net/avahi-app/files/patch-man_Makefile.in b/net/avahi-app/files/patch-man_Makefile.in
deleted file mode 100644
index b46557af681a..000000000000
--- a/net/avahi-app/files/patch-man_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/Makefile.in.orig	Sat Jun  9 14:04:44 2007
-+++ man/Makefile.in	Sat Jun  9 14:05:41 2007
-@@ -861,7 +861,7 @@ uninstall-man: uninstall-man1 uninstall-
- @HAVE_DBUS_TRUE@		$(LN_S) avahi-browse.1 avahi-browse-domains.1 && \
- @HAVE_DBUS_TRUE@		$(LN_S) avahi-publish.1 avahi-publish-address.1 && \
- @HAVE_DBUS_TRUE@                $(LN_S) avahi-publish.1 avahi-publish-service.1 && \
--@HAVE_DBUS_TRUE@                $(LN_S) bssh.1 bvnc.1
-+@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@                $(LN_S) bssh.1 bvnc.1
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist
index bf08432dcc01..1d2c450aff02 100644
--- a/net/avahi-app/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -78,7 +78,7 @@ lib/libavahi-common.so.3
 lib/libavahi-core.a
 lib/libavahi-core.la
 lib/libavahi-core.so
-lib/libavahi-core.so.5
+lib/libavahi-core.so.6
 lib/libavahi-glib.a
 lib/libavahi-glib.la
 lib/libavahi-glib.so
@@ -109,17 +109,24 @@ sbin/avahi-dnsconfd
 %%DATADIR%%/introspection/ServiceResolver.introspect
 %%DATADIR%%/introspection/ServiceTypeBrowser.introspect
 %%DATADIR%%/service-types
+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/sv/LC_MESSAGES/avahi.mo
 share/locale/sr@latin/LC_MESSAGES/avahi.mo
 share/locale/zh_CN/LC_MESSAGES/avahi.mo
 @dirrmtry share/locale/sr@latin/LC_MESSAGES