Update vino to 2.32.2.

Vino 2.32.2
===========

  Fixes:

	- Avoid out-of-bounds memory accesses.
	- Exit immediately when the server is disabled.
	- Bind both an IPv4 and an IPv6 socket.

  Translations:

	+ Daniel Korostil (uk)
	+ Fran Diéguez (gl)
	+ Gheyret T.Kenji (ug)
	+ Wei-Lun Chao (zh_HK, zh_TW)

==============
Version 2.32.1
==============

  Fixes:

	+ Be compatible with old (< 0.7.0) and new (>= 0.7.0) libnotify

  Translations:

	+ Joan Duran (ca@valencia)
	+ Thanos Lefteris (el)
	+ Priit Laes (et)
	+ Takayuki KUSANO (ja)
	+ Changwoo Ryu (ko)
	+ Sahran (ug)

Vino 2.32.0
===========

  Translations:

	+ Baurzhan Muftakhidinov (kk)
	+ Takayuki KUSANO (ja)

Vino 2.31.91
============

  Translations:

	+ Fran Diéguez (gl)
	+ krishnababu k (te)
	+ Kristjan Schmidt (eo)
	+ Petr Kovar (cs)

Vino 2.31.4
===========

  Features:

	+ Improvements on Telepathy tubes stuff
	+ Various internal work on replacing deprecated stuff

  Translations:

	+ Andika Triwidada (id)
	+ Carles Ferrando (ca@valencia)
	+ Leonid Kanter (ru)
	+ Luca Ferretti (it)
	+ Matej Urbančič (sl)
	+ Priit Laes (et)
	+ Sira Nokyoongtong (th)
	+ Theppitak Karoonboonyanan (th)
	+ Thomas Thurman (en@shaw)

7 files changed, 26 insertions, 43 deletions

diff --git a/net/vino/Makefile b/net/vino/Makefile
index 30e018db77e..16d8c8d52cf 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.67 2013/06/06 12:54:58 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2013/08/12 09:36:41 obache Exp $
 
-DISTNAME=	vino-2.28.3
-PKGREVISION=	21
+DISTNAME=	vino-2.32.2
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vino/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vino/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	VNC server for GNOME
+LICENSE=	gnu-gpl-v2
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -30,7 +30,7 @@ GCONF_SCHEMAS=		vino-server.schemas
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
diff --git a/net/vino/PLIST b/net/vino/PLIST
index 83a40f3b55e..abbc03e548d 100644
--- a/net/vino/PLIST
+++ b/net/vino/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.11 2010/06/14 18:00:53 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/08/12 09:36:41 obache Exp $
 bin/vino-passwd
 bin/vino-preferences
 libexec/vino-server
 share/applications/vino-preferences.desktop
-share/dbus-1/services/org.gnome.Vino.service
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
 share/gconf/schemas/vino-server.schemas
 share/gnome/autostart/vino-server.desktop
 share/locale/ar/LC_MESSAGES/vino.mo
@@ -27,6 +27,7 @@ share/locale/el/LC_MESSAGES/vino.mo
 share/locale/en@shaw/LC_MESSAGES/vino.mo
 share/locale/en_CA/LC_MESSAGES/vino.mo
 share/locale/en_GB/LC_MESSAGES/vino.mo
+share/locale/eo/LC_MESSAGES/vino.mo
 share/locale/es/LC_MESSAGES/vino.mo
 share/locale/et/LC_MESSAGES/vino.mo
 share/locale/eu/LC_MESSAGES/vino.mo
@@ -44,6 +45,7 @@ share/locale/id/LC_MESSAGES/vino.mo
 share/locale/it/LC_MESSAGES/vino.mo
 share/locale/ja/LC_MESSAGES/vino.mo
 share/locale/ka/LC_MESSAGES/vino.mo
+share/locale/kk/LC_MESSAGES/vino.mo
 share/locale/kn/LC_MESSAGES/vino.mo
 share/locale/ko/LC_MESSAGES/vino.mo
 share/locale/ku/LC_MESSAGES/vino.mo
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 689612df2f8..af30411c5dd 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2011/11/26 17:14:54 marino Exp $
+$NetBSD: distinfo,v 1.12 2013/08/12 09:36:41 obache Exp $
 
