Add CONFLICTS with the each others.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15871 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 470 insertions, 3 deletions

diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
new file mode 100644
index 000000000..6cc7a5e2f
--- /dev/null
+++ b/net/vinagre/Makefile
@@ -0,0 +1,64 @@
+# New ports collection makefile for:	vinagre
+# Date created:				16 December 2007
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/net/vinagre/Makefile,v 1.24 2010/11/20 15:36:49 kwm Exp $
+#   $MCom: ports/net/vinagre/Makefile,v 1.42 2010/09/29 14:23:36 kwm Exp $
+#
+
+PORTNAME=	vinagre
+PORTVERSION=	2.30.3
+CATEGORIES=	net gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	VNC client for the GNOME Desktop
+
+LIB_DEPENDS=	gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \
+    		avahi-core.7:${PORTSDIR}/net/avahi-app \
+		avahi-ui.0:${PORTSDIR}/net/avahi-gtk \
+		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+
+CONFLICTS=	vinagre-3.[0-9]*
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+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 --enable-applet -enable-ssh
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+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
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
new file mode 100644
index 000000000..9a870e3fd
--- /dev/null
+++ b/net/vinagre/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/vinagre-2.30.3.tar.bz2) = 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4
+SIZE (gnome2/vinagre-2.30.3.tar.bz2) = 2447388
diff --git a/net/vinagre/files/patch-Makefile.in b/net/vinagre/files/patch-Makefile.in
new file mode 100644
index 000000000..d54e01e7f
--- /dev/null
+++ b/net/vinagre/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2007-12-16 14:18:35.000000000 -0500
++++ Makefile.in	2007-12-16 14:19:09.000000000 -0500
+@@ -667,7 +667,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-vinagredocDATA
++install-data-am:
+ 
+ install-dvi: install-dvi-recursive
+ 
diff --git a/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c b/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c
new file mode 100644
index 000000000..e855de33e
--- /dev/null
+++ b/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c
@@ -0,0 +1,11 @@
+--- plugins/vnc/vinagre-vnc-listener-dialog.c.orig	2010-01-06 19:49:40.000000000 -0500
++++ plugins/vnc/vinagre-vnc-listener-dialog.c	2010-01-06 19:49:55.000000000 -0500
+@@ -18,6 +18,8 @@
+  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <net/if.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
diff --git a/net/vinagre/pkg-descr b/net/vinagre/pkg-descr
new file mode 100644
index 000000000..9aa3ad1fa
--- /dev/null
+++ b/net/vinagre/pkg-descr
@@ -0,0 +1,10 @@
+Vinagre is a VNC Client for the GNOME Desktop.  Its features include:
+
+* You can connect to several machines at the same time, we like tabs
+* You can keep track of your most used connections, we like favorites
+* You can keep track of your recently used connections, we like GtkRecent
+* You can browse your network for VNC servers, we like avahi
+* You don't need to supply the password on every connection, we like GNOME
+  Keyring
+
+WWW: http://www.gnome.org/projects/vinagre/
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
new file mode 100644
index 000000000..e104951d7
--- /dev/null
+++ b/net/vinagre/pkg-plist
@@ -0,0 +1,363 @@
+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-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
+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-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
+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.freedesktop.Telepathy.Client.Vinagre.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
+share/icons/hicolor/16x16/mimetypes/application-x-remote-connection.png
+share/icons/hicolor/16x16/mimetypes/application-x-vnc.png
+share/icons/hicolor/16x16/status/view-minimize.png
+share/icons/hicolor/22x22/apps/vinagre.png
+share/icons/hicolor/22x22/mimetypes/application-x-remote-connection.png
+share/icons/hicolor/22x22/mimetypes/application-x-vnc.png
+share/icons/hicolor/22x22/status/view-minimize.png
+share/icons/hicolor/24x24/apps/vinagre.png
+share/icons/hicolor/24x24/mimetypes/application-x-remote-connection.png
+share/icons/hicolor/24x24/mimetypes/application-x-vnc.png
+share/icons/hicolor/32x32/apps/vinagre.png
+share/icons/hicolor/32x32/mimetypes/application-x-remote-connection.png
+share/icons/hicolor/32x32/mimetypes/application-x-vnc.png
+share/icons/hicolor/32x32/status/view-minimize.png
+share/icons/hicolor/48x48/apps/vinagre.png
+share/icons/hicolor/48x48/mimetypes/application-x-remote-connection.png
+share/icons/hicolor/48x48/mimetypes/application-x-vnc.png
+share/icons/hicolor/48x48/status/view-minimize.png
+share/icons/hicolor/scalable/apps/vinagre.svg
+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@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/es/LC_MESSAGES/vinagre.mo
+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
+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/vi/LC_MESSAGES/vinagre.mo
+share/locale/uk/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/application/x-remote-connection.xml
+share/mime/application/x-vnc.xml
+share/mime/packages/vinagre-mime.xml
+share/omf/vinagre/vinagre-C.omf
+share/omf/vinagre/vinagre-ca.omf
+share/omf/vinagre/vinagre-cs.omf
+share/omf/vinagre/vinagre-de.omf
+share/omf/vinagre/vinagre-el.omf
+share/omf/vinagre/vinagre-en_GB.omf
+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
+share/omf/vinagre/vinagre-sv.omf
+share/omf/vinagre/vinagre-th.omf
+share/omf/vinagre/vinagre-zh_CN.omf
+%%TELEPATHY%%share/telepathy/clients/Vinagre.client
+share/vinagre-1/plugins/vnc/vnc.ui
+%%DATADIR%%/vinagre-fav-ui.xml
+%%DATADIR%%/GNOME_VinagreApplet.xml
+%%DATADIR%%/vinagre-ui.xml
+%%DATADIR%%/vinagre.ui
+@dirrm %%DATADIR%%
+@dirrm share/vinagre-1/plugins/vnc
+@dirrm share/vinagre-1/plugins
+@dirrm share/vinagre-1
+%%TELEPATHY%%@dirrmtry share/telepathy/clients
+%%TELEPATHY%%@dirrmtry share/telepathy
+@dirrm share/omf/vinagre
+@dirrm share/gnome/help/vinagre/zh_CN/figures
+@dirrm share/gnome/help/vinagre/zh_CN
+@dirrm share/gnome/help/vinagre/th/figures
+@dirrm share/gnome/help/vinagre/th
+@dirrm share/gnome/help/vinagre/sv/figures
+@dirrm share/gnome/help/vinagre/sv
+@dirrm share/gnome/help/vinagre/sq/figures
+@dirrm share/gnome/help/vinagre/sq
+@dirrm share/gnome/help/vinagre/pt_BR/figures
+@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
+@dirrm share/gnome/help/vinagre/it
+@dirrm share/gnome/help/vinagre/fr/figures
+@dirrm share/gnome/help/vinagre/fr
+@dirrm share/gnome/help/vinagre/es/figures
+@dirrm share/gnome/help/vinagre/es
+@dirrm share/gnome/help/vinagre/en_GB/figures
+@dirrm share/gnome/help/vinagre/en_GB
+@dirrm share/gnome/help/vinagre/el/figures
+@dirrm share/gnome/help/vinagre/el
+@dirrm share/gnome/help/vinagre/de/figures
+@dirrm share/gnome/help/vinagre/de
+@dirrm share/gnome/help/vinagre/cs/figures
+@dirrm share/gnome/help/vinagre/cs
+@dirrm share/gnome/help/vinagre/ca/figures
+@dirrm share/gnome/help/vinagre/ca
+@dirrm share/gnome/help/vinagre/C/figures
+@dirrm share/gnome/help/vinagre/C
+@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
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/oc/LC_MESSAGES
+@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/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@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
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/net/vinagre3/Makefile b/net/vinagre3/Makefile
index eb624a72c..b185e88b5 100644
--- a/net/vinagre3/Makefile
+++ b/net/vinagre3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#  $MCom: ports/net/vinagre3/Makefile,v 1.3 2011/04/08 23:02:14 mezz Exp $
+#  $MCom: ports/net/vinagre3/Makefile,v 1.4 2011/04/15 16:24:18 kwm Exp $
 #
 
 PORTNAME=	vinagre
