The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD. The official GNOME 2.22 release notes can be found at http://library.gnome.org/misc/release-notes/2.22/ . On the FreeBSD front, this release features an updated hal port with support for video4linux devices, DRM (Direct Rendering), and better support of removable media. Work is also underway to tie webkit more closely into GNOME. As part of the GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well. Be sure to consult UPDATING on the proper steps to upgrade all of your GNOME ports. This release would not have been possible without the contributions and testing efforts of the following people: Pawel Worach kan edwin Peter Ulrich Kruppa J. W. Ballantine Yasuda Keisuke Andriy Gapon
author: Joe Marcus Clarke <marcus@FreeBSD.org> 2008-03-24 03:52:36 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2008-03-24 03:52:36 +0000
commit: 6f32add9a75efb180e462ffbdb0b080bc88088e3 (patch)
tree: 0fc7af36e22fc0dc7c1dc8aacabf6fe117e881da /x11
parent: - Add USE_XORG= x11 (diff)
63 files changed, 891 insertions, 295 deletions
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 8cc82c3b54b4..9c96e26c8e4c 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,13 +3,13 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.28 2007/09/18 15:01:12 ahze Exp $
+#   $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.31 2008/03/10 01:00:42 mezz Exp $
+#
 
 PORTNAME=	fast-user-switch-applet
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo
index 1a39f7b9e781..f4a6dbe0642d 100644
--- a/x11/fast-user-switch-applet/distinfo
+++ b/x11/fast-user-switch-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = 1d1fd25b5599f7656e3fa89aa913137c
-SHA256 (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = c7123f132aff47978e754d83cd5e449a4e02e215466fc3fc2f3bc81fb5cec5fd
-SIZE (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = 777118
+MD5 (gnome2/fast-user-switch-applet-2.22.0.tar.bz2) = 540f2567582e77cdd673dde3546b61db
+SHA256 (gnome2/fast-user-switch-applet-2.22.0.tar.bz2) = 8278823d988de6fc0b2d89ec3ad245c464e549d44f032f468fc6f2bdaf02c0d4
+SIZE (gnome2/fast-user-switch-applet-2.22.0.tar.bz2) = 763401
diff --git a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
index cd89dc462d8a..34f8423a3157 100644
--- a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
+++ b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c
@@ -1,19 +1,10 @@
---- src/gdm-queue.c.orig	2007-04-09 12:01:03.000000000 -0400
-+++ src/gdm-queue.c	2007-08-08 15:18:12.000000000 -0400
+--- src/gdm-queue.c.orig	2008-02-09 11:06:43.000000000 -0500
++++ src/gdm-queue.c	2008-02-09 11:06:53.000000000 -0500
 @@ -32,6 +32,7 @@
- #include <sys/stat.h>
  #include <sys/un.h>
  #include <errno.h>
-+#include <signal.h>
  #include <stdio.h>
++#include <signal.h>
  
  #include "gdm-queue.h"
-@@ -237,7 +238,7 @@ gboolean gdm_run_queue (void *dummy)
  
-         if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0)
-           strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME);
--        if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
-+	else if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
-           strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME);
-         else
-           g_error ("Can't find gdm socket!");
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
index 6c9de7ec4923..ae4718935047 100644
--- a/x11/fast-user-switch-applet/pkg-plist
+++ b/x11/fast-user-switch-applet/pkg-plist
@@ -60,6 +60,7 @@ share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-text
 share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-username.png
 share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet.png
 share/locale/ar/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/be@latin/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/bg/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/bn/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/bn_IN/LC_MESSAGES/fast-user-switch-applet.mo
@@ -99,13 +100,16 @@ share/locale/mr/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/nb/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/ne/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/nl/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/nn/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/oc/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/or/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/pa/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/pl/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/ps/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/pt/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/pt_BR/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/ru/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/si/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/sk/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/sl/LC_MESSAGES/fast-user-switch-applet.mo
 share/locale/sq/LC_MESSAGES/fast-user-switch-applet.mo
@@ -149,6 +153,10 @@ share/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf
 @dirrm %%DATADIR%%
 @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/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -161,3 +169,5 @@ share/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf
 @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
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index dc38e97a1d69..ba3c67339180 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,38 +3,41 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gdm/Makefile,v 1.6 2007/12/02 01:41:20 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.117 2008/03/22 04:21:52 mezz Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.20.3
+PORTVERSION=	2.20.4
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 version of xdm display manager
 
 BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
-RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+		ck-connector.0:${PORTSDIR}/sysutils/consolekit
+RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
+		xrdb:${PORTSDIR}/x11/xrdb
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
 USE_XORG=	dmx dmxproto
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
+USE_GNOME=	gnomehack intlhack gnomehier librsvg2 gnomedocutils \
 		gnomeprefix
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
+CONFIGURE_ARGS=--with-console-kit=yes
 
 GDMDIR?=	${PREFIX}/etc/gdm
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -44,8 +47,7 @@ GNOME_LOCALSTATEDIR=	/var
 MAN1=		gdm.1
 
 OPTIONS=	IPV6 "Enable IPv6 support" on \
-		LOG_LIMIT "Limit ~/.xsession-errors size" on \
-		CONSOLEKIT "Enable ConsoleKit support" off
+		LOG_LIMIT "Limit ~/.xsession-errors size" on
 
 .include <bsd.port.pre.mk>
 
@@ -65,13 +67,6 @@ CONFIGURE_ARGS+=	--disable-ipv6
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-daemon_slave.c
 .endif
 
-.if defined(WITH_CONSOLEKIT)
-CONFIGURE_ARGS+=--with-console-kit=yes
-LIB_DEPENDS+=	ck-connector.0:${PORTSDIR}/sysutils/consolekit
-.else
-CONFIGURE_ARGS+=--with-console-kit=no
-.endif
-
 post-patch:
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index bda84c0948a5..d72e4a4bf86a 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.20.3.tar.bz2) = 0074b163986cfe48d3998518084c4d00
-SHA256 (gnome2/gdm-2.20.3.tar.bz2) = 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500
-SIZE (gnome2/gdm-2.20.3.tar.bz2) = 3891861
+MD5 (gnome2/gdm-2.20.4.tar.bz2) = 53a75133cadf1de5fea2be49483b9ce3
+SHA256 (gnome2/gdm-2.20.4.tar.bz2) = adb64d70d9c2bf87a2f67520f40bba29bd76726baee21440f8b24cf3f6336061
+SIZE (gnome2/gdm-2.20.4.tar.bz2) = 3906797
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index d938b64f4dad..272deae4b017 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.1 2007/12/02 01:41:21 marcus Exp $
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.28 2008/03/11 04:21:47 mezz Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index 8f264dbe4812..3b159499d3a5 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -1,6 +1,6 @@
---- config/locale.alias.orig	Sat Jun 11 02:01:45 2005
-+++ config/locale.alias	Sat Jun 11 03:34:22 2005
-@@ -14,132 +14,57 @@
+--- config/locale.alias.orig	2008-03-10 21:53:02.000000000 -0500
++++ config/locale.alias	2008-03-10 21:53:37.000000000 -0500
+@@ -14,133 +14,57 @@
  #
  #		- George
  
@@ -16,6 +16,7 @@
 -Azerbaijani(Iran)	az_IR.UTF-8,az_IR
 -Basque			eu_ES.UTF-8,eu_ES
 -Belarusian		be_BY.UTF-8,be_BY
+-Belarusian(Latin)	be_BY.UTF-8@latin,be_BY@latin
 -Bengali			bn_BD.UTF-8,bn_BD
 -Bengali(India)		bn_IN.UTF-8,bn_IN
 -Bosnian			bs_BA.UTF-8,bs_BA
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index c0790daa476f..1d9b4eddd8ec 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -238,7 +238,6 @@ share/xsessions/gnome.desktop
 @dirrm etc/gdm
 @dirrmtry etc/dm/Sessions
 @dirrmtry etc/dm
-@dirrmtry sbin
 @dirrmtry share/log/gdm
 @dirrmtry share/log
 @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index fb058ac8755e..3fd7606c00a4 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-applets/Makefile,v 1.165 2007/09/16 17:19:03 ahze Exp $
+#   $MCom: ports/x11/gnome-applets/Makefile,v 1.175 2008/03/10 20:03:41 mezz Exp $
 #
 
 PORTNAME=	gnome-applets
-PORTVERSION=	2.20.1
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,7 +18,8 @@ COMMENT=	Applets components for the GNOME 2 Desktop Environment
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		xklavier.11:${PORTSDIR}/x11/libxklavier \
+		gweather.0:${PORTSDIR}/net/libgweather \
+		xklavier.12:${PORTSDIR}/x11/libxklavier \
 		gucharmap.6:${PORTSDIR}/deskutils/gucharmap
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
@@ -44,8 +44,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		OS_SYS="/usr/include"
 
 GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas \
-		gweather.schemas mixer.schemas multiload.schemas \
-		stickynotes.schemas
+		mixer.schemas multiload.schemas stickynotes.schemas
 
 OPTIONS=	MINI_COMMANDER "Enable mini-commander applet" off
 
@@ -95,8 +94,6 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
-		${WRKSRC}/libgweather/weather-met.c
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 	    	's|" == "|" = "|g'
 .if !defined(USE_PYTHON)
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 18d30dc2af8c..1615f44453d4 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.20.1.tar.bz2) = e49402e7323bdd9595dc5cbfdba6ba5b
-SHA256 (gnome2/gnome-applets-2.20.1.tar.bz2) = d9ac9c48c007aa1444a60e947bd95359ac3e4998b074d8613082755aa22c87a8
-SIZE (gnome2/gnome-applets-2.20.1.tar.bz2) = 7490737
+MD5 (gnome2/gnome-applets-2.22.0.tar.bz2) = cd31cc9171cc350e7d0074b1a8092fbd
+SHA256 (gnome2/gnome-applets-2.22.0.tar.bz2) = d63979ad23873a2ba0f9e36a399c1fedf8311da7f7dd65d4288f5da99e4c150b
+SIZE (gnome2/gnome-applets-2.22.0.tar.bz2) = 6923842
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 15dbb4e41d2a..29aa4df4550c 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,13 +1,6 @@
 %%CPUFREQ%%bin/cpufreq-selector
 %%PYTHON%%bin/invest-chart
 %%BATTERY%%etc/sound/events/battstat_applet.soundlist
-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
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyo
@@ -52,7 +45,6 @@ libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
 libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
 libdata/bonobo/servers/GNOME_StickyNotesApplet.server
 %%PYTHON%%libdata/bonobo/servers/Invest_Applet.server
-libdata/pkgconfig/gweather.pc
 libexec/accessx-status-applet
 %%BATTERY%%libexec/battstat-applet-2
 libexec/charpick_applet2
@@ -111,9 +103,7 @@ share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
 %%DATADIR%%/glade/modemlights.glade
 %%PYTHON%%%%DATADIR%%/glade/prefs-dialog.glade
 %%DATADIR%%/glade/stickynotes.glade
-%%DATADIR%%/glade/trashapplet.glade
-%%DATADIR%%/gweather/Locations.xml
-%%DATADIR%%/gweather/locations.dtd
+%%DATADIR%%/glade/trashapplet-empty-progress.ui
 %%PYTHON%%%%DATADIR%%/invest-applet/invest-16.png
 %%PYTHON%%%%DATADIR%%/invest-applet/invest-button.png
 %%PYTHON%%%%DATADIR%%/invest-applet/invest.svg
@@ -299,6 +289,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
 %%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-credits-hal.png
 %%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-preferences.png
 %%BATTERY%%share/gnome/help/battstat/pa/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/pt_BR/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/context-menu.png
 %%BATTERY%%share/gnome/help/battstat/sv/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png
 %%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png
@@ -322,6 +318,11 @@ share/gnome/help/char-palette/bg/figures/charpalette_applet.png
 share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/bg/figures/charpick-preferences.png
 share/gnome/help/char-palette/bg/figures/charpick_characters.png
+share/gnome/help/char-palette/ca/char-palette.xml
+share/gnome/help/char-palette/ca/figures/charpalette_applet.png
+share/gnome/help/char-palette/ca/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/ca/figures/charpick-preferences.png
+share/gnome/help/char-palette/ca/figures/charpick_characters.png
 share/gnome/help/char-palette/en_GB/char-palette.xml
 share/gnome/help/char-palette/en_GB/figures/charpalette_applet.png
 share/gnome/help/char-palette/en_GB/figures/charpalette_chargroup.png
