Update to GNOME 2.2.

This is Phase I. All existing ports have been updated to their GNOME 2.2 counterparts.
author: Joe Marcus Clarke <marcus@FreeBSD.org> 2003-02-07 18:42:25 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2003-02-07 18:42:25 +0000
commit: 336b31c3940aea29270fc9fd9b51d3ba1633729e (patch)
tree: ab986f61fb6fef3625ba83cee9ea5d304243bfe8 /x11
parent: add ocaml-images 2.10 (diff)
59 files changed, 655 insertions, 1274 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 54491b9daae3..1471cf2cc960 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.4.0.12
-PORTREVISION=	1
+PORTVERSION=	2.4.1.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.4
@@ -16,8 +15,8 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		rsvg-2.2:${PORTSDIR}/graphics/librsvg2
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
+		rsvg-2.4:${PORTSDIR}/graphics/librsvg2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -56,6 +55,8 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 9e9c3533acea..07f6ddaaa9b5 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.4.0.12.tar.bz2) = 8aa6e503d4f74de8df32dee28df9a0de
+MD5 (gnome2/gdm-2.4.1.3.tar.bz2) = 448769257c5bda3cda48e63869825173
diff --git a/x11/gdm2/files/patch-al b/x11/gdm2/files/patch-al
index ee0fb6a8fdfd..6458c9e46ae2 100644
--- a/x11/gdm2/files/patch-al
+++ b/x11/gdm2/files/patch-al
@@ -1,12 +1,9 @@
---- config/gnomerc.in.orig	Wed Jul 24 15:25:51 2002
-+++ config/gnomerc.in	Mon Dec 23 23:53:21 2002
-@@ -2,7 +2,8 @@
+--- config/gnomerc.in.orig	Mon Nov 11 10:54:52 2002
++++ config/gnomerc.in	Fri Jan  3 12:09:49 2003
+@@ -9,5 +9,6 @@
+ #fi
  
- # Do we have gnome-volume-control?
- # If so we should run it to load the gnome-volume-control settings
--if command -v gnome-volume-control > /dev/null 2>&1; then
+ # path takes precedence
 +LC_CTYPE= ; export LC_CTYPE
-+if /usr/bin/which -s gnome-volume-control > /dev/null 2>&1; then
- 	gnome-volume-control -i
- elif [ -x @EXPANDED_BINDIR@/gnome-volume-control ] ; then
- 	@EXPANDED_BINDIR@/gnome-volume-control -i
+ exec gnome-session
+ exec @EXPANDED_BINDIR@/gnome-session
diff --git a/x11/gdm2/files/patch-config_Default b/x11/gdm2/files/patch-config_Default
deleted file mode 100644
index 1c82c6b155c7..000000000000
--- a/x11/gdm2/files/patch-config_Default
+++ /dev/null
@@ -1,20 +0,0 @@
---- config/Default.orig	Mon Dec 23 23:53:42 2002
-+++ config/Default	Mon Dec 23 23:54:11 2002
-@@ -7,7 +7,7 @@
- 
- sysmodmap=/etc/X11/Xmodmap
- 
--if command -v xmodmap > /dev/null 2>&1; then
-+if /usr/bin/which -s xmodmap > /dev/null 2>&1; then
-   if [ -z "$GDM_PARENT_DISPLAY" ]; then
-     if [ -f $sysmodmap ]; then
-       xmodmap $sysmodmap
-@@ -17,7 +17,7 @@
-   fi
- fi
- 
--if command -v setxkbmap > /dev/null 2>&1; then
-+if /usr/bin/which -s setxkbmap > /dev/null 2>&1; then
-   # FIXME: is this all right?  Is this completely on crack?
-   # What this does is move the xkb configuration from the GDM_PARENT_DISPLAY
-   # FIXME: This should be done in code.  Or there must be an easier way ...
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
index a162ae14275f..48d7d1b0004d 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -1,90 +1,91 @@
---- config/locale.alias.orig	Thu Aug 22 18:47:35 2002
-+++ config/locale.alias	Wed Sep 18 22:18:10 2002
-@@ -14,54 +14,36 @@
+--- config/locale.alias.orig	Wed Jan  8 13:31:44 2003
++++ config/locale.alias	Tue Jan 14 16:51:29 2003
+@@ -14,55 +14,36 @@
  #
  #		- George
  
--Azerbaijani		az_AZ.utf8,az_AZ
--Arabic(Egypt)		ar_EG.utf8,ar_EG
--Arabic(Lebanon)		ar_LB.utf8,ar_LB
--Basque			eu_ES.utf8,eu_ES
--Bulgarian		bg_BG.utf8,bg_BG
--Catalan			ca_ES.utf8,ca_ES
--Chinese(simplified)	zh_CN.utf8,zh_CN
--Chinese(traditional)	zh_TW.utf8,zh_TW
--Croatian		hr_HR.utf8,hr_HR
--Czech			cs_CZ.utf8,cs_CZ
--Danish			da_DK.utf8,da_DK
--Dutch			nl_NL.utf8,nl_NL
--Estonian		et_EE.utf8,et_EE
--English(American)	en_US.utf8,en_US
--English(Australian)	en_AU.utf8,en_AU
--English(British)	en_GB.utf8,en_GB
--English(Ireland)	en_IE.utf8,en_IE
--Finnish			fi_FI.utf8,fi_FI
--French			fr_FR.utf8,fr_FR
--Galician		gl_ES.utf8,gl_ES
--German			de_DE.utf8,de_DE
--Greek			el_GR.utf8,el_GR
--Hebrew			he_IL.utf8,he_IL
--Hungarian		hu_HU.utf8,hu_HU
--Icelandic		is_IS.utf8,is_IS
--Irish			ga_IE.utf8,ga_IE
--Italian			it_IT.utf8,it_IT
--Japanese		ja_JP.utf8,ja_JP
--Korean			ko_KR.utf8,ko_KR
--Latvian			lv_LV.utf8,lv_LV
--Lithuanian		lt_LT.utf8,lt_LT
--Macedonian		mk_MK.utf8,mk_MK
--Malay			ms_MY.utf8,ms_MY
--Norwegian(bokmal)	no_NO.utf8,no_NO
--Norwegian(nynorsk)	nn_NO.utf8,nn_NO
--Polish			pl_PL.utf8,pl_PL
--Portuguese		pt_PT.utf8,pt_PT
--Portuguese(Brazilian)	pt_BR.utf8,pt_BR
--Romanian		ro_RO.utf8,ro_RO
--Russian			ru_RU.utf8,ru_RU
--Slovak			sk_SK.utf8,sk_SK
--Slovenian		sl_SI.utf8,sl_SI
--Spanish			es_ES.utf8,es_ES
--Spanish(Mexico)		es_MX.utf8,es_MX
--Swedish			sv_SE.utf8,sv_SE
--Swedish(Finland)	sv_FI.utf8,sv_FI
--Tamil			ta_IN.utf8,ta_IN
--Turkish			tr_TR.utf8,tr_TR
--Ukrainian		uk_UA.utf8,uk_UA
--Vietnamese		vi_VN.utf8,vi_VN
--Walloon			wa_BE.utf8,wa_BE
-+Bulgarian		bg_BG.utf8,bg_BG.CP1251
-+Chinese(simplified)	zh_CN.utf8,zh_CN.EUC
-+Chinese(traditional)	zh_TW.utf8,zh_TW.Big5
-+Croatian		hr_HR.utf8,hr_HR.ISO_8859-2
-+Czech			cs_CZ.utf8,cs_CZ.ISO_8859-2
-+Danish			da_DK.utf8,da_DK.ISO_8859-1
-+Dutch			nl_NL.utf8,nl_NL.ISO_8859-1
-+Estonian		et_EE.utf8,et_EE.ISO_8859-15
-+English(American)	en_US.utf8,en_US.ISO_8859-1
-+English(Australian)	en_AU.utf8,en_AU.ISO_8859-1
-+English(British)	en_GB.utf8,en_GB.ISO_8859-1
-+Finnish			fi_FI.utf8,fi_FI.ISO_8859-1
-+French			fr_FR.utf8,fr_FR.ISO_8859-1
-+German			de_DE.utf8,de_DE.ISO_8859-1
-+Greek			el_GR.utf8,el_GR.ISO_8859-7
-+Hungarian		hu_HU.utf8,hu_HU.ISO_8859-2
-+Icelandic		is_IS.utf8,is_IS.ISO_8859-1
-+Italian			it_IT.utf8,it_IT.ISO_8859-1
-+Japanese		ja_JP.utf8,ja_JP.EUC
-+Korean			ko_KR.utf8,ko_KR.EUC
-+Lithuanian		lt_LT.utf8,lt_LT.ISO_8859-4
-+Norwegian(bokmal)	no_NO.utf8,no_NO.ISO_8859-1
-+Polish			pl_PL.utf8,pl_PL.ISO_8859-2
-+Portuguese		pt_PT.utf8,pt_PT.ISO_8859-1
-+Portuguese(Brazilian)	pt_BR.utf8,pt_BR.ISO8859-1
-+Romanian		ro_RO.utf8,ro_RO.ISO8859-2
-+Russian			ru_RU.utf8,ru_RU.ISO_8859-5
-+Slovak			sk_SK.utf8,sk_SK.ISO_8859-2
-+Slovenian		sl_SI.utf8,sl_SI.ISO_8859-2
-+Spanish			es_ES.utf8,es_ES.ISO_8859-1
-+Swedish			sv_SE.utf8,sv_SE.ISO_8859-1
-+Turkish			tr_TR.utf8,tr_TR.ISO_8859-9
-+Ukrainian		uk_UA.utf8,uk_UA.ISO8859-5
+-Azerbaijani		az_AZ.UTF-8,az_AZ
+-Arabic(Egypt)		ar_EG.UTF-8,ar_EG
+-Arabic(Lebanon)		ar_LB.UTF-8,ar_LB
+-Amharic			am_ET.UTF-8,am_ET
+-Basque			eu_ES.UTF-8,eu_ES
+-Bulgarian		bg_BG.UTF-8,bg_BG
+-Catalan			ca_ES.UTF-8,ca_ES
+-Chinese(simplified)	zh_CN.UTF-8,zh_CN
+-Chinese(traditional)	zh_TW.UTF-8,zh_TW
+-Croatian		hr_HR.UTF-8,hr_HR
+-Czech			cs_CZ.UTF-8,cs_CZ
+-Danish			da_DK.UTF-8,da_DK
+-Dutch			nl_NL.UTF-8,nl_NL
+-Estonian		et_EE.UTF-8,et_EE
+-English(American)	en_US.UTF-8,en_US
+-English(Australian)	en_AU.UTF-8,en_AU
+-English(British)	en_GB.UTF-8,en_GB
+-English(Ireland)	en_IE.UTF-8,en_IE
+-Finnish			fi_FI.UTF-8,fi_FI
+-French			fr_FR.UTF-8,fr_FR
+-Galician		gl_ES.UTF-8,gl_ES
+-German			de_DE.UTF-8,de_DE
+-Greek			el_GR.UTF-8,el_GR
+-Hebrew			he_IL.UTF-8,he_IL
+-Hungarian		hu_HU.UTF-8,hu_HU
+-Icelandic		is_IS.UTF-8,is_IS
+-Irish			ga_IE.UTF-8,ga_IE
+-Italian			it_IT.UTF-8,it_IT
+-Japanese		ja_JP.UTF-8,ja_JP
+-Korean			ko_KR.UTF-8,ko_KR
+-Latvian			lv_LV.UTF-8,lv_LV
+-Lithuanian		lt_LT.UTF-8,lt_LT
+-Macedonian		mk_MK.UTF-8,mk_MK
+-Malay			ms_MY.UTF-8,ms_MY
+-Norwegian(bokmal)	no_NO.UTF-8,no_NO
+-Norwegian(nynorsk)	nn_NO.UTF-8,nn_NO
+-Polish			pl_PL.UTF-8,pl_PL
+-Portuguese		pt_PT.UTF-8,pt_PT
+-Portuguese(Brazilian)	pt_BR.UTF-8,pt_BR
+-Romanian		ro_RO.UTF-8,ro_RO
+-Russian			ru_RU.UTF-8,ru_RU
+-Slovak			sk_SK.UTF-8,sk_SK
+-Slovenian		sl_SI.UTF-8,sl_SI
+-Spanish			es_ES.UTF-8,es_ES
+-Spanish(Mexico)		es_MX.UTF-8,es_MX
+-Swedish			sv_SE.UTF-8,sv_SE
+-Swedish(Finland)	sv_FI.UTF-8,sv_FI
+-Tamil			ta_IN.UTF-8,ta_IN
+-Turkish			tr_TR.UTF-8,tr_TR
+-Ukrainian		uk_UA.UTF-8,uk_UA
+-Vietnamese		vi_VN.UTF-8,vi_VN
+-Walloon			wa_BE.UTF-8,wa_BE
++Bulgarian              bg_BG.UTF-8,bg_BG.CP1251
++Chinese(simplified)    zh_CN.UTF-8,zh_CN.EUC
++Chinese(traditional)   zh_TW.UTF-8,zh_TW.Big5
++Croatian               hr_HR.UTF-8,hr_HR.ISO_8859-2
++Czech                  cs_CZ.UTF-8,cs_CZ.ISO_8859-2
++Danish                 da_DK.UTF-8,da_DK.ISO_8859-1
++Dutch                  nl_NL.UTF-8,nl_NL.ISO_8859-1
++Estonian               et_EE.UTF-8,et_EE.ISO_8859-15
++English(American)      en_US.UTF-8,en_US.ISO_8859-1
++English(Australian)    en_AU.UTF-8,en_AU.ISO_8859-1
++English(British)       en_GB.UTF-8,en_GB.ISO_8859-1
++Finnish                        fi_FI.UTF-8,fi_FI.ISO_8859-1
++French                 fr_FR.UTF-8,fr_FR.ISO_8859-1
++German                 de_DE.UTF-8,de_DE.ISO_8859-1
++Greek                  el_GR.UTF-8,el_GR.ISO_8859-7
++Hungarian              hu_HU.UTF-8,hu_HU.ISO_8859-2
++Icelandic              is_IS.UTF-8,is_IS.ISO_8859-1
++Italian                        it_IT.UTF-8,it_IT.ISO_8859-1
++Japanese               ja_JP.UTF-8,ja_JP.EUC
++Korean                 ko_KR.UTF-8,ko_KR.EUC
++Lithuanian             lt_LT.UTF-8,lt_LT.ISO_8859-4
++Norwegian(bokmal)      no_NO.UTF-8,no_NO.ISO_8859-1
++Polish                 pl_PL.UTF-8,pl_PL.ISO_8859-2
++Portuguese             pt_PT.UTF-8,pt_PT.ISO_8859-1
++Portuguese(Brazilian)  pt_BR.UTF-8,pt_BR.ISO8859-1
++Romanian               ro_RO.UTF-8,ro_RO.ISO8859-2
++Russian                        ru_RU.UTF-8,ru_RU.ISO_8859-5
++Slovak                 sk_SK.UTF-8,sk_SK.ISO_8859-2
++Slovenian              sl_SI.UTF-8,sl_SI.ISO_8859-2
++Spanish                        es_ES.UTF-8,es_ES.ISO_8859-1
++Swedish                        sv_SE.UTF-8,sv_SE.ISO_8859-1
++Turkish                        tr_TR.UTF-8,tr_TR.ISO_8859-9
++Ukrainian              uk_UA.UTF-8,uk_UA.ISO8859-5
diff --git a/x11/gdm2/files/patch-daemon_gdm.c b/x11/gdm2/files/patch-daemon_gdm.c
new file mode 100644
index 000000000000..76c115f8b982
--- /dev/null
+++ b/x11/gdm2/files/patch-daemon_gdm.c
@@ -0,0 +1,11 @@
+--- daemon/gdm.c.orig	Thu May 30 11:02:29 2002
++++ daemon/gdm.c	Thu May 30 10:59:19 2002
+@@ -36,7 +36,7 @@
+ #include <locale.h>
+ 
+ /* This should be moved to auth.c I suppose */
+-#include <X11/Xauth.h>
++/*#include <X11/Xauth.h>*/
+ 
+ #include <vicious.h>
+ 
diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install
index 237a1ceaa0ca..e373a44e33ca 100644
--- a/x11/gdm2/pkg-install
+++ b/x11/gdm2/pkg-install
@@ -36,8 +36,8 @@ if [ "$2" = "POST-INSTALL" ]; then
 			exit 1
 		fi
 	fi
