Tue Jul 6 16:17:56 2010 UTC ()
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)


(drochner)
diff -r1.10 -r1.11 pkgsrc/net/vinagre/Makefile
diff -r1.4 -r1.5 pkgsrc/net/vinagre/PLIST
diff -r1.3 -r1.4 pkgsrc/net/vinagre/distinfo
cvs diff -r1.10 -r1.11 pkgsrc/net/vinagre/Makefile (expand / switch to unified diff)

--- pkgsrc/net/vinagre/Makefile 2010/06/13 22:45:13 1.10
+++ pkgsrc/net/vinagre/Makefile 2010/07/06 16:17:56 1.11
@@ -1,46 +1,54 @@ @@ -1,46 +1,54 @@
1# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2010/07/06 16:17:56 drochner Exp $
2# 2#
3 3
4DISTNAME= vinagre-2.28.1 4DISTNAME= vinagre-2.30.2
5PKGREVISION= 4 
6CATEGORIES= x11 5CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vinagre/2.28/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vinagre/2.30/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://projects.gnome.org/vinagre/ 9HOMEPAGE= http://projects.gnome.org/vinagre/
11COMMENT= VNC client for GNOME 10COMMENT= VNC client for GNOME
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18USE_TOOLS+= gmake intltool pkg-config msgfmt 17USE_TOOLS+= gmake intltool pkg-config msgfmt
 18USE_LANGUAGES= c c++
19 19
20GCONF_SCHEMAS+= vinagre.schemas 20GCONF_SCHEMAS+= vinagre.schemas
21 21
22PKG_OPTIONS_VAR= PKG_OPTIONS.vinagre 22PKG_OPTIONS_VAR= PKG_OPTIONS.vinagre
23PKG_SUPPORTED_OPTIONS= avahi 23PKG_SUPPORTED_OPTIONS= avahi telepathy
24.include "../../mk/bsd.options.mk" 24.include "../../mk/bsd.options.mk"
25.if empty(PKG_OPTIONS:Mavahi) 25.if empty(PKG_OPTIONS:Mavahi)
26CONFIGURE_ARGS+= --disable-avahi 26CONFIGURE_ARGS+= --disable-avahi
27.else 27.else
28.include "../../net/avahi/buildlink3.mk" 28.include "../../net/avahi/buildlink3.mk"
29.endif 29.endif
 30PLIST_VARS+= telepathy
 31.if !empty(PKG_OPTIONS:Mtelepathy)
 32CONFIGURE_ARGS+= --enable-telepathy
 33.include "../../chat/telepathy-glib/buildlink3.mk"
 34PLIST.telepathy= yes
 35.else
 36CONFIGURE_ARGS+= --disable-telepathy
 37.endif
30 38
31.include "../../databases/shared-mime-info/mimedb.mk" 39.include "../../databases/shared-mime-info/mimedb.mk"
32BUILDLINK_API_DEPENDS.GConf+= GConf>=2.16.0 40BUILDLINK_API_DEPENDS.GConf+= GConf>=2.16.0
33.include "../../devel/GConf/schemas.mk" 41.include "../../devel/GConf/schemas.mk"
34BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.0 42BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.0
35.include "../../devel/glib2/buildlink3.mk" 43.include "../../devel/glib2/buildlink3.mk"
36.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 44.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
37BUILDLINK_API_DEPENDS.gtk-vnc+= gtk-vnc>=0.3.8nb1 45BUILDLINK_API_DEPENDS.gtk-vnc+= gtk-vnc>=0.3.8nb1
38.include "../../net/gtk-vnc/buildlink3.mk" 46.include "../../net/gtk-vnc/buildlink3.mk"
39.include "../../security/gnome-keyring/buildlink3.mk" 47.include "../../security/libgnome-keyring/buildlink3.mk"
40.include "../../sysutils/desktop-file-utils/desktopdb.mk" 48.include "../../sysutils/desktop-file-utils/desktopdb.mk"
41.include "../../textproc/gnome-doc-utils/buildlink3.mk" 49.include "../../textproc/gnome-doc-utils/buildlink3.mk"
42.include "../../mk/omf-scrollkeeper.mk" 50.include "../../mk/omf-scrollkeeper.mk"
43BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.13.1 51BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.13.1
44.include "../../x11/gtk2/buildlink3.mk" 52.include "../../x11/gtk2/buildlink3.mk"
45.include "../../x11/gnome-panel/buildlink3.mk" 53.include "../../x11/gnome-panel/buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/net/vinagre/PLIST (expand / switch to unified diff)

