Update to 3.6.2

* Update dependencies.

Changelog:
Vinagre 3.6.2
=============

David King (4):
      Update NEWS for 3.6.2 release
      Post-release version bump to 3.6.2
      Do not use NULL attributes with libsecret
      Fix missing prototypes warnings

Vinagre 3.6.1
=============

David King (2):
      Update NEWS for 3.6.1 release
      Post-release version bump to 3.6.1

Rudolfs Mazurs (1):
      Updated Latvian translation.

Shankar Prasad (1):
      Updated Kannada Translations

Vinagre 3.6.0
=============

Updated translation

Vinagre 3.5.92
==============

Update Translation

Vinagre 3.5.90
==============

Updated translation

Vinagre 3.5.2
=============

Update and add documentations
Depend on intltool 0.50 for GSettings translations

Vinagre 3.5.1
=============

Updated Translations
Use example.com in address examples, bug 672238

5 files changed, 149 insertions, 89 deletions

diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index bd8567b8714..314d388f281 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2012/10/23 17:19:17 asau Exp $
+# $NetBSD: Makefile,v 1.35 2012/11/30 16:02:32 ryoon Exp $
 #
 
-DISTNAME=	vinagre-3.4.2
-PKGREVISION=	4
+DISTNAME=	vinagre-3.6.2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vinagre/3.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vinagre/3.6/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -25,27 +24,27 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.vinagre
 PKG_SUPPORTED_OPTIONS=	avahi telepathy
 .include "../../mk/bsd.options.mk"
 .if empty(PKG_OPTIONS:Mavahi)
-CONFIGURE_ARGS+= --disable-avahi
+CONFIGURE_ARGS+= --without-avahi
 .else
 .include "../../net/avahi/buildlink3.mk"
 .endif
 PLIST_VARS+= telepathy
 .if !empty(PKG_OPTIONS:Mtelepathy)
-CONFIGURE_ARGS+= --enable-telepathy
+CONFIGURE_ARGS+= --with-telepathy
 .include "../../chat/telepathy-glib/buildlink3.mk"
 PLIST.telepathy= yes
 .else
-CONFIGURE_ARGS+= --disable-telepathy
+CONFIGURE_ARGS+= --without-telepathy
 .endif
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.28.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk-vnc+=	gtk-vnc>=0.4.3
 .include "../../net/gtk-vnc/buildlink3.mk"
-.include "../../security/libgnome-keyring/buildlink3.mk"
+.include "../../security/libsecret/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
diff --git a/net/vinagre/PLIST b/net/vinagre/PLIST
index 749a4331c6c..da9051bda59 100644
--- a/net/vinagre/PLIST
+++ b/net/vinagre/PLIST
@@ -1,76 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2012/08/20 11:36:16 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/11/30 16:02:32 ryoon Exp $
 bin/vinagre
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/as/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ast/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/be@latin/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/bn_IN/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ca@valencia/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/en@shaw/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/kk/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/mai/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/oc/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/or/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/si/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/sr@latin/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/te/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/th/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/ug/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/vinagre.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/vinagre.mo
 man/man1/vinagre.1
 share/GConf/gsettings/org.gnome.Vinagre.convert
 share/applications/vinagre-file.desktop
@@ -113,6 +42,24 @@ share/help/de/vinagre/reverse-connections.page
 share/help/de/vinagre/scaling.page
 share/help/de/vinagre/take-screenshot.page
 share/help/de/vinagre/view-only.page
+share/help/el/vinagre/connect-file.page
+share/help/el/vinagre/connect.page
+share/help/el/vinagre/figures/vinagre-auth-needed.png
+share/help/el/vinagre/figures/vinagre-connect-dialog.png
+share/help/el/vinagre/figures/vinagre-connected.png
+share/help/el/vinagre/figures/vinagre-connection-closed.png
+share/help/el/vinagre/figures/vinagre-fullscreen.png
+share/help/el/vinagre/figures/vinagre-no-scaling.png
+share/help/el/vinagre/figures/vinagre-reverse-connections.png
+share/help/el/vinagre/figures/vinagre-scaling.png
+share/help/el/vinagre/fullscreen.page
+share/help/el/vinagre/index.page
+share/help/el/vinagre/introduction.page
+share/help/el/vinagre/keyboard-shortcuts.page
+share/help/el/vinagre/reverse-connections.page
+share/help/el/vinagre/scaling.page
+share/help/el/vinagre/take-screenshot.page
+share/help/el/vinagre/view-only.page
 share/help/es/vinagre/connect-file.page
 share/help/es/vinagre/connect.page
 share/help/es/vinagre/figures/vinagre-auth-needed.png
@@ -149,6 +96,24 @@ share/help/eu/vinagre/reverse-connections.page
 share/help/eu/vinagre/scaling.page
 share/help/eu/vinagre/take-screenshot.page
 share/help/eu/vinagre/view-only.page