-        ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm
-        ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm
+	${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm
+	${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm
 	exit 0
 fi
 
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 8f165bb2d6b8..269c2f7e39ca 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -61,6 +61,7 @@ share/gnome/pixmaps/gdm.png
 share/gnome/pixmaps/login-photo.png
 share/gnome/pixmaps/nobody.png
 share/gnome/pixmaps/nohost.png
+share/locale/am/LC_MESSAGES/gdm-2.4.mo
 share/locale/ar/LC_MESSAGES/gdm-2.4.mo
 share/locale/az/LC_MESSAGES/gdm-2.4.mo
 share/locale/be/LC_MESSAGES/gdm-2.4.mo
@@ -77,12 +78,15 @@ share/locale/fi/LC_MESSAGES/gdm-2.4.mo
 share/locale/fr/LC_MESSAGES/gdm-2.4.mo
 share/locale/ga/LC_MESSAGES/gdm-2.4.mo
 share/locale/gl/LC_MESSAGES/gdm-2.4.mo
+share/locale/he/LC_MESSAGES/gdm-2.4.mo
 share/locale/hu/LC_MESSAGES/gdm-2.4.mo
 share/locale/it/LC_MESSAGES/gdm-2.4.mo
 share/locale/ja/LC_MESSAGES/gdm-2.4.mo
 share/locale/ko/LC_MESSAGES/gdm-2.4.mo
 share/locale/lt/LC_MESSAGES/gdm-2.4.mo
 share/locale/lv/LC_MESSAGES/gdm-2.4.mo
+share/locale/mk/LC_MESSAGES/gdm-2.4.mo
+share/locale/mn/LC_MESSAGES/gdm-2.4.mo
 share/locale/ms/LC_MESSAGES/gdm-2.4.mo
 share/locale/nl/LC_MESSAGES/gdm-2.4.mo
 share/locale/nn/LC_MESSAGES/gdm-2.4.mo
@@ -104,5 +108,4 @@ share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo
 @dirrm share/gnome/gdm/themes/happygnome
 @dirrm share/gnome/gdm/themes/circles
 @dirrm share/gnome/gdm/themes
-@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
 @dirrm etc/pam.d
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 1c5db99a1fd5..b0eeba4d3e62 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-applets/2.2
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomehier gnomeprefix gnomehack
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 3f22cfe63b90..265e0d7b2cb5 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.0.4.tar.bz2) = a31f48077622bb28c6672b46abbcd7a3
+MD5 (gnome2/gnome-applets-2.2.0.tar.bz2) = 2c5650d11253fd5c4716c96f688729f7
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index e7abc6211310..fc72f4f9ee6b 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Mon Nov 18 18:04:37 2002
-+++ configure	Wed Nov 20 02:25:38 2002
-@@ -5683,6 +5683,7 @@
+--- configure.orig	Mon Dec 16 17:15:36 2002
++++ configure	Thu Dec 19 13:43:27 2002
+@@ -7862,6 +7862,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
++c_aux_dir/ltconfig $LIBTOOL_DEPS
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8771,6 +8772,7 @@
+@@ -12328,6 +12329,7 @@
  *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
  *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
  *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -16,41 +16,41 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
  esac
  case "$host" in
-@@ -8831,6 +8833,20 @@
-   HAVE_LIBAPM_TRUE='#'
-   HAVE_LIBAPM_FALSE=
+@@ -12391,6 +12393,20 @@
  fi
-+	;;
+ 
+ 	;;
 +  i386-*-freebsd*)
-+  	HAVE_LIBAPM=no
-+
++      HAVE_LIBAPM=no
 +if test "x$HAVE_LIBAPM" = "xyes"; then
-+    	HAVE_LIBAPM_TRUE=
-+	HAVE_LIBAPM_FALSE='#'
++    HAVE_LIBAPM_TRUE=
++    HAVE_LIBAPM_FALSE='#'
 +else
-+    	HAVE_LIBAPM_TRUE='#'
-+	HAVE_LIBAPM_FALSE=
++    HAVE_LIBAPM_TRUE='#'
++    HAVE_LIBAPM_FALSE=
 +fi
-+	;;
++    ;;
 +  *-*-freebsd*)
-+  	build_battstat_applet=no
- 	
- 	;;
++      build_battstat_applet=no
++
++    ;;
    *-*-linux*)
-@@ -9420,14 +9436,14 @@
+ 	echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
+ echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6
+@@ -13688,14 +13704,14 @@
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
 -#define GNOME_ICONDIR "${prefix}/share/pixmaps"
 +#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
+ _ACEOF
  
  
- #defined the below to enable help to work for applets 
+ #defined the below to enable help to work for applets
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
 -#define DATADIR "${prefix}/share"
 +#define DATADIR "${datadir}"
- EOF
+ _ACEOF
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
diff --git a/x11/gnome-applets/files/patch-battstat_Makefile.in b/x11/gnome-applets/files/patch-battstat_Makefile.in
index d0834c4e4faa..f47e6bab6dae 100644
--- a/x11/gnome-applets/files/patch-battstat_Makefile.in
+++ b/x11/gnome-applets/files/patch-battstat_Makefile.in
@@ -1,26 +1,27 @@
---- battstat/Makefile.in.orig	Wed Nov 20 02:26:09 2002
-+++ battstat/Makefile.in	Wed Nov 20 02:28:24 2002
-@@ -144,11 +144,11 @@
+--- battstat/Makefile.in.orig	Thu Dec 19 13:50:27 2002
++++ battstat/Makefile.in	Thu Dec 19 13:51:02 2002
+@@ -148,11 +148,11 @@
  pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = battstat.png
- @HAVE_LIBAPM_TRUE@APMLIB = -lapm
--@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
+ @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
+-@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
 +@HAVE_LIBAPM_FALSE@APMLIB = 
  @HAVE_LIBAPM_TRUE@APMDIR = 
--@HAVE_LIBAPM_FALSE@APMDIR = apmlib
+-@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
 +@HAVE_LIBAPM_FALSE@APMDIR = 
  @HAVE_LIBAPM_TRUE@APMINC = 
--@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
+-@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
 +@HAVE_LIBAPM_FALSE@APMINC = 
  
  SUBDIRS = docs sounds $(APMDIR)
  
-@@ -194,7 +194,7 @@
- battstat_applet_2_OBJECTS =  properties.$(OBJEXT) \
- battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = 
--@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =  apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =
+@@ -223,8 +223,7 @@
+ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES =  \
+ @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
+ @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =  \
+-@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \
+-@HAVE_LIBAPM_FALSE@apmlib/libapm.a
++@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la
  battstat_applet_2_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index b0cfa6f65db6..759100e439d0 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -45,19 +45,23 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
 libdata/bonobo/servers/GNOME_MixerApplet.server
 libdata/bonobo/servers/GNOME_ModemLightsApplet.server
 libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
+libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
 %%BATTERY%%libexec/battstat-applet-2
 libexec/cdplayer_applet2
 libexec/charpick_applet2
 libexec/drivemount_applet2
 libexec/geyes_applet2
 libexec/gkb-applet-2
+libexec/gnome-applets/mc-install-default-macros
 libexec/gtik2_applet2
 libexec/gweather-applet-2
 libexec/mini_commander_applet
 libexec/mixer_applet2
 libexec/modemlights_applet2
 libexec/multiload-applet-2
+libexec/wireless-applet
 %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade
+share/gnome/gen_util/mini-commander.glade
 share/gnome/geyes/Bizarre/Bizarre-eye.png
 share/gnome/geyes/Bizarre/Bizarre-pupil.png
 share/gnome/geyes/Bizarre/config
@@ -75,6 +79,7 @@ share/gnome/geyes/Horrid/horrid_eye.png
 share/gnome/geyes/Horrid/horrid_pupil.png
 share/gnome/gkb/AM_Armenian.keyprop
 share/gnome/gkb/AR_Arabic.keyprop
+share/gnome/gkb/AR_Arabic_x.keyprop
 share/gnome/gkb/AZ_Azerbaidjani_Turkic.keyprop
 share/gnome/gkb/Armenian.keyprop
 share/gnome/gkb/BE_Dutch.keyprop
@@ -100,10 +105,12 @@ share/gnome/gkb/Dvorak.keyprop
 share/gnome/gkb/EE_Estonian.keyprop
 share/gnome/gkb/EE_Estonian_x.keyprop
 share/gnome/gkb/ES_Spanish.keyprop
+share/gnome/gkb/ES_Spanish-x86.keyprop
 share/gnome/gkb/ES_Spanish_x.keyprop
 share/gnome/gkb/FI_Finnish.keyprop
 share/gnome/gkb/FI_Finnish_x.keyprop
 share/gnome/gkb/FR_French.keyprop
+share/gnome/gkb/FR_French-x86.keyprop
 share/gnome/gkb/FR_French_x.keyprop
 share/gnome/gkb/FrenchCanadian.keyprop
 share/gnome/gkb/FrenchCanadian2.keyprop
@@ -119,10 +126,12 @@ share/gnome/gkb/GeorgianLatin.keyprop
 share/gnome/gkb/GeorgianRussian.keyprop
 share/gnome/gkb/German.keyprop
 share/gnome/gkb/GermanSwiss.keyprop
+share/gnome/gkb/HR_Croatian.keyprop
 share/gnome/gkb/HU_Hungarian.keyprop
 share/gnome/gkb/Hungarian-101.keyprop
 share/gnome/gkb/Hungarian-lat1.keyprop
 share/gnome/gkb/Hungarian-sun.keyprop
+share/gnome/gkb/Hungarian-x86.keyprop
 share/gnome/gkb/Hungarian.keyprop
 share/gnome/gkb/Hungarian101-1.keyprop
 share/gnome/gkb/Hungarian101.keyprop
@@ -134,6 +143,7 @@ share/gnome/gkb/IT_Italian.keyprop
 share/gnome/gkb/IT_Italian_x.keyprop
 share/gnome/gkb/JP_Japanese.keyprop
 share/gnome/gkb/JP_Japanese_x.keyprop
+share/gnome/gkb/KR_Korean.keyprop
 share/gnome/gkb/LA_Lao_x.keyprop
 share/gnome/gkb/LT_Lithuanian.keyprop
 share/gnome/gkb/LT_Lithuanian_x.keyprop
@@ -171,7 +181,9 @@ share/gnome/gkb/TR_Turkish_x.keyprop
 share/gnome/gkb/Thai.keyprop
 share/gnome/gkb/Thai2.keyprop
 share/gnome/gkb/UA_Ukrainian.keyprop
+share/gnome/gkb/UK-x86.keyprop
 share/gnome/gkb/UK.keyprop
+share/gnome/gkb/US-101A-x86.keyprop
 share/gnome/gkb/US-101.keyprop
 share/gnome/gkb/US-84.keyprop
 share/gnome/gkb/US-dec.keyprop
@@ -184,8 +196,9 @@ share/gnome/gkb/US.keyprop
 share/gnome/gkb/US_English.keyprop
 share/gnome/gkb/US_international.keyprop
 share/gnome/gkb/VN_Vietnamese.keyprop
-share/gnome/gkb/YU_Serbo-Croatian_x.keyprop
+share/gnome/gkb/YU_Serb_x.keyprop
 share/gnome/gkb/Yugoslav.keyprop
+share/gnome/gkb/presets.xml
 %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml
@@ -198,6 +211,7 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml
 share/gnome/gweather/Locations
 %%BATTERY%%share/gnome/help/battstat/C/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png
@@ -223,6 +237,12 @@ share/gnome/help/char-palette/C/legal.xml
 share/gnome/help/command-line/C/command-line.xml
 share/gnome/help/command-line/C/figures/command-line.png
 share/gnome/help/command-line/C/legal.xml
+share/gnome/help/drivemount/C/drivemount.xml
+share/gnome/help/drivemount/C/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/C/legal.xml
 share/gnome/help/geyes/C/figures/geyes_applet.png
 share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
@@ -242,14 +262,25 @@ share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
 share/gnome/help/mixer_applet2/C/topic.dat
 %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
+@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/cdplayer-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/char-palette-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/command-line-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/geyes-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gkb-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gweather-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/mixer_applet2-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true
 %%BATTERY%%share/gnome/pixmaps/battstat.png
 share/gnome/pixmaps/charpick.png
 share/gnome/pixmaps/drivemount-applet.png
@@ -293,7 +324,9 @@ share/gnome/pixmaps/gkb/it.png
 share/gnome/pixmaps/gkb/jo.png
 share/gnome/pixmaps/gkb/jp.png
 share/gnome/pixmaps/gkb/km.png
+share/gnome/pixmaps/gkb/kr.png
 share/gnome/pixmaps/gkb/kw.png
+share/gnome/pixmaps/gkb/lam.png
 share/gnome/pixmaps/gkb/la.png
 share/gnome/pixmaps/gkb/lb.png
 share/gnome/pixmaps/gkb/lt.png