@@ -485,6 +486,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-selector-both.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-selector.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-100.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-25.png
@@ -627,6 +638,7 @@ share/gnome/help/geyes/uk/figures/geyes_applet.png
 share/gnome/help/geyes/uk/geyes.xml
 share/gnome/help/gswitchit/C/gswitchit.xml
 share/gnome/help/gswitchit/C/legal.xml
+share/gnome/help/gswitchit/ca/gswitchit.xml
 share/gnome/help/gswitchit/el/gswitchit.xml
 share/gnome/help/gswitchit/en_GB/gswitchit.xml
 share/gnome/help/gswitchit/es/gswitchit.xml
@@ -756,6 +768,36 @@ share/gnome/help/gweather/pa/figures/stock_weather-snow.png
 share/gnome/help/gweather/pa/figures/stock_weather-storm.png
 share/gnome/help/gweather/pa/figures/stock_weather-sunny.png
 share/gnome/help/gweather/pa/gweather.xml
+share/gnome/help/gweather/pt_BR/figures/gweather-details.png
+share/gnome/help/gweather/pt_BR/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/pt_BR/figures/gweather-prefs-general.png
+share/gnome/help/gweather/pt_BR/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/pt_BR/figures/gweather_applet.png
+share/gnome/help/gweather/pt_BR/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/pt_BR/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/pt_BR/figures/stock_weather-fog.png
+share/gnome/help/gweather/pt_BR/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/pt_BR/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/pt_BR/figures/stock_weather-showers.png
+share/gnome/help/gweather/pt_BR/figures/stock_weather-snow.png
+share/gnome/help/gweather/pt_BR/figures/stock_weather-storm.png
+share/gnome/help/gweather/pt_BR/figures/stock_weather-sunny.png
+share/gnome/help/gweather/pt_BR/gweather.xml
+share/gnome/help/gweather/ru/figures/gweather-details.png
+share/gnome/help/gweather/ru/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/ru/figures/gweather-prefs-general.png
+share/gnome/help/gweather/ru/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/ru/figures/gweather_applet.png
+share/gnome/help/gweather/ru/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/ru/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/ru/figures/stock_weather-fog.png
+share/gnome/help/gweather/ru/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/ru/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/ru/figures/stock_weather-showers.png
+share/gnome/help/gweather/ru/figures/stock_weather-snow.png
+share/gnome/help/gweather/ru/figures/stock_weather-storm.png
+share/gnome/help/gweather/ru/figures/stock_weather-sunny.png
+share/gnome/help/gweather/ru/gweather.xml
 share/gnome/help/gweather/sv/figures/gweather-details.png
 share/gnome/help/gweather/sv/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/sv/figures/gweather-prefs-general.png
@@ -805,6 +847,8 @@ share/gnome/help/mixer_applet2/oc/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/oc/mixer_applet2.xml
 share/gnome/help/mixer_applet2/pa/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/pa/mixer_applet2.xml
+share/gnome/help/mixer_applet2/pt_BR/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/pt_BR/mixer_applet2.xml
 share/gnome/help/mixer_applet2/ru/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/ru/mixer_applet2.xml
 share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png
@@ -863,6 +907,18 @@ share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png
 share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/ca/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/ca/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/ca/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/ca/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/ca/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/ca/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/el/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/el/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/el/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/el/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/el/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/el/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-note-prefs.png
@@ -899,6 +955,12 @@ share/gnome/help/stickynotes_applet/pa/figures/stickynotes-note-prefs.png
 share/gnome/help/stickynotes_applet/pa/figures/stickynotes-prefs.png
 share/gnome/help/stickynotes_applet/pa/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/pa/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/ru/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/ru/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/ru/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/ru/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/ru/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/ru/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/sv/figures/stickynotes-note-prefs.png
@@ -1018,6 +1080,7 @@ share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1054,8 +1117,6 @@ share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1081,10 +1142,12 @@ share/omf/accessx-status/accessx-status-uk.omf
 %%BATTERY%%share/omf/battstat/battstat-ko.omf
 %%BATTERY%%share/omf/battstat/battstat-oc.omf
 %%BATTERY%%share/omf/battstat/battstat-pa.omf
+%%BATTERY%%share/omf/battstat/battstat-pt_BR.omf
 %%BATTERY%%share/omf/battstat/battstat-sv.omf
 %%BATTERY%%share/omf/battstat/battstat-uk.omf
 share/omf/char-palette/char-palette-C.omf
 share/omf/char-palette/char-palette-bg.omf
+share/omf/char-palette/char-palette-ca.omf
 share/omf/char-palette/char-palette-en_GB.omf
 share/omf/char-palette/char-palette-es.omf
 share/omf/char-palette/char-palette-fr.omf
@@ -1112,6 +1175,7 @@ share/omf/char-palette/char-palette-uk.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fr.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-nl.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-oc.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-pt_BR.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ru.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-sv.omf
 %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-uk.omf
@@ -1142,6 +1206,7 @@ share/omf/geyes/geyes-ru.omf
 share/omf/geyes/geyes-sv.omf
 share/omf/geyes/geyes-uk.omf
 share/omf/gswitchit/gswitchit-C.omf
+share/omf/gswitchit/gswitchit-ca.omf
 share/omf/gswitchit/gswitchit-el.omf
 share/omf/gswitchit/gswitchit-en_GB.omf
 share/omf/gswitchit/gswitchit-es.omf
@@ -1158,6 +1223,8 @@ share/omf/gweather/gweather-ko.omf
 share/omf/gweather/gweather-nl.omf
 share/omf/gweather/gweather-oc.omf
 share/omf/gweather/gweather-pa.omf
+share/omf/gweather/gweather-pt_BR.omf
+share/omf/gweather/gweather-ru.omf
 share/omf/gweather/gweather-sv.omf
 share/omf/gweather/gweather-uk.omf
 share/omf/mixer_applet2/mixer_applet2-C.omf
@@ -1169,6 +1236,7 @@ share/omf/mixer_applet2/mixer_applet2-it.omf
 share/omf/mixer_applet2/mixer_applet2-ko.omf
 share/omf/mixer_applet2/mixer_applet2-oc.omf
 share/omf/mixer_applet2/mixer_applet2-pa.omf
+share/omf/mixer_applet2/mixer_applet2-pt_BR.omf
 share/omf/mixer_applet2/mixer_applet2-ru.omf
 share/omf/mixer_applet2/mixer_applet2-sv.omf
 share/omf/mixer_applet2/mixer_applet2-uk.omf
@@ -1184,12 +1252,15 @@ share/omf/multiload/multiload-ru.omf
 share/omf/multiload/multiload-sv.omf
 share/omf/multiload/multiload-uk.omf
 share/omf/stickynotes_applet/stickynotes_applet-C.omf
+share/omf/stickynotes_applet/stickynotes_applet-ca.omf
+share/omf/stickynotes_applet/stickynotes_applet-el.omf
 share/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
 share/omf/stickynotes_applet/stickynotes_applet-es.omf
 share/omf/stickynotes_applet/stickynotes_applet-fr.omf
 share/omf/stickynotes_applet/stickynotes_applet-ko.omf
 share/omf/stickynotes_applet/stickynotes_applet-oc.omf
 share/omf/stickynotes_applet/stickynotes_applet-pa.omf
+share/omf/stickynotes_applet/stickynotes_applet-ru.omf
 share/omf/stickynotes_applet/stickynotes_applet-sv.omf
 share/omf/stickynotes_applet/stickynotes_applet-uk.omf
 share/omf/trashapplet/trashapplet-C.omf
@@ -1385,6 +1456,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/stickynotes_applet/uk
 @dirrm share/gnome/help/stickynotes_applet/sv/figures
 @dirrm share/gnome/help/stickynotes_applet/sv
+@dirrm share/gnome/help/stickynotes_applet/ru/figures
+@dirrm share/gnome/help/stickynotes_applet/ru
 @dirrm share/gnome/help/stickynotes_applet/pa/figures
 @dirrm share/gnome/help/stickynotes_applet/pa
 @dirrm share/gnome/help/stickynotes_applet/oc/figures
@@ -1397,6 +1470,10 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/stickynotes_applet/es
 @dirrm share/gnome/help/stickynotes_applet/en_GB/figures
 @dirrm share/gnome/help/stickynotes_applet/en_GB
+@dirrm share/gnome/help/stickynotes_applet/el/figures
+@dirrm share/gnome/help/stickynotes_applet/el
+@dirrm share/gnome/help/stickynotes_applet/ca/figures
+@dirrm share/gnome/help/stickynotes_applet/ca
 @dirrm share/gnome/help/stickynotes_applet/C/figures
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
@@ -1429,6 +1506,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/mixer_applet2/sv
 @dirrm share/gnome/help/mixer_applet2/ru/figures
 @dirrm share/gnome/help/mixer_applet2/ru
+@dirrm share/gnome/help/mixer_applet2/pt_BR/figures
+@dirrm share/gnome/help/mixer_applet2/pt_BR
 @dirrm share/gnome/help/mixer_applet2/pa/figures
 @dirrm share/gnome/help/mixer_applet2/pa
 @dirrm share/gnome/help/mixer_applet2/oc/figures
@@ -1452,6 +1531,10 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/gweather/uk
 @dirrm share/gnome/help/gweather/sv/figures
 @dirrm share/gnome/help/gweather/sv
+@dirrm share/gnome/help/gweather/ru/figures
+@dirrm share/gnome/help/gweather/ru
+@dirrm share/gnome/help/gweather/pt_BR/figures
+@dirrm share/gnome/help/gweather/pt_BR
 @dirrm share/gnome/help/gweather/pa/figures
 @dirrm share/gnome/help/gweather/pa
 @dirrm share/gnome/help/gweather/oc/figures
@@ -1477,6 +1560,7 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/gswitchit/es
 @dirrm share/gnome/help/gswitchit/en_GB
 @dirrm share/gnome/help/gswitchit/el
+@dirrm share/gnome/help/gswitchit/ca
 @dirrm share/gnome/help/gswitchit/C
 @dirrm share/gnome/help/gswitchit
 @dirrm share/gnome/help/geyes/uk/figures
@@ -1539,6 +1623,8 @@ share/xmodmap/xmodmap.yu
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ru/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ru
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/pt_BR/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/pt_BR
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures
@@ -1595,6 +1681,8 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/char-palette/es
 @dirrm share/gnome/help/char-palette/en_GB/figures
 @dirrm share/gnome/help/char-palette/en_GB
+@dirrm share/gnome/help/char-palette/ca/figures
+@dirrm share/gnome/help/char-palette/ca
 @dirrm share/gnome/help/char-palette/bg/figures
 @dirrm share/gnome/help/char-palette/bg
 @dirrm share/gnome/help/char-palette/C/figures
@@ -1604,6 +1692,8 @@ share/xmodmap/xmodmap.yu
 %%BATTERY%%@dirrm share/gnome/help/battstat/uk
 %%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/sv
+%%BATTERY%%@dirrm share/gnome/help/battstat/pt_BR/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/pt_BR
 %%BATTERY%%@dirrm share/gnome/help/battstat/pa/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/pa
 %%BATTERY%%@dirrm share/gnome/help/battstat/oc/figures
@@ -1645,7 +1735,6 @@ share/xmodmap/xmodmap.yu
 @dirrm share/gnome/help/accessx-status/C
 @dirrm share/gnome/help/accessx-status
 %%PYTHON%%@dirrm %%DATADIR%%/invest-applet
-@dirrm %%DATADIR%%/gweather
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/geyes/Tango
 @dirrm %%DATADIR%%/geyes/Horrid
@@ -1657,13 +1746,10 @@ share/xmodmap/xmodmap.yu
 @dirrm %%DATADIR%%
 %%COMMANDER%%@dirrmtry libexec/gnome-applets
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
-@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/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
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 3fc5466064ba..2b5d34481764 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gnome-desktop/Makefile,v 1.1 2007/12/02 00:19:50 marcus Exp $
+#   $MCom: ports/x11/gnome-desktop/Makefile,v 1.138 2008/03/11 00:00:35 ahze Exp $
 #
 
 PORTNAME=	gnome-desktop
