update to 2.30.2

This switches to the gnome-2.30 release branch.

pkgsrc note: added "telepathy" option for integration with the
telepathy/farsight framework (defaults to "off" for now)

3 files changed, 28 insertions, 11 deletions

diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index ad64c0c122c..f9fbc7fa06b 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:13 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/07/06 16:17:56 drochner Exp $
 #
 
-DISTNAME=	vinagre-2.28.1
-PKGREVISION=	4
+DISTNAME=	vinagre-2.30.2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vinagre/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vinagre/2.30/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://projects.gnome.org/vinagre/
@@ -16,17 +15,26 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake intltool pkg-config msgfmt
+USE_LANGUAGES=	c c++
 
 GCONF_SCHEMAS+=	vinagre.schemas
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vinagre
-PKG_SUPPORTED_OPTIONS=	avahi
+PKG_SUPPORTED_OPTIONS=	avahi telepathy
 .include "../../mk/bsd.options.mk"
 .if empty(PKG_OPTIONS:Mavahi)
 CONFIGURE_ARGS+= --disable-avahi
 .else
 .include "../../net/avahi/buildlink3.mk"
 .endif
+PLIST_VARS+= telepathy
+.if !empty(PKG_OPTIONS:Mtelepathy)
+CONFIGURE_ARGS+= --enable-telepathy
+.include "../../chat/telepathy-glib/buildlink3.mk"
+PLIST.telepathy= yes
+.else
+CONFIGURE_ARGS+= --disable-telepathy
+.endif
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.16.0
@@ -36,7 +44,7 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.17.0
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk-vnc+=	gtk-vnc>=0.3.8nb1
 .include "../../net/gtk-vnc/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../security/libgnome-keyring/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 a8fe2809d39..a5cb4502dd0 100644
--- a/net/vinagre/PLIST
+++ b/net/vinagre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/10/26 11:04:28 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/07/06 16:17:56 drochner Exp $
 bin/vinagre
 include/vinagre-1.0/vinagre/vinagre-app.h
 include/vinagre-1.0/vinagre/vinagre-bacon.h
@@ -7,6 +7,7 @@ include/vinagre-1.0/vinagre/vinagre-bookmarks-migration.h
 include/vinagre-1.0/vinagre/vinagre-bookmarks-tree.h
 include/vinagre-1.0/vinagre/vinagre-bookmarks-ui.h
 include/vinagre-1.0/vinagre/vinagre-bookmarks.h
+include/vinagre-1.0/vinagre/vinagre-cache-prefs.h
 include/vinagre-1.0/vinagre/vinagre-commands.h
 include/vinagre-1.0/vinagre/vinagre-connect.h
 include/vinagre-1.0/vinagre/vinagre-connection.h
@@ -18,6 +19,7 @@ include/vinagre-1.0/vinagre/vinagre-notebook.h
 include/vinagre-1.0/vinagre/vinagre-plugin-loader.h
 include/vinagre-1.0/vinagre/vinagre-plugin.h
 include/vinagre-1.0/vinagre/vinagre-prefs.h
+include/vinagre-1.0/vinagre/vinagre-ssh.h
 include/vinagre-1.0/vinagre/vinagre-tab.h
 include/vinagre-1.0/vinagre/vinagre-ui.h
 include/vinagre-1.0/vinagre/vinagre-utils.h
@@ -31,6 +33,7 @@ libexec/vinagre-applet
 man/man1/vinagre.1
 share/applications/vinagre-file.desktop
 share/applications/vinagre.desktop
+${PLIST.telepathy}share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
 share/doc/vinagre/AUTHORS
 share/doc/vinagre/COPYING
 share/doc/vinagre/ChangeLog
@@ -194,6 +197,7 @@ 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/es/LC_MESSAGES/vinagre.mo
 share/locale/et/LC_MESSAGES/vinagre.mo
@@ -206,6 +210,7 @@ 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/kn/LC_MESSAGES/vinagre.mo
@@ -229,6 +234,7 @@ 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
@@ -261,6 +267,9 @@ share/omf/vinagre/vinagre-sq.omf
 share/omf/vinagre/vinagre-sv.omf
 share/omf/vinagre/vinagre-th.omf
 share/omf/vinagre/vinagre-zh_CN.omf
+${PLIST.telepathy}share/telepathy/clients/Vinagre.client
+share/vinagre-1/plugins/vnc/vnc.ui
 share/vinagre/GNOME_VinagreApplet.xml
+share/vinagre/vinagre-fav-ui.xml
 share/vinagre/vinagre-ui.xml
 share/vinagre/vinagre.ui
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index 187554a5445..e1f33486fc7 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/10/26 11:04:28 drochner Exp $
+$NetBSD: distinfo,v 1.4 2010/07/06 16:17:56 drochner Exp $
 
-SHA1 (vinagre-2.28.1.tar.gz) = fcbf1474c0aad96df06bc8ae68712ef78bcbece5
-RMD160 (vinagre-2.28.1.tar.gz) = 771038d4c7aa688a04e871222268ffa119d31b0a
-Size (vinagre-2.28.1.tar.gz) = 2311211 bytes
+SHA1 (vinagre-2.30.2.tar.gz) = 69fac5ca59f809cbaece64412d094bc57cef604d
+RMD160 (vinagre-2.30.2.tar.gz) = 202ad1422a38c9f7f4fd063f307188ccd29f20ac
+Size (vinagre-2.30.2.tar.gz) = 2946268 bytes