-SHA1 (vino-2.28.3.tar.bz2) = 5ffd9d9b3d9ecfd028468e1e889006929e5590af
-RMD160 (vino-2.28.3.tar.bz2) = 885bdcab1f2993bbd9a74e78ede93f58a93d4eee
-Size (vino-2.28.3.tar.bz2) = 848908 bytes
-SHA1 (patch-aa) = a79f5d6cae5377c9029e5f1dfaf9b76f6da7e0a2
-SHA1 (patch-ab) = 81efc17f2d1275ea6131ffd44bdb8f50d0cf464e
-SHA1 (patch-ac) = 69bf929df606e106bf9401fc3a5b2a0fc241b8e7
+SHA1 (vino-2.32.2.tar.bz2) = e457d1c5705607c3cd18b7e6fbb8776b7483c733
+RMD160 (vino-2.32.2.tar.bz2) = 1de0923ef33a73dd6a9c4e761291728c552708e8
+Size (vino-2.32.2.tar.bz2) = 856440 bytes
+SHA1 (patch-aa) = d240f809769fee144ce0a6057327107ade82ef6c
+SHA1 (patch-ab) = 0c09812fc98bced9938a0460305c7dbcbed40ad3
 SHA1 (patch-ad) = 0e1b226e8c5ac5f9e3d3c7270b9a19a2314ef737
diff --git a/net/vino/options.mk b/net/vino/options.mk
index 209e61b4052..153698ad083 100644
--- a/net/vino/options.mk
+++ b/net/vino/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:02 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2013/08/12 09:36:41 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vino
 PKG_SUPPORTED_OPTIONS+=	avahi inet6 telepathy
@@ -21,6 +21,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if !empty(PKG_OPTIONS:Mtelepathy)
 CONFIGURE_ARGS+=	--enable-telepathy
+BUILDLINK_API_DEPENDS.telepathy-glib+=	telepathy-glib>=0.11.6
 .include "../../chat/telepathy-glib/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-telepathy
diff --git a/net/vino/patches/patch-aa b/net/vino/patches/patch-aa
index f0764487e7b..1b51b6df70f 100644
--- a/net/vino/patches/patch-aa
+++ b/net/vino/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2010/06/14 18:00:54 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2013/08/12 09:36:41 obache Exp $
 
---- configure.orig	2010-03-30 13:12:02.000000000 +0000
+--- configure.orig	2011-05-02 16:35:08.000000000 +0000
 +++ configure
-@@ -15144,6 +15144,8 @@ fi
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -16129,6 +16129,8 @@ if test "x$ac_cv_header_ifaddrs_h" = "xy
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 +#include <sys/types.h>
 +#include <sys/socket.h>
-       #include <ifaddrs.h>
+           #include <ifaddrs.h>
+           #include <net/if.h>
  
- int
diff --git a/net/vino/patches/patch-ab b/net/vino/patches/patch-ab
index aa79a2e407f..55a56fcfe07 100644
--- a/net/vino/patches/patch-ab
+++ b/net/vino/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2010/01/21 18:20:43 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2013/08/12 09:36:41 obache Exp $
 
---- server/Makefile.in.orig	2009-10-19 12:06:23.000000000 +0000
+--- server/Makefile.in.orig	2011-05-02 16:35:08.000000000 +0000
 +++ server/Makefile.in
-@@ -366,7 +366,7 @@ vino_enum_headers = \
+@@ -433,7 +433,7 @@ vino_enum_headers = \
  schemasdir = $(GCONF_SCHEMA_FILE_DIR)
  schemas_in_files = vino-server.schemas.in
  schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
diff --git a/net/vino/patches/patch-ac b/net/vino/patches/patch-ac
deleted file mode 100644
index d8931b38315..00000000000
--- a/net/vino/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/01/21 18:20:43 drochner Exp $
-
---- server/libvncserver/sockets.c.orig	2009-05-12 11:39:33.000000000 +0000
-+++ server/libvncserver/sockets.c
-@@ -671,6 +671,14 @@ NewSocketListenTCP(struct sockaddr *addr
-     if ((sock = socket(addr->sa_family, SOCK_STREAM, 0)) < 0)
-       return -1;
- 
-+#if defined(__NetBSD__) && defined(ENABLE_IPV6)
-+	if (addr->sa_family == AF_INET6) {
-+		/* NetBSD defaults to V6ONLY */
-+		int no = 0;
-+		setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
-+	}
-+#endif
-+
-     if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)) < 0) {
-       close(sock);
-       return -1;