-PORTVERSION=	2.20.3
+PORTVERSION=	2.22.0
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -21,14 +21,16 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-USE_XPM=	yes
+RUN_DEPENDS=	${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2
+
+USE_XORG=	xpm
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
 		ltverhack referencehack
 GNOME_DESKTOP_VERSION=2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_BISON=	build
-USE_XLIB=	yes
+USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index a708127bc4c4..e0fb2f5fdcf5 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.20.3.tar.bz2) = d59ddca5e9bc4e4d1717538ceae57501
-SHA256 (gnome2/gnome-desktop-2.20.3.tar.bz2) = b793ce87b99ba2f9b0eb48a4646128f752a1de2e7c4cd94da9b5e9fd6dcbc36a
-SIZE (gnome2/gnome-desktop-2.20.3.tar.bz2) = 1362861
+MD5 (gnome2/gnome-desktop-2.22.0.tar.bz2) = 452d4ee91b3c54aac4282f3f1e3b68f0
+SHA256 (gnome2/gnome-desktop-2.22.0.tar.bz2) = 09b96d473e941fdc51773ab296f0f2fb8fe7694c580a9487effac4eb18c964af
+SIZE (gnome2/gnome-desktop-2.22.0.tar.bz2) = 1386857
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index ee615541cc20..fa73b6407ae1 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -1,5 +1,6 @@
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
+include/gnome-desktop-2.0/libgnomeui/gnome-bg.h
 include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
 include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
 lib/libgnome-desktop-2.a
@@ -83,6 +84,7 @@ share/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -298,6 +300,7 @@ share/pixmaps/vnterm.xpm
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
+@dirrmtry share/applications
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -336,10 +339,11 @@ share/pixmaps/vnterm.xpm
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @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/applications
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index ec1145f5842a..cce2627157a7 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gnome-menus/Makefile,v 1.5 2007/12/01 20:00:52 marcus Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.74 2008/03/10 23:44:52 ahze Exp $
 #
 
 PORTNAME=	gnome-menus
-PORTVERSION=	2.20.3
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,21 +18,14 @@ COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomevfs2 ltverhack
+USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
 USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
-USE_FAM=	yes
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu||' \
 		${WRKSRC}/layout/Makefile.in
@@ -52,4 +45,4 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
 		${PREFIX}/share/desktop-directories
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 8abb1433497b..7cc995ff1c3b 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.20.3.tar.bz2) = b8ab05f5edfdc3e6a46662a504934657
-SHA256 (gnome2/gnome-menus-2.20.3.tar.bz2) = 2ce7a6aabed338ca3f65685e7e46149cdacc80fab0a8701c2d827fcb950a9897
-SIZE (gnome2/gnome-menus-2.20.3.tar.bz2) = 446966
+MD5 (gnome2/gnome-menus-2.22.0.tar.bz2) = b504e4ea92fcf5b1c2817d682ac5f61c
+SHA256 (gnome2/gnome-menus-2.22.0.tar.bz2) = 3b461efd7b4831b5ca7105d52295f7b3417690cf4701532acf9481082d55db7e
+SIZE (gnome2/gnome-menus-2.22.0.tar.bz2) = 482226
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 07e67ea4e8ad..1541e93ecb50 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -1,4 +1,3 @@
-bin/gnome-menu-spec-test
 etc/xdg/menus/gnome-applications.menu
 etc/xdg/menus/preferences.menu
 etc/xdg/menus/settings.menu
@@ -59,6 +58,7 @@ share/locale/eu/LC_MESSAGES/gnome-menus.mo
 share/locale/fa/LC_MESSAGES/gnome-menus.mo
 share/locale/fi/LC_MESSAGES/gnome-menus.mo
 share/locale/fr/LC_MESSAGES/gnome-menus.mo
+share/locale/fur/LC_MESSAGES/gnome-menus.mo
 share/locale/ga/LC_MESSAGES/gnome-menus.mo
 share/locale/gl/LC_MESSAGES/gnome-menus.mo
 share/locale/gn/LC_MESSAGES/gnome-menus.mo
@@ -68,6 +68,7 @@ share/locale/hi/LC_MESSAGES/gnome-menus.mo
 share/locale/hu/LC_MESSAGES/gnome-menus.mo
 share/locale/hy/LC_MESSAGES/gnome-menus.mo
 share/locale/id/LC_MESSAGES/gnome-menus.mo
+share/locale/io/LC_MESSAGES/gnome-menus.mo
 share/locale/it/LC_MESSAGES/gnome-menus.mo
 share/locale/ja/LC_MESSAGES/gnome-menus.mo
 share/locale/ka/LC_MESSAGES/gnome-menus.mo
@@ -77,6 +78,7 @@ share/locale/ku/LC_MESSAGES/gnome-menus.mo
 share/locale/ky/LC_MESSAGES/gnome-menus.mo
 share/locale/lt/LC_MESSAGES/gnome-menus.mo
 share/locale/lv/LC_MESSAGES/gnome-menus.mo
+share/locale/mai/LC_MESSAGES/gnome-menus.mo
 share/locale/mg/LC_MESSAGES/gnome-menus.mo
 share/locale/mk/LC_MESSAGES/gnome-menus.mo
 share/locale/ml/LC_MESSAGES/gnome-menus.mo
@@ -139,14 +141,20 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/io/LC_MESSAGES
+@dirrmtry share/locale/io
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/gn/LC_MESSAGES
 @dirrmtry share/locale/gn
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index f4b9b720b80e..49487cf3f0a7 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gnome-panel/Makefile,v 1.1 2007/12/02 00:54:55 marcus Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.177 2008/03/23 06:13:12 marcus Exp $
 #
 
 PORTNAME=	gnome-panel
-PORTVERSION=	2.20.3
-PORTREVISION?=	0
+PORTVERSION=	2.22.0
+PORTREVISION?=	2
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,19 +20,24 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
+LIB_DEPENDS=	gweather.0:${PORTSDIR}/net/libgweather \
+    		polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome
+
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \
 		libwnck gnomemenus gnomedocutils ltverhack referencehack
 WANT_GNOME=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share \
-		--with-kde-docdir=${LOCALBASE}/share/doc
+		--with-kde-docdir=${LOCALBASE}/share/doc \
+		--disable-network-manager \
+		--enable-polkit
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -64,6 +68,8 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|"applications.menu"|"gnome-applications.menu"|'
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+	    	${WRKSRC}/applets/clock/gweather-xml.c
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
 .for po in da.po it.po zh_CN.po zh_TW.po
@@ -71,6 +77,11 @@ post-patch:
 .endfor
 .endif
 