+share/help/fa/vinagre/connect-file.page
+share/help/fa/vinagre/connect.page
+share/help/fa/vinagre/figures/vinagre-auth-needed.png
+share/help/fa/vinagre/figures/vinagre-connect-dialog.png
+share/help/fa/vinagre/figures/vinagre-connected.png
+share/help/fa/vinagre/figures/vinagre-connection-closed.png
+share/help/fa/vinagre/figures/vinagre-fullscreen.png
+share/help/fa/vinagre/figures/vinagre-no-scaling.png
+share/help/fa/vinagre/figures/vinagre-reverse-connections.png
+share/help/fa/vinagre/figures/vinagre-scaling.png
+share/help/fa/vinagre/fullscreen.page
+share/help/fa/vinagre/index.page
+share/help/fa/vinagre/introduction.page
+share/help/fa/vinagre/keyboard-shortcuts.page
+share/help/fa/vinagre/reverse-connections.page
+share/help/fa/vinagre/scaling.page
+share/help/fa/vinagre/take-screenshot.page
+share/help/fa/vinagre/view-only.page
 share/help/fr/vinagre/connect-file.page
 share/help/fr/vinagre/connect.page
 share/help/fr/vinagre/figures/vinagre-auth-needed.png
@@ -273,6 +238,77 @@ share/icons/hicolor/48x48/mimetypes/application-x-vnc.png
 share/icons/hicolor/48x48/status/view-minimize.png
 share/icons/hicolor/scalable/mimetypes/application-x-remote-connection.svg
 share/icons/hicolor/scalable/mimetypes/application-x-vnc.svg
+share/locale/ar/LC_MESSAGES/vinagre.mo
+share/locale/as/LC_MESSAGES/vinagre.mo
+share/locale/ast/LC_MESSAGES/vinagre.mo
+share/locale/be/LC_MESSAGES/vinagre.mo
+share/locale/be@latin/LC_MESSAGES/vinagre.mo
+share/locale/bg/LC_MESSAGES/vinagre.mo
+share/locale/bn/LC_MESSAGES/vinagre.mo
+share/locale/bn_IN/LC_MESSAGES/vinagre.mo
+share/locale/ca/LC_MESSAGES/vinagre.mo
+share/locale/ca@valencia/LC_MESSAGES/vinagre.mo
+share/locale/cs/LC_MESSAGES/vinagre.mo
+share/locale/da/LC_MESSAGES/vinagre.mo
+share/locale/de/LC_MESSAGES/vinagre.mo
+share/locale/el/LC_MESSAGES/vinagre.mo
+share/locale/en@shaw/LC_MESSAGES/vinagre.mo
+share/locale/en_GB/LC_MESSAGES/vinagre.mo
+share/locale/eo/LC_MESSAGES/vinagre.mo
+share/locale/es/LC_MESSAGES/vinagre.mo
+share/locale/et/LC_MESSAGES/vinagre.mo
+share/locale/eu/LC_MESSAGES/vinagre.mo
+share/locale/fa/LC_MESSAGES/vinagre.mo
+share/locale/fi/LC_MESSAGES/vinagre.mo
+share/locale/fr/LC_MESSAGES/vinagre.mo
+share/locale/ga/LC_MESSAGES/vinagre.mo
+share/locale/gl/LC_MESSAGES/vinagre.mo
+share/locale/gu/LC_MESSAGES/vinagre.mo
+share/locale/he/LC_MESSAGES/vinagre.mo
+share/locale/hi/LC_MESSAGES/vinagre.mo
+share/locale/hu/LC_MESSAGES/vinagre.mo
+share/locale/id/LC_MESSAGES/vinagre.mo
+share/locale/it/LC_MESSAGES/vinagre.mo
+share/locale/ja/LC_MESSAGES/vinagre.mo
+share/locale/kk/LC_MESSAGES/vinagre.mo
+share/locale/kn/LC_MESSAGES/vinagre.mo
+share/locale/ko/LC_MESSAGES/vinagre.mo
+share/locale/ku/LC_MESSAGES/vinagre.mo
+share/locale/lt/LC_MESSAGES/vinagre.mo
+share/locale/lv/LC_MESSAGES/vinagre.mo
+share/locale/mai/LC_MESSAGES/vinagre.mo
+share/locale/mk/LC_MESSAGES/vinagre.mo
+share/locale/ml/LC_MESSAGES/vinagre.mo
+share/locale/mr/LC_MESSAGES/vinagre.mo
+share/locale/ms/LC_MESSAGES/vinagre.mo
+share/locale/nb/LC_MESSAGES/vinagre.mo
+share/locale/nl/LC_MESSAGES/vinagre.mo
+share/locale/nn/LC_MESSAGES/vinagre.mo
+share/locale/oc/LC_MESSAGES/vinagre.mo
+share/locale/or/LC_MESSAGES/vinagre.mo
+share/locale/pa/LC_MESSAGES/vinagre.mo
+share/locale/pl/LC_MESSAGES/vinagre.mo
+share/locale/pt/LC_MESSAGES/vinagre.mo
+share/locale/pt_BR/LC_MESSAGES/vinagre.mo
+share/locale/ro/LC_MESSAGES/vinagre.mo
+share/locale/ru/LC_MESSAGES/vinagre.mo
+share/locale/si/LC_MESSAGES/vinagre.mo
+share/locale/sk/LC_MESSAGES/vinagre.mo
+share/locale/sl/LC_MESSAGES/vinagre.mo
+share/locale/sq/LC_MESSAGES/vinagre.mo
+share/locale/sr/LC_MESSAGES/vinagre.mo
+share/locale/sr@latin/LC_MESSAGES/vinagre.mo
+share/locale/sv/LC_MESSAGES/vinagre.mo
+share/locale/ta/LC_MESSAGES/vinagre.mo
+share/locale/te/LC_MESSAGES/vinagre.mo
+share/locale/th/LC_MESSAGES/vinagre.mo
+share/locale/tr/LC_MESSAGES/vinagre.mo
+share/locale/ug/LC_MESSAGES/vinagre.mo
+share/locale/uk/LC_MESSAGES/vinagre.mo
+share/locale/vi/LC_MESSAGES/vinagre.mo
+share/locale/zh_CN/LC_MESSAGES/vinagre.mo
+share/locale/zh_HK/LC_MESSAGES/vinagre.mo
+share/locale/zh_TW/LC_MESSAGES/vinagre.mo
 share/mime/packages/vinagre-mime.xml
 ${PLIST.telepathy}share/telepathy/clients/Vinagre.client
 share/vinagre/vinagre-ui.xml
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index 039ada9bdcc..e9e6b498873 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2012/08/20 11:36:16 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2012/11/30 16:02:32 ryoon Exp $
 