@@ -22,6 +22,8 @@ LIB_DEPENDS=	gtk-vnc-2.0.0:${PORTSDIR}/net/gtk-vnc3 \
 		avahi-ui-gtk3.0:${PORTSDIR}/net/avahi-gtk3 \
 		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
 
+CONFLICTS=	vinagre-2.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gtk30 libxml2 vte3
diff --git a/net/vino/Makefile b/net/vino/Makefile
index ae00c2779..edcd61dd9 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vino/Makefile,v 1.83 2011/03/07 08:48:34 kwm Exp $
+#   $MCom: ports/net/vino/Makefile,v 1.84 2011/04/10 19:41:36 mezz Exp $
 #
 
 PORTNAME=	vino
@@ -20,6 +20,8 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 
+CONFLICTS=	vino-3.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomepanel
diff --git a/net/vino3/Makefile b/net/vino3/Makefile
index b3dd4dc42..ddcb94d37 100644
--- a/net/vino3/Makefile
+++ b/net/vino3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vino3/Makefile,v 1.5 2011/04/10 19:41:36 mezz Exp $
+#   $MCom: ports/net/vino3/Makefile,v 1.6 2011/04/14 20:32:17 kwm Exp $
 #
 
 PORTNAME=	vino
@@ -23,6 +23,8 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
 		avahi-glib.1:${PORTSDIR}/net/avahi-app
 
+CONFLICTS=	vino-2.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gtk30