+post-install:
+	${MKDIR} ${PREFIX}/share/gnome-panel
+	${INSTALL_DATA} ${FILESDIR}/iso3166.tab \
+	    	${PREFIX}/share/gnome-panel/iso3166.tab
+
 .include <bsd.port.post.mk>
 
 .endif
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 761f01205b24..57f37c4c59d5 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.20.3.tar.bz2) = 0ddf04cea0859570216319d6f1f8c4d8
-SHA256 (gnome2/gnome-panel-2.20.3.tar.bz2) = fa76158e659ab5d36f016ba9a5117c4d03680e7c94aa174fdcc03200fe2444c9
-SIZE (gnome2/gnome-panel-2.20.3.tar.bz2) = 2829469
+MD5 (gnome2/gnome-panel-2.22.0.tar.bz2) = fe10c920c1f182a2bd5dba98863c786c
+SHA256 (gnome2/gnome-panel-2.22.0.tar.bz2) = 8b2152b35e3d82a640c383b29e99a322595dca23269450ad8d3182bdd94b308a
+SIZE (gnome2/gnome-panel-2.22.0.tar.bz2) = 3267787
diff --git a/x11/gnome-panel/files/iso3166.tab b/x11/gnome-panel/files/iso3166.tab
new file mode 100644
index 000000000000..22ff82083588
--- /dev/null
+++ b/x11/gnome-panel/files/iso3166.tab
@@ -0,0 +1,268 @@
+# $OpenBSD: iso3166.tab,v 1.17 2007/02/02 20:26:51 millert Exp $
+# ISO 3166 alpha-2 country codes
+#
+# @(#)iso3166.tab	8.4
+#
+# From Paul Eggert (2006-09-27):
+#
+# This file contains a table with the following columns:
+# 1.  ISO 3166-1 alpha-2 country code, current as of
+#     ISO 3166-1 Newsletter No. V-12 (2006-09-26).  See:
+#     <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html">
+#     ISO 3166 Maintenance agency (ISO 3166/MA)
+#     </a>.
+# 2.  The usual English name for the country,
+#     chosen so that alphabetic sorting of subsets produces helpful lists.
+#     This is not the same as the English name in the ISO 3166 tables.
+#
+# Columns are separated by a single tab.
+# The table is sorted by country code.
+#
+# Lines beginning with `#' are comments.
+#
+#country-
+#code	country name
+AD	Andorra
+AE	United Arab Emirates
+AF	Afghanistan
+AG	Antigua & Barbuda
+AI	Anguilla
+AL	Albania
+AM	Armenia
+AN	Netherlands Antilles
+AO	Angola
+AQ	Antarctica
+AR	Argentina
+AS	Samoa (American)
+AT	Austria
+AU	Australia
+AW	Aruba
+AX	Aaland Islands
+AZ	Azerbaijan
+BA	Bosnia & Herzegovina
+BB	Barbados
+BD	Bangladesh
+BE	Belgium
+BF	Burkina Faso
+BG	Bulgaria
+BH	Bahrain
+BI	Burundi
+BJ	Benin
+BM	Bermuda
+BN	Brunei
+BO	Bolivia
+BR	Brazil
+BS	Bahamas
+BT	Bhutan
+BV	Bouvet Island
+BW	Botswana
+BY	Belarus
+BZ	Belize
+CA	Canada
+CC	Cocos (Keeling) Islands
+CD	Congo (Dem. Rep.)
+CF	Central African Rep.
+CG	Congo (Rep.)
+CH	Switzerland
+CI	Cote d'Ivoire
+CK	Cook Islands
+CL	Chile
+CM	Cameroon
+CN	China
+CO	Colombia
+CR	Costa Rica
+CU	Cuba
+CV	Cape Verde
+CX	Christmas Island
+CY	Cyprus
+CZ	Czech Republic
+DE	Germany
+DJ	Djibouti
+DK	Denmark
+DM	Dominica
+DO	Dominican Republic
+DZ	Algeria
+EC	Ecuador
+EE	Estonia
+EG	Egypt
+EH	Western Sahara
+ER	Eritrea
+ES	Spain
+ET	Ethiopia
+FI	Finland
+FJ	Fiji
+FK	Falkland Islands
+FM	Micronesia
+FO	Faroe Islands
+FR	France
+GA	Gabon
+GB	Britain (UK)
+GD	Grenada
+GE	Georgia
+GF	French Guiana
+GG	Guernsey
+GH	Ghana
+GI	Gibraltar
+GL	Greenland
+GM	Gambia
+GN	Guinea
+GP	Guadeloupe
+GQ	Equatorial Guinea
+GR	Greece
+GS	South Georgia & the South Sandwich Islands
+GT	Guatemala
+GU	Guam
+GW	Guinea-Bissau
+GY	Guyana
+HK	Hong Kong
+HM	Heard Island & McDonald Islands
+HN	Honduras
+HR	Croatia
+HT	Haiti
+HU	Hungary
+ID	Indonesia
+IE	Ireland
+IL	Israel
+IM	Isle of Man
+IN	India
+IO	British Indian Ocean Territory
+IQ	Iraq
+IR	Iran
+IS	Iceland
+IT	Italy
+JE	Jersey
+JM	Jamaica
+JO	Jordan
+JP	Japan
+KE	Kenya
+KG	Kyrgyzstan
+KH	Cambodia
+KI	Kiribati
+KM	Comoros
+KN	St Kitts & Nevis
+KP	Korea (North)
+KR	Korea (South)
+KW	Kuwait
+KY	Cayman Islands
+KZ	Kazakhstan
+LA	Laos
+LB	Lebanon
+LC	St Lucia
+LI	Liechtenstein
+LK	Sri Lanka
+LR	Liberia
+LS	Lesotho
+LT	Lithuania
+LU	Luxembourg
+LV	Latvia
+LY	Libya
+MA	Morocco
+MC	Monaco
+MD	Moldova
+ME	Montenegro
+MG	Madagascar
+MH	Marshall Islands
+MK	Macedonia
+ML	Mali
+MM	Myanmar (Burma)
+MN	Mongolia
+MO	Macau
+MP	Northern Mariana Islands
+MQ	Martinique
+MR	Mauritania
+MS	Montserrat
+MT	Malta
+MU	Mauritius
+MV	Maldives
+MW	Malawi
+MX	Mexico
+MY	Malaysia
+MZ	Mozambique
+NA	Namibia
+NC	New Caledonia
+NE	Niger
+NF	Norfolk Island
+NG	Nigeria
+NI	Nicaragua
+NL	Netherlands
+NO	Norway
+NP	Nepal
+NR	Nauru
+NU	Niue
+NZ	New Zealand
+OM	Oman
+PA	Panama
+PE	Peru
+PF	French Polynesia
+PG	Papua New Guinea
+PH	Philippines
+PK	Pakistan
+PL	Poland
+PM	St Pierre & Miquelon
+PN	Pitcairn
+PR	Puerto Rico
+PS	Palestine
+PT	Portugal
+PW	Palau
+PY	Paraguay
+QA	Qatar
+RE	Reunion
+RO	Romania
+RS	Serbia
+RU	Russia
+RW	Rwanda
+SA	Saudi Arabia
+SB	Solomon Islands
+SC	Seychelles
+SD	Sudan
+SE	Sweden
+SG	Singapore
+SH	St Helena
+SI	Slovenia
+SJ	Svalbard & Jan Mayen
+SK	Slovakia
+SL	Sierra Leone
+SM	San Marino
+SN	Senegal
+SO	Somalia
+SR	Suriname
+ST	Sao Tome & Principe
+SV	El Salvador
+SY	Syria
+SZ	Swaziland
+TC	Turks & Caicos Is
+TD	Chad
+TF	French Southern & Antarctic Lands
+TG	Togo
+TH	Thailand
+TJ	Tajikistan
+TK	Tokelau
+TL	East Timor
+TM	Turkmenistan
+TN	Tunisia
+TO	Tonga
+TR	Turkey
+TT	Trinidad & Tobago
+TV	Tuvalu
+TW	Taiwan
+TZ	Tanzania
+UA	Ukraine
+UG	Uganda
+UM	US minor outlying islands
+US	United States
+UY	Uruguay
+UZ	Uzbekistan
+VA	Vatican City
+VC	St Vincent
+VE	Venezuela
+VG	Virgin Islands (UK)
+VI	Virgin Islands (US)
+VN	Vietnam
+VU	Vanuatu
+WF	Wallis & Futuna
+WS	Samoa (western)
+YE	Yemen
+YT	Mayotte
+ZA	South Africa
+ZM	Zambia
+ZW	Zimbabwe
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c
new file mode 100644
index 000000000000..1bb485f32586
--- /dev/null
+++ b/x11/gnome-panel/files/patch-applets_clock_clock-location.c
@@ -0,0 +1,59 @@
+--- applets/clock/clock-location.c.orig	2008-03-22 21:14:45.000000000 -0400
++++ applets/clock/clock-location.c	2008-03-23 02:11:34.000000000 -0400
+@@ -28,6 +28,8 @@
+ #include "set-timezone.h"
+ #include "gweather-xml.h"
+ 
++#define daylight 1
++
+ G_DEFINE_TYPE (ClockLocation, clock_location, G_TYPE_OBJECT)
+ 
+ typedef struct {
+@@ -62,6 +64,7 @@ static void clock_location_unset_tz (Clo
+ static void setup_weather_updates (ClockLocation *loc);
+ static void add_to_network_monitor (ClockLocation *loc);
+ static void remove_from_network_monitor (ClockLocation *loc);
++static gchar *clock_location_guess_zone (ClockZoneTable *zones);
+ 
+ #define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_LOCATION_TYPE, ClockLocationPrivate))
+ 
+@@ -271,7 +274,6 @@ parse_etc_sysconfig_clock (void)
+ 			}
+ 		}
+ 	}
+-
+ out:
+ 	if (lines)
+ 		g_strfreev (lines);
+@@ -298,7 +300,11 @@ zone_from_etc_sysconfig_clock (void)
+ 
+ 		parse_etc_sysconfig_clock ();
+ 		
++#ifndef __FreeBSD__
+ 		file = g_file_new_for_path ("/etc/sysconfig/clock");
++#else
++		file = g_file_new_for_path ("/etc/localtime");
++#endif
+ 
+ 		monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE,
+ 					       NULL, NULL);
+@@ -632,10 +638,17 @@ gboolean
+ clock_location_is_current (ClockLocation *loc)
+ {
+         ClockLocationPrivate *priv = PRIVATE (loc);
+-	const char *zone;
++	ClockZoneTable *zones;
++	char *zone;
+ 
+-	if ((zone = zone_from_etc_sysconfig_clock ()))
++	zones = clock_zonetable_new (SYSTEM_ZONEINFODIR);
++
++	if ((zone = clock_location_guess_zone (zones))) {
++		g_object_unref (zones);
+ 		return strcmp (zone, priv->timezone) == 0;
++	}
++
++	g_object_unref (zones);
+ 
+ 	return clock_location_get_offset (loc) == 0;
+ }
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c
new file mode 100644
index 000000000000..0df281fd941d
--- /dev/null
+++ b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c
@@ -0,0 +1,14 @@
+--- applets/clock/clock-zonetable.c.orig	2008-01-20 13:32:13.000000000 -0500
++++ applets/clock/clock-zonetable.c	2008-01-20 13:35:34.000000000 -0500
+@@ -124,7 +124,10 @@ clock_zonetable_new (gchar *zoneinfodir)
+         priv = PRIVATE (this);
+ 
+         priv->zonetab = g_build_filename (zoneinfodir, "zone.tab", NULL);
+-        priv->iso3166 = g_build_filename (zoneinfodir, "iso3166.tab", NULL);
++        /*priv->iso3166 = g_build_filename (zoneinfodir, "iso3166.tab", NULL);*/
++	/* FreeBSD doesn't include iso3166.tab, so we install it especially
++	 * for this clock. */
++	priv->iso3166 = g_build_filename (DATADIR, "gnome-panel", "iso3166.tab", NULL);
+ 
+ #ifdef CLOCK_TEXTDOMAIN
+         /* this is used when clock is embedded in the gnome-panel
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
new file mode 100644
index 000000000000..5acc58b408c6
--- /dev/null
+++ b/x11/gnome-panel/files/patch-applets_clock_clock.c
@@ -0,0 +1,11 @@
+--- applets/clock/clock.c.orig	2008-02-26 14:17:49.000000000 +0100
++++ applets/clock/clock.c	2008-02-26 18:01:17.000000000 +0100
+@@ -84,6 +84,8 @@
+ 
+ #define FALLBACK_CONFIG_TOOL "time-admin"
+ 
++#define daylight 1
++
+ static const char *clock_config_tools [] = {
+ 	CLOCK_TIME_UTILITY,
+ 	FALLBACK_CONFIG_TOOL
diff --git a/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c b/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c
new file mode 100644
index 000000000000..7ae87fdd360f
--- /dev/null
+++ b/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c
@@ -0,0 +1,11 @@
+--- applets/clock/gweather-xml.c.orig	2008-01-23 00:51:33.000000000 -0500
++++ applets/clock/gweather-xml.c	2008-01-23 00:52:35.000000000 -0500
+@@ -359,7 +359,7 @@ gweather_xml_load_locations( GtkTreeView
+ #ifdef GWEATHER_XML_LOCATION
+   xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION "Locations.xml");
+ #else
+-  xml = xmlNewTextReaderFilename ("/usr/share/gnome-applets/gweather/Locations.xml");
++  xml = xmlNewTextReaderFilename ("/usr/local/share/libgweather/Locations.xml");
+ #endif
+   if( xml == NULL )
+     goto error_out;
diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po
index 45d98a92c0be..7de508a0eba4 100644
--- a/x11/gnome-panel/files/patch-po_ko.po
+++ b/x11/gnome-panel/files/patch-po_ko.po
@@ -1,38 +1,29 @@
---- po/ko.po.orig	Sun Jul  8 18:23:19 2007
-+++ po/ko.po	Sun Jul  8 18:26:46 2007
-@@ -88,7 +88,7 @@
+--- po/ko.po.orig	2008-02-26 18:15:58.000000000 +0100
++++ po/ko.po	2008-02-26 18:16:31.000000000 +0100
+@@ -95,7 +95,7 @@ msgstr "%H:%M"
  #. * possible.
- #: ../applets/clock/calendar-window.c:233
+ #: ../applets/clock/calendar-window.c:250
  msgid "%b %d"
 -msgstr "%b %e일"
 +msgstr "%B %e일"
  
- #: ../applets/clock/calendar-window.c:741
- msgid "_Tasks"
-@@ -129,7 +129,7 @@
+ #: ../applets/clock/calendar-window.c:765
+ msgid "Tasks"
+@@ -146,7 +146,7 @@ msgstr "%H:%M:%S"
  #.
- #: ../applets/clock/clock.c:367
+ #: ../applets/clock/clock.c:443
  msgid "%a %b %e"
 -msgstr "%b %e일 (%a)"
 +msgstr "%B %e일 (%a)"
  
  #. translators: reverse the order of these arguments
  #. *              if the time should come before the
-@@ -156,7 +156,7 @@
- #. Show date in tooltip
- #: ../applets/clock/clock.c:520
- msgid "%A %B %d"
--msgstr "%b %e일 %A"
-+msgstr "%B %e일 %A"
+@@ -207,7 +207,7 @@ msgstr "%p %I:%M"
  
- #: ../applets/clock/clock.c:534
- msgid "Click to hide your appointments and tasks"
-@@ -188,7 +188,7 @@
- 
- #: ../applets/clock/clock.c:1073
+ #: ../applets/clock/clock.c:1590
  msgid "%A, %B %d %Y"
 -msgstr "%Y년 %b %e일 %A"
 +msgstr "%Y년 %B %e일 %A"
  
- #: ../applets/clock/clock.c:1148
+ #: ../applets/clock/clock.c:1665
  #, c-format
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 1613aea9ffd5..776e004791d3 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -1,6 +1,7 @@
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
+etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
 etc/gconf/schemas/panel-default-setup.entries
@@ -22,9 +23,12 @@ libdata/bonobo/servers/GNOME_Wncklet_Factory.server
 libdata/pkgconfig/libpanelapplet-2.0.pc
 libexec/clock-applet
 libexec/fish-applet-2
+libexec/gnome-clock-applet-mechanism
 libexec/notification-area-applet
 libexec/wnck-applet
+share/PolicyKit/policy/gnome-clock-applet-mechanism.policy
 share/applications/gnome-panel.desktop
+share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
 share/gnome-2.0/ui/GNOME_ClockApplet.xml
 share/gnome-2.0/ui/GNOME_FishApplet.xml
 share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
@@ -33,6 +37,7 @@ share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
 share/gnome-2.0/ui/GNOME_WindowListApplet.xml
 share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
 share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+%%DATADIR%%/glade/clock.glade
 %%DATADIR%%/glade/fish.glade
 %%DATADIR%%/glade/panel-properties-dialog.glade
 %%DATADIR%%/glade/panel-run-dialog.glade
@@ -40,6 +45,18 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
 %%DATADIR%%/glade/timezone.glade
 %%DATADIR%%/glade/window-list.glade
 %%DATADIR%%/glade/workspace-switcher.glade
+%%DATADIR%%/iso3166.tab
+%%DATADIR%%/pixmaps/clock-calendar-icon.png
+%%DATADIR%%/pixmaps/clock-face-large.svg
+%%DATADIR%%/pixmaps/clock-face-small-day.svg
+%%DATADIR%%/pixmaps/clock-face-small-evening.svg
+%%DATADIR%%/pixmaps/clock-face-small-morning.svg
+%%DATADIR%%/pixmaps/clock-face-small-night.svg
+%%DATADIR%%/pixmaps/clock-face-small.svg
+%%DATADIR%%/pixmaps/clock-map-location-current.png
+%%DATADIR%%/pixmaps/clock-map-location-hilight.png
+%%DATADIR%%/pixmaps/clock-map-location-marker.png
+%%DATADIR%%/pixmaps/clock-map.png
 %%DATADIR%%/pixmaps/fishanim.png
 %%DATADIR%%/pixmaps/footguy.png
 %%DATADIR%%/pixmaps/gnome-gegl2-2.png
@@ -153,6 +170,7 @@ share/gnome/help/fish/uk/fish.xml
 share/gnome/help/fish/uk/legal.xml
 share/gnome/help/window-list/C/window-list.xml
 share/gnome/help/window-list/ca/window-list.xml
+share/gnome/help/window-list/da/window-list.xml
 share/gnome/help/window-list/de/figures/window_list_applet.png
 share/gnome/help/window-list/de/figures/window_list_group.png
 share/gnome/help/window-list/de/figures/window_list_group_applet.png
@@ -180,6 +198,7 @@ share/gnome/help/window-list/zh_TW/legal.xml
 share/gnome/help/window-list/zh_TW/window-list.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/help/workspace-switcher/ca/workspace-switcher.xml
+share/gnome/help/workspace-switcher/da/workspace-switcher.xml
 share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/de/legal.xml
@@ -251,6 +270,7 @@ share/icons/hicolor/32x32/apps/gnome-panel-window-list.png
 share/icons/hicolor/32x32/apps/gnome-panel-window-menu.png
 share/icons/hicolor/32x32/apps/gnome-panel-workspace-switcher.png
 share/icons/hicolor/32x32/apps/gnome-panel.png
+share/icons/hicolor/48x48/apps/gnome-panel.png
 share/icons/hicolor/scalable/apps/gnome-panel-clock.svg
 share/icons/hicolor/scalable/apps/gnome-panel-drawer.svg
 share/icons/hicolor/scalable/apps/gnome-panel-fish.svg
@@ -266,6 +286,7 @@ share/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be@latin/LC_MESSAGES/gnome-panel-2.0.mo
@@ -325,6 +346,7 @@ share/locale/oc/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ps/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo
@@ -395,6 +417,7 @@ share/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/omf/gnome-panel/workspace-switcher-zh_TW.omf
 share/omf/window-list/window-list-C.omf
 share/omf/window-list/window-list-ca.omf
+share/omf/window-list/window-list-da.omf
 share/omf/window-list/window-list-de.omf
 share/omf/window-list/window-list-el.omf
 share/omf/window-list/window-list-es.omf
@@ -409,6 +432,7 @@ share/omf/window-list/window-list-uk.omf
 share/omf/window-list/window-list-zh_CN.omf
 share/omf/workspace-switcher/workspace-switcher-C.omf
 share/omf/workspace-switcher/workspace-switcher-ca.omf
+share/omf/workspace-switcher/workspace-switcher-da.omf
 share/omf/workspace-switcher/workspace-switcher-de.omf
 share/omf/workspace-switcher/workspace-switcher-el.omf
 share/omf/workspace-switcher/workspace-switcher-es.omf
@@ -448,6 +472,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/workspace-switcher/el
 @dirrm share/gnome/help/workspace-switcher/de/figures
 @dirrm share/gnome/help/workspace-switcher/de
+@dirrm share/gnome/help/workspace-switcher/da
 @dirrm share/gnome/help/workspace-switcher/ca
 @dirrm share/gnome/help/workspace-switcher/C
 @dirrm share/gnome/help/workspace-switcher
@@ -468,6 +493,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/window-list/el
 @dirrm share/gnome/help/window-list/de/figures
 @dirrm share/gnome/help/window-list/de
+@dirrm share/gnome/help/window-list/da
 @dirrm share/gnome/help/window-list/ca
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
@@ -543,6 +569,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrm include/panel-2.0
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
@@ -562,6 +589,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
@@ -584,4 +613,5 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/applications
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 2f6d1e58a864..6e335094dedd 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,19 +3,19 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.80 2007/09/18 16:46:42 marcus Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.83 2008/03/11 03:13:07 mezz Exp $
 #
 
 PORTNAME=	gnome-screensaver
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen saver and locker
 
+LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
 USE_BZIP2=	yes
@@ -23,14 +23,17 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomemenus \
-		libgnomekbd
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+
 GCONF_SCHEMAS=	gnome-screensaver.schemas
+MAN1=		gnome-screensaver-command.1 gnome-screensaver-preferences.1 \
+		gnome-screensaver.1
+
 
 PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index e83e9955e264..8ebc79dc6df6 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = d166a3ebf69289331b2ebcf5c0187fd9
-SHA256 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9
-SIZE (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 2013842
+MD5 (gnome2/gnome-screensaver-2.22.0.tar.bz2) = 3f307d340d511c97192a9dc9b83a69f5
+SHA256 (gnome2/gnome-screensaver-2.22.0.tar.bz2) = e6d66ad1092babe5b9a1ded2a50464e21206fa42a922ea1de0c688e764e05bfb
+SIZE (gnome2/gnome-screensaver-2.22.0.tar.bz2) = 2038929
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index fd8810021e01..7d0f70fd54b7 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -17,6 +17,8 @@ share/desktop-directories/gnome-screensaver.directory
 %%DATADIR%%/gnome-screensaver-preferences.glade
 %%DATADIR%%/lock-dialog-default.glade
 share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
+share/locale/as/LC_MESSAGES/gnome-screensaver.mo
+share/locale/be/LC_MESSAGES/gnome-screensaver.mo
 share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo
 share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
 share/locale/bn/LC_MESSAGES/gnome-screensaver.mo
@@ -36,6 +38,7 @@ share/locale/eu/LC_MESSAGES/gnome-screensaver.mo
 share/locale/fa/LC_MESSAGES/gnome-screensaver.mo
 share/locale/fi/LC_MESSAGES/gnome-screensaver.mo
 share/locale/fr/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ga/LC_MESSAGES/gnome-screensaver.mo
 share/locale/gl/LC_MESSAGES/gnome-screensaver.mo
 share/locale/gu/LC_MESSAGES/gnome-screensaver.mo
 share/locale/he/LC_MESSAGES/gnome-screensaver.mo
@@ -53,9 +56,11 @@ share/locale/mg/LC_MESSAGES/gnome-screensaver.mo
 share/locale/mk/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ml/LC_MESSAGES/gnome-screensaver.mo
 share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mr/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/nn/LC_MESSAGES/gnome-screensaver.mo
 share/locale/oc/LC_MESSAGES/gnome-screensaver.mo
 share/locale/or/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pa/LC_MESSAGES/gnome-screensaver.mo
@@ -91,8 +96,10 @@ share/pixmaps/backgrounds/cosmos/sombrero.jpg
 share/pixmaps/backgrounds/cosmos/whirlpool.jpg
 share/pixmaps/gnome-logo-white.svg
 @dirrm share/pixmaps/backgrounds/cosmos
-@dirrm share/pixmaps/backgrounds
+@dirrmtry share/pixmaps/backgrounds
 @dirrm %%DATADIR%%
+@dirrm share/applications/screensavers
+@dirrmtry share/applications
 @dirrm libexec/gnome-screensaver
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
@@ -102,6 +109,8 @@ share/pixmaps/gnome-logo-white.svg
 @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/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -112,4 +121,5 @@ share/pixmaps/gnome-logo-white.svg
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/applications
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index c8e6b86efd94..56e06481b759 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gnome-session/Makefile,v 1.1 2007/12/01 20:11:32 marcus Exp $
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.141 2008/03/10 23:48:33 ahze Exp $
 #
 
 PORTNAME=	gnome-session
-PORTVERSION=	2.20.3
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.marcuscom.com/downloads/:local
@@ -20,23 +20,23 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the GNOME 2 desktop
 
-BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
-RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center \
+		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
+		notify.1:${PORTSDIR}/devel/libnotify
+RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
 		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop
+USE_XORG=	xau xrandr
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		ESD_SERVER="${LOCALBASE}/bin/esd"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnome-session.1 gnome-wm.1 session-properties.1 \
 		gnome-session-save.1
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index b4863f6af36a..c77a3cf49892 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.20.3.tar.bz2) = f9d80e12c8fd79efa9786f617ba18bc7
-SHA256 (gnome2/gnome-session-2.20.3.tar.bz2) = eff4f7a1eb15a9a92317de9c07f9530ce1110c9ac84fc777f97a59316b9f2ee1
-SIZE (gnome2/gnome-session-2.20.3.tar.bz2) = 751906
+MD5 (gnome2/gnome-session-2.22.0.tar.bz2) = 5f9531565c5ec08104c3518c72c79f42
+SHA256 (gnome2/gnome-session-2.22.0.tar.bz2) = ae426a2f356012aea1086dca89e0551d6970c404a56e31b814a53e24eab19939
+SIZE (gnome2/gnome-session-2.22.0.tar.bz2) = 778868
 MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
 SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
 SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in
index 8fcdd3e2c5e7..82e1ed49f216 100644
--- a/x11/gnome-session/files/patch-data_Makefile.in
+++ b/x11/gnome-session/files/patch-data_Makefile.in
@@ -1,9 +1,18 @@
---- data/Makefile.in.orig	Sun Jan 28 20:39:50 2007
-+++ data/Makefile.in	Sun Jan 28 20:41:03 2007
-@@ -271,7 +271,7 @@ EXTRA_DIST = \
- 	session-properties.desktop.in
+--- data/Makefile.in.orig	2008-03-01 02:09:17.000000000 -0500
++++ data/Makefile.in	2008-03-01 02:10:21.000000000 -0500
+@@ -258,7 +258,7 @@ default_in_files = default.session.in
+ default_DATA = $(default_in_files:.session.in=.session)
+ xsessiondir = $(datadir)/xsessions
+ xsession_in_files = gnome.desktop.in
+-xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
++xsession_DATA = # $(xsession_in_files:.desktop.in=.desktop)
+ settingsdir = $(datadir)/applications
+ @SESSION_TRUE@settings_in_files = session-properties.desktop.in
+ @SESSION_TRUE@settings_DATA = $(settings_in_files:.desktop.in=.desktop)
+@@ -280,7 +280,7 @@ CLEANFILES = \
+ 	gnome.desktop			\
+ 	session-properties.desktop
  
- CLEANFILES = default.session gnome-session.schemas session-properties.desktop
 -all: all-recursive
 +all: all-recursive default.session
  
diff --git a/x11/gnome-session/files/patch-disable_debug b/x11/gnome-session/files/patch-disable_debug
new file mode 100644
index 000000000000..778d72c9e67f
--- /dev/null
+++ b/x11/gnome-session/files/patch-disable_debug
@@ -0,0 +1,13 @@
+--- gnome-session/main.c.orig	2008-01-16 16:48:55.000000000 -0600
++++ gnome-session/main.c	2008-01-16 16:50:01.000000000 -0600
+@@ -626,8 +626,8 @@
+       major = atoi (versions [1]);
+       if ((major % 2) != 0)
+ 	{
+-          g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
+-	  g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
++          /* g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
++	     g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); */
+ 	}
+     }
+   g_strfreev (versions);
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index d90630fed19f..9c51b437c0e5 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -36,6 +36,7 @@ share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo
@@ -116,6 +117,8 @@ share/pixmaps/splash/original-gnome-splash.png
 share/pixmaps/splash/tremulant-2.12.png
 share/pixmaps/splash/tremulant-blood-2.12.png
 share/pixmaps/splash/tremulant-brushed-metal-2.12.png