--- pkgsrc/net/vinagre/PLIST 2009/10/26 11:04:28 1.4
+++ pkgsrc/net/vinagre/PLIST 2010/07/06 16:17:56 1.5
@@ -1,46 +1,49 @@ @@ -1,46 +1,49 @@
1@comment $NetBSD: PLIST,v 1.4 2009/10/26 11:04:28 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.5 2010/07/06 16:17:56 drochner Exp $
2bin/vinagre 2bin/vinagre
3include/vinagre-1.0/vinagre/vinagre-app.h 3include/vinagre-1.0/vinagre/vinagre-app.h
4include/vinagre-1.0/vinagre/vinagre-bacon.h 4include/vinagre-1.0/vinagre/vinagre-bacon.h
5include/vinagre-1.0/vinagre/vinagre-bookmarks-entry.h 5include/vinagre-1.0/vinagre/vinagre-bookmarks-entry.h
6include/vinagre-1.0/vinagre/vinagre-bookmarks-migration.h 6include/vinagre-1.0/vinagre/vinagre-bookmarks-migration.h
7include/vinagre-1.0/vinagre/vinagre-bookmarks-tree.h 7include/vinagre-1.0/vinagre/vinagre-bookmarks-tree.h
8include/vinagre-1.0/vinagre/vinagre-bookmarks-ui.h 8include/vinagre-1.0/vinagre/vinagre-bookmarks-ui.h
9include/vinagre-1.0/vinagre/vinagre-bookmarks.h 9include/vinagre-1.0/vinagre/vinagre-bookmarks.h
 10include/vinagre-1.0/vinagre/vinagre-cache-prefs.h
10include/vinagre-1.0/vinagre/vinagre-commands.h 11include/vinagre-1.0/vinagre/vinagre-commands.h
11include/vinagre-1.0/vinagre/vinagre-connect.h 12include/vinagre-1.0/vinagre/vinagre-connect.h
12include/vinagre-1.0/vinagre/vinagre-connection.h 13include/vinagre-1.0/vinagre/vinagre-connection.h
13include/vinagre-1.0/vinagre/vinagre-debug.h 14include/vinagre-1.0/vinagre/vinagre-debug.h
14include/vinagre-1.0/vinagre/vinagre-dirs.h 15include/vinagre-1.0/vinagre/vinagre-dirs.h
15include/vinagre-1.0/vinagre/vinagre-dnd.h 16include/vinagre-1.0/vinagre/vinagre-dnd.h
16include/vinagre-1.0/vinagre/vinagre-fav.h 17include/vinagre-1.0/vinagre/vinagre-fav.h
17include/vinagre-1.0/vinagre/vinagre-notebook.h 18include/vinagre-1.0/vinagre/vinagre-notebook.h
18include/vinagre-1.0/vinagre/vinagre-plugin-loader.h 19include/vinagre-1.0/vinagre/vinagre-plugin-loader.h
19include/vinagre-1.0/vinagre/vinagre-plugin.h 20include/vinagre-1.0/vinagre/vinagre-plugin.h
20include/vinagre-1.0/vinagre/vinagre-prefs.h 21include/vinagre-1.0/vinagre/vinagre-prefs.h
 22include/vinagre-1.0/vinagre/vinagre-ssh.h
21include/vinagre-1.0/vinagre/vinagre-tab.h 23include/vinagre-1.0/vinagre/vinagre-tab.h
22include/vinagre-1.0/vinagre/vinagre-ui.h 24include/vinagre-1.0/vinagre/vinagre-ui.h
23include/vinagre-1.0/vinagre/vinagre-utils.h 25include/vinagre-1.0/vinagre/vinagre-utils.h
24include/vinagre-1.0/vinagre/vinagre-window.h 26include/vinagre-1.0/vinagre/vinagre-window.h
25lib/bonobo/servers/GNOME_VinagreApplet.server 27lib/bonobo/servers/GNOME_VinagreApplet.server
26lib/pkgconfig/vinagre-1.0.pc 28lib/pkgconfig/vinagre-1.0.pc
27lib/vinagre-1/plugin-loaders/libcloader.la 29lib/vinagre-1/plugin-loaders/libcloader.la
28lib/vinagre-1/plugins/libvnc.la 30lib/vinagre-1/plugins/libvnc.la
29lib/vinagre-1/plugins/vnc.vinagre-plugin 31lib/vinagre-1/plugins/vnc.vinagre-plugin
30libexec/vinagre-applet 32libexec/vinagre-applet
31man/man1/vinagre.1 33man/man1/vinagre.1
32share/applications/vinagre-file.desktop 34share/applications/vinagre-file.desktop
33share/applications/vinagre.desktop 35share/applications/vinagre.desktop
 36${PLIST.telepathy}share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