@@ -316,6 +349,7 @@ share/gnome/pixmaps/gkb/se.png
 share/gnome/pixmaps/gkb/si.png
 share/gnome/pixmaps/gkb/sk.png
 share/gnome/pixmaps/gkb/so.png
+share/gnome/pixmaps/gkb/sr.png
 share/gnome/pixmaps/gkb/su.png
 share/gnome/pixmaps/gkb/sv.png
 share/gnome/pixmaps/gkb/sy.png
@@ -343,7 +377,16 @@ share/gnome/pixmaps/mixer/volume-medium.png
 share/gnome/pixmaps/mixer/volume-min.png
 share/gnome/pixmaps/mixer/volume-mute.png
 share/gnome/pixmaps/mixer/volume-zero.png
+share/gnome/pixmaps/wireless-applet/broken-0.png
+share/gnome/pixmaps/wireless-applet/no-link-0.png
+share/gnome/pixmaps/wireless-applet/signal-1-40.png
+share/gnome/pixmaps/wireless-applet/signal-41-60.png
+share/gnome/pixmaps/wireless-applet/signal-61-80.png
+share/gnome/pixmaps/wireless-applet/signal-81-100.png
+share/gnome/pixmaps/wireless-applet/wireless-applet.png
+share/gnome/wireless-applet/wireless-applet.glade
 share/gnome/xmodmap/xmodmap.am
+share/gnome/xmodmap/xmodmap.ar
 share/gnome/xmodmap/xmodmap.be
 share/gnome/xmodmap/xmodmap.bg
 share/gnome/xmodmap/xmodmap.br
@@ -357,9 +400,11 @@ share/gnome/xmodmap/xmodmap.dk
 share/gnome/xmodmap/xmodmap.dvorak
 share/gnome/xmodmap/xmodmap.ee
 share/gnome/xmodmap/xmodmap.es
+share/gnome/xmodmap/xmodmap.es_x86
 share/gnome/xmodmap/xmodmap.fi
 share/gnome/xmodmap/xmodmap.fr
 share/gnome/xmodmap/xmodmap.fr-2
+share/gnome/xmodmap/xmodmap.fr_x86
 share/gnome/xmodmap/xmodmap.gb
 share/gnome/xmodmap/xmodmap.gb-102
 share/gnome/xmodmap/xmodmap.gb-105
@@ -374,11 +419,13 @@ share/gnome/xmodmap/xmodmap.hu-lat1
 share/gnome/xmodmap/xmodmap.hu-sun-lat2
 share/gnome/xmodmap/xmodmap.hu.old
 share/gnome/xmodmap/xmodmap.hu_latin1
+share/gnome/xmodmap/xmodmap.hu_x86
 share/gnome/xmodmap/xmodmap.il
 share/gnome/xmodmap/xmodmap.il_phonetic
 share/gnome/xmodmap/xmodmap.is
 share/gnome/xmodmap/xmodmap.it
 share/gnome/xmodmap/xmodmap.jp
+share/gnome/xmodmap/xmodmap.kr
 share/gnome/xmodmap/xmodmap.la
 share/gnome/xmodmap/xmodmap.lt
 share/gnome/xmodmap/xmodmap.lt_b
@@ -405,7 +452,9 @@ share/gnome/xmodmap/xmodmap.th
 share/gnome/xmodmap/xmodmap.tr_f
 share/gnome/xmodmap/xmodmap.tr_q
 share/gnome/xmodmap/xmodmap.uk
+share/gnome/xmodmap/xmodmap.uk_x86
 share/gnome/xmodmap/xmodmap.us
+share/gnome/xmodmap/xmodmap.us101A_x86
 share/gnome/xmodmap/xmodmap.us-101
 share/gnome/xmodmap/xmodmap.us-84
 share/gnome/xmodmap/xmodmap.us-dec
@@ -435,12 +484,15 @@ share/locale/fi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hu/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/ko/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
@@ -461,6 +513,7 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/xmodmap
+@dirrm share/gnome/wireless-applet
 @dirrm share/gnome/pixmaps/mixer
 @dirrm share/gnome/pixmaps/mini-commander
 @dirrm share/gnome/pixmaps/gweather
@@ -475,12 +528,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/gtik2_applet2/C/figures
 @dirrm share/gnome/help/gtik2_applet2/C
 @dirrm share/gnome/help/gtik2_applet2
-@dirrm share/gnome/help/gkb/C/figures
-@dirrm share/gnome/help/gkb/C
-@dirrm share/gnome/help/gkb
 @dirrm share/gnome/help/geyes/C/figures
 @dirrm share/gnome/help/geyes/C
 @dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/C/figures
+@dirrm share/gnome/help/drivemount/C
+@dirrm share/gnome/help/drivemount
 @dirrm share/gnome/help/command-line/C/figures
 @dirrm share/gnome/help/command-line/C
 @dirrm share/gnome/help/command-line
@@ -490,18 +543,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/cdplayer/C/figures
 @dirrm share/gnome/help/cdplayer/C
 @dirrm share/gnome/help/cdplayer
-%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
-%%BATTERY%%@dirrm share/gnome/help/battstat/C
-%%BATTERY%%@dirrm share/gnome/help/battstat
 @dirrm share/gnome/gweather
 @dirrm share/gnome/gkb
-@dirrm share/gnome/geyes/Horrid
-@dirrm share/gnome/geyes/Default-tiny
-@dirrm share/gnome/geyes/Default
-@dirrm share/gnome/geyes/Bloodshot
-@dirrm share/gnome/geyes/Bizarre
-@dirrm share/gnome/geyes
+@dirrm share/gnome/gen_util
 %%BATTERY%%@dirrm share/gnome/battstat_applet
+@dirrm libexec/gnome-applets
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
@@ -524,3 +570,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet
 %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs
 %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet
+@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 323915fab1ef..8f1c292a4c49 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.0.10
+PORTVERSION=	2.2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.2
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 49d280e227f2..3ebb8fa8c311 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.0.10.tar.bz2) = 5a04d472ce8c6be6a823d348362a6d0b
+MD5 (gnome2/gnome-desktop-2.2.0.1.tar.bz2) = 5463b9a864447d670d1ea40de2022519
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index cbd05d5d550e..c1eb5c92f788 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -1,11 +1,10 @@
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
-include/gnome-desktop-2.0/libgnome/gnome-icon-loader.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
 lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.0
+lib/libgnome-desktop-2.so.3
 libdata/pkgconfig/gnome-desktop-2.0.pc
 share/gnome/gnome-about/contributors.dat
 share/gnome/gnome-about/gnome-version.xml
@@ -18,15 +17,13 @@ share/gnome/vfolders/Applications.directory
 share/gnome/vfolders/Development.directory
 share/gnome/vfolders/Games.directory
 share/gnome/vfolders/Graphics.directory
-share/gnome/vfolders/Home.directory
 share/gnome/vfolders/Internet.directory
 share/gnome/vfolders/Multimedia.directory
 share/gnome/vfolders/Office.directory
 share/gnome/vfolders/Root.directory
-share/gnome/vfolders/Root.order
 share/gnome/vfolders/Settings.directory
-share/gnome/vfolders/Settings.order
 share/gnome/vfolders/System.directory
+share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
 share/gnome/pixmaps/cdeappmenu.png
@@ -155,7 +152,6 @@ share/gnome/pixmaps/panel-folder.png
 share/gnome/pixmaps/panel-knob.png
 share/gnome/pixmaps/panel-menu-main.png
 share/gnome/pixmaps/vnterm.xpm
-share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -183,6 +179,7 @@ share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -195,9 +192,11 @@ share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sp/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index a28b5926035f..db2138760fbb 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.0.11
+PORTVERSION=	2.2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-panel/2.2
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \
-		gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
+LIB_DEPENDS=	wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck \
+		gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
+USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 66c1e6cb333f..e6e3514326ed 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.0.11.tar.bz2) = 27345e392e336df85ca4fe44af90a3f4
+MD5 (gnome2/gnome-panel-2.2.0.1.tar.bz2) = cd8a74425cadadc8d10ab1fe5e9e3fe8
diff --git a/x11/gnome-panel/files/patch-config.h.in b/x11/gnome-panel/files/patch-config.h.in
index cb37ef76389a..8a59166a57b7 100644
--- a/x11/gnome-panel/files/patch-config.h.in
+++ b/x11/gnome-panel/files/patch-config.h.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- config.h.in	2002/05/14 14:15:00	1.1
-+++ config.h.in	2002/05/14 14:15:35
-@@ -148,6 +148,8 @@
- /* Define if you have the `strdup' function. */
- #undef HAVE_STRDUP
+--- config.h.in.orig	Thu Jan  2 19:50:41 2003
++++ config.h.in	Mon Jan  6 13:11:12 2003
+@@ -96,6 +96,8 @@
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
  
 +#undef HAVE_LANGINFO_H
 +