+@dirrmtry share/xsessions
+@dirrmtry share/applications
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -142,10 +145,11 @@ share/pixmaps/splash/tremulant-brushed-metal-2.12.png
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @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/applications
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 2f9e302b425a..f837a8ee8224 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gnome-terminal/Makefile,v 1.1 2007/12/02 01:46:28 marcus Exp $
+#   $MCom: ports/x11/gnome-terminal/Makefile,v 1.101 2008/03/11 02:42:58 mezz Exp $
 #
 
 PORTNAME=	gnome-terminal
-PORTVERSION=	2.18.4
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index b9f731480081..2a408d023865 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.18.4.tar.bz2) = e4429d66d0d2ede8e14756cfbc15d30a
-SHA256 (gnome2/gnome-terminal-2.18.4.tar.bz2) = 1a6b1cbf81ed1a21b9ae628533f60511aa9495e02dfed6583df17db30d8d2282
-SIZE (gnome2/gnome-terminal-2.18.4.tar.bz2) = 2072290
+MD5 (gnome2/gnome-terminal-2.22.0.tar.bz2) = e91f000b8157c668940a297d7cfbc9f8
+SHA256 (gnome2/gnome-terminal-2.22.0.tar.bz2) = f157938dbfe0babe8545bcdb7b1fa51403bbf17904d56f3242a528d55190b56e
+SIZE (gnome2/gnome-terminal-2.22.0.tar.bz2) = 1819541
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index f69d5bcef194..491f827e3058 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -8,7 +8,6 @@ share/gnome/help/gnome-terminal/C/gnome-terminal.xml
 share/gnome/help/gnome-terminal/C/legal.xml
 share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/bg/figures/terminal_window.png
 share/gnome/help/gnome-terminal/bg/gnome-terminal.xml
 share/gnome/help/gnome-terminal/bg/legal.xml
 share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png
