16 files changed, 352 insertions, 37 deletions

diff --git a/net/Makefile b/net/Makefile
index 5680ad3cb650..593cb9069721 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -279,6 +279,7 @@
     SUBDIR += libevnet
     SUBDIR += libexosip2
     SUBDIR += libgnetwork
+    SUBDIR += libgweather
     SUBDIR += libmms
     SUBDIR += libmxp
     SUBDIR += libnet
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 1df4dffccaf8..3bd79b734dd2 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/avahi-app/Makefile,v 1.6 2007/08/26 06:10:14 marcus Exp $
+#   $MCom: ports/net/avahi-app/Makefile,v 1.9 2008/03/20 16:07:21 mezz Exp $
 #
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.22
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
@@ -113,6 +113,9 @@ avahi-post-patch:
 	    	s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
 		${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
 		${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in
+	@${REINPLACE_CMD} -e 's|dbus_connection_disconnect|dbus_connection_close|g' \
+	    	${WRKSRC}/avahi-client/client.c \
+		${WRKSRC}/avahi-daemon/dbus-protocol.c
 
 post-build: avahi-post-build
 
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 5463ef66074c..fc2ffbd0db89 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,22 +3,19 @@
 # Whom:				Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnome-nettool/Makefile,v 1.40 2007/09/18 14:09:24 ahze Exp $
+#   $MCom: ports/net/gnome-nettool/Makefile,v 1.42 2008/03/10 21:33:09 mezz Exp $
 #
 
 PORTNAME=	gnome-nettool
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 PORTEPOCH=	1
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-nettool/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-nettool-${PORTVERSION}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME utility that provides network information statistics
 
-USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
 USE_GMAKE=	yes
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 60572e77e0f0..6bf5e40c6e7e 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8f16e4207655ccf1e7af679fc0f58bbd
-SHA256 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8668dfa5b7d97245ffe5d53630b891d17f22e86c237ca9b8345774b20d745c15
-SIZE (gnome2/gnome-nettool-2.20.0.tar.bz2) = 572137
+MD5 (gnome2/gnome-nettool-2.22.0.tar.bz2) = 290dd50a08a3859332afb6daf46dde25
+SHA256 (gnome2/gnome-nettool-2.22.0.tar.bz2) = ddf6de5d2df6515423ef8aad12750a69a553584685854fa47073126b89fc25a3
+SIZE (gnome2/gnome-nettool-2.22.0.tar.bz2) = 617193
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 50ceb8333f26..3dceffc9e15f 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -21,9 +21,11 @@ share/gnome/help/gnome-nettool/uk/gnome-nettool.xml
 share/gnome/help/gnome-nettool/vi/gnome-nettool.xml
 share/icons/hicolor/16x16/apps/gnome-nettool.png
 share/icons/hicolor/22x22/apps/gnome-nettool.png
+share/icons/hicolor/24x24/apps/gnome-nettool.png
 share/icons/hicolor/32x32/apps/gnome-nettool.png
 share/icons/hicolor/scalable/apps/gnome-nettool.svg
 share/locale/ar/LC_MESSAGES/gnome-nettool.mo
+share/locale/as/LC_MESSAGES/gnome-nettool.mo
 share/locale/az/LC_MESSAGES/gnome-nettool.mo
 share/locale/bg/LC_MESSAGES/gnome-nettool.mo
 share/locale/bn/LC_MESSAGES/gnome-nettool.mo
@@ -55,6 +57,7 @@ share/locale/id/LC_MESSAGES/gnome-nettool.mo
 share/locale/it/LC_MESSAGES/gnome-nettool.mo
 share/locale/ja/LC_MESSAGES/gnome-nettool.mo
 share/locale/ka/LC_MESSAGES/gnome-nettool.mo
+share/locale/kn/LC_MESSAGES/gnome-nettool.mo
 share/locale/ko/LC_MESSAGES/gnome-nettool.mo
 share/locale/ku/LC_MESSAGES/gnome-nettool.mo
 share/locale/lt/LC_MESSAGES/gnome-nettool.mo
@@ -63,10 +66,12 @@ share/locale/mg/LC_MESSAGES/gnome-nettool.mo
 share/locale/mk/LC_MESSAGES/gnome-nettool.mo
 share/locale/ml/LC_MESSAGES/gnome-nettool.mo
 share/locale/mn/LC_MESSAGES/gnome-nettool.mo
+share/locale/mr/LC_MESSAGES/gnome-nettool.mo
 share/locale/ms/LC_MESSAGES/gnome-nettool.mo
 share/locale/nb/LC_MESSAGES/gnome-nettool.mo
 share/locale/ne/LC_MESSAGES/gnome-nettool.mo
 share/locale/nl/LC_MESSAGES/gnome-nettool.mo
+share/locale/nn/LC_MESSAGES/gnome-nettool.mo
 share/locale/oc/LC_MESSAGES/gnome-nettool.mo
 share/locale/or/LC_MESSAGES/gnome-nettool.mo
 share/locale/pa/LC_MESSAGES/gnome-nettool.mo
@@ -88,6 +93,8 @@ share/locale/te/LC_MESSAGES/gnome-nettool.mo
 share/locale/th/LC_MESSAGES/gnome-nettool.mo
 share/locale/tr/LC_MESSAGES/gnome-nettool.mo
 share/locale/uk/LC_MESSAGES/gnome-nettool.mo
+share/locale/uz/LC_MESSAGES/gnome-nettool.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-nettool.mo
 share/locale/vi/LC_MESSAGES/gnome-nettool.mo
 share/locale/wa/LC_MESSAGES/gnome-nettool.mo
 share/locale/xh/LC_MESSAGES/gnome-nettool.mo
@@ -118,10 +125,13 @@ share/pixmaps/gnome-nettool.png
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/dialogs
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/si/LC_MESSAGES
@@ -130,6 +140,8 @@ share/pixmaps/gnome-nettool.png
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -138,4 +150,5 @@ share/pixmaps/gnome-nettool.png
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/net/gstreamer-plugins-libmms/Makefile b/net/gstreamer-plugins-libmms/Makefile
index 9f3d61ce6b87..432d04d5c0f9 100644
--- a/net/gstreamer-plugins-libmms/Makefile
+++ b/net/gstreamer-plugins-libmms/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/net/gstreamer-plugins-libmms/Makefile,v 1.3 2008/03/19 14:05:38 ahze Exp $
 #
 
 PORTREVISION=	2
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
new file mode 100644
index 000000000000..15fc44ccff56
--- /dev/null
+++ b/net/libgweather/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for:	libgweather
+# Date created:				14th Jan 2008
+# Whom:					Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/net/libgweather/Makefile,v 1.7 2008/03/11 11:45:48 ahze Exp $
+#
+
+PORTNAME=	libgweather
+PORTVERSION=	2.22.0
+CATEGORIES=	net gnome
+MASTER_SITES=	GNOME
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Library to accessing online weather informations
+
+USE_GETTEXT=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gnomevfs2
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	gweather.schemas
+
+.include <bsd.port.mk>
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
new file mode 100644
index 000000000000..62580528c851
--- /dev/null
+++ b/net/libgweather/distinfo
@@ -0,0 +1,3 @@
+MD5 (libgweather-2.22.0.tar.bz2) = f25d3dada7416bf2d5edb5c7fd7ffce0
+SHA256 (libgweather-2.22.0.tar.bz2) = 4532c8f6938b8f878e20a5fd4069ac7ee9153da28561e74162fc112abfd0f411
+SIZE (libgweather-2.22.0.tar.bz2) = 2785765
diff --git a/net/libgweather/pkg-descr b/net/libgweather/pkg-descr
new file mode 100644
index 000000000000..99ea830ef287
--- /dev/null
+++ b/net/libgweather/pkg-descr
@@ -0,0 +1,9 @@
+libgweather is a library to access weather information from online
+services for numerous locations.
+
+libgweather isn't supported in the devel platform, which means OS vendors
+won't guarantee the API/ABI long-term, but authors of open source apps
+should feel free to use libgweather as users can always recompile against
+a new version.
+
+WWW: http://www.gnome.org/
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
new file mode 100644
index 000000000000..5ffe9ae7e731
--- /dev/null
+++ b/net/libgweather/pkg-plist
@@ -0,0 +1,170 @@
+include/libgweather/gweather-gconf.h
+include/libgweather/gweather-prefs.h
+include/libgweather/weather.h
+lib/libgweather.a
+lib/libgweather.la
+lib/libgweather.so
+lib/libgweather.so.0
+libdata/pkgconfig/gweather.pc
+%%DATADIR%%/Locations.xml
+%%DATADIR%%/locations.dtd
+share/locale/am/LC_MESSAGES/libgweather.mo
+share/locale/ar/LC_MESSAGES/libgweather.mo
+share/locale/as/LC_MESSAGES/libgweather.mo
+share/locale/az/LC_MESSAGES/libgweather.mo
+share/locale/be/LC_MESSAGES/libgweather.mo
+share/locale/be@latin/LC_MESSAGES/libgweather.mo
+share/locale/bg/LC_MESSAGES/libgweather.mo
+share/locale/bn/LC_MESSAGES/libgweather.mo
+share/locale/bn_IN/LC_MESSAGES/libgweather.mo
+share/locale/bs/LC_MESSAGES/libgweather.mo
+share/locale/ca/LC_MESSAGES/libgweather.mo
+share/locale/cs/LC_MESSAGES/libgweather.mo
+share/locale/cy/LC_MESSAGES/libgweather.mo
+share/locale/da/LC_MESSAGES/libgweather.mo
+share/locale/de/LC_MESSAGES/libgweather.mo
+share/locale/dz/LC_MESSAGES/libgweather.mo
+share/locale/el/LC_MESSAGES/libgweather.mo
+share/locale/en_CA/LC_MESSAGES/libgweather.mo
+share/locale/en_GB/LC_MESSAGES/libgweather.mo
+share/locale/es/LC_MESSAGES/libgweather.mo
+share/locale/es_AR/LC_MESSAGES/libgweather.mo
+share/locale/es_CL/LC_MESSAGES/libgweather.mo
+share/locale/es_CO/LC_MESSAGES/libgweather.mo
+share/locale/es_CR/LC_MESSAGES/libgweather.mo
+share/locale/es_DO/LC_MESSAGES/libgweather.mo
+share/locale/es_EC/LC_MESSAGES/libgweather.mo
+share/locale/es_ES/LC_MESSAGES/libgweather.mo
+share/locale/es_GT/LC_MESSAGES/libgweather.mo
+share/locale/es_HN/LC_MESSAGES/libgweather.mo
+share/locale/es_MX/LC_MESSAGES/libgweather.mo
+share/locale/es_NI/LC_MESSAGES/libgweather.mo
+share/locale/es_PA/LC_MESSAGES/libgweather.mo
+share/locale/es_PE/LC_MESSAGES/libgweather.mo
+share/locale/es_PR/LC_MESSAGES/libgweather.mo
+share/locale/es_SV/LC_MESSAGES/libgweather.mo
+share/locale/es_UY/LC_MESSAGES/libgweather.mo
+share/locale/es_VE/LC_MESSAGES/libgweather.mo
+share/locale/et/LC_MESSAGES/libgweather.mo
+share/locale/eu/LC_MESSAGES/libgweather.mo
+share/locale/fa/LC_MESSAGES/libgweather.mo
+share/locale/fi/LC_MESSAGES/libgweather.mo
+share/locale/fr/LC_MESSAGES/libgweather.mo
+share/locale/ga/LC_MESSAGES/libgweather.mo
+share/locale/gl/LC_MESSAGES/libgweather.mo
+share/locale/gu/LC_MESSAGES/libgweather.mo
+share/locale/he/LC_MESSAGES/libgweather.mo
+share/locale/hi/LC_MESSAGES/libgweather.mo
+share/locale/hr/LC_MESSAGES/libgweather.mo
+share/locale/hu/LC_MESSAGES/libgweather.mo
+share/locale/hy/LC_MESSAGES/libgweather.mo
+share/locale/id/LC_MESSAGES/libgweather.mo
+share/locale/is/LC_MESSAGES/libgweather.mo
+share/locale/it/LC_MESSAGES/libgweather.mo
+share/locale/ja/LC_MESSAGES/libgweather.mo
+share/locale/ka/LC_MESSAGES/libgweather.mo
+share/locale/kn/LC_MESSAGES/libgweather.mo
+share/locale/ko/LC_MESSAGES/libgweather.mo
+share/locale/ku/LC_MESSAGES/libgweather.mo
+share/locale/ky/LC_MESSAGES/libgweather.mo
+share/locale/lt/LC_MESSAGES/libgweather.mo
+share/locale/lv/LC_MESSAGES/libgweather.mo
+share/locale/mg/LC_MESSAGES/libgweather.mo
+share/locale/mk/LC_MESSAGES/libgweather.mo
+share/locale/ml/LC_MESSAGES/libgweather.mo
+share/locale/mn/LC_MESSAGES/libgweather.mo
+share/locale/mr/LC_MESSAGES/libgweather.mo
+share/locale/ms/LC_MESSAGES/libgweather.mo
+share/locale/nb/LC_MESSAGES/libgweather.mo
+share/locale/ne/LC_MESSAGES/libgweather.mo
+share/locale/nl/LC_MESSAGES/libgweather.mo
+share/locale/nn/LC_MESSAGES/libgweather.mo
+share/locale/oc/LC_MESSAGES/libgweather.mo
+share/locale/or/LC_MESSAGES/libgweather.mo
+share/locale/pa/LC_MESSAGES/libgweather.mo
+share/locale/pl/LC_MESSAGES/libgweather.mo
+share/locale/pt/LC_MESSAGES/libgweather.mo
+share/locale/pt_BR/LC_MESSAGES/libgweather.mo
+share/locale/ro/LC_MESSAGES/libgweather.mo
+share/locale/ru/LC_MESSAGES/libgweather.mo
+share/locale/rw/LC_MESSAGES/libgweather.mo
+share/locale/si/LC_MESSAGES/libgweather.mo
+share/locale/sk/LC_MESSAGES/libgweather.mo
+share/locale/sl/LC_MESSAGES/libgweather.mo
+share/locale/sq/LC_MESSAGES/libgweather.mo
+share/locale/sr/LC_MESSAGES/libgweather.mo
+share/locale/sr@Latn/LC_MESSAGES/libgweather.mo
+share/locale/sv/LC_MESSAGES/libgweather.mo
+share/locale/ta/LC_MESSAGES/libgweather.mo
+share/locale/te/LC_MESSAGES/libgweather.mo
+share/locale/th/LC_MESSAGES/libgweather.mo
+share/locale/tr/LC_MESSAGES/libgweather.mo
+share/locale/uk/LC_MESSAGES/libgweather.mo
+share/locale/vi/LC_MESSAGES/libgweather.mo
+share/locale/wa/LC_MESSAGES/libgweather.mo
+share/locale/xh/LC_MESSAGES/libgweather.mo
+share/locale/zh_CN/LC_MESSAGES/libgweather.mo
+share/locale/zh_HK/LC_MESSAGES/libgweather.mo
+share/locale/zh_TW/LC_MESSAGES/libgweather.mo
+@dirrm %%DATADIR%%
+@dirrm include/libgweather
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/es_VE/LC_MESSAGES
+@dirrmtry share/locale/es_VE
+@dirrmtry share/locale/es_UY/LC_MESSAGES
+@dirrmtry share/locale/es_UY
+@dirrmtry share/locale/es_SV/LC_MESSAGES
+@dirrmtry share/locale/es_SV
+@dirrmtry share/locale/es_PR/LC_MESSAGES
+@dirrmtry share/locale/es_PR
+@dirrmtry share/locale/es_PE/LC_MESSAGES
+@dirrmtry share/locale/es_PE
+@dirrmtry share/locale/es_PA/LC_MESSAGES
+@dirrmtry share/locale/es_PA
+@dirrmtry share/locale/es_NI/LC_MESSAGES
+@dirrmtry share/locale/es_NI
+@dirrmtry share/locale/es_HN/LC_MESSAGES
+@dirrmtry share/locale/es_HN
+@dirrmtry share/locale/es_GT/LC_MESSAGES
+@dirrmtry share/locale/es_GT
+@dirrmtry share/locale/es_EC/LC_MESSAGES
+@dirrmtry share/locale/es_EC
+@dirrmtry share/locale/es_DO/LC_MESSAGES
+@dirrmtry share/locale/es_DO
+@dirrmtry share/locale/es_CR/LC_MESSAGES
+@dirrmtry share/locale/es_CR
+@dirrmtry share/locale/es_CO/LC_MESSAGES
+@dirrmtry share/locale/es_CO
+@dirrmtry share/locale/es_CL/LC_MESSAGES
+@dirrmtry share/locale/es_CL
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@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/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 5143efce23c4..72d180430026 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,14 +3,15 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/net/vinagre/Makefile,v 1.5 2008/03/10 15:15:00 ahze Exp $
 #
 
 PORTNAME=	vinagre
-PORTVERSION=	0.4
-PORTREVISION=	3
+PORTVERSION=	0.5.0
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC client for the GNOME Desktop
@@ -23,20 +24,25 @@ LIB_DEPENDS=	gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libglade2 gconf2 gnomevfs2
+USE_GNOME=	gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-avahi
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	vinagre.schemas
+
+MAN1=		vinagre.1
+
 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 INSTALL MAINTAINERS NEWS README
+.for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index 5d984c827b08..a1327a702e0e 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (vinagre-0.4.tar.bz2) = 97dee0faa1b78e2497b9d231053b2f6d
-SHA256 (vinagre-0.4.tar.bz2) = 547663727bc6e14688a6d9f9cf0fd5a724ed678a6279ab457afb40a61e89a2e3
-SIZE (vinagre-0.4.tar.bz2) = 363407
+MD5 (gnome2/vinagre-0.5.0.tar.bz2) = 3d5febbf26565e2095355848064a796a
+SHA256 (gnome2/vinagre-0.5.0.tar.bz2) = 9e0552bb68b8514e0a6d6f62ccda60edbcf0a4f5dc3c524017321916e902d151
+SIZE (gnome2/vinagre-0.5.0.tar.bz2) = 1026066
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index 11d6f2b45350..59d5b0b091f2 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -4,10 +4,24 @@ share/applications/vinagre.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+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/es/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/es/vinagre.xml
+share/gnome/help/vinagre/fr/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/fr/vinagre.xml
+share/gnome/help/vinagre/it/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/it/vinagre.xml
+share/gnome/help/vinagre/oc/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/oc/vinagre.xml
+share/gnome/help/vinagre/pt/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/pt/vinagre.xml
+share/gnome/help/vinagre/sv/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/sv/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
@@ -27,33 +41,92 @@ 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/be@latin/LC_MESSAGES/vinagre.mo
 share/locale/bg/LC_MESSAGES/vinagre.mo
+share/locale/bn_IN/LC_MESSAGES/vinagre.mo
 share/locale/ca/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_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/gl/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/it/LC_MESSAGES/vinagre.mo
+share/locale/ja/LC_MESSAGES/vinagre.mo
+share/locale/ko/LC_MESSAGES/vinagre.mo
+share/locale/lt/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/nb/LC_MESSAGES/vinagre.mo
 share/locale/nl/LC_MESSAGES/vinagre.mo
 share/locale/oc/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/ru/LC_MESSAGES/vinagre.mo
 share/locale/si/LC_MESSAGES/vinagre.mo
 share/locale/sl/LC_MESSAGES/vinagre.mo
 share/locale/sv/LC_MESSAGES/vinagre.mo
+share/locale/ta/LC_MESSAGES/vinagre.mo
+share/locale/th/LC_MESSAGES/vinagre.mo
+share/locale/tr/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/vinagre/vinagre-ui.xml
-share/vinagre/vinagre.glade
-@dirrm share/vinagre
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+share/omf/vinagre/vinagre-C.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-pt.omf
+share/omf/vinagre/vinagre-sv.omf
+%%DATADIR%%/vinagre-ui.xml
+%%DATADIR%%/vinagre.glade
+@dirrm %%DATADIR%%
+@dirrm share/omf/vinagre
+@dirrm share/gnome/help/vinagre/sv/figures
+@dirrm share/gnome/help/vinagre/sv
+@dirrm share/gnome/help/vinagre/pt/figures
+@dirrm share/gnome/help/vinagre/pt
+@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/C/figures
+@dirrm share/gnome/help/vinagre/C
+@dirrm share/gnome/help/vinagre
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@dirrmtry share/applications
 @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/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@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/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
diff --git a/net/vino/Makefile b/net/vino/Makefile
index a374c02561d2..3b87c8712fee 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vino/Makefile,v 1.48 2007/10/15 17:13:51 mezz Exp $
+#   $MCom: ports/net/vino/Makefile,v 1.56 2008/03/10 15:23:55 ahze Exp $
 #
 
 PORTNAME=	vino
-PORTVERSION=	2.20.1
-PORTREVISION=	1
+PORTVERSION=	2.22.0
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/net/vino/distinfo b/net/vino/distinfo
index eb4977814af6..374426be8c54 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (vino-2.20.1.tar.bz2) = c45379bd177e0bc9a937a3388fc81650
-SHA256 (vino-2.20.1.tar.bz2) = 372ec01ebf8bffdd4b2f318eae7a49873a79634bb715e6355de19809c9fa1221
-SIZE (vino-2.20.1.tar.bz2) = 625243
+MD5 (vino-2.22.0.tar.bz2) = c4bb4a18f264ad8dc21e7200911a0412
+SHA256 (vino-2.22.0.tar.bz2) = 1b81a3a1f0fe717ccf8256a325492a8aa76d348afbf301c22f172f1bbbae06e4
+SIZE (vino-2.22.0.tar.bz2) = 661662
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 067a1a1cc76b..5f0b20bdfbd0 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -3,9 +3,10 @@ bin/vino-session
 libdata/bonobo/servers/GNOME_RemoteDesktop.server
 libexec/vino-server
 share/applications/vino-preferences.desktop
-share/icons/hicolor/48x48/apps/gnome-remote-desktop.png
 share/locale/ar/LC_MESSAGES/vino.mo
+share/locale/as/LC_MESSAGES/vino.mo
 share/locale/az/LC_MESSAGES/vino.mo
+share/locale/be@latin/LC_MESSAGES/vino.mo
 share/locale/bg/LC_MESSAGES/vino.mo
 share/locale/bn/LC_MESSAGES/vino.mo
 share/locale/bn_IN/LC_MESSAGES/vino.mo
@@ -34,6 +35,7 @@ share/locale/id/LC_MESSAGES/vino.mo
 share/locale/it/LC_MESSAGES/vino.mo
 share/locale/ja/LC_MESSAGES/vino.mo
 share/locale/ka/LC_MESSAGES/vino.mo
+share/locale/kn/LC_MESSAGES/vino.mo
 share/locale/ko/LC_MESSAGES/vino.mo
 share/locale/ku/LC_MESSAGES/vino.mo
 share/locale/lt/LC_MESSAGES/vino.mo
@@ -41,6 +43,7 @@ share/locale/lv/LC_MESSAGES/vino.mo
 share/locale/mk/LC_MESSAGES/vino.mo
 share/locale/ml/LC_MESSAGES/vino.mo
 share/locale/mn/LC_MESSAGES/vino.mo
+share/locale/mr/LC_MESSAGES/vino.mo
 share/locale/ms/LC_MESSAGES/vino.mo
 share/locale/nb/LC_MESSAGES/vino.mo
 share/locale/ne/LC_MESSAGES/vino.mo
@@ -63,6 +66,7 @@ share/locale/sr/LC_MESSAGES/vino.mo
 share/locale/sr@Latn/LC_MESSAGES/vino.mo
 share/locale/sv/LC_MESSAGES/vino.mo
 share/locale/ta/LC_MESSAGES/vino.mo
+share/locale/te/LC_MESSAGES/vino.mo
 share/locale/th/LC_MESSAGES/vino.mo
 share/locale/tr/LC_MESSAGES/vino.mo
 share/locale/ug/LC_MESSAGES/vino.mo
@@ -76,22 +80,30 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo
 %%DATADIR%%/vino-preferences.glade
 %%DATADIR%%/vino-prompt.glade
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as