- /* Define if you have the <strings.h> header file. */
+ /* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H
  
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
index 89007e07bc69..a94d4761c395 100644
--- a/x11/gnome-panel/files/patch-configure
+++ b/x11/gnome-panel/files/patch-configure
@@ -1,22 +1,19 @@
-
-$FreeBSD$
-
---- configure.orig	Tue May 14 17:16:32 2002
-+++ configure	Tue May 14 17:17:03 2002
-@@ -7232,6 +7232,7 @@
+--- configure.orig	Mon Jan  6 01:04:20 2003
++++ configure	Mon Jan  6 13:12:56 2003
+@@ -4254,7 +4254,7 @@
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9288,7 +9289,7 @@
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 -                  inttypes.h stdint.h unistd.h
 +                  inttypes.h stdint.h unistd.h langinfo.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:9294: checking for $ac_header" >&5
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -7878,6 +7878,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnome-panel/files/patch-temp b/x11/gnome-panel/files/patch-temp
deleted file mode 100644
index a863cbbc8bd9..000000000000
--- a/x11/gnome-panel/files/patch-temp
+++ /dev/null
@@ -1,441 +0,0 @@
-This patch reverts fully rev.1.50 of xstuff.c and rev.1.22 of xstuff.h, as
-well as partially rev.1.302 of session.c and rev.1.176 of basep-widget.c.
-The goal is to make Nautilus recognizing presence of the panel on screen,
-so that it doesn't put its icons under the panel(s). For some reason,
-advertized in ChangeLog _NET_WM_WORKAREA isn't recognised by Nautilus-2.0.0
-available at this time.
-
---- gnome-panel/xstuff.c.orig	Sun Aug  4 18:30:21 2002
-+++ gnome-panel/xstuff.c	Thu Aug  8 22:19:15 2002
-@@ -8,46 +8,97 @@
-  *          Mark McLoughlin <mark@skynet.ie>
-  */
- #include <config.h>
--#include <string.h>
--
--#include <gdk/gdk.h>
- #include <gdk/gdkx.h>
-+#include <string.h>
- 
-+#include <X11/Xmd.h>
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
- 
--#include "xstuff.h"
-+/* Yes, yes I know, now bugger off ... */
-+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
-+#include <libwnck/libwnck.h>
- 
-+#include "xstuff.h"
-+#include "multiscreen-stuff.h"
-+#include "basep-widget.h"
-+#include "foobar-widget.h"
- #include "global-keys.h"
- 
--static Atom
--panel_atom_get (Display    *display,
--		const char *atom_name)
-+/*list of all panel widgets created*/
-+extern GSList *panel_list;
-+
-+static void xstuff_setup_global_desktop_area (int left, int right,
-+					int top, int bottom);
-+
-+#define ATOM(name) xstuff_atom_intern(GDK_DISPLAY(),name)
-+/* Once we have multiple display support we need to only use
-+ * the below ones */
-+
-+#define ATOMD(display,name) xstuff_atom_intern(display,name)
-+#define ATOMEV(event,name) xstuff_atom_intern(((XAnyEvent *)event)->display,name)
-+#define ATOMGDK(win,name) xstuff_atom_intern(GDK_WINDOW_XDISPLAY(win),name)
-+
-+Atom
-+xstuff_atom_intern (Display *display, const char *name)
- {
--	static GHashTable *atom_hash;
--	Atom               retval;
-+	static GHashTable *cache = NULL;
-+	char *key;
-+	Atom atom;
- 
- 	g_return_val_if_fail (display != NULL, None);
--	g_return_val_if_fail (atom_name != NULL, None);
-+	g_return_val_if_fail (name != NULL, None);
-+
-+	if (cache == 0)
-+	    cache = g_hash_table_new (g_str_hash, g_str_equal);
- 
--	if (!atom_hash)
--		atom_hash = g_hash_table_new_full (
--				g_str_hash, g_str_equal, g_free, NULL);
--
--	retval = GPOINTER_TO_UINT (g_hash_table_lookup (atom_hash, atom_name));
--	if (!retval) {
--		retval = XInternAtom (display, atom_name, FALSE);
--
--		if (retval != None)
--			g_hash_table_insert (atom_hash, g_strdup (atom_name),
--					     GUINT_TO_POINTER (retval));
-+	key = g_strdup_printf ("%p %s", display, name);
-+
-+	atom = (Atom)g_hash_table_lookup (cache, key);
-+	if (atom == 0) {
-+	    	atom = XInternAtom (display, name, False);
-+		g_hash_table_insert (cache, key, (gpointer)atom);
-+	} else {
-+	   	g_free (key);
- 	}
- 
--	return retval;
-+    	return atom;
-+}
-+
-+void
-+xstuff_init (void)
-+{
-+       /* setup the keys filter */
-+       gdk_window_add_filter (gdk_get_default_root_window (),
-+                              panel_global_keys_filter,
-+                              NULL);
-+
-+       gdk_error_trap_push ();
-+
-+       xstuff_setup_global_desktop_area (0, 0, 0, 0);
-+
-+       gdk_error_trap_pop ();
-+}
-+
-+void
-+xstuff_set_simple_hint (GdkWindow *w, const char *name, long val)
-+{
-+       Atom atom = ATOMGDK (w, name);
-+
-+       gdk_error_trap_push ();
-+
-+       XChangeProperty (GDK_DISPLAY (),
-+                        GDK_WINDOW_XWINDOW (w),
-+                        atom, atom,
-+                        32, PropModeReplace,
-+                        (unsigned char*)&val, 1);
-+
-+       gdk_flush ();
-+       gdk_error_trap_pop ();
- }
- 
- /* Stolen from deskguide */
--static gpointer
-+gpointer
- get_typed_property_data (Display *xdisplay,
- 			 Window   xwindow,
- 			 Atom     property,
-@@ -156,7 +207,7 @@
-         
- 	data = get_typed_property_data (GDK_DISPLAY (),
- 					GDK_ROOT_WINDOW (),
--					panel_atom_get (GDK_DISPLAY (), "_NET_SUPPORTED"),
-+					ATOM ("_NET_SUPPORTED"),
- 					XA_ATOM,
- 					&size, 32);
- 	if (data != NULL) {
-@@ -176,11 +227,9 @@
- 
- 	XDeleteProperty (GDK_WINDOW_XDISPLAY (win),
- 			 GDK_WINDOW_XWINDOW (win),
--			 panel_atom_get (GDK_WINDOW_XDISPLAY (win),
--					 "WM_CLIENT_LEADER"));
-+			 ATOMGDK (win, "WM_CLIENT_LEADER"));
- 
--	old_wmhints = XGetWMHints (GDK_WINDOW_XDISPLAY (win),
--				   GDK_WINDOW_XWINDOW (win));
-+	old_wmhints = XGetWMHints (GDK_DISPLAY (), GDK_WINDOW_XWINDOW (win));
- 	/* General paranoia */
- 	if (old_wmhints != NULL) {
- 		memcpy (&wmhints, old_wmhints, sizeof (XWMHints));
-@@ -197,16 +246,124 @@
- 		wmhints.input = False;
- 		wmhints.initial_state = NormalState;
- 	}
--
--	XSetWMHints (GDK_WINDOW_XDISPLAY (win),
-+	XSetWMHints (GDK_DISPLAY (),
- 		     GDK_WINDOW_XWINDOW (win),
- 		     &wmhints);
- }
- 
-+
-+static void
-+xstuff_setup_global_desktop_area (int left, int right, int top, int bottom)
-+{
-+       long vals[4];
-+       static int old_left = -1, old_right = -1, old_top = -1, old_bottom = -1;+
-+       left = left >= 0 ? left : old_left;
-+       right = right >= 0 ? right : old_right;
-+       top = top >= 0 ? top : old_top;
-+       bottom = bottom >= 0 ? bottom : old_bottom;
-+
-+      if (old_left == left &&
-+           old_right == right &&
-+           old_top == top &&
-+           old_bottom == bottom)
-+               return;
-+
-+       vals[0] = left;
-+       vals[1] = right;
-+       vals[2] = top;
-+       vals[3] = bottom;
-+
-+       XChangeProperty (GDK_DISPLAY (),
-+                        GDK_ROOT_WINDOW (),
-+                        ATOM ("GNOME_PANEL_DESKTOP_AREA"),
-+                        XA_CARDINAL,
-+                        32, PropModeReplace,
-+                        (unsigned char *)vals, 4);
-+
-+       old_left = left;
-+       old_right = right;
-+       old_top = top;
-+       old_bottom = bottom;
-+}
-+
-+void
-+xstuff_setup_desktop_area (int screen, int left, int right, int top, int bottom)
-+{
-+       char *screen_atom;
-+       long vals[4];
-+       static int screen_width = -1, screen_height = -1;
-+
-+       if (screen_width < 0)
-+               screen_width = gdk_screen_width ();
-+       if (screen_height < 0)
-+               screen_height = gdk_screen_height ();
-+
-+       vals[0] = left;
-+       vals[1] = right;
-+       vals[2] = top;
-+       vals[3] = bottom;
-+
-+       gdk_error_trap_push ();
-+
-+       /* Note, when we do standard multihead and we have per screen
-+        * root window, this should just set the GNOME_PANEL_DESKTOP_AREA */
-+       screen_atom = g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d",
-+                                      screen);
-+       XChangeProperty (GDK_DISPLAY (),
-+                        GDK_ROOT_WINDOW (),
-+                        ATOM (screen_atom),
-+                        XA_CARDINAL,
-+                        32, PropModeReplace,
-+                        (unsigned char *)vals, 4);
-+
-+       g_free (screen_atom);
-+
-+       xstuff_setup_global_desktop_area
-+               ((multiscreen_x (screen)      == 0)             ? left   : -1,
-+                (multiscreen_x (screen) +
-+                 multiscreen_width (screen)  == screen_width)  ? right  : -1,
-+                (multiscreen_y (screen)      == 0)             ? top    : -1,
-+                (multiscreen_y (screen) +
-+                 multiscreen_height (screen) == screen_height) ? bottom : -1);
-+
-+       gdk_flush ();
-+       gdk_error_trap_pop ();
-+}
-+
-+void
-+xstuff_unsetup_desktop_area (void)
-+{
-+       int i;
-+       char *screen_atom;
-+
-+       gdk_error_trap_push ();
-+
-+       XDeleteProperty (GDK_DISPLAY (),
-+                        GDK_ROOT_WINDOW (),
-+                        ATOM ("GNOME_PANEL_DESKTOP_AREA"));
-+
-+       for (i = 0; i < multiscreen_screens (); i++) {
-+               screen_atom =
-+                       g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d", i);
-+
-+               XDeleteProperty (GDK_DISPLAY (),
-+                                GDK_ROOT_WINDOW (),
-+                                ATOM (screen_atom));
-+
-+               g_free (screen_atom);
-+       }
-+
-+       gdk_flush ();
-+       gdk_error_trap_pop ();
-+}
-+
-+
-+
- /* This is such a broken stupid function. */   
- void
- xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h)
- {
-+	Window win = GDK_WINDOW_XWINDOW (window);
- 	XSizeHints size_hints;
- 	int old_x, old_y, old_w, old_h;
- 
-@@ -231,9 +388,7 @@
-   
- 	gdk_error_trap_push ();
- 
--	XSetWMNormalHints (GDK_WINDOW_XDISPLAY (window),
--			   GDK_WINDOW_XWINDOW (window),
--			   &size_hints);
-+	XSetWMNormalHints (GDK_DISPLAY (), win, &size_hints);
- 
- 	gdk_window_move_resize (window, x, y, w, h);
- 
-@@ -250,33 +405,29 @@
- xstuff_set_wmspec_dock_hints (GdkWindow *window,
- 			      gboolean autohide)
- {
--        Atom atoms [2] = { None, None };
-+	Atom atoms[2] = { None, None };
-         
--	if (!autohide)
--		atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					    "_NET_WM_WINDOW_TYPE_DOCK");
--	else {
--		atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					    "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL");
--		atoms [1] = panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					    "_NET_WM_WINDOW_TYPE_DOCK");
-+	if (autohide) {
-+		atoms[0] = ATOMGDK (window, "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL");
-+		atoms[1] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK");
-+	} else {
-+		atoms[0] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK");
- 	}
- 
-         XChangeProperty (GDK_WINDOW_XDISPLAY (window),
-                          GDK_WINDOW_XWINDOW (window),
--			 panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					 "_NET_WM_WINDOW_TYPE"),
-+			 ATOMGDK (window, "_NET_WM_WINDOW_TYPE"),
-                          XA_ATOM, 32, PropModeReplace,
--                         (unsigned char *) atoms, 
-+			 (guchar *)atoms,
- 			 autohide ? 2 : 1);
- }
- 
- void
- xstuff_set_wmspec_strut (GdkWindow *window,
--			 int        left,
--			 int        right,
--			 int        top,
--			 int        bottom)
-+			int left,
-+			int right,
-+			int top,
-+			int bottom)
- {
- 	long vals [4];
-         
-@@ -287,25 +438,15 @@
- 
-         XChangeProperty (GDK_WINDOW_XDISPLAY (window),
-                          GDK_WINDOW_XWINDOW (window),
--			 panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					 "_NET_WM_STRUT"),
-+			 ATOMGDK (window, "_NET_WM_STRUT"),
-                          XA_CARDINAL, 32, PropModeReplace,
--                         (unsigned char *) vals, 4);
-+			 (guchar *)vals, 4);
- }
- 
- void
- xstuff_delete_property (GdkWindow *window, const char *name)
- {
--	Display *xdisplay = GDK_WINDOW_XDISPLAY (window);
--	Window   xwindow  = GDK_WINDOW_XWINDOW (window);
--
--        XDeleteProperty (xdisplay, xwindow,
--			 panel_atom_get (xdisplay, name));
--}
--
--void
--xstuff_init (void)
--{
--	gdk_window_add_filter (gdk_get_default_root_window (),
--			       panel_global_keys_filter, NULL);
-+	XDeleteProperty (GDK_WINDOW_XDISPLAY (window),
-+			GDK_WINDOW_XWINDOW (window),
-+			ATOMGDK (window, name));
- }
---- gnome-panel/xstuff.h.orig	Fri Jun 21 02:07:59 2002
-+++ gnome-panel/xstuff.h	Thu Aug  8 22:11:31 2002
-@@ -1,15 +1,36 @@
--#ifndef __XSTUFF_H__
--#define __XSTUFF_H__
-+#ifndef XSTUFF_H
- 
--#include <gdk/gdk.h>
-+#include <gdk/gdkx.h>
-+
-+#include <X11/Xmd.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
- 
- void xstuff_init			(void);
-+Atom xstuff_atom_intern                        (Display *display,
-+					const char *name);
-+void xstuff_set_simple_hint            (GdkWindow *w,
-+					const char *name,
-+					long val);
- void xstuff_delete_property		(GdkWindow *window,
- 					 const char *name);
- gboolean xstuff_is_compliant_wm		(void);
- 
-+gpointer get_typed_property_data       (Display *xdisplay,
-+					Window   xwindow,
-+					Atom     property,
-+					Atom     requested_type,
-+					gint    *size_p,
-+					guint    expected_format);
-+
- void xstuff_set_no_group_and_no_input	(GdkWindow *win);
- 
-+void xstuff_setup_desktop_area         (int screen,
-+					int left,
-+					int right,
-+					int top,
-+					int bottom);
-+
- void xstuff_unsetup_desktop_area	(void);
- void xstuff_set_pos_size		(GdkWindow *window,
- 					 int x, int y,
-@@ -22,4 +43,4 @@
- 					 int top,
- 					 int bottom);
- 
--#endif /* __XSTUFF_H__ */
-+#endif
---- gnome-panel/basep-widget.c.orig	Sun Aug  4 18:29:17 2002
-+++ gnome-panel/basep-widget.c	Thu Aug  8 22:11:37 2002
-@@ -2508,6 +2508,11 @@
- 		    BASEP_WIDGET (panel)->screen == screen)
- 			gtk_widget_queue_resize (panel);
- 	}
-+	xstuff_setup_desktop_area (screen,
-+				   sb->left,
-+				   sb->right,
-+				   sb->top,
-+				   sb->bottom);
- }
- 
- static guint  queue_recalc_id = 0;
---- gnome-panel/session.c.orig	Wed Jul 31 20:02:15 2002
-+++ gnome-panel/session.c	Thu Aug  8 22:11:41 2002
-@@ -242,6 +242,8 @@
- 
- 	gnome_config_sync ();
- 
-+	xstuff_unsetup_desktop_area ();
-+
- 	panel_shell_unregister ();
- 	
- 	gtk_main_quit();
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 62253efbfd8e..a8c6fcc9d5dc 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -3,12 +3,14 @@ bin/gnome-panel
 bin/gnome-panel-preferences
 bin/gnome-panel-screenshot
 bin/panel-test-applets
+etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml
@@ -26,6 +28,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001/%gconf.xml
@@ -42,6 +45,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml
 etc/gconf/schemas/clock.schemas
 etc/gconf/schemas/fish.schemas
+etc/gconf/schemas/gnome-panel-screenshot.schemas
 etc/gconf/schemas/mailcheck.schemas
 etc/gconf/schemas/pager.schemas
 etc/gconf/schemas/panel-global-config.schemas
@@ -57,17 +61,21 @@ lib/libpanel-applet-2.so
 lib/libpanel-applet-2.so.0
 libdata/bonobo/servers/GNOME_FishApplet_Factory.server
 libdata/bonobo/servers/GNOME_GenUtilApplet_Factory.server
+libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
 libdata/bonobo/servers/GNOME_Panel.server
 libdata/pkgconfig/libpanelapplet-2.0.pc
 libexec/fish-applet-2
+libexec/notification-area-applet
 share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
 share/gnome/gen_util/pager.glade
 share/gnome/gen_util/tasklist.glade
 share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml
+share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml
 share/gnome/gnome-panelrc
 share/doc/panel-applet/applet-popups.html
@@ -81,35 +89,40 @@ share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/panelapplet.html
 share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
+share/gnome/fish/fish.glade
 share/gnome/gnome-panel/glade/panel-test-applets.glade
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
 share/gnome/help/fish-applet-2/C/figures/fish_applet.png
-share/gnome/help/fish-applet-2/C/figures/fish_settings.png
 share/gnome/help/fish-applet-2/C/fish-applet-2.xml
 share/gnome/help/fish-applet-2/C/legal.xml
-share/gnome/help/mailcheck/C/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
+share/gnome/help/notification-area/C/figures/notification-area.png
+share/gnome/help/notification-area/C/legal.xml
+share/gnome/help/notification-area/C/notification-area.xml
 share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group.png
 share/gnome/help/window-list/C/figures/window_list_group_applet.png
 share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/gnome/omf/gnome-panel/clock-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/mailcheck-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/notification-area-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/panel/gnome-panel-preferences.glade
 share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/pixmaps/fish/fishanim.png
@@ -123,6 +136,7 @@ share/gnome/pixmaps/mailcheck/email-eclouds.png
 share/gnome/pixmaps/mailcheck/email-tiny.png
 share/gnome/pixmaps/mailcheck/email.png
 share/gnome/pixmaps/mailcheck/tux-anim.png
+share/gnome/pixmaps/gnome-show-desktop.png
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
@@ -141,6 +155,7 @@ share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
@@ -148,6 +163,7 @@ share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
@@ -160,6 +176,7 @@ share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sp/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo
@@ -189,6 +206,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/gen_util
 @dirrm share/gnome/gnome-panel/glade
 @dirrm share/gnome/gnome-panel
+@dirrm share/gnome/fish
 @dirrm share/doc/panel-applet
 @dirrm include/panel-2.0
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs
@@ -205,6 +223,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002
@@ -222,9 +241,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 25f637facffc..b18a2db68a72 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.0.9
+PORTVERSION=	2.2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.2
 DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -28,8 +28,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 save-session.1 \