@@ -28,7 +27,6 @@ share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/it/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ja/figures/terminal_window.png
 share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ja/legal.xml
 share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
@@ -37,9 +35,11 @@ share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
 share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/oc/gnome-terminal.xml
+share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/pt_BR/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ro/figures/terminal_window.png
 share/gnome/help/gnome-terminal/ro/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ro/legal.xml
 share/gnome/help/gnome-terminal/ru/figures/gnome-terminal-default.png
@@ -53,12 +53,10 @@ share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/uk/gnome-terminal.xml
 share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png
 share/gnome/help/gnome-terminal/zh_CN/gnome-terminal.xml
 share/gnome/help/gnome-terminal/zh_CN/legal.xml
 share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png
 share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
 share/gnome/help/gnome-terminal/zh_TW/legal.xml
 share/locale/am/LC_MESSAGES/gnome-terminal.mo
@@ -86,6 +84,7 @@ share/locale/eu/LC_MESSAGES/gnome-terminal.mo
 share/locale/fa/LC_MESSAGES/gnome-terminal.mo
 share/locale/fi/LC_MESSAGES/gnome-terminal.mo
 share/locale/fr/LC_MESSAGES/gnome-terminal.mo
+share/locale/fur/LC_MESSAGES/gnome-terminal.mo
 share/locale/ga/LC_MESSAGES/gnome-terminal.mo
 share/locale/gl/LC_MESSAGES/gnome-terminal.mo
 share/locale/gu/LC_MESSAGES/gnome-terminal.mo
@@ -148,6 +147,7 @@ share/omf/gnome-terminal/gnome-terminal-it.omf
 share/omf/gnome-terminal/gnome-terminal-ja.omf
 share/omf/gnome-terminal/gnome-terminal-ko.omf
 share/omf/gnome-terminal/gnome-terminal-oc.omf
+share/omf/gnome-terminal/gnome-terminal-pt_BR.omf
 share/omf/gnome-terminal/gnome-terminal-ro.omf
 share/omf/gnome-terminal/gnome-terminal-ru.omf
 share/omf/gnome-terminal/gnome-terminal-sv.omf
@@ -168,6 +168,8 @@ share/pixmaps/gnome-terminal.png
 @dirrm share/gnome/help/gnome-terminal/ru
 @dirrm share/gnome/help/gnome-terminal/ro/figures
 @dirrm share/gnome/help/gnome-terminal/ro
+@dirrm share/gnome/help/gnome-terminal/pt_BR/figures
+@dirrm share/gnome/help/gnome-terminal/pt_BR
 @dirrm share/gnome/help/gnome-terminal/oc/figures
 @dirrm share/gnome/help/gnome-terminal/oc
 @dirrm share/gnome/help/gnome-terminal/ko/figures
@@ -191,6 +193,7 @@ share/pixmaps/gnome-terminal.png
 @dirrm share/gnome/help/gnome-terminal
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -209,6 +212,8 @@ share/pixmaps/gnome-terminal.png
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
@@ -217,4 +222,3 @@ share/pixmaps/gnome-terminal.png
 @dirrmtry share/locale/be@latin
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrmtry share/applications
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index b9fa5664607c..5fa2ef6fc306 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.79 2007/10/18 23:45:20 marcus Exp $
+#   $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.82 2008/03/12 21:19:04 marcus Exp $
 #
 
 PORTREVISION=	0
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	-power-tools
 
 COMMENT=	The 'Geektoys' for the GNOME 2 power user
 