34share/doc/vinagre/AUTHORS 37share/doc/vinagre/AUTHORS
35share/doc/vinagre/COPYING 38share/doc/vinagre/COPYING
36share/doc/vinagre/ChangeLog 39share/doc/vinagre/ChangeLog
37share/doc/vinagre/INSTALL 40share/doc/vinagre/INSTALL
38share/doc/vinagre/MAINTAINERS 41share/doc/vinagre/MAINTAINERS
39share/doc/vinagre/NEWS 42share/doc/vinagre/NEWS
40share/doc/vinagre/README 43share/doc/vinagre/README
41share/gconf/schemas/vinagre.schemas 44share/gconf/schemas/vinagre.schemas
42share/gnome/help/vinagre/C/figures/vinagre-auth-needed.png 45share/gnome/help/vinagre/C/figures/vinagre-auth-needed.png
43share/gnome/help/vinagre/C/figures/vinagre-bookmarks-side-panel.png 46share/gnome/help/vinagre/C/figures/vinagre-bookmarks-side-panel.png
44share/gnome/help/vinagre/C/figures/vinagre-connect-dialog.png 47share/gnome/help/vinagre/C/figures/vinagre-connect-dialog.png
45share/gnome/help/vinagre/C/figures/vinagre-editing-bookmarks.png 48share/gnome/help/vinagre/C/figures/vinagre-editing-bookmarks.png
46share/gnome/help/vinagre/C/figures/vinagre-saving-bookmarks.png 49share/gnome/help/vinagre/C/figures/vinagre-saving-bookmarks.png
@@ -184,61 +187,64 @@ share/icons/hicolor/scalable/mimetypes/a @@ -184,61 +187,64 @@ share/icons/hicolor/scalable/mimetypes/a
184share/locale/ar/LC_MESSAGES/vinagre.mo 187share/locale/ar/LC_MESSAGES/vinagre.mo
185share/locale/as/LC_MESSAGES/vinagre.mo 188share/locale/as/LC_MESSAGES/vinagre.mo
186share/locale/ast/LC_MESSAGES/vinagre.mo 189share/locale/ast/LC_MESSAGES/vinagre.mo
187share/locale/be@latin/LC_MESSAGES/vinagre.mo 190share/locale/be@latin/LC_MESSAGES/vinagre.mo
188share/locale/bg/LC_MESSAGES/vinagre.mo 191share/locale/bg/LC_MESSAGES/vinagre.mo
189share/locale/bn/LC_MESSAGES/vinagre.mo 192share/locale/bn/LC_MESSAGES/vinagre.mo
190share/locale/bn_IN/LC_MESSAGES/vinagre.mo 193share/locale/bn_IN/LC_MESSAGES/vinagre.mo
191share/locale/ca/LC_MESSAGES/vinagre.mo 194share/locale/ca/LC_MESSAGES/vinagre.mo
192share/locale/ca@valencia/LC_MESSAGES/vinagre.mo 195share/locale/ca@valencia/LC_MESSAGES/vinagre.mo
193share/locale/cs/LC_MESSAGES/vinagre.mo 196share/locale/cs/LC_MESSAGES/vinagre.mo
194share/locale/da/LC_MESSAGES/vinagre.mo 197share/locale/da/LC_MESSAGES/vinagre.mo
195share/locale/de/LC_MESSAGES/vinagre.mo 198share/locale/de/LC_MESSAGES/vinagre.mo
196share/locale/el/LC_MESSAGES/vinagre.mo 199share/locale/el/LC_MESSAGES/vinagre.mo
 200share/locale/en@shaw/LC_MESSAGES/vinagre.mo