-	session-properties.1
+MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
+	gnome-session-save.1
 MAN5=	default.session.5
 
 post-patch:
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index d62947fd6993..7a3e911c6bc1 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-2.0.9.tar.bz2) = 55659ab1dbcc521ded652aadc309287d
+MD5 (gnome2/gnome-session-2.2.0.2.tar.bz2) = e53f68858792c99ee71954f1fef11bc3
diff --git a/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in
new file mode 100644
index 000000000000..9bd6c9a2cf68
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in
@@ -0,0 +1,11 @@
+--- gnome-session/gnome-session.schemas.in.in.orig	Mon Oct 14 17:18:15 2002
++++ gnome-session/gnome-session.schemas.in.in	Mon Oct 14 17:17:44 2002
+@@ -50,7 +50,7 @@
+          <applyto>/apps/gnome-session/options/splash_image</applyto>
+          <owner>gnome</owner>
+          <type>string</type>
+-         <default>@prefix@/share/pixmaps/splash/gnome-splash.png</default>
++         <default>@datadir@/pixmaps/splash/gnome-splash.png</default>
+          <locale name="C">
+             <short>Splash Screen Image</short>
+             <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long>
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index a7aa07265800..6f959c8d2217 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -40,6 +40,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
@@ -52,6 +53,7 @@ share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sp/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 1ebe61ff7ee5..b555f0146410 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,17 +6,22 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.0.2
+PORTVERSION=	2.2.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.2
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \
-		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
+
+.if defined(WITH_ZVT)
+LIB_DEPENDS+=	zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt
+.else
+LIB_DEPENDS+=	vte.4:${PORTSDIR}/x11-toolkits/vte
+.endif
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -29,8 +34,16 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+.if defined(WITH_ZVT)
+CONFIGURE_ARGS=	--with-widget=zvt
+.else
+CONFIGURE_ARGS=	--with-widget=vte
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 47aefe60135d..bb26f7157df0 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.0.2.tar.bz2) = 3a4a7e523e05296ede8d2a23029a8d50
+MD5 (gnome2/gnome-terminal-2.2.1.tar.bz2) = 05603de355b2d4095cbd6f6ac0c438aa
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 0c42fb08539a..52c9e6d8ab6b 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -18,9 +18,18 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/C/figures/terminal_window.png
 share/gnome/help/gnome-terminal/C/gnome-terminal.xml
 share/gnome/help/gnome-terminal/C/legal.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/omf/gnome-terminal/gnome-terminal-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-terminal.png
 share/locale/am/LC_MESSAGES/gnome-terminal.mo
+share/locale/ar/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
@@ -34,12 +43,17 @@ share/locale/et/LC_MESSAGES/gnome-terminal.mo
 share/locale/fi/LC_MESSAGES/gnome-terminal.mo
 share/locale/fr/LC_MESSAGES/gnome-terminal.mo
 share/locale/gl/LC_MESSAGES/gnome-terminal.mo
+share/locale/he/LC_MESSAGES/gnome-terminal.mo
 share/locale/hu/LC_MESSAGES/gnome-terminal.mo
+share/locale/it/LC_MESSAGES/gnome-terminal.mo
 share/locale/ja/LC_MESSAGES/gnome-terminal.mo
 share/locale/ko/LC_MESSAGES/gnome-terminal.mo
 share/locale/lt/LC_MESSAGES/gnome-terminal.mo
 share/locale/lv/LC_MESSAGES/gnome-terminal.mo
+share/locale/mk/LC_MESSAGES/gnome-terminal.mo
+share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
+share/locale/nl/LC_MESSAGES/gnome-terminal.mo
 share/locale/no/LC_MESSAGES/gnome-terminal.mo
 share/locale/pl/LC_MESSAGES/gnome-terminal.mo
 share/locale/pt/LC_MESSAGES/gnome-terminal.mo
@@ -48,15 +62,16 @@ share/locale/ro/LC_MESSAGES/gnome-terminal.mo
 share/locale/ru/LC_MESSAGES/gnome-terminal.mo
 share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
+share/locale/sq/LC_MESSAGES/gnome-terminal.mo
 share/locale/sv/LC_MESSAGES/gnome-terminal.mo
-share/locale/ta/LC_MESSAGES/gnome-terminal.mo
 share/locale/tr/LC_MESSAGES/gnome-terminal.mo
 share/locale/uk/LC_MESSAGES/gnome-terminal.mo
 share/locale/vi/LC_MESSAGES/gnome-terminal.mo
 share/locale/wa/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrm share/gnome/omf/gnome-terminal
+@dirrm share/gnome/help/gnome-terminal/ro/figures
+@dirrm share/gnome/help/gnome-terminal/ro
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
@@ -67,3 +82,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 1c5db99a1fd5..b0eeba4d3e62 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-applets/2.2
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomehier gnomeprefix gnomehack
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 3f22cfe63b90..265e0d7b2cb5 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.0.4.tar.bz2) = a31f48077622bb28c6672b46abbcd7a3
+MD5 (gnome2/gnome-applets-2.2.0.tar.bz2) = 2c5650d11253fd5c4716c96f688729f7
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index e7abc6211310..fc72f4f9ee6b 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.orig	Mon Nov 18 18:04:37 2002
-+++ configure	Wed Nov 20 02:25:38 2002
-@@ -5683,6 +5683,7 @@
+--- configure.orig	Mon Dec 16 17:15:36 2002
++++ configure	Thu Dec 19 13:43:27 2002
+@@ -7862,6 +7862,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
++c_aux_dir/ltconfig $LIBTOOL_DEPS
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8771,6 +8772,7 @@
+@@ -12328,6 +12329,7 @@
  *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
  *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
  *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -16,41 +16,41 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
  esac
  case "$host" in
-@@ -8831,6 +8833,20 @@
-   HAVE_LIBAPM_TRUE='#'
-   HAVE_LIBAPM_FALSE=
+@@ -12391,6 +12393,20 @@
  fi
-+	;;
+ 
+ 	;;
 +  i386-*-freebsd*)
-+  	HAVE_LIBAPM=no
-+
++      HAVE_LIBAPM=no
 +if test "x$HAVE_LIBAPM" = "xyes"; then
-+    	HAVE_LIBAPM_TRUE=
-+	HAVE_LIBAPM_FALSE='#'
++    HAVE_LIBAPM_TRUE=
++    HAVE_LIBAPM_FALSE='#'
 +else
-+    	HAVE_LIBAPM_TRUE='#'
-+	HAVE_LIBAPM_FALSE=
++    HAVE_LIBAPM_TRUE='#'
++    HAVE_LIBAPM_FALSE=
 +fi
-+	;;
++    ;;
 +  *-*-freebsd*)
-+  	build_battstat_applet=no
- 	
- 	;;
++      build_battstat_applet=no
++
++    ;;
    *-*-linux*)
-@@ -9420,14 +9436,14 @@
+ 	echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5
+ echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6
+@@ -13688,14 +13704,14 @@
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
 -#define GNOME_ICONDIR "${prefix}/share/pixmaps"
 +#define GNOME_ICONDIR "${datadir}/pixmaps"
- EOF
+ _ACEOF
  
  
- #defined the below to enable help to work for applets 
+ #defined the below to enable help to work for applets
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
 -#define DATADIR "${prefix}/share"
 +#define DATADIR "${datadir}"
- EOF
+ _ACEOF
  
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
index d0834c4e4faa..f47e6bab6dae 100644
--- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in
+++ b/x11/gnomeapplets2/files/patch-battstat_Makefile.in
@@ -1,26 +1,27 @@
---- battstat/Makefile.in.orig	Wed Nov 20 02:26:09 2002
-+++ battstat/Makefile.in	Wed Nov 20 02:28:24 2002
-@@ -144,11 +144,11 @@
+--- battstat/Makefile.in.orig	Thu Dec 19 13:50:27 2002
++++ battstat/Makefile.in	Thu Dec 19 13:51:02 2002
+@@ -148,11 +148,11 @@
  pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = battstat.png
- @HAVE_LIBAPM_TRUE@APMLIB = -lapm
--@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a
+ @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm
+-@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a
 +@HAVE_LIBAPM_FALSE@APMLIB = 
  @HAVE_LIBAPM_TRUE@APMDIR = 
--@HAVE_LIBAPM_FALSE@APMDIR = apmlib
+-@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib
 +@HAVE_LIBAPM_FALSE@APMDIR = 
  @HAVE_LIBAPM_TRUE@APMINC = 
--@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/
+-@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/
 +@HAVE_LIBAPM_FALSE@APMINC = 
  
  SUBDIRS = docs sounds $(APMDIR)
  
-@@ -194,7 +194,7 @@
- battstat_applet_2_OBJECTS =  properties.$(OBJEXT) \
- battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
- @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = 
--@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =  apmlib/libapm.a
-+@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =
+@@ -223,8 +223,7 @@
+ @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES =  \
+ @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la
+ @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES =  \
+-@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \
+-@HAVE_LIBAPM_FALSE@apmlib/libapm.a
++@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la
  battstat_applet_2_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index b0cfa6f65db6..759100e439d0 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -45,19 +45,23 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
 libdata/bonobo/servers/GNOME_MixerApplet.server
 libdata/bonobo/servers/GNOME_ModemLightsApplet.server
 libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
+libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
 %%BATTERY%%libexec/battstat-applet-2
 libexec/cdplayer_applet2
 libexec/charpick_applet2
 libexec/drivemount_applet2
 libexec/geyes_applet2
 libexec/gkb-applet-2
+libexec/gnome-applets/mc-install-default-macros
 libexec/gtik2_applet2
 libexec/gweather-applet-2
 libexec/mini_commander_applet
 libexec/mixer_applet2
 libexec/modemlights_applet2
 libexec/multiload-applet-2
+libexec/wireless-applet
 %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade
+share/gnome/gen_util/mini-commander.glade
 share/gnome/geyes/Bizarre/Bizarre-eye.png
 share/gnome/geyes/Bizarre/Bizarre-pupil.png
 share/gnome/geyes/Bizarre/config
@@ -75,6 +79,7 @@ share/gnome/geyes/Horrid/horrid_eye.png
 share/gnome/geyes/Horrid/horrid_pupil.png
 share/gnome/gkb/AM_Armenian.keyprop
 share/gnome/gkb/AR_Arabic.keyprop
+share/gnome/gkb/AR_Arabic_x.keyprop
 share/gnome/gkb/AZ_Azerbaidjani_Turkic.keyprop
 share/gnome/gkb/Armenian.keyprop
 share/gnome/gkb/BE_Dutch.keyprop
@@ -100,10 +105,12 @@ share/gnome/gkb/Dvorak.keyprop
 share/gnome/gkb/EE_Estonian.keyprop
 share/gnome/gkb/EE_Estonian_x.keyprop
 share/gnome/gkb/ES_Spanish.keyprop
+share/gnome/gkb/ES_Spanish-x86.keyprop
 share/gnome/gkb/ES_Spanish_x.keyprop
 share/gnome/gkb/FI_Finnish.keyprop
 share/gnome/gkb/FI_Finnish_x.keyprop
 share/gnome/gkb/FR_French.keyprop
+share/gnome/gkb/FR_French-x86.keyprop
 share/gnome/gkb/FR_French_x.keyprop
 share/gnome/gkb/FrenchCanadian.keyprop
 share/gnome/gkb/FrenchCanadian2.keyprop
@@ -119,10 +126,12 @@ share/gnome/gkb/GeorgianLatin.keyprop
 share/gnome/gkb/GeorgianRussian.keyprop
 share/gnome/gkb/German.keyprop
 share/gnome/gkb/GermanSwiss.keyprop
+share/gnome/gkb/HR_Croatian.keyprop
 share/gnome/gkb/HU_Hungarian.keyprop
 share/gnome/gkb/Hungarian-101.keyprop
 share/gnome/gkb/Hungarian-lat1.keyprop
 share/gnome/gkb/Hungarian-sun.keyprop
+share/gnome/gkb/Hungarian-x86.keyprop
 share/gnome/gkb/Hungarian.keyprop
 share/gnome/gkb/Hungarian101-1.keyprop
 share/gnome/gkb/Hungarian101.keyprop
@@ -134,6 +143,7 @@ share/gnome/gkb/IT_Italian.keyprop
 share/gnome/gkb/IT_Italian_x.keyprop
 share/gnome/gkb/JP_Japanese.keyprop
 share/gnome/gkb/JP_Japanese_x.keyprop
+share/gnome/gkb/KR_Korean.keyprop
 share/gnome/gkb/LA_Lao_x.keyprop
 share/gnome/gkb/LT_Lithuanian.keyprop
 share/gnome/gkb/LT_Lithuanian_x.keyprop
@@ -171,7 +181,9 @@ share/gnome/gkb/TR_Turkish_x.keyprop
 share/gnome/gkb/Thai.keyprop
 share/gnome/gkb/Thai2.keyprop
 share/gnome/gkb/UA_Ukrainian.keyprop
+share/gnome/gkb/UK-x86.keyprop
 share/gnome/gkb/UK.keyprop
+share/gnome/gkb/US-101A-x86.keyprop
 share/gnome/gkb/US-101.keyprop
 share/gnome/gkb/US-84.keyprop
 share/gnome/gkb/US-dec.keyprop
@@ -184,8 +196,9 @@ share/gnome/gkb/US.keyprop
 share/gnome/gkb/US_English.keyprop
 share/gnome/gkb/US_international.keyprop
 share/gnome/gkb/VN_Vietnamese.keyprop
-share/gnome/gkb/YU_Serbo-Croatian_x.keyprop
+share/gnome/gkb/YU_Serb_x.keyprop
 share/gnome/gkb/Yugoslav.keyprop
+share/gnome/gkb/presets.xml
 %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml
@@ -198,6 +211,7 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml
 share/gnome/gweather/Locations
 %%BATTERY%%share/gnome/help/battstat/C/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png
@@ -223,6 +237,12 @@ share/gnome/help/char-palette/C/legal.xml
 share/gnome/help/command-line/C/command-line.xml
 share/gnome/help/command-line/C/figures/command-line.png
 share/gnome/help/command-line/C/legal.xml
+share/gnome/help/drivemount/C/drivemount.xml
+share/gnome/help/drivemount/C/figures/drivemount_applet_all.png
+share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png
+share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png
+share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/C/legal.xml
 share/gnome/help/geyes/C/figures/geyes_applet.png
 share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
@@ -242,14 +262,25 @@ share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
 share/gnome/help/mixer_applet2/C/topic.dat
 %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
+@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/cdplayer-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/char-palette-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/command-line-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/drivemount-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/geyes-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gkb-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gweather-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/mixer_applet2-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true
 %%BATTERY%%share/gnome/pixmaps/battstat.png
 share/gnome/pixmaps/charpick.png
 share/gnome/pixmaps/drivemount-applet.png
@@ -293,7 +324,9 @@ share/gnome/pixmaps/gkb/it.png
 share/gnome/pixmaps/gkb/jo.png
 share/gnome/pixmaps/gkb/jp.png
 share/gnome/pixmaps/gkb/km.png
+share/gnome/pixmaps/gkb/kr.png
 share/gnome/pixmaps/gkb/kw.png
+share/gnome/pixmaps/gkb/lam.png
 share/gnome/pixmaps/gkb/la.png
 share/gnome/pixmaps/gkb/lb.png
 share/gnome/pixmaps/gkb/lt.png