-RUN_DEPENDS=	${LOCALBASE}/lib/epiphany/2.20/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
+RUN_DEPENDS=	${LOCALBASE}/lib/epiphany/2.22/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
 		gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \
 		${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
 		${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/epiphany/2.20/extensions/libgesturesextension.so:$
 		gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
 		serpentine:${PORTSDIR}/sysutils/serpentine \
 		devilspie:${PORTSDIR}/x11-wm/devilspie \
-		${LOCALBASE}/lib/nautilus/extensions-1.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \
+		${LOCALBASE}/lib/nautilus/extensions-2.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \
 		gtweakui-menus:${PORTSDIR}/deskutils/gtweakui \
 		gnome-art:${PORTSDIR}/x11-themes/gnome-art \
 		brightside:${PORTSDIR}/x11/brightside \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 69ee8d17f6b9..e19af12aeafb 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gnome2/Makefile,v 1.5 2007/12/04 17:28:14 mezz Exp $
+#   $MCom: ports/x11/gnome2/Makefile,v 1.236 2008/03/15 18:40:17 marcus Exp $
 #
 
 PORTNAME=	gnome2
-PORTVERSION=	2.20.3
-PORTREVISION?=	0
+PORTVERSION=	2.22.0
+PORTREVISION?=	1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -48,25 +48,29 @@ RUN_DEPENDS?=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
 		network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
 		gnome-nettool:${PORTSDIR}/net/gnome-nettool \
 		vino-session:${PORTSDIR}/net/vino \
-		exchange-connector-setup-2.12:${PORTSDIR}/mail/evolution-exchange \
+		exchange-connector-setup-2.22:${PORTSDIR}/mail/evolution-exchange \
 		${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
 		${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
 		totem:${PORTSDIR}/multimedia/totem \
 		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
 		${LOCALBASE}/share/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
 		sound-juicer:${PORTSDIR}/audio/sound-juicer \
-		gnome-keyring-manager:${PORTSDIR}/security/gnome-keyring-manager \
 		${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
 		evince:${PORTSDIR}/graphics/evince \
 		${LOCALBASE}/libexec/fast-user-switch-applet:${PORTSDIR}/x11/fast-user-switch-applet \
 		${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
 		alacarte:${PORTSDIR}/deskutils/alacarte \
 		gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \
-		gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \
+		${LOCALBASE}/libexec/gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \
 		orca:${PORTSDIR}/accessibility/orca \
 		gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
 		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \
-		seahorse:${PORTSDIR}/security/seahorse
+		seahorse:${PORTSDIR}/security/seahorse \
+		swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \
+		mousetweaks:${PORTSDIR}/accessibility/mousetweaks \
+		vinagre:${PORTSDIR}/net/vinagre \
+		cheese:${PORTSDIR}/multimedia/cheese \
+		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info
 
 NO_BUILD=	yes
 
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index cc476664cc1b..9b755c3a2989 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/Makefile,v 1.110 2007/10/17 21:36:13 mezz Exp $
+#   $MCom: ports/x11/libgnome/Makefile,v 1.115 2008/03/10 15:39:00 ahze Exp $
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.20.1.1
-PORTREVISION?=	1
+PORTVERSION=	2.22.0
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +17,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libraries for GNOME, a GNU desktop environment
 
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
@@ -25,12 +25,11 @@ BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_GETTEXT=	yes
-USE_XPM=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack esound \
-		gnomevfs2 libxslt ltverhack referencehack
+USE_GNOME=	gnomeprefix gnomehack intlhack esound libbonobo \
+		gnomevfs2 ltverhack referencehack
 USE_BISON=	build
-USE_XLIB=	yes
+USE_XORG=	xpm
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -42,19 +41,21 @@ MAN7=		gnome-options.7
 
 GCONF_SCHEMAS=	desktop_gnome_accessibility_keyboard.schemas \
 		desktop_gnome_accessibility_startup.schemas \
+		desktop_gnome_applications_at_mobility.schemas \
+		desktop_gnome_applications_at_visual.schemas \
 		desktop_gnome_applications_browser.schemas \
-		desktop_gnome_applications_help_viewer.schemas \
+		desktop_gnome_applications_office.schemas \
 		desktop_gnome_applications_terminal.schemas \
 		desktop_gnome_applications_window_manager.schemas \
 		desktop_gnome_background.schemas \
 		desktop_gnome_file_views.schemas \
-		desktop_gnome_interface.schemas desktop_gnome_lockdown.schemas \
+		desktop_gnome_interface.schemas \
+		desktop_gnome_lockdown.schemas \
 		desktop_gnome_peripherals_keyboard.schemas \
 		desktop_gnome_peripherals_mouse.schemas \
-		desktop_gnome_sound.schemas desktop_gnome_thumbnailers.schemas \
-		desktop_gnome_typing_break.schemas \
-		desktop_gnome_applications_at_mobility.schemas \
-		desktop_gnome_applications_at_visual.schemas
+		desktop_gnome_sound.schemas \
+		desktop_gnome_thumbnailers.schemas \
+		desktop_gnome_typing_break.schemas
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 0d26b855320a..24ddd0fdd860 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.20.1.1.tar.bz2) = cfab025a8b9a19cdae1c64f8b005c513
-SHA256 (gnome2/libgnome-2.20.1.1.tar.bz2) = d5b66f1beeefe3b61b654fa4d9c35b642fd73e310da1dd241e0ccb99dc93adec
-SIZE (gnome2/libgnome-2.20.1.1.tar.bz2) = 1370144
+MD5 (gnome2/libgnome-2.22.0.tar.gz) = 556dea8d920cb0a20a852ea36c28b58b
+SHA256 (gnome2/libgnome-2.22.0.tar.gz) = 5992dcdc6fc0f5385c9b1e6254b7a9c1fb14dc6c53f24a029c818d6519407085
+SIZE (gnome2/libgnome-2.22.0.tar.gz) = 1954010
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index 37c981693b8b..7d848a121482 100644
--- a/x11/libgnome/files/pkg-deinstall.in
+++ b/x11/libgnome/files/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.12 2007/04/26 14:17:52 ahze Exp $
+#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.14 2008/01/28 17:41:05 mezz Exp $
 #
 # Restore gconf keys of gnomevfs2.
 
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 47b38ad06555..cd55ecea0376 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -51,6 +51,7 @@ share/locale/eu/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
+share/locale/fur/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ga/LC_MESSAGES/libgnome-2.0.mo
 share/locale/gl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/gu/LC_MESSAGES/libgnome-2.0.mo
@@ -71,6 +72,7 @@ share/locale/mg/LC_MESSAGES/libgnome-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ml/LC_MESSAGES/libgnome-2.0.mo
 share/locale/mn/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mr/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nb/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ne/LC_MESSAGES/libgnome-2.0.mo
@@ -85,6 +87,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ro/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnome-2.0.mo
 share/locale/rw/LC_MESSAGES/libgnome-2.0.mo
+share/locale/si/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sq/LC_MESSAGES/libgnome-2.0.mo
@@ -105,8 +108,8 @@ share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 share/pixmaps/backgrounds/gnome/background-default.jpg
-@dirrm share/pixmaps/backgrounds/gnome
-@dirrm share/pixmaps/backgrounds
+@dirrmtry share/pixmaps/backgrounds/gnome
+@dirrmtry share/pixmaps/backgrounds
 @dirrmtry share/gnome-background-properties
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
@@ -120,14 +123,20 @@ share/pixmaps/backgrounds/gnome/background-default.jpg
 @dirrmtry share/locale/tt
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
+@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/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 85a453f578eb..48c2cdf7a2e3 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnomekbd/Makefile,v 1.13 2007/09/17 14:06:48 ahze Exp $
+#   $MCom: ports/x11/libgnomekbd/Makefile,v 1.19 2008/03/20 13:08:28 marcus Exp $
 #
 
 PORTNAME=	libgnomekbd
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,12 +16,12 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME keyboard shared library
 
-LIB_DEPENDS=	xklavier.11:${PORTSDIR}/x11/libxklavier \
+LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 USE_BZIP2=	yes
-USE_GNOME=	libgnomeui gnometarget gnomeprefix gnomehack
-GNU_CONFIGURE=	yes
+USE_GNOME=	libgnomeui gnometarget gnomeprefix gnomehack ltverhack
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 931fde380f27..a4d5c97e740a 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomekbd-2.20.0.tar.bz2) = 0b495d355e25c3531419cb3996be7e28
-SHA256 (gnome2/libgnomekbd-2.20.0.tar.bz2) = b82310e5d319ac1ba33d008360c4fae128f1b68768f1e51ff1021b60c19a900c
-SIZE (gnome2/libgnomekbd-2.20.0.tar.bz2) = 392206
+MD5 (gnome2/libgnomekbd-2.22.0.tar.bz2) = a8b64278ae3471583607d734db9347eb
+SHA256 (gnome2/libgnomekbd-2.22.0.tar.bz2) = 84ca7c6703909bccab436d631d69675c9815899752ffdf2fe76102a620f723da
+SIZE (gnome2/libgnomekbd-2.22.0.tar.bz2) = 406083
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index e198161eecc8..5bcddd4508b4 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -1,6 +1,4 @@
 bin/gkbd-indicator-plugins-capplet
-include/libgnomekbd/gkbd-config-registry-client.h
-include/libgnomekbd/gkbd-config-registry.h
 include/libgnomekbd/gkbd-desktop-config.h
 include/libgnomekbd/gkbd-indicator-config.h
 include/libgnomekbd/gkbd-indicator-plugin.h
@@ -11,21 +9,21 @@ include/libgnomekbd/gkbd-util.h
 lib/libgnomekbd.a
 lib/libgnomekbd.la
 lib/libgnomekbd.so
-lib/libgnomekbd.so.1
+lib/libgnomekbd.so.2
 lib/libgnomekbdui.a
 lib/libgnomekbdui.la
 lib/libgnomekbdui.so
-lib/libgnomekbdui.so.1
+lib/libgnomekbdui.so.2
 libdata/pkgconfig/libgnomekbd.pc
 libdata/pkgconfig/libgnomekbdui.pc
 share/applications/gkbd-indicator-plugins-capplet.desktop
-share/icons/hicolor/48x48/apps/gkbd-indicator-plugins-capplet.png
 %%DATADIR%%/glade/gkbd-indicator-plugins.glade
 share/locale/ar/LC_MESSAGES/libgnomekbd.mo
 share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo
 share/locale/bg/LC_MESSAGES/libgnomekbd.mo
 share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo
 share/locale/ca/LC_MESSAGES/libgnomekbd.mo
+share/locale/cs/LC_MESSAGES/libgnomekbd.mo
 share/locale/da/LC_MESSAGES/libgnomekbd.mo
 share/locale/de/LC_MESSAGES/libgnomekbd.mo
 share/locale/dz/LC_MESSAGES/libgnomekbd.mo
@@ -33,10 +31,12 @@ share/locale/el/LC_MESSAGES/libgnomekbd.mo
 share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
 share/locale/es/LC_MESSAGES/libgnomekbd.mo
 share/locale/et/LC_MESSAGES/libgnomekbd.mo
+share/locale/eu/LC_MESSAGES/libgnomekbd.mo
 share/locale/fi/LC_MESSAGES/libgnomekbd.mo
 share/locale/fr/LC_MESSAGES/libgnomekbd.mo
 share/locale/gl/LC_MESSAGES/libgnomekbd.mo
 share/locale/gu/LC_MESSAGES/libgnomekbd.mo
+share/locale/he/LC_MESSAGES/libgnomekbd.mo
 share/locale/hu/LC_MESSAGES/libgnomekbd.mo
 share/locale/it/LC_MESSAGES/libgnomekbd.mo
 share/locale/ja/LC_MESSAGES/libgnomekbd.mo
@@ -44,7 +44,10 @@ share/locale/ka/LC_MESSAGES/libgnomekbd.mo
 share/locale/ko/LC_MESSAGES/libgnomekbd.mo
 share/locale/lt/LC_MESSAGES/libgnomekbd.mo
 share/locale/mk/LC_MESSAGES/libgnomekbd.mo
+share/locale/ml/LC_MESSAGES/libgnomekbd.mo
+share/locale/mr/LC_MESSAGES/libgnomekbd.mo
 share/locale/nb/LC_MESSAGES/libgnomekbd.mo
+share/locale/nn/LC_MESSAGES/libgnomekbd.mo
 share/locale/nl/LC_MESSAGES/libgnomekbd.mo
 share/locale/oc/LC_MESSAGES/libgnomekbd.mo
 share/locale/or/LC_MESSAGES/libgnomekbd.mo
@@ -54,23 +57,33 @@ share/locale/pt/LC_MESSAGES/libgnomekbd.mo
 share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo
 share/locale/ru/LC_MESSAGES/libgnomekbd.mo
 share/locale/si/LC_MESSAGES/libgnomekbd.mo
+share/locale/sl/LC_MESSAGES/libgnomekbd.mo
+share/locale/sq/LC_MESSAGES/libgnomekbd.mo
+share/locale/sr/LC_MESSAGES/libgnomekbd.mo
+share/locale/sr@Latn/LC_MESSAGES/libgnomekbd.mo
 share/locale/sv/LC_MESSAGES/libgnomekbd.mo
 share/locale/ta/LC_MESSAGES/libgnomekbd.mo
 share/locale/th/LC_MESSAGES/libgnomekbd.mo
+share/locale/tr/LC_MESSAGES/libgnomekbd.mo
 share/locale/uk/LC_MESSAGES/libgnomekbd.mo
 share/locale/vi/LC_MESSAGES/libgnomekbd.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo
+share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
 @dirrm include/libgnomekbd
+@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/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/applications
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 6e7db08070b5..7ea6c53d4e2c 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnomemm26/Makefile,v 1.14 2007/09/17 03:10:06 marcus Exp $
+#   $MCom: ports/x11/libgnomemm26/Makefile,v 1.16 2008/03/08 16:50:27 marcus Exp $
 #
 
 PORTNAME=	libgnomemm
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index 862b17d72c20..1de4fb030c27 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomemm-2.20.0.tar.bz2) = 6263d15a96c34a73964be37c4e9a261f
-SHA256 (gnome2/libgnomemm-2.20.0.tar.bz2) = 4118936224bec44913e11b6b850ae33512c7aa8fde5524d171fcc7eafe1c5aa8
-SIZE (gnome2/libgnomemm-2.20.0.tar.bz2) = 248837
+MD5 (gnome2/libgnomemm-2.22.0.tar.bz2) = a07209b2cfbc630f8c4d46b6a6f1db32
+SHA256 (gnome2/libgnomemm-2.22.0.tar.bz2) = f9d8f5d19a53ec1f0f709adff091b6ea9e5169a09114936ccc6493808b5ddfd0
+SIZE (gnome2/libgnomemm-2.22.0.tar.bz2) = 323427
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index bfde4178af74..060c2039e0f3 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libxklavier/Makefile,v 1.35 2007/09/10 15:36:39 mezz Exp $
+#   $MCom: ports/x11/libxklavier/Makefile,v 1.39 2008/03/20 16:07:22 mezz Exp $
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	3.3
-PORTREVISION=	1
+PORTVERSION=	3.5
 PORTEPOCH=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 9c48625aed65..2b2523958002 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-3.3.tar.gz) = 0b9a62ad4f007e6c42a70a4f6e0aecbf
-SHA256 (libxklavier-3.3.tar.gz) = 050a14ddeda0bbf5c742cb60dee56de48736968d050543fc2e46bcd2e1837870
-SIZE (libxklavier-3.3.tar.gz) = 475629
+MD5 (libxklavier-3.5.tar.gz) = d0625fdd7e22dbe382af40872fbbe77b
+SHA256 (libxklavier-3.5.tar.gz) = adac155e4d6be6b5bf6283eb265048e20c37c1caa49f39845532914151172706
+SIZE (libxklavier-3.5.tar.gz) = 448663
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index caf0c1705393..493ca170ada0 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -7,7 +7,7 @@ include/libxklavier/xklavier.h
 lib/libxklavier.a
 lib/libxklavier.la
 lib/libxklavier.so
-lib/libxklavier.so.11
+lib/libxklavier.so.12
 libdata/pkgconfig/libxklavier.pc
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
@@ -25,7 +25,5 @@ libdata/pkgconfig/libxklavier.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-%%DATADIR%%/xfree86.xml
-@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrm include/libxklavier
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index f644e39af29c..843c15b4487f 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.2
 CATEGORIES=	x11
 MASTER_SITES=	http://xlibs.freedesktop.org/xkbdesc/
 DISTNAME=	xkeyboard-config-${PORTVERSION}
@@ -15,8 +14,7 @@ DISTNAME=	xkeyboard-config-${PORTVERSION}
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
 
-BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 
 # XXX - sigh
 PREFIX=		${X11BASE}
@@ -24,11 +22,14 @@ PREFIX=		${X11BASE}
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
+USE_GNOME=	intlhack
 USE_GETTEXT=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-xkb-base=${PREFIX}/share/X11/xkb \
+CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 			--with-xkb-rules-symlink=xorg
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-install:
 	${MKDIR} /var/lib/xkb
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 2ad7f7527dd8..725911b0f6da 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,3 +1,3 @@
-MD5 (xkeyboard-config-1.0.tar.bz2) = bcf08a6bf76bd5661f730d36a1d66517
-SHA256 (xkeyboard-config-1.0.tar.bz2) = 44e4765c90b4ff3791eee40bdd95ab24d5b0089e39badedc2155cf10d4072ffb
-SIZE (xkeyboard-config-1.0.tar.bz2) = 534180
+MD5 (xkeyboard-config-1.2.tar.bz2) = 667c582a54d5715d24110c20e8c4be38
+SHA256 (xkeyboard-config-1.2.tar.bz2) = 64856896fb71708b6fc2bab146b387b2fb34da02ca9425a77dcfbfa59edb27f7
+SIZE (xkeyboard-config-1.2.tar.bz2) = 586629
diff --git a/x11/xkeyboard-config/files/patch-configure b/x11/xkeyboard-config/files/patch-configure
new file mode 100644
index 000000000000..c7d7ce26efb3
--- /dev/null
+++ b/x11/xkeyboard-config/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2008-02-08 23:52:05.000000000 -0500
++++ configure	2008-02-08 23:52:12.000000000 -0500
+@@ -7456,7 +7456,7 @@ else
+   echo "    Symbolic link(s) to legacy rules: $xkb_rules_symlink"
+ fi
+ 
+-if test "$enable_compat_rules" == "yes" ; then
++if test "$enable_compat_rules" = "yes" ; then
+   echo "    Compatibility rules are included"
+ else
+   echo "    Compatibility rules are not included"
diff --git a/x11/xkeyboard-config/files/patch-intltool-merge.in b/x11/xkeyboard-config/files/patch-intltool-merge.in
deleted file mode 100644
index 32de637e9f5a..000000000000
--- a/x11/xkeyboard-config/files/patch-intltool-merge.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- intltool-merge.in.orig	2007-12-03 07:58:17.000000000 +0900
-+++ intltool-merge.in	2007-12-03 08:00:47.000000000 +0900
-@@ -91,7 +91,7 @@
- 
- my %po_files_by_lang = ();
- my %translations = ();
--my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv";
-+my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
- 
- # Use this instead of \w for XML files to handle more possible characters.
- my $w = "[-A-Za-z0-9._:]";
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index e86940e9f01d..9799efb0a4ec 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -13,6 +13,7 @@ share/X11/xkb/compat/level5
 share/X11/xkb/compat/misc
 share/X11/xkb/compat/mousekeys
 share/X11/xkb/compat/norepeat
+share/X11/xkb/compat/olpc
 share/X11/xkb/compat/pc
 share/X11/xkb/compat/pc98
 share/X11/xkb/compat/xfree86
@@ -133,6 +134,7 @@ share/X11/xkb/symbols/digital_vndr/vt
 share/X11/xkb/symbols/fujitsu_vndr/jp
 share/X11/xkb/symbols/fujitsu_vndr/us
 share/X11/xkb/symbols/hp_vndr/us
+share/X11/xkb/symbols/kpdl
 share/X11/xkb/symbols/macintosh_vndr/apple
 share/X11/xkb/symbols/macintosh_vndr/ch
 share/X11/xkb/symbols/macintosh_vndr/de
@@ -150,7 +152,9 @@ share/X11/xkb/symbols/macintosh_vndr/pt
 share/X11/xkb/symbols/macintosh_vndr/se
 share/X11/xkb/symbols/macintosh_vndr/us
 share/X11/xkb/symbols/nec_vndr/jp
+share/X11/xkb/symbols/olpc
 share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/shift
 share/X11/xkb/symbols/sony_vndr/us
 share/X11/xkb/symbols/sun_vndr/cs
 share/X11/xkb/symbols/sun_vndr/cz
@@ -198,7 +202,7 @@ share/X11/xkb/symbols/by
 share/X11/xkb/symbols/ca
 share/X11/xkb/symbols/cd
 share/X11/xkb/symbols/ch
-share/X11/xkb/symbols/cs
+share/X11/xkb/symbols/cn
 share/X11/xkb/symbols/cz
 share/X11/xkb/symbols/de
 share/X11/xkb/symbols/dk
@@ -212,6 +216,7 @@ share/X11/xkb/symbols/fr
 share/X11/xkb/symbols/gb
 share/X11/xkb/symbols/ge
 share/X11/xkb/symbols/gh
+share/X11/xkb/symbols/gn
 share/X11/xkb/symbols/gr
 share/X11/xkb/symbols/hr
 share/X11/xkb/symbols/hu
@@ -235,6 +240,7 @@ share/X11/xkb/symbols/lt
 share/X11/xkb/symbols/lv
 share/X11/xkb/symbols/ma
 share/X11/xkb/symbols/mao
+share/X11/xkb/symbols/me
 share/X11/xkb/symbols/mk
 share/X11/xkb/symbols/mm
 share/X11/xkb/symbols/mn
@@ -250,6 +256,7 @@ share/X11/xkb/symbols/pk
 share/X11/xkb/symbols/pl
 share/X11/xkb/symbols/pt
 share/X11/xkb/symbols/ro
+share/X11/xkb/symbols/rs
 share/X11/xkb/symbols/ru
 share/X11/xkb/symbols/se
 share/X11/xkb/symbols/si
@@ -289,6 +296,34 @@ share/X11/xkb/types/numpad
 share/X11/xkb/types/pc
 share/X11/xkb/types/README
 share/X11/xkb/xkbcomp
+share/locale/af/LC_MESSAGES/xkeyboard-config.mo
+share/locale/az/LC_MESSAGES/xkeyboard-config.mo
+share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
+share/locale/cs/LC_MESSAGES/xkeyboard-config.mo
+share/locale/da/LC_MESSAGES/xkeyboard-config.mo
+share/locale/el/LC_MESSAGES/xkeyboard-config.mo
+share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo
+share/locale/es/LC_MESSAGES/xkeyboard-config.mo
+share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
+share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
+share/locale/it/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
+share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
+share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sl/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sq/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sr@Latn/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sv/LC_MESSAGES/xkeyboard-config.mo
+share/locale/tr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/uk/LC_MESSAGES/xkeyboard-config.mo
+share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
+share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
+share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 @exec mkdir -p /var/lib/xkb
 @dirrm share/X11/xkb/compat
 @dirrm share/X11/xkb/geometry/digital_vndr
@@ -317,3 +352,5 @@ share/X11/xkb/xkbcomp
 @dirrm share/X11/xkb
 @dirrmtry share/X11
 @dirrmtry /var/lib/xkb
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index c32be1a305ea..94a6d0a4d2cb 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/yelp/Makefile,v 1.117 2007/09/18 16:50:09 marcus Exp $
+#   $MCom: ports/x11/yelp/Makefile,v 1.122 2008/03/09 21:51:58 mezz Exp $
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,18 +18,17 @@ COMMENT=	A help browser for the GNOME 2 desktop
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
     		rarian.0:${PORTSDIR}/textproc/rarian
 
-USE_GECKO=	firefox xulrunner firefox-devel<->firefox
+USE_GECKO=	firefox xulrunner seamonkey
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
+USE_XORG=	ice
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
-		libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-mozilla=${GECKO}
+CONFIGURE_ARGS=	--with-gecko=${GECKO}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 GCONF_SCHEMAS=	yelp.schemas
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 4d65e16ff4f2..b488f21f2869 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.20.0.tar.bz2) = 8902618c343093b1c64ee6d647ec41ed
-SHA256 (gnome2/yelp-2.20.0.tar.bz2) = 0f4e1c5f3c4bf8d5109794b4d0a340ed847d49381d42968beb405f14b68c61ed
-SIZE (gnome2/yelp-2.20.0.tar.bz2) = 903106
+MD5 (gnome2/yelp-2.22.0.tar.bz2) = 941e67796bbc332c1db3d63771ae2590
+SHA256 (gnome2/yelp-2.22.0.tar.bz2) = 211b05ff153efff714b7767c4d5bce068562bf242e5f935a703f54d899e30cd0
+SIZE (gnome2/yelp-2.22.0.tar.bz2) = 978777
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 9d5800d0c26b..b55642d47706 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,37 +1,11 @@
 bin/gnome-help
 bin/yelp
 share/applications/yelp.desktop
-share/yelp/default.css
-share/yelp/icons/yelp-icon-caution.png
-share/yelp/icons/yelp-icon-important.png
-share/yelp/icons/yelp-icon-note.png
-share/yelp/icons/yelp-icon-tip.png
-share/yelp/icons/yelp-icon-warning.png
-share/yelp/icons/yelp-watermark-blockquote-00AB.png
-share/yelp/icons/yelp-watermark-blockquote-00BB.png
-share/yelp/icons/yelp-watermark-blockquote-201C.png
-share/yelp/icons/yelp-watermark-blockquote-201D.png
-share/yelp/icons/yelp-watermark-blockquote-201E.png
-share/yelp/important_docs.xml
-share/yelp/info.xml
-share/yelp/man.xml
-share/yelp/scrollkeeper.xml
-share/yelp/toc.xml
-share/yelp/ui/yelp-search-ui.xml
-share/yelp/ui/yelp-ui.xml
-share/yelp/ui/yelp.glade
-share/yelp/xslt/db-title.xsl
-share/yelp/xslt/db2html.xsl
-share/yelp/xslt/info2html.xsl
-share/yelp/xslt/man2html.xsl
-share/yelp/xslt/search2html.xsl
-share/yelp/xslt/toc2html.xsl
-share/yelp/xslt/yelp-common.xsl
-share/yelp/yelp.js
 share/icons/hicolor/192x192/apps/yelp-icon-big.png
 share/locale/af/LC_MESSAGES/yelp.mo
 share/locale/am/LC_MESSAGES/yelp.mo
 share/locale/ar/LC_MESSAGES/yelp.mo
+share/locale/as/LC_MESSAGES/yelp.mo
 share/locale/az/LC_MESSAGES/yelp.mo
 share/locale/be/LC_MESSAGES/yelp.mo
 share/locale/be@latin/LC_MESSAGES/yelp.mo
@@ -117,10 +91,38 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_HK/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 share/locale/zu/LC_MESSAGES/yelp.mo
-@dirrm share/yelp/xslt
-@dirrm share/yelp/ui
-@dirrm share/yelp/icons
-@dirrm share/yelp
+%%DATADIR%%/default.css
+%%DATADIR%%/icons/yelp-icon-caution.png
+%%DATADIR%%/icons/yelp-icon-important.png
+%%DATADIR%%/icons/yelp-icon-note.png
+%%DATADIR%%/icons/yelp-icon-tip.png
+%%DATADIR%%/icons/yelp-icon-warning.png
+%%DATADIR%%/icons/yelp-watermark-blockquote-00AB.png
+%%DATADIR%%/icons/yelp-watermark-blockquote-00BB.png
+%%DATADIR%%/icons/yelp-watermark-blockquote-201C.png
+%%DATADIR%%/icons/yelp-watermark-blockquote-201D.png
+%%DATADIR%%/icons/yelp-watermark-blockquote-201E.png
+%%DATADIR%%/important_docs.xml
+%%DATADIR%%/info.xml
+%%DATADIR%%/man.xml
+%%DATADIR%%/scrollkeeper.xml
+%%DATADIR%%/toc.xml
+%%DATADIR%%/ui/yelp-search-ui.xml
+%%DATADIR%%/ui/yelp-ui.xml
+%%DATADIR%%/ui/yelp.glade
+%%DATADIR%%/xslt/db-title.xsl
+%%DATADIR%%/xslt/db2html.xsl
+%%DATADIR%%/xslt/info2html.xsl
+%%DATADIR%%/xslt/man2html.xsl
+%%DATADIR%%/xslt/search2html.xsl
+%%DATADIR%%/xslt/toc2html.xsl
+%%DATADIR%%/xslt/yelp-common.xsl
+%%DATADIR%%/yelp.js
+@dirrm %%DATADIR%%/xslt
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -155,4 +157,5 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/applications
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 2e9bcc0032aa..fe4e9e25f535 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Franz Klammer <klammer@webonaut.com>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/zenity/Makefile,v 1.1 2007/12/01 19:10:42 marcus Exp $
+#   $MCom: ports/x11/zenity/Makefile,v 1.90 2008/03/10 13:46:16 ahze Exp $
 #
 
 PORTNAME=	zenity
-PORTVERSION=	2.20.1
+PORTVERSION=	2.22.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index db03818b9408..3507e2a8df1e 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.20.1.tar.bz2) = b9989582ea43f8fd58819d85ef9c9bc5
-SHA256 (gnome2/zenity-2.20.1.tar.bz2) = cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36
-SIZE (gnome2/zenity-2.20.1.tar.bz2) = 1830201
+MD5 (gnome2/zenity-2.22.0.tar.bz2) = f482090f1bd4946a2f8aee8e73200b04
+SHA256 (gnome2/zenity-2.22.0.tar.bz2) = d7c1277b7e69b41c1e21814a6cd613220b06b522fbfbf931f42b1c4b557bfaee
+SIZE (gnome2/zenity-2.22.0.tar.bz2) = 1821422
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 54d0d5ef1892..2b697946e3c0 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -111,7 +111,9 @@ share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/uk/zenity.xml
 share/locale/am/LC_MESSAGES/zenity.mo
 share/locale/ar/LC_MESSAGES/zenity.mo