-SHA1 (vinagre-3.4.2.tar.xz) = e701eea80e154818820ac99ee5e3bf49aae6392c
-RMD160 (vinagre-3.4.2.tar.xz) = 925ec545204838788af180d4b2c87686f7b817e9
-Size (vinagre-3.4.2.tar.xz) = 2503232 bytes
-SHA1 (patch-configure) = 3bcd1e2a18dafb1795a3cffbc7716908d7a5d855
+SHA1 (vinagre-3.6.2.tar.xz) = 380f7f7197d062f4db78365ab1b8e3115476e3a2
+RMD160 (vinagre-3.6.2.tar.xz) = 091c45059f778dd9342a9488318a2fe9da43ee24
+Size (vinagre-3.6.2.tar.xz) = 2497324 bytes
+SHA1 (patch-configure) = d9622874fbeba6705c1dcbbf01aed7a6588afce0
+SHA1 (patch-vinagre_pty__open.c) = 6ae023039419d18ef9d47e82a8c692d2cd11ab84
diff --git a/net/vinagre/patches/patch-configure b/net/vinagre/patches/patch-configure
index 8808ad4084a..5858efcbdfe 100644
--- a/net/vinagre/patches/patch-configure
+++ b/net/vinagre/patches/patch-configure
@@ -1,8 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2012/08/20 11:36:17 ryoon Exp $
+$NetBSD: patch-configure,v 1.2 2012/11/30 16:02:32 ryoon Exp $
 
---- configure.orig	2012-08-19 06:45:55.000000000 +0000
+* Improve compatibility
+
+--- configure.orig	2012-11-12 21:14:06.000000000 +0000
 +++ configure
-@@ -5926,7 +5926,7 @@ fi
+@@ -5958,7 +5958,7 @@ fi
  done
  
  
diff --git a/net/vinagre/patches/patch-vinagre_pty__open.c b/net/vinagre/patches/patch-vinagre_pty__open.c
new file mode 100644
index 00000000000..584cbac65de
--- /dev/null
+++ b/net/vinagre/patches/patch-vinagre_pty__open.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-vinagre_pty__open.c,v 1.1 2012/11/30 16:02:32 ryoon Exp $
+
+--- vinagre/pty_open.c.orig	2011-12-03 07:23:20.000000000 +0000
++++ vinagre/pty_open.c
+@@ -40,7 +40,7 @@
+ 
+ /* Originally from vte */
+ 
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 600
+ #define _GNU_SOURCE
+ 
+ #include "config.h"
+@@ -69,7 +69,7 @@
+ #ifdef HAVE_UTMP_H
+ #include <utmp.h>
+ #endif
+-#ifdef HAVE_UTIL_H
++#ifdef HAVE_LOGIN_TTY
+ #include <util.h>
+ #endif
+ #include <glib.h>