@@ -316,6 +349,7 @@ share/gnome/pixmaps/gkb/se.png
 share/gnome/pixmaps/gkb/si.png
 share/gnome/pixmaps/gkb/sk.png
 share/gnome/pixmaps/gkb/so.png
+share/gnome/pixmaps/gkb/sr.png
 share/gnome/pixmaps/gkb/su.png
 share/gnome/pixmaps/gkb/sv.png
 share/gnome/pixmaps/gkb/sy.png
@@ -343,7 +377,16 @@ share/gnome/pixmaps/mixer/volume-medium.png
 share/gnome/pixmaps/mixer/volume-min.png
 share/gnome/pixmaps/mixer/volume-mute.png
 share/gnome/pixmaps/mixer/volume-zero.png
+share/gnome/pixmaps/wireless-applet/broken-0.png
+share/gnome/pixmaps/wireless-applet/no-link-0.png
+share/gnome/pixmaps/wireless-applet/signal-1-40.png
+share/gnome/pixmaps/wireless-applet/signal-41-60.png
+share/gnome/pixmaps/wireless-applet/signal-61-80.png
+share/gnome/pixmaps/wireless-applet/signal-81-100.png
+share/gnome/pixmaps/wireless-applet/wireless-applet.png
+share/gnome/wireless-applet/wireless-applet.glade
 share/gnome/xmodmap/xmodmap.am
+share/gnome/xmodmap/xmodmap.ar
 share/gnome/xmodmap/xmodmap.be
 share/gnome/xmodmap/xmodmap.bg
 share/gnome/xmodmap/xmodmap.br
@@ -357,9 +400,11 @@ share/gnome/xmodmap/xmodmap.dk
 share/gnome/xmodmap/xmodmap.dvorak
 share/gnome/xmodmap/xmodmap.ee
 share/gnome/xmodmap/xmodmap.es
+share/gnome/xmodmap/xmodmap.es_x86
 share/gnome/xmodmap/xmodmap.fi
 share/gnome/xmodmap/xmodmap.fr
 share/gnome/xmodmap/xmodmap.fr-2
+share/gnome/xmodmap/xmodmap.fr_x86
 share/gnome/xmodmap/xmodmap.gb
 share/gnome/xmodmap/xmodmap.gb-102
 share/gnome/xmodmap/xmodmap.gb-105
@@ -374,11 +419,13 @@ share/gnome/xmodmap/xmodmap.hu-lat1
 share/gnome/xmodmap/xmodmap.hu-sun-lat2
 share/gnome/xmodmap/xmodmap.hu.old
 share/gnome/xmodmap/xmodmap.hu_latin1
+share/gnome/xmodmap/xmodmap.hu_x86
 share/gnome/xmodmap/xmodmap.il
 share/gnome/xmodmap/xmodmap.il_phonetic
 share/gnome/xmodmap/xmodmap.is
 share/gnome/xmodmap/xmodmap.it
 share/gnome/xmodmap/xmodmap.jp
+share/gnome/xmodmap/xmodmap.kr
 share/gnome/xmodmap/xmodmap.la
 share/gnome/xmodmap/xmodmap.lt
 share/gnome/xmodmap/xmodmap.lt_b
@@ -405,7 +452,9 @@ share/gnome/xmodmap/xmodmap.th
 share/gnome/xmodmap/xmodmap.tr_f
 share/gnome/xmodmap/xmodmap.tr_q
 share/gnome/xmodmap/xmodmap.uk
+share/gnome/xmodmap/xmodmap.uk_x86
 share/gnome/xmodmap/xmodmap.us
+share/gnome/xmodmap/xmodmap.us101A_x86
 share/gnome/xmodmap/xmodmap.us-101
 share/gnome/xmodmap/xmodmap.us-84
 share/gnome/xmodmap/xmodmap.us-dec
@@ -435,12 +484,15 @@ share/locale/fi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hu/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/ko/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
@@ -461,6 +513,7 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/xmodmap
+@dirrm share/gnome/wireless-applet
 @dirrm share/gnome/pixmaps/mixer
 @dirrm share/gnome/pixmaps/mini-commander
 @dirrm share/gnome/pixmaps/gweather
@@ -475,12 +528,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/gtik2_applet2/C/figures
 @dirrm share/gnome/help/gtik2_applet2/C
 @dirrm share/gnome/help/gtik2_applet2
-@dirrm share/gnome/help/gkb/C/figures
-@dirrm share/gnome/help/gkb/C
-@dirrm share/gnome/help/gkb
 @dirrm share/gnome/help/geyes/C/figures
 @dirrm share/gnome/help/geyes/C
 @dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/C/figures
+@dirrm share/gnome/help/drivemount/C
+@dirrm share/gnome/help/drivemount
 @dirrm share/gnome/help/command-line/C/figures
 @dirrm share/gnome/help/command-line/C
 @dirrm share/gnome/help/command-line
@@ -490,18 +543,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/cdplayer/C/figures
 @dirrm share/gnome/help/cdplayer/C
 @dirrm share/gnome/help/cdplayer
-%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
-%%BATTERY%%@dirrm share/gnome/help/battstat/C
-%%BATTERY%%@dirrm share/gnome/help/battstat
 @dirrm share/gnome/gweather
 @dirrm share/gnome/gkb
-@dirrm share/gnome/geyes/Horrid
-@dirrm share/gnome/geyes/Default-tiny
-@dirrm share/gnome/geyes/Default
-@dirrm share/gnome/geyes/Bloodshot
-@dirrm share/gnome/geyes/Bizarre
-@dirrm share/gnome/geyes
+@dirrm share/gnome/gen_util
 %%BATTERY%%@dirrm share/gnome/battstat_applet
+@dirrm libexec/gnome-applets
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
@@ -524,3 +570,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet
 %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs
 %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet
+@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 323915fab1ef..8f1c292a4c49 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.0.10
+PORTVERSION=	2.2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.2
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 49d280e227f2..3ebb8fa8c311 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.0.10.tar.bz2) = 5a04d472ce8c6be6a823d348362a6d0b
+MD5 (gnome2/gnome-desktop-2.2.0.1.tar.bz2) = 5463b9a864447d670d1ea40de2022519
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index cbd05d5d550e..c1eb5c92f788 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -1,11 +1,10 @@
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
-include/gnome-desktop-2.0/libgnome/gnome-icon-loader.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
 lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.0
+lib/libgnome-desktop-2.so.3
 libdata/pkgconfig/gnome-desktop-2.0.pc
 share/gnome/gnome-about/contributors.dat
 share/gnome/gnome-about/gnome-version.xml
@@ -18,15 +17,13 @@ share/gnome/vfolders/Applications.directory
 share/gnome/vfolders/Development.directory
 share/gnome/vfolders/Games.directory
 share/gnome/vfolders/Graphics.directory
-share/gnome/vfolders/Home.directory
 share/gnome/vfolders/Internet.directory
 share/gnome/vfolders/Multimedia.directory
 share/gnome/vfolders/Office.directory
 share/gnome/vfolders/Root.directory
-share/gnome/vfolders/Root.order
 share/gnome/vfolders/Settings.directory
-share/gnome/vfolders/Settings.order
 share/gnome/vfolders/System.directory
+share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
 share/gnome/pixmaps/cdeappmenu.png
@@ -155,7 +152,6 @@ share/gnome/pixmaps/panel-folder.png
 share/gnome/pixmaps/panel-knob.png
 share/gnome/pixmaps/panel-menu-main.png
 share/gnome/pixmaps/vnterm.xpm
-share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -183,6 +179,7 @@ share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -195,9 +192,11 @@ share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sp/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index a28b5926035f..db2138760fbb 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.0.11
+PORTVERSION=	2.2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-panel/2.2
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \
-		gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
+LIB_DEPENDS=	wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck \
+		gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
+USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index 66c1e6cb333f..e6e3514326ed 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.0.11.tar.bz2) = 27345e392e336df85ca4fe44af90a3f4
+MD5 (gnome2/gnome-panel-2.2.0.1.tar.bz2) = cd8a74425cadadc8d10ab1fe5e9e3fe8
diff --git a/x11/gnomepanel/files/patch-config.h.in b/x11/gnomepanel/files/patch-config.h.in
index cb37ef76389a..8a59166a57b7 100644
--- a/x11/gnomepanel/files/patch-config.h.in
+++ b/x11/gnomepanel/files/patch-config.h.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- config.h.in	2002/05/14 14:15:00	1.1
-+++ config.h.in	2002/05/14 14:15:35
-@@ -148,6 +148,8 @@
- /* Define if you have the `strdup' function. */
- #undef HAVE_STRDUP
+--- config.h.in.orig	Thu Jan  2 19:50:41 2003
++++ config.h.in	Mon Jan  6 13:11:12 2003
+@@ -96,6 +96,8 @@
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
  
 +#undef HAVE_LANGINFO_H
 +