+share/locale/as/LC_MESSAGES/zenity.mo
 share/locale/az/LC_MESSAGES/zenity.mo
+share/locale/be@latin/LC_MESSAGES/zenity.mo
 share/locale/be/LC_MESSAGES/zenity.mo
 share/locale/bg/LC_MESSAGES/zenity.mo
 share/locale/bn/LC_MESSAGES/zenity.mo
@@ -154,6 +156,7 @@ share/locale/mi/LC_MESSAGES/zenity.mo
 share/locale/mk/LC_MESSAGES/zenity.mo
 share/locale/ml/LC_MESSAGES/zenity.mo
 share/locale/mn/LC_MESSAGES/zenity.mo
+share/locale/mr/LC_MESSAGES/zenity.mo
 share/locale/ms/LC_MESSAGES/zenity.mo
 share/locale/nb/LC_MESSAGES/zenity.mo
 share/locale/ne/LC_MESSAGES/zenity.mo
@@ -243,6 +246,8 @@ share/omf/zenity/zenity-uk.omf
 @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/mi/LC_MESSAGES
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -253,3 +258,7 @@ share/omf/zenity/zenity-uk.omf
 @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
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2008-03-24 03:52:36 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2008-03-24 03:52:36 +0000
commit	6f32add9a75efb180e462ffbdb0b080bc88088e3 (patch)
tree	0fc7af36e22fc0dc7c1dc8aacabf6fe117e881da /x11
parent	- Add USE_XORG= x11 (diff)