197share/locale/en_GB/LC_MESSAGES/vinagre.mo 201share/locale/en_GB/LC_MESSAGES/vinagre.mo
198share/locale/es/LC_MESSAGES/vinagre.mo 202share/locale/es/LC_MESSAGES/vinagre.mo
199share/locale/et/LC_MESSAGES/vinagre.mo 203share/locale/et/LC_MESSAGES/vinagre.mo
200share/locale/eu/LC_MESSAGES/vinagre.mo 204share/locale/eu/LC_MESSAGES/vinagre.mo
201share/locale/fi/LC_MESSAGES/vinagre.mo 205share/locale/fi/LC_MESSAGES/vinagre.mo
202share/locale/fr/LC_MESSAGES/vinagre.mo 206share/locale/fr/LC_MESSAGES/vinagre.mo
203share/locale/ga/LC_MESSAGES/vinagre.mo 207share/locale/ga/LC_MESSAGES/vinagre.mo
204share/locale/gl/LC_MESSAGES/vinagre.mo 208share/locale/gl/LC_MESSAGES/vinagre.mo
205share/locale/gu/LC_MESSAGES/vinagre.mo 209share/locale/gu/LC_MESSAGES/vinagre.mo
206share/locale/he/LC_MESSAGES/vinagre.mo 210share/locale/he/LC_MESSAGES/vinagre.mo
207share/locale/hi/LC_MESSAGES/vinagre.mo 211share/locale/hi/LC_MESSAGES/vinagre.mo
208share/locale/hu/LC_MESSAGES/vinagre.mo 212share/locale/hu/LC_MESSAGES/vinagre.mo
 213share/locale/id/LC_MESSAGES/vinagre.mo
209share/locale/it/LC_MESSAGES/vinagre.mo 214share/locale/it/LC_MESSAGES/vinagre.mo
210share/locale/ja/LC_MESSAGES/vinagre.mo 215share/locale/ja/LC_MESSAGES/vinagre.mo
211share/locale/kn/LC_MESSAGES/vinagre.mo 216share/locale/kn/LC_MESSAGES/vinagre.mo
212share/locale/ko/LC_MESSAGES/vinagre.mo 217share/locale/ko/LC_MESSAGES/vinagre.mo
213share/locale/ku/LC_MESSAGES/vinagre.mo 218share/locale/ku/LC_MESSAGES/vinagre.mo
214share/locale/lt/LC_MESSAGES/vinagre.mo 219share/locale/lt/LC_MESSAGES/vinagre.mo
215share/locale/lv/LC_MESSAGES/vinagre.mo 220share/locale/lv/LC_MESSAGES/vinagre.mo
216share/locale/mai/LC_MESSAGES/vinagre.mo 221share/locale/mai/LC_MESSAGES/vinagre.mo
217share/locale/mk/LC_MESSAGES/vinagre.mo 222share/locale/mk/LC_MESSAGES/vinagre.mo
218share/locale/ml/LC_MESSAGES/vinagre.mo 223share/locale/ml/LC_MESSAGES/vinagre.mo
219share/locale/mr/LC_MESSAGES/vinagre.mo 224share/locale/mr/LC_MESSAGES/vinagre.mo
220share/locale/nb/LC_MESSAGES/vinagre.mo 225share/locale/nb/LC_MESSAGES/vinagre.mo
221share/locale/nl/LC_MESSAGES/vinagre.mo 226share/locale/nl/LC_MESSAGES/vinagre.mo
222share/locale/nn/LC_MESSAGES/vinagre.mo 227share/locale/nn/LC_MESSAGES/vinagre.mo
223share/locale/oc/LC_MESSAGES/vinagre.mo 228share/locale/oc/LC_MESSAGES/vinagre.mo
224share/locale/or/LC_MESSAGES/vinagre.mo 229share/locale/or/LC_MESSAGES/vinagre.mo
225share/locale/pa/LC_MESSAGES/vinagre.mo 230share/locale/pa/LC_MESSAGES/vinagre.mo
226share/locale/pl/LC_MESSAGES/vinagre.mo 231share/locale/pl/LC_MESSAGES/vinagre.mo
227share/locale/pt/LC_MESSAGES/vinagre.mo 232share/locale/pt/LC_MESSAGES/vinagre.mo
228share/locale/pt_BR/LC_MESSAGES/vinagre.mo 233share/locale/pt_BR/LC_MESSAGES/vinagre.mo
229share/locale/ro/LC_MESSAGES/vinagre.mo 234share/locale/ro/LC_MESSAGES/vinagre.mo
230share/locale/ru/LC_MESSAGES/vinagre.mo 235share/locale/ru/LC_MESSAGES/vinagre.mo
231share/locale/si/LC_MESSAGES/vinagre.mo 236share/locale/si/LC_MESSAGES/vinagre.mo
 237share/locale/sk/LC_MESSAGES/vinagre.mo