- /* Define if you have the <strings.h> header file. */
+ /* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H
  
diff --git a/x11/gnomepanel/files/patch-configure b/x11/gnomepanel/files/patch-configure
index 89007e07bc69..a94d4761c395 100644
--- a/x11/gnomepanel/files/patch-configure
+++ b/x11/gnomepanel/files/patch-configure
@@ -1,22 +1,19 @@
-
-$FreeBSD$
-
---- configure.orig	Tue May 14 17:16:32 2002
-+++ configure	Tue May 14 17:17:03 2002
-@@ -7232,6 +7232,7 @@
+--- configure.orig	Mon Jan  6 01:04:20 2003
++++ configure	Mon Jan  6 13:12:56 2003
+@@ -4254,7 +4254,7 @@
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9288,7 +9289,7 @@
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 -                  inttypes.h stdint.h unistd.h
 +                  inttypes.h stdint.h unistd.h langinfo.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:9294: checking for $ac_header" >&5
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -7878,6 +7878,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnomepanel/files/patch-temp b/x11/gnomepanel/files/patch-temp
deleted file mode 100644
index a863cbbc8bd9..000000000000
--- a/x11/gnomepanel/files/patch-temp
+++ /dev/null
@@ -1,441 +0,0 @@
-This patch reverts fully rev.1.50 of xstuff.c and rev.1.22 of xstuff.h, as
-well as partially rev.1.302 of session.c and rev.1.176 of basep-widget.c.
-The goal is to make Nautilus recognizing presence of the panel on screen,
-so that it doesn't put its icons under the panel(s). For some reason,
-advertized in ChangeLog _NET_WM_WORKAREA isn't recognised by Nautilus-2.0.0
-available at this time.
-
---- gnome-panel/xstuff.c.orig	Sun Aug  4 18:30:21 2002
-+++ gnome-panel/xstuff.c	Thu Aug  8 22:19:15 2002
-@@ -8,46 +8,97 @@
-  *          Mark McLoughlin <mark@skynet.ie>
-  */
- #include <config.h>
--#include <string.h>
--
--#include <gdk/gdk.h>
- #include <gdk/gdkx.h>
-+#include <string.h>
- 
-+#include <X11/Xmd.h>
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
- 
--#include "xstuff.h"
-+/* Yes, yes I know, now bugger off ... */
-+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
-+#include <libwnck/libwnck.h>
- 
-+#include "xstuff.h"
-+#include "multiscreen-stuff.h"
-+#include "basep-widget.h"
-+#include "foobar-widget.h"
- #include "global-keys.h"
- 
--static Atom
--panel_atom_get (Display    *display,
--		const char *atom_name)
-+/*list of all panel widgets created*/
-+extern GSList *panel_list;
-+
-+static void xstuff_setup_global_desktop_area (int left, int right,
-+					int top, int bottom);
-+
-+#define ATOM(name) xstuff_atom_intern(GDK_DISPLAY(),name)
-+/* Once we have multiple display support we need to only use
-+ * the below ones */
-+
-+#define ATOMD(display,name) xstuff_atom_intern(display,name)
-+#define ATOMEV(event,name) xstuff_atom_intern(((XAnyEvent *)event)->display,name)
-+#define ATOMGDK(win,name) xstuff_atom_intern(GDK_WINDOW_XDISPLAY(win),name)
-+
-+Atom
-+xstuff_atom_intern (Display *display, const char *name)
- {
--	static GHashTable *atom_hash;
--	Atom               retval;
-+	static GHashTable *cache = NULL;
-+	char *key;
-+	Atom atom;
- 
- 	g_return_val_if_fail (display != NULL, None);
--	g_return_val_if_fail (atom_name != NULL, None);
-+	g_return_val_if_fail (name != NULL, None);
-+
-+	if (cache == 0)
-+	    cache = g_hash_table_new (g_str_hash, g_str_equal);
- 
--	if (!atom_hash)
--		atom_hash = g_hash_table_new_full (
--				g_str_hash, g_str_equal, g_free, NULL);
--
--	retval = GPOINTER_TO_UINT (g_hash_table_lookup (atom_hash, atom_name));
--	if (!retval) {
--		retval = XInternAtom (display, atom_name, FALSE);
--
--		if (retval != None)
--			g_hash_table_insert (atom_hash, g_strdup (atom_name),
--					     GUINT_TO_POINTER (retval));
-+	key = g_strdup_printf ("%p %s", display, name);
-+
-+	atom = (Atom)g_hash_table_lookup (cache, key);
-+	if (atom == 0) {
-+	    	atom = XInternAtom (display, name, False);
-+		g_hash_table_insert (cache, key, (gpointer)atom);
-+	} else {
-+	   	g_free (key);
- 	}
- 
--	return retval;
-+    	return atom;
-+}
-+
-+void
-+xstuff_init (void)
-+{
-+       /* setup the keys filter */
-+       gdk_window_add_filter (gdk_get_default_root_window (),
-+                              panel_global_keys_filter,
-+                              NULL);
-+
-+       gdk_error_trap_push ();
-+
-+       xstuff_setup_global_desktop_area (0, 0, 0, 0);
-+
-+       gdk_error_trap_pop ();
-+}
-+
-+void
-+xstuff_set_simple_hint (GdkWindow *w, const char *name, long val)
-+{
-+       Atom atom = ATOMGDK (w, name);
-+
-+       gdk_error_trap_push ();
-+
-+       XChangeProperty (GDK_DISPLAY (),
-+                        GDK_WINDOW_XWINDOW (w),
-+                        atom, atom,
-+                        32, PropModeReplace,
-+                        (unsigned char*)&val, 1);
-+
-+       gdk_flush ();
-+       gdk_error_trap_pop ();
- }
- 
- /* Stolen from deskguide */
--static gpointer
-+gpointer
- get_typed_property_data (Display *xdisplay,
- 			 Window   xwindow,
- 			 Atom     property,
-@@ -156,7 +207,7 @@
-         
- 	data = get_typed_property_data (GDK_DISPLAY (),
- 					GDK_ROOT_WINDOW (),
--					panel_atom_get (GDK_DISPLAY (), "_NET_SUPPORTED"),
-+					ATOM ("_NET_SUPPORTED"),
- 					XA_ATOM,
- 					&size, 32);
- 	if (data != NULL) {
-@@ -176,11 +227,9 @@
- 
- 	XDeleteProperty (GDK_WINDOW_XDISPLAY (win),
- 			 GDK_WINDOW_XWINDOW (win),
--			 panel_atom_get (GDK_WINDOW_XDISPLAY (win),
--					 "WM_CLIENT_LEADER"));
-+			 ATOMGDK (win, "WM_CLIENT_LEADER"));
- 
--	old_wmhints = XGetWMHints (GDK_WINDOW_XDISPLAY (win),
--				   GDK_WINDOW_XWINDOW (win));
-+	old_wmhints = XGetWMHints (GDK_DISPLAY (), GDK_WINDOW_XWINDOW (win));
- 	/* General paranoia */
- 	if (old_wmhints != NULL) {
- 		memcpy (&wmhints, old_wmhints, sizeof (XWMHints));
-@@ -197,16 +246,124 @@
- 		wmhints.input = False;
- 		wmhints.initial_state = NormalState;
- 	}
--
--	XSetWMHints (GDK_WINDOW_XDISPLAY (win),
-+	XSetWMHints (GDK_DISPLAY (),
- 		     GDK_WINDOW_XWINDOW (win),
- 		     &wmhints);
- }
- 
-+
-+static void
-+xstuff_setup_global_desktop_area (int left, int right, int top, int bottom)
-+{
-+       long vals[4];
-+       static int old_left = -1, old_right = -1, old_top = -1, old_bottom = -1;+
-+       left = left >= 0 ? left : old_left;
-+       right = right >= 0 ? right : old_right;
-+       top = top >= 0 ? top : old_top;
-+       bottom = bottom >= 0 ? bottom : old_bottom;
-+
-+      if (old_left == left &&
-+           old_right == right &&
-+           old_top == top &&
-+           old_bottom == bottom)
-+               return;
-+
-+       vals[0] = left;
-+       vals[1] = right;
-+       vals[2] = top;
-+       vals[3] = bottom;
-+
-+       XChangeProperty (GDK_DISPLAY (),
-+                        GDK_ROOT_WINDOW (),
-+                        ATOM ("GNOME_PANEL_DESKTOP_AREA"),
-+                        XA_CARDINAL,
-+                        32, PropModeReplace,
-+                        (unsigned char *)vals, 4);
-+
-+       old_left = left;
-+       old_right = right;
-+       old_top = top;
-+       old_bottom = bottom;
-+}
-+
-+void
-+xstuff_setup_desktop_area (int screen, int left, int right, int top, int bottom)
-+{
-+       char *screen_atom;
-+       long vals[4];
-+       static int screen_width = -1, screen_height = -1;
-+
-+       if (screen_width < 0)
-+               screen_width = gdk_screen_width ();
-+       if (screen_height < 0)
-+               screen_height = gdk_screen_height ();
-+
-+       vals[0] = left;
-+       vals[1] = right;
-+       vals[2] = top;
-+       vals[3] = bottom;
-+
-+       gdk_error_trap_push ();
-+
-+       /* Note, when we do standard multihead and we have per screen
-+        * root window, this should just set the GNOME_PANEL_DESKTOP_AREA */
-+       screen_atom = g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d",
-+                                      screen);
-+       XChangeProperty (GDK_DISPLAY (),
-+                        GDK_ROOT_WINDOW (),
-+                        ATOM (screen_atom),
-+                        XA_CARDINAL,
-+                        32, PropModeReplace,
-+                        (unsigned char *)vals, 4);
-+
-+       g_free (screen_atom);
-+
-+       xstuff_setup_global_desktop_area
-+               ((multiscreen_x (screen)      == 0)             ? left   : -1,
-+                (multiscreen_x (screen) +
-+                 multiscreen_width (screen)  == screen_width)  ? right  : -1,
-+                (multiscreen_y (screen)      == 0)             ? top    : -1,
-+                (multiscreen_y (screen) +
-+                 multiscreen_height (screen) == screen_height) ? bottom : -1);
-+
-+       gdk_flush ();
-+       gdk_error_trap_pop ();
-+}
-+
-+void
-+xstuff_unsetup_desktop_area (void)
-+{
-+       int i;
-+       char *screen_atom;
-+
-+       gdk_error_trap_push ();
-+
-+       XDeleteProperty (GDK_DISPLAY (),
-+                        GDK_ROOT_WINDOW (),
-+                        ATOM ("GNOME_PANEL_DESKTOP_AREA"));
-+
-+       for (i = 0; i < multiscreen_screens (); i++) {
-+               screen_atom =
-+                       g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d", i);
-+
-+               XDeleteProperty (GDK_DISPLAY (),
-+                                GDK_ROOT_WINDOW (),
-+                                ATOM (screen_atom));
-+
-+               g_free (screen_atom);
-+       }
-+
-+       gdk_flush ();
-+       gdk_error_trap_pop ();
-+}
-+
-+
-+
- /* This is such a broken stupid function. */   
- void
- xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h)
- {
-+	Window win = GDK_WINDOW_XWINDOW (window);
- 	XSizeHints size_hints;
- 	int old_x, old_y, old_w, old_h;
- 
-@@ -231,9 +388,7 @@
-   
- 	gdk_error_trap_push ();
- 
--	XSetWMNormalHints (GDK_WINDOW_XDISPLAY (window),
--			   GDK_WINDOW_XWINDOW (window),
--			   &size_hints);
-+	XSetWMNormalHints (GDK_DISPLAY (), win, &size_hints);
- 
- 	gdk_window_move_resize (window, x, y, w, h);
- 
-@@ -250,33 +405,29 @@
- xstuff_set_wmspec_dock_hints (GdkWindow *window,
- 			      gboolean autohide)
- {
--        Atom atoms [2] = { None, None };
-+	Atom atoms[2] = { None, None };
-         
--	if (!autohide)
--		atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					    "_NET_WM_WINDOW_TYPE_DOCK");
--	else {
--		atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					    "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL");
--		atoms [1] = panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					    "_NET_WM_WINDOW_TYPE_DOCK");
-+	if (autohide) {
-+		atoms[0] = ATOMGDK (window, "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL");
-+		atoms[1] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK");
-+	} else {
-+		atoms[0] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK");
- 	}
- 
-         XChangeProperty (GDK_WINDOW_XDISPLAY (window),
-                          GDK_WINDOW_XWINDOW (window),
--			 panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					 "_NET_WM_WINDOW_TYPE"),
-+			 ATOMGDK (window, "_NET_WM_WINDOW_TYPE"),
-                          XA_ATOM, 32, PropModeReplace,
--                         (unsigned char *) atoms, 
-+			 (guchar *)atoms,
- 			 autohide ? 2 : 1);
- }
- 
- void
- xstuff_set_wmspec_strut (GdkWindow *window,
--			 int        left,
--			 int        right,
--			 int        top,
--			 int        bottom)
-+			int left,
-+			int right,
-+			int top,
-+			int bottom)
- {
- 	long vals [4];
-         
-@@ -287,25 +438,15 @@
- 
-         XChangeProperty (GDK_WINDOW_XDISPLAY (window),
-                          GDK_WINDOW_XWINDOW (window),
--			 panel_atom_get (GDK_WINDOW_XDISPLAY (window),
--					 "_NET_WM_STRUT"),
-+			 ATOMGDK (window, "_NET_WM_STRUT"),
-                          XA_CARDINAL, 32, PropModeReplace,
--                         (unsigned char *) vals, 4);
-+			 (guchar *)vals, 4);
- }
- 
- void
- xstuff_delete_property (GdkWindow *window, const char *name)
- {
--	Display *xdisplay = GDK_WINDOW_XDISPLAY (window);
--	Window   xwindow  = GDK_WINDOW_XWINDOW (window);
--
--        XDeleteProperty (xdisplay, xwindow,
--			 panel_atom_get (xdisplay, name));
--}
--
--void
--xstuff_init (void)
--{
--	gdk_window_add_filter (gdk_get_default_root_window (),
--			       panel_global_keys_filter, NULL);
-+	XDeleteProperty (GDK_WINDOW_XDISPLAY (window),
-+			GDK_WINDOW_XWINDOW (window),
-+			ATOMGDK (window, name));
- }
---- gnome-panel/xstuff.h.orig	Fri Jun 21 02:07:59 2002
-+++ gnome-panel/xstuff.h	Thu Aug  8 22:11:31 2002
-@@ -1,15 +1,36 @@
--#ifndef __XSTUFF_H__
--#define __XSTUFF_H__
-+#ifndef XSTUFF_H
- 
--#include <gdk/gdk.h>
-+#include <gdk/gdkx.h>
-+
-+#include <X11/Xmd.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
- 
- void xstuff_init			(void);
-+Atom xstuff_atom_intern                        (Display *display,
-+					const char *name);
-+void xstuff_set_simple_hint            (GdkWindow *w,
-+					const char *name,
-+					long val);
- void xstuff_delete_property		(GdkWindow *window,
- 					 const char *name);
- gboolean xstuff_is_compliant_wm		(void);
- 
-+gpointer get_typed_property_data       (Display *xdisplay,
-+					Window   xwindow,
-+					Atom     property,
-+					Atom     requested_type,
-+					gint    *size_p,
-+					guint    expected_format);
-+
- void xstuff_set_no_group_and_no_input	(GdkWindow *win);
- 
-+void xstuff_setup_desktop_area         (int screen,
-+					int left,
-+					int right,
-+					int top,
-+					int bottom);
-+
- void xstuff_unsetup_desktop_area	(void);
- void xstuff_set_pos_size		(GdkWindow *window,
- 					 int x, int y,
-@@ -22,4 +43,4 @@
- 					 int top,
- 					 int bottom);
- 
--#endif /* __XSTUFF_H__ */
-+#endif
---- gnome-panel/basep-widget.c.orig	Sun Aug  4 18:29:17 2002
-+++ gnome-panel/basep-widget.c	Thu Aug  8 22:11:37 2002
-@@ -2508,6 +2508,11 @@
- 		    BASEP_WIDGET (panel)->screen == screen)
- 			gtk_widget_queue_resize (panel);
- 	}
-+	xstuff_setup_desktop_area (screen,
-+				   sb->left,
-+				   sb->right,
-+				   sb->top,
-+				   sb->bottom);
- }
- 
- static guint  queue_recalc_id = 0;
---- gnome-panel/session.c.orig	Wed Jul 31 20:02:15 2002
-+++ gnome-panel/session.c	Thu Aug  8 22:11:41 2002
-@@ -242,6 +242,8 @@
- 
- 	gnome_config_sync ();
- 
-+	xstuff_unsetup_desktop_area ();
-+
- 	panel_shell_unregister ();
- 	
- 	gtk_main_quit();
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 62253efbfd8e..a8c6fcc9d5dc 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -3,12 +3,14 @@ bin/gnome-panel
 bin/gnome-panel-preferences
 bin/gnome-panel-screenshot
 bin/panel-test-applets
+etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml
@@ -26,6 +28,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001/%gconf.xml
@@ -42,6 +45,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml
 etc/gconf/schemas/clock.schemas
 etc/gconf/schemas/fish.schemas
+etc/gconf/schemas/gnome-panel-screenshot.schemas
 etc/gconf/schemas/mailcheck.schemas
 etc/gconf/schemas/pager.schemas
 etc/gconf/schemas/panel-global-config.schemas
@@ -57,17 +61,21 @@ lib/libpanel-applet-2.so
 lib/libpanel-applet-2.so.0
 libdata/bonobo/servers/GNOME_FishApplet_Factory.server
 libdata/bonobo/servers/GNOME_GenUtilApplet_Factory.server
+libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
 libdata/bonobo/servers/GNOME_Panel.server
 libdata/pkgconfig/libpanelapplet-2.0.pc
 libexec/fish-applet-2
+libexec/notification-area-applet
 share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
 share/gnome/gen_util/pager.glade
 share/gnome/gen_util/tasklist.glade
 share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml
+share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml
 share/gnome/gnome-panelrc
 share/doc/panel-applet/applet-popups.html
@@ -81,35 +89,40 @@ share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/panelapplet.html
 share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
+share/gnome/fish/fish.glade
 share/gnome/gnome-panel/glade/panel-test-applets.glade
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
 share/gnome/help/fish-applet-2/C/figures/fish_applet.png
-share/gnome/help/fish-applet-2/C/figures/fish_settings.png
 share/gnome/help/fish-applet-2/C/fish-applet-2.xml
 share/gnome/help/fish-applet-2/C/legal.xml
-share/gnome/help/mailcheck/C/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
+share/gnome/help/notification-area/C/figures/notification-area.png
+share/gnome/help/notification-area/C/legal.xml
+share/gnome/help/notification-area/C/notification-area.xml
 share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group.png
 share/gnome/help/window-list/C/figures/window_list_group_applet.png
 share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/gnome/omf/gnome-panel/clock-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/mailcheck-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-panel/notification-area-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/panel/gnome-panel-preferences.glade
 share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/pixmaps/fish/fishanim.png
@@ -123,6 +136,7 @@ share/gnome/pixmaps/mailcheck/email-eclouds.png
 share/gnome/pixmaps/mailcheck/email-tiny.png
 share/gnome/pixmaps/mailcheck/email.png
 share/gnome/pixmaps/mailcheck/tux-anim.png
+share/gnome/pixmaps/gnome-show-desktop.png
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
@@ -141,6 +155,7 @@ share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
@@ -148,6 +163,7 @@ share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
@@ -160,6 +176,7 @@ share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sp/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo
@@ -189,6 +206,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/gen_util
 @dirrm share/gnome/gnome-panel/glade
 @dirrm share/gnome/gnome-panel
+@dirrm share/gnome/fish
 @dirrm share/doc/panel-applet
 @dirrm include/panel-2.0
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs
@@ -205,6 +223,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002
@@ -222,9 +241,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 25f637facffc..b18a2db68a72 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.0.9
+PORTVERSION=	2.2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.2
 DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -28,8 +28,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 save-session.1 \
