3 files changed, 157 insertions, 10 deletions

diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index ea7bd27f417b..692a0ab46a7b 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/net/vinagre/Makefile,v 1.1 2009/04/15 09:36:08 kwm Exp $
+#   $MCom: ports/net/vinagre/Makefile,v 1.32 2009/10/19 13:20:56 avl Exp $
 #
 
 PORTNAME=	vinagre
-PORTVERSION=	2.26.2
-PORTREVISION=	1
+PORTVERSION=	2.28.1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -23,13 +22,13 @@ LIB_DEPENDS=	gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils \
+USE_GNOME=	gnomeprefix intlhack gnomehack vte gconf2 gnomedocutils \
 		gnomepanel
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--enable-avahi
+CONFIGURE_ARGS=	--enable-avahi --enable-applet -enable-ssh
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -37,6 +36,19 @@ GCONF_SCHEMAS=	vinagre.schemas
 
 MAN1=		vinagre.1
 
+OPTIONS=	TELEPATHY "Enable telepathy integration" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_TELEPATHY)
+CONFIGURE_ARGS+=--enable-telepathy
+LIB_DEPENDS+=	telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+PLIST_SUB+=	TELEPATHY=""
+.else
+CONFIGURE_ARGS+=--disable-telepathy
+PLIST_SUB+=	TELEPATHY="@comment "
+.endif
+
 post-install:
 	@-update-desktop-database > /dev/null
 	@-update-mime-database ${PREFIX}/share/mime > /dev/null
@@ -47,4 +59,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index be3f82179e45..26137b5073ff 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vinagre-2.26.2.tar.bz2) = 86686bb8ba70a6cf38de48c45515c7fc
-SHA256 (gnome2/vinagre-2.26.2.tar.bz2) = 8a1e86dff5e1c14bb53f8f5ee579c7ddaaf532d5d7b1f66a2b5a239a65a15fb5
-SIZE (gnome2/vinagre-2.26.2.tar.bz2) = 1445532
+MD5 (gnome2/vinagre-2.28.1.tar.bz2) = 3fec37a3e20d6f3641d905b580f7306a
+SHA256 (gnome2/vinagre-2.28.1.tar.bz2) = 774276784b3f097faf165dff37d1e9372098db5570421f4e213fa3c8e9808ad4
+SIZE (gnome2/vinagre-2.28.1.tar.bz2) = 1888223
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index 01d26136148b..6f9d4155544f 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -1,45 +1,164 @@
 bin/vinagre
 libdata/bonobo/servers/GNOME_VinagreApplet.server
 libexec/vinagre-applet
+include/vinagre-1.0/vinagre/vinagre-app.h
+include/vinagre-1.0/vinagre/vinagre-bacon.h
+include/vinagre-1.0/vinagre/vinagre-bookmarks-entry.h
+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-commands.h
+include/vinagre-1.0/vinagre/vinagre-connect.h
+include/vinagre-1.0/vinagre/vinagre-connection.h
+include/vinagre-1.0/vinagre/vinagre-debug.h
+include/vinagre-1.0/vinagre/vinagre-dirs.h
+include/vinagre-1.0/vinagre/vinagre-dnd.h
+include/vinagre-1.0/vinagre/vinagre-fav.h
+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-tab.h
+include/vinagre-1.0/vinagre/vinagre-ui.h
+include/vinagre-1.0/vinagre/vinagre-utils.h
+include/vinagre-1.0/vinagre/vinagre-window.h
+lib/vinagre-1/plugin-loaders/libcloader.la
+lib/vinagre-1/plugin-loaders/libcloader.so
+lib/vinagre-1/plugins/libssh.la
+lib/vinagre-1/plugins/libssh.so
+lib/vinagre-1/plugins/libvnc.la
+lib/vinagre-1/plugins/libvnc.so
+lib/vinagre-1/plugins/ssh.vinagre-plugin
+lib/vinagre-1/plugins/vnc.vinagre-plugin
+libdata/pkgconfig/vinagre-1.0.pc
 share/applications/vinagre-file.desktop
 share/applications/vinagre.desktop
+%%TELEPATHY%%share/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.rfb.service
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+share/gnome/help/vinagre/C/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/C/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/C/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/C/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/C/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/C/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/C/legal.xml
 share/gnome/help/vinagre/C/vinagre.xml