232share/locale/sl/LC_MESSAGES/vinagre.mo 238share/locale/sl/LC_MESSAGES/vinagre.mo
233share/locale/sq/LC_MESSAGES/vinagre.mo 239share/locale/sq/LC_MESSAGES/vinagre.mo
234share/locale/sr/LC_MESSAGES/vinagre.mo 240share/locale/sr/LC_MESSAGES/vinagre.mo
235share/locale/sr@latin/LC_MESSAGES/vinagre.mo 241share/locale/sr@latin/LC_MESSAGES/vinagre.mo
236share/locale/sv/LC_MESSAGES/vinagre.mo 242share/locale/sv/LC_MESSAGES/vinagre.mo
237share/locale/ta/LC_MESSAGES/vinagre.mo 243share/locale/ta/LC_MESSAGES/vinagre.mo
238share/locale/te/LC_MESSAGES/vinagre.mo 244share/locale/te/LC_MESSAGES/vinagre.mo
239share/locale/th/LC_MESSAGES/vinagre.mo 245share/locale/th/LC_MESSAGES/vinagre.mo
240share/locale/tr/LC_MESSAGES/vinagre.mo 246share/locale/tr/LC_MESSAGES/vinagre.mo
241share/locale/uk/LC_MESSAGES/vinagre.mo 247share/locale/uk/LC_MESSAGES/vinagre.mo
242share/locale/vi/LC_MESSAGES/vinagre.mo 248share/locale/vi/LC_MESSAGES/vinagre.mo
243share/locale/zh_CN/LC_MESSAGES/vinagre.mo 249share/locale/zh_CN/LC_MESSAGES/vinagre.mo
244share/locale/zh_HK/LC_MESSAGES/vinagre.mo 250share/locale/zh_HK/LC_MESSAGES/vinagre.mo
@@ -251,16 +257,19 @@ share/omf/vinagre/vinagre-de.omf @@ -251,16 +257,19 @@ share/omf/vinagre/vinagre-de.omf
251share/omf/vinagre/vinagre-el.omf 257share/omf/vinagre/vinagre-el.omf
252share/omf/vinagre/vinagre-en_GB.omf 258share/omf/vinagre/vinagre-en_GB.omf
253share/omf/vinagre/vinagre-es.omf 259share/omf/vinagre/vinagre-es.omf
254share/omf/vinagre/vinagre-fr.omf 260share/omf/vinagre/vinagre-fr.omf
255share/omf/vinagre/vinagre-it.omf 261share/omf/vinagre/vinagre-it.omf
256share/omf/vinagre/vinagre-oc.omf 262share/omf/vinagre/vinagre-oc.omf
257share/omf/vinagre/vinagre-pl.omf 263share/omf/vinagre/vinagre-pl.omf
258share/omf/vinagre/vinagre-pt.omf 264share/omf/vinagre/vinagre-pt.omf
259share/omf/vinagre/vinagre-pt_BR.omf 265share/omf/vinagre/vinagre-pt_BR.omf
260share/omf/vinagre/vinagre-sq.omf 266share/omf/vinagre/vinagre-sq.omf
261share/omf/vinagre/vinagre-sv.omf 267share/omf/vinagre/vinagre-sv.omf
262share/omf/vinagre/vinagre-th.omf 268share/omf/vinagre/vinagre-th.omf
263share/omf/vinagre/vinagre-zh_CN.omf 269share/omf/vinagre/vinagre-zh_CN.omf
 270${PLIST.telepathy}share/telepathy/clients/Vinagre.client
 271share/vinagre-1/plugins/vnc/vnc.ui
264share/vinagre/GNOME_VinagreApplet.xml 272share/vinagre/GNOME_VinagreApplet.xml
 273share/vinagre/vinagre-fav-ui.xml
265share/vinagre/vinagre-ui.xml 274share/vinagre/vinagre-ui.xml
266share/vinagre/vinagre.ui 275share/vinagre/vinagre.ui
cvs diff -r1.3 -r1.4 pkgsrc/net/vinagre/distinfo (expand / switch to unified diff)

--- pkgsrc/net/vinagre/distinfo 2009/10/26 11:04:28 1.3
+++ pkgsrc/net/vinagre/distinfo 2010/07/06 16:17:56 1.4
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.3 2009/10/26 11:04:28 drochner Exp $ 1$NetBSD: distinfo,v 1.4 2010/07/06 16:17:56 drochner Exp $
2 2
3SHA1 (vinagre-2.28.1.tar.gz) = fcbf1474c0aad96df06bc8ae68712ef78bcbece5 3SHA1 (vinagre-2.30.2.tar.gz) = 69fac5ca59f809cbaece64412d094bc57cef604d
4RMD160 (vinagre-2.28.1.tar.gz) = 771038d4c7aa688a04e871222268ffa119d31b0a 4RMD160 (vinagre-2.30.2.tar.gz) = 202ad1422a38c9f7f4fd063f307188ccd29f20ac
5Size (vinagre-2.28.1.tar.gz) = 2311211 bytes 5Size (vinagre-2.30.2.tar.gz) = 2946268 bytes