-	session-properties.1
+MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
+	gnome-session-save.1
 MAN5=	default.session.5
 
 post-patch:
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index d62947fd6993..7a3e911c6bc1 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-2.0.9.tar.bz2) = 55659ab1dbcc521ded652aadc309287d
+MD5 (gnome2/gnome-session-2.2.0.2.tar.bz2) = e53f68858792c99ee71954f1fef11bc3
diff --git a/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in
new file mode 100644
index 000000000000..9bd6c9a2cf68
--- /dev/null
+++ b/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in
@@ -0,0 +1,11 @@
+--- gnome-session/gnome-session.schemas.in.in.orig	Mon Oct 14 17:18:15 2002
++++ gnome-session/gnome-session.schemas.in.in	Mon Oct 14 17:17:44 2002
+@@ -50,7 +50,7 @@
+          <applyto>/apps/gnome-session/options/splash_image</applyto>
+          <owner>gnome</owner>
+          <type>string</type>
+-         <default>@prefix@/share/pixmaps/splash/gnome-splash.png</default>
++         <default>@datadir@/pixmaps/splash/gnome-splash.png</default>
+          <locale name="C">
+             <short>Splash Screen Image</short>
+             <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long>
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index a7aa07265800..6f959c8d2217 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -40,6 +40,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
@@ -52,6 +53,7 @@ share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sp/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 1ebe61ff7ee5..b555f0146410 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,17 +6,22 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.0.2
+PORTVERSION=	2.2.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.2
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \
-		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
+
+.if defined(WITH_ZVT)
+LIB_DEPENDS+=	zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt
+.else
+LIB_DEPENDS+=	vte.4:${PORTSDIR}/x11-toolkits/vte
+.endif
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -29,8 +34,16 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+.if defined(WITH_ZVT)
+CONFIGURE_ARGS=	--with-widget=zvt
+.else
+CONFIGURE_ARGS=	--with-widget=vte
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.mk>
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index 47aefe60135d..bb26f7157df0 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.0.2.tar.bz2) = 3a4a7e523e05296ede8d2a23029a8d50
+MD5 (gnome2/gnome-terminal-2.2.1.tar.bz2) = 05603de355b2d4095cbd6f6ac0c438aa
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 0c42fb08539a..52c9e6d8ab6b 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -18,9 +18,18 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/C/figures/terminal_window.png
 share/gnome/help/gnome-terminal/C/gnome-terminal.xml
 share/gnome/help/gnome-terminal/C/legal.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/omf/gnome-terminal/gnome-terminal-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-terminal.png
 share/locale/am/LC_MESSAGES/gnome-terminal.mo
+share/locale/ar/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
@@ -34,12 +43,17 @@ share/locale/et/LC_MESSAGES/gnome-terminal.mo
 share/locale/fi/LC_MESSAGES/gnome-terminal.mo
 share/locale/fr/LC_MESSAGES/gnome-terminal.mo
 share/locale/gl/LC_MESSAGES/gnome-terminal.mo
+share/locale/he/LC_MESSAGES/gnome-terminal.mo
 share/locale/hu/LC_MESSAGES/gnome-terminal.mo
+share/locale/it/LC_MESSAGES/gnome-terminal.mo
 share/locale/ja/LC_MESSAGES/gnome-terminal.mo
 share/locale/ko/LC_MESSAGES/gnome-terminal.mo
 share/locale/lt/LC_MESSAGES/gnome-terminal.mo
 share/locale/lv/LC_MESSAGES/gnome-terminal.mo
+share/locale/mk/LC_MESSAGES/gnome-terminal.mo
+share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
+share/locale/nl/LC_MESSAGES/gnome-terminal.mo
 share/locale/no/LC_MESSAGES/gnome-terminal.mo
 share/locale/pl/LC_MESSAGES/gnome-terminal.mo
 share/locale/pt/LC_MESSAGES/gnome-terminal.mo
@@ -48,15 +62,16 @@ share/locale/ro/LC_MESSAGES/gnome-terminal.mo
 share/locale/ru/LC_MESSAGES/gnome-terminal.mo
 share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
+share/locale/sq/LC_MESSAGES/gnome-terminal.mo
 share/locale/sv/LC_MESSAGES/gnome-terminal.mo
-share/locale/ta/LC_MESSAGES/gnome-terminal.mo
 share/locale/tr/LC_MESSAGES/gnome-terminal.mo
 share/locale/uk/LC_MESSAGES/gnome-terminal.mo
 share/locale/vi/LC_MESSAGES/gnome-terminal.mo
 share/locale/wa/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrm share/gnome/omf/gnome-terminal
+@dirrm share/gnome/help/gnome-terminal/ro/figures
+@dirrm share/gnome/help/gnome-terminal/ro
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
@@ -67,3 +82,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 4c083e30cdb5..02af321003bc 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.0.6
+PORTVERSION=	2.2.0.1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 191f34d1164f..edd59de38133 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-2.0.6.tar.bz2) = 97a8c8f85f8b56174afc638321bfd641
+MD5 (gnome2/libgnome-2.2.0.1.tar.bz2) = 8735919b4ff0a6588f8da9d49220228d
diff --git a/x11/libgnome/files/patch-configure b/x11/libgnome/files/patch-configure
index c444fc7c7117..d5a0a23fd4fa 100644
--- a/x11/libgnome/files/patch-configure
+++ b/x11/libgnome/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon May 13 13:03:40 2002
-+++ configure	Sun May 26 03:43:23 2002
-@@ -7186,6 +7186,7 @@
+--- configure.orig	Fri Nov  1 06:34:11 2002
++++ configure	Sat Nov  9 02:15:02 2002
+@@ -7964,6 +7964,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7471,7 +7472,7 @@
- LIBGNOME_AGE=0
+@@ -8335,7 +8336,7 @@
+ 
  
    case $host in
 -  *-linux-gnu | *-irix6*)
 +  *-linux-gnu | *-irix6* | *-freebsd*)
- cat >>confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
  #define HAVE_MAN_WHEREIS 1
- EOF
+ _ACEOF
diff --git a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
index d2267d824fcf..d8569e65c2db 100644
--- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
+++ b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
@@ -1,11 +1,15 @@
---- help-converters/gnome-vfs-module/Makefile.in.orig	Wed Aug  7 01:46:48 2002
-+++ help-converters/gnome-vfs-module/Makefile.in	Wed Aug  7 01:49:21 2002
-@@ -138,12 +138,12 @@
+--- help-converters/gnome-vfs-module/Makefile.in.orig	Tue Nov  5 00:53:20 2002
++++ help-converters/gnome-vfs-module/Makefile.in	Tue Nov  5 00:56:05 2002
+@@ -138,15 +138,15 @@
  cxxflags_set = @cxxflags_set@
  gnomelocaledir = @gnomelocaledir@
  
--INCLUDES =  	-I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
-+INCLUDES =  	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
+-INCLUDES = \
+-	-I$(top_srcdir)					\
++INCLUDES =	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" \
++	-DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir) \
+ 	$(HELP_VFS_MODULE_CFLAGS)		\
+     -DSERVERDIR=\"$(libexecdir)\"
  
  
  modules_LTLIBRARIES = libvfs-help.la
@@ -14,4 +18,4 @@
 +module_flags = -export_dynamic -avoid-version -module
  modulesdir = $(libdir)/gnome-vfs-2.0/modules
  
- libvfs_help_la_SOURCES =  	help-method.c		help-method.h		
+ libvfs_help_la_SOURCES = \
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 6b3a3178efba..21a31faff5fe 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- libgnome/Makefile.in.orig	Fri Apr 26 13:14:03 2002
-+++ libgnome/Makefile.in	Fri Apr 26 13:14:03 2002
-@@ -149,7 +149,7 @@
- 
+--- libgnome/Makefile.in.orig	Tue Nov  5 00:56:43 2002
++++ libgnome/Makefile.in	Tue Nov  5 00:58:40 2002
+@@ -149,6 +149,8 @@
  libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
  
--INCLUDES =  	-I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
-+INCLUDES =  	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
- 
- 
- libgnome_2_la_SOURCES =  	libgnometypebuiltins.h		libgnometypebuiltins.c		gnome-config.c			gnome-sound.c			gnome-triggers.c		gnome-triggersP.h		gnome-program.c			gnome-help.c			gnome-exec.c			gnome-gconf.c			gnome-gconfP.h			gnome-i18n.c			gnome-i18nP.h			gnome-url.c			gnome-util.c			gnome-score.c			gnome-init.c
+ INCLUDES = \
++	-DPREFIX="\"$(PREFIX)"\" -DLOCALBASE="\"$(LOCALBASE)\"" \
++	-DX11BASE="\"$(X11BASE)"\"				\
+ 	-I..							\
+ 	-I$(srcdir)/..						\
+ 	$(WARN_CFLAGS)						\
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 826b9f698918..df26639e8376 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -1,3 +1,4 @@
+etc/gconf/gconf.xml.defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
@@ -14,6 +15,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
@@ -25,6 +27,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/start-here/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/system-settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
@@ -41,6 +44,7 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
@@ -63,6 +67,7 @@ etc/gconf/schemas/desktop_gnome_interface.schemas
 etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas
 etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
 etc/gconf/schemas/desktop_gnome_sound.schemas
+etc/gconf/schemas/desktop_gnome_thumbnailers.schemas
 etc/gconf/schemas/desktop_gnome_url_handlers.schemas
 etc/gnome-vfs-2.0/modules/help-methods.conf
 etc/sound/events/gnome-2.soundlist
@@ -86,14 +91,16 @@ lib/bonobo/monikers/libmoniker_extra_2.so
 lib/gnome-vfs-2.0/modules/libvfs-help.so
 lib/libgnome-2.a
 lib/libgnome-2.so
-lib/libgnome-2.so.0
+lib/libgnome-2.so.200
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
 libexec/gnome2-db2html
 libexec/gnome2-info2html
 libexec/gnome2-man2html
+share/doc/libgnome/home.png
 share/doc/libgnome/index.html
 share/doc/libgnome/index.sgml
+share/doc/libgnome/left.png
 share/doc/libgnome/libgnome-gnome-config.html
 share/doc/libgnome/libgnome-gnome-exec.html
 share/doc/libgnome/libgnome-gnome-gconf.html
@@ -108,10 +115,12 @@ share/doc/libgnome/libgnome-gnome-url.html
 share/doc/libgnome/libgnome-gnome-util.html
 share/doc/libgnome/libgnome-libgnometypebuiltins.html
 share/doc/libgnome/libgnome.html
-share/doc/libgnome/x1311.html
-share/doc/libgnome/x2881.html
-share/doc/libgnome/x3341.html
-share/doc/libgnome/x4188.html
+share/doc/libgnome/right.png
+share/doc/libgnome/up.png
+share/doc/libgnome/x1296.html
+share/doc/libgnome/x2754.html
+share/doc/libgnome/x3411.html
+share/doc/libgnome/x4196.html
 share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
 share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
 share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml
@@ -121,20 +130,31 @@ share/locale/az/LC_MESSAGES/libgnome-2.0.mo
 share/locale/be/LC_MESSAGES/libgnome-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
 share/locale/bs/LC_MESSAGES/libgnome-2.0.mo
+share/locale/ca/LC_MESSAGES/libgnome-2.0.mo
 share/locale/cs/LC_MESSAGES/libgnome-2.0.mo
 share/locale/da/LC_MESSAGES/libgnome-2.0.mo
 share/locale/de/LC_MESSAGES/libgnome-2.0.mo
 share/locale/el/LC_MESSAGES/libgnome-2.0.mo
+share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo
 share/locale/es/LC_MESSAGES/libgnome-2.0.mo
+share/locale/et/LC_MESSAGES/libgnome-2.0.mo
 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/gl/LC_MESSAGES/libgnome-2.0.mo
+share/locale/he/LC_MESSAGES/libgnome-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnome-2.0.mo
+share/locale/hu/LC_MESSAGES/libgnome-2.0.mo
 share/locale/it/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnome-2.0.mo
+share/locale/lt/LC_MESSAGES/libgnome-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnome-2.0.mo
+share/locale/nl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/no/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
@@ -166,6 +186,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard
@@ -193,6 +214,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 437d6e84d411..a3271eb87070 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	yelp
-PORTVERSION=	1.0.7
+PORTVERSION=	2.2.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml
 
 USE_BZIP2=	yes
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index abe9320188b3..5cd3c8fb44b3 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1 +1 @@
-MD5 (gnome2/yelp-1.0.7.tar.bz2) = cc487e4368588155271ce9272f906da0
+MD5 (gnome2/yelp-2.2.0.tar.bz2) = 1148afe2578ad50be59a591677946a4c
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 7e36d8321ee4..d84546ff459a 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,5 +1,7 @@
+bin/gman
 bin/gnome-help
 bin/yelp
+bin/yelp-pregenerate
 libdata/bonobo/servers/GNOME_Yelp.server
 libexec/yelp-db2html
 share/gnome/applications/yelp.desktop
@@ -134,6 +136,7 @@ share/gnome/sgml/docbook/yelp/yelp-custom.xsl
 share/gnome/sgml/docbook/yelp/yelp-customization.xsl
 share/gnome/yelp/catalog
 share/gnome/yelp/important_docs.xml
+share/gnome/yelp/ui/yelp.glade
 share/locale/am/LC_MESSAGES/yelp.mo
 share/locale/ar/LC_MESSAGES/yelp.mo
 share/locale/az/LC_MESSAGES/yelp.mo
@@ -146,14 +149,17 @@ share/locale/de/LC_MESSAGES/yelp.mo
 share/locale/el/LC_MESSAGES/yelp.mo
 share/locale/es/LC_MESSAGES/yelp.mo
 share/locale/et/LC_MESSAGES/yelp.mo
+share/locale/fi/LC_MESSAGES/yelp.mo
 share/locale/fr/LC_MESSAGES/yelp.mo
 share/locale/gl/LC_MESSAGES/yelp.mo
 share/locale/he/LC_MESSAGES/yelp.mo
+share/locale/hi/LC_MESSAGES/yelp.mo
 share/locale/hu/LC_MESSAGES/yelp.mo
 share/locale/it/LC_MESSAGES/yelp.mo
 share/locale/ja/LC_MESSAGES/yelp.mo
 share/locale/ko/LC_MESSAGES/yelp.mo
 share/locale/lv/LC_MESSAGES/yelp.mo
+share/locale/mk/LC_MESSAGES/yelp.mo
 share/locale/ms/LC_MESSAGES/yelp.mo
 share/locale/nl/LC_MESSAGES/yelp.mo
 share/locale/nn/LC_MESSAGES/yelp.mo
@@ -174,6 +180,7 @@ share/locale/vi/LC_MESSAGES/yelp.mo
 share/locale/wa/LC_MESSAGES/yelp.mo
 share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
+@dirrm share/gnome/yelp/ui
 @dirrm share/gnome/yelp
 @dirrm share/gnome/sgml/docbook/yelp/docbook/lib
 @dirrm share/gnome/sgml/docbook/yelp/docbook/images
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2003-02-07 18:42:25 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2003-02-07 18:42:25 +0000
commit	336b31c3940aea29270fc9fd9b51d3ba1633729e (patch)
tree	ab986f61fb6fef3625ba83cee9ea5d304243bfe8 /x11
parent	add ocaml-images 2.10 (diff)