+share/gnome/help/vinagre/ca/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/ca/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/ca/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/ca/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/ca/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/ca/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/ca/vinagre.xml
+share/gnome/help/vinagre/cs/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/cs/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/cs/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/cs/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/cs/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/cs/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/cs/vinagre.xml
+share/gnome/help/vinagre/de/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/de/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/de/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/de/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/de/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/de/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/de/vinagre.xml
+share/gnome/help/vinagre/el/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/el/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/el/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/el/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/el/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/el/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/el/vinagre.xml
+share/gnome/help/vinagre/en_GB/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/en_GB/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/en_GB/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/en_GB/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/en_GB/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/en_GB/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/en_GB/vinagre.xml
+share/gnome/help/vinagre/es/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/es/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/es/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/es/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/es/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/es/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/es/vinagre.xml
+share/gnome/help/vinagre/fr/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/fr/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/fr/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/fr/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/fr/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/fr/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/fr/vinagre.xml
+share/gnome/help/vinagre/it/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/it/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/it/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/it/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/it/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/it/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/it/vinagre.xml
+share/gnome/help/vinagre/oc/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/oc/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/oc/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/oc/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/oc/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/oc/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/oc/vinagre.xml
+share/gnome/help/vinagre/pl/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/pl/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/pl/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/pl/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/pl/figures/vinagre-saving-bookmarks.png
+share/gnome/help/vinagre/pl/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/pl/vinagre.xml
+share/gnome/help/vinagre/pt/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/pt/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/pt/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/pt/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/pt/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/pt/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/pt/vinagre.xml
+share/gnome/help/vinagre/pt_BR/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/pt_BR/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/pt_BR/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/pt_BR/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/pt_BR/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/pt_BR/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/pt_BR/vinagre.xml
+share/gnome/help/vinagre/sq/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/sq/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/sq/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/sq/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/sq/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/sq/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/sq/vinagre.xml
+share/gnome/help/vinagre/sv/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/sv/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/sv/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/sv/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/sv/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/sv/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/sv/vinagre.xml
+share/gnome/help/vinagre/th/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/th/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/th/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/th/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/th/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/th/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/th/vinagre.xml
+share/gnome/help/vinagre/zh_CN/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/zh_CN/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/zh_CN/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/zh_CN/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/zh_CN/figures/vinagre-saving-bookmarks.png
 share/gnome/help/vinagre/zh_CN/figures/vinagre-screenshot.png
 share/gnome/help/vinagre/zh_CN/vinagre.xml
 share/icons/hicolor/16x16/apps/vinagre.png
@@ -69,8 +188,10 @@ share/locale/as/LC_MESSAGES/vinagre.mo
 share/locale/ast/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
@@ -81,6 +202,7 @@ share/locale/et/LC_MESSAGES/vinagre.mo
 share/locale/eu/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
@@ -93,6 +215,7 @@ 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
@@ -135,6 +258,7 @@ share/omf/vinagre/vinagre-es.omf
 share/omf/vinagre/vinagre-fr.omf
 share/omf/vinagre/vinagre-it.omf
 share/omf/vinagre/vinagre-oc.omf
+share/omf/vinagre/vinagre-pl.omf
 share/omf/vinagre/vinagre-pt.omf
 share/omf/vinagre/vinagre-pt_BR.omf
 share/omf/vinagre/vinagre-sq.omf
@@ -143,7 +267,7 @@ share/omf/vinagre/vinagre-th.omf
 share/omf/vinagre/vinagre-zh_CN.omf
 %%DATADIR%%/GNOME_VinagreApplet.xml
 %%DATADIR%%/vinagre-ui.xml
-%%DATADIR%%/vinagre.glade
+%%DATADIR%%/vinagre.ui
 @dirrm %%DATADIR%%
 @dirrm share/omf/vinagre
 @dirrm share/gnome/help/vinagre/zh_CN/figures
@@ -158,6 +282,8 @@ share/omf/vinagre/vinagre-zh_CN.omf
 @dirrm share/gnome/help/vinagre/pt_BR
 @dirrm share/gnome/help/vinagre/pt/figures
 @dirrm share/gnome/help/vinagre/pt
+@dirrm share/gnome/help/vinagre/pl/figures
+@dirrm share/gnome/help/vinagre/pl
 @dirrm share/gnome/help/vinagre/oc/figures
 @dirrm share/gnome/help/vinagre/oc
 @dirrm share/gnome/help/vinagre/it/figures
@@ -181,6 +307,11 @@ share/omf/vinagre/vinagre-zh_CN.omf
 @dirrm share/gnome/help/vinagre
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
+@dirrm lib/vinagre-1/plugins
+@dirrm lib/vinagre-1/plugin-loaders
+@dirrm lib/vinagre-1
+@dirrm include/vinagre-1.0/vinagre
+@dirrm include/vinagre-1.0
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -197,8 +328,12 @@ share/omf/vinagre/vinagre-zh_CN.omf
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/ca@valencia//LC_MESSAGES
+@dirrmtry share/locale/ca@valencia/
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES