Update to 2.11.90.

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

14 files changed, 88 insertions, 84 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index c8851379a..fc52cbb72 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.99 2005/07/05 08:37:59 mezz Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.100 2005/07/13 10:23:44 ahze Exp $
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.11.5
+PORTVERSION=	2.11.90
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.11
@@ -23,7 +23,7 @@ INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
-		libwnck gnomemenus
+		libwnck gnomemenus gnomedocutils
 WANT_GNOME=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 34d75fcb8..12551fb14 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.11.5.tar.bz2) = bc1356213a86a89b188d01f707799469
-SIZE (gnome2/gnome-panel-2.11.5.tar.bz2) = 2365251
+MD5 (gnome2/gnome-panel-2.11.90.tar.bz2) = fbf0357b195fb9e2e925f18a3fd6f0b3
+SIZE (gnome2/gnome-panel-2.11.90.tar.bz2) = 2475693
diff --git a/x11/gnome-panel/files/patch-gnome-panel::GNOME_Panel.server.in b/x11/gnome-panel/files/patch-gnome-panel::GNOME_Panel.server.in
deleted file mode 100644
index 655ae6a68..000000000
--- a/x11/gnome-panel/files/patch-gnome-panel::GNOME_Panel.server.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-  $MCom$
-
---- gnome-panel/GNOME_Panel.server.in	2002/05/09 21:00:58	1.1
-+++ gnome-panel/GNOME_Panel.server.in	2002/05/09 21:01:11
-@@ -1,6 +1,6 @@
- <oaf_info>
- 
--<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="panel-2">
-+<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="gnome-panel">
- 	<oaf_attribute name="repo_ids" type="stringv">
- 		<item value="IDL:GNOME/Vertigo/PanelShell:1.0"/>
- 		<item value="IDL:Bonobo/Unknown:1.0"/>
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index dc44baa95..81fdf1d27 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -51,7 +51,6 @@ share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
 share/gnome/gnome-panelrc
 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/clock/de/clock.xml
 share/gnome/help/clock/de/figures/clock_applet.png
@@ -71,6 +70,8 @@ share/gnome/help/clock/ja/legal.xml
 share/gnome/help/clock/ko/clock.xml
 share/gnome/help/clock/ko/figures/clock_applet.png
 share/gnome/help/clock/ko/legal.xml
+share/gnome/help/clock/sr/clock.xml
+share/gnome/help/clock/sr/legal.xml
 share/gnome/help/clock/sv/clock.xml
 share/gnome/help/clock/sv/figures/clock_applet.png
 share/gnome/help/clock/sv/legal.xml
@@ -83,9 +84,6 @@ share/gnome/help/clock/zh_CN/legal.xml
 share/gnome/help/clock/zh_TW/clock.xml
 share/gnome/help/clock/zh_TW/figures/clock_applet.png
 share/gnome/help/clock/zh_TW/legal.xml
-share/gnome/help/fish-applet-2/C/figures/fish_applet.png
-share/gnome/help/fish-applet-2/C/fish-applet-2.xml
-share/gnome/help/fish-applet-2/C/legal.xml
 share/gnome/help/fish-applet-2/de/figures/fish_applet.png
 share/gnome/help/fish-applet-2/de/figures/fish_settings.png
 share/gnome/help/fish-applet-2/de/fish-applet-2.xml
@@ -124,8 +122,8 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png
 share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png
 share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml
 share/gnome/help/fish-applet-2/zh_TW/legal.xml
-share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group_applet.png
+share/gnome/help/fish/C/fish.xml
+share/gnome/help/fish/C/legal.xml
 share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
 share/gnome/help/window-list/de/figures/window_list_applet.png
@@ -176,7 +174,6 @@ share/gnome/help/window-list/zh_TW/figures/window_list_group.png
 share/gnome/help/window-list/zh_TW/figures/window_list_group_applet.png
 share/gnome/help/window-list/zh_TW/legal.xml
 share/gnome/help/window-list/zh_TW/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
@@ -202,6 +199,8 @@ share/gnome/help/workspace-switcher/ko/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/ko/legal.xml
 share/gnome/help/workspace-switcher/ko/workspace-switcher.xml
+share/gnome/help/workspace-switcher/nl/legal.xml
+share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
 share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/sv/legal.xml
@@ -218,7 +217,19 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_TW/legal.xml
 share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml
 share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
-share/gnome/omf/gnome-panel/clock-C.omf
+share/gnome/omf/clock/clock-C.omf
+share/gnome/omf/clock/clock-de.omf
+share/gnome/omf/clock/clock-es.omf
+share/gnome/omf/clock/clock-fr.omf
+share/gnome/omf/clock/clock-it.omf
+share/gnome/omf/clock/clock-ja.omf
+share/gnome/omf/clock/clock-ko.omf
+share/gnome/omf/clock/clock-sr.omf
+share/gnome/omf/clock/clock-sv.omf
+share/gnome/omf/clock/clock-uk.omf
+share/gnome/omf/clock/clock-zh_CN.omf
+share/gnome/omf/clock/clock-zh_TW.omf
+share/gnome/omf/fish/fish-C.omf
 share/gnome/omf/gnome-panel/clock-de.omf
 share/gnome/omf/gnome-panel/clock-es.omf
 share/gnome/omf/gnome-panel/clock-fr.omf
@@ -229,7 +240,6 @@ share/gnome/omf/gnome-panel/clock-sv.omf
 share/gnome/omf/gnome-panel/clock-uk.omf
 share/gnome/omf/gnome-panel/clock-zh_CN.omf
 share/gnome/omf/gnome-panel/clock-zh_TW.omf
-share/gnome/omf/gnome-panel/fish-applet-2-C.omf
 share/gnome/omf/gnome-panel/fish-applet-2-de.omf
 share/gnome/omf/gnome-panel/fish-applet-2-es.omf
 share/gnome/omf/gnome-panel/fish-applet-2-fr.omf
@@ -240,7 +250,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
 share/gnome/omf/gnome-panel/fish-applet-2-uk.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
-share/gnome/omf/gnome-panel/window-list-C.omf
 share/gnome/omf/gnome-panel/window-list-de.omf
 share/gnome/omf/gnome-panel/window-list-es.omf
 share/gnome/omf/gnome-panel/window-list-fr.omf
@@ -251,7 +260,6 @@ share/gnome/omf/gnome-panel/window-list-sv.omf
 share/gnome/omf/gnome-panel/window-list-uk.omf
 share/gnome/omf/gnome-panel/window-list-zh_CN.omf
 share/gnome/omf/gnome-panel/window-list-zh_TW.omf
-share/gnome/omf/gnome-panel/workspace-switcher-C.omf
 share/gnome/omf/gnome-panel/workspace-switcher-de.omf
 share/gnome/omf/gnome-panel/workspace-switcher-es.omf
 share/gnome/omf/gnome-panel/workspace-switcher-fr.omf
@@ -262,6 +270,9 @@ share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
 share/gnome/omf/gnome-panel/workspace-switcher-uk.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
+share/gnome/omf/window-list/window-list-C.omf
+share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
+share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf
 share/gnome/panel/glade/fish.glade
 share/gnome/panel/glade/panel-properties-dialog.glade
 share/gnome/panel/glade/panel-run-dialog.glade
@@ -374,7 +385,11 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true
 @dirrm share/gnome/panel/pixmaps
 @dirrm share/gnome/panel/glade
+@dirrm share/gnome/omf/workspace-switcher
+@dirrm share/gnome/omf/window-list
 @dirrm share/gnome/omf/gnome-panel
+@dirrm share/gnome/omf/fish
+@dirrm share/gnome/omf/clock
 @dirrm share/gnome/idl/gnome-panel-2.0
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
 @dirrm share/gnome/help/workspace-switcher/zh_TW
@@ -384,6 +399,7 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/workspace-switcher/uk
 @dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
+@dirrm share/gnome/help/workspace-switcher/nl
 @dirrm share/gnome/help/workspace-switcher/ko/figures
 @dirrm share/gnome/help/workspace-switcher/ko
 @dirrm share/gnome/help/workspace-switcher/ja/figures
@@ -396,7 +412,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/workspace-switcher/es
 @dirrm share/gnome/help/workspace-switcher/de/figures
 @dirrm share/gnome/help/workspace-switcher/de
-@dirrm share/gnome/help/workspace-switcher/C/figures
 @dirrm share/gnome/help/workspace-switcher/C
 @dirrm share/gnome/help/workspace-switcher
 @dirrm share/gnome/help/window-list/zh_TW/figures
@@ -419,9 +434,9 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/window-list/es
 @dirrm share/gnome/help/window-list/de/figures
 @dirrm share/gnome/help/window-list/de
-@dirrm share/gnome/help/window-list/C/figures
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
+@dirrm share/gnome/help/fish/C
 @dirrm share/gnome/help/fish-applet-2/zh_TW/figures
 @dirrm share/gnome/help/fish-applet-2/zh_TW
 @dirrm share/gnome/help/fish-applet-2/zh_CN/figures
@@ -442,9 +457,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/fish-applet-2/es
 @dirrm share/gnome/help/fish-applet-2/de/figures
 @dirrm share/gnome/help/fish-applet-2/de
-@dirrm share/gnome/help/fish-applet-2/C/figures
-@dirrm share/gnome/help/fish-applet-2/C
 @dirrm share/gnome/help/fish-applet-2
+@dirrm share/gnome/help/fish
 @dirrm share/gnome/help/clock/zh_TW/figures
 @dirrm share/gnome/help/clock/zh_TW
 @dirrm share/gnome/help/clock/zh_CN/figures
@@ -453,6 +467,7 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/uk
 @dirrm share/gnome/help/clock/sv/figures
 @dirrm share/gnome/help/clock/sv
+@dirrm share/gnome/help/clock/sr
 @dirrm share/gnome/help/clock/ko/figures
 @dirrm share/gnome/help/clock/ko
 @dirrm share/gnome/help/clock/ja/figures
@@ -465,7 +480,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/es
 @dirrm share/gnome/help/clock/de/figures
 @dirrm share/gnome/help/clock/de
-@dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
 @dirrm share/doc/panel-applet
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 90e70668e..5f9fa28d2 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomesession/Makefile,v 1.60 2005/06/28 05:40:13 adamw Exp $
+#   $MCom: ports/x11/gnomesession/Makefile,v 1.61 2005/07/01 18:08:46 marcus Exp $
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.11.1
+PORTVERSION=	2.11.90
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -31,8 +31,8 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
-		session-properties.1 gnome-session-save.1
+MAN1=		gnome-session.1 gnome-wm.1 session-properties.1 \
+		gnome-session-save.1
 MAN5=		default.session.5
 GCONF_SCHEMAS=	gnome-session.schemas
 
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 0f456184d..21b6d1072 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.11.1.tar.bz2) = c5c208e51af45d89f5bb81e40ccdabd9
-SIZE (gnome2/gnome-session-2.11.1.tar.bz2) = 814046
+MD5 (gnome2/gnome-session-2.11.90.tar.bz2) = 818720b1439f5bc98142189f78c997ad
+SIZE (gnome2/gnome-session-2.11.90.tar.bz2) = 680769
 MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34
 SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index b9d52e30e..d0543d5d4 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -2,7 +2,6 @@ bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
 bin/gnome-session-save
-bin/gnome-smproxy
 bin/gnome-wm
 share/gnome/applications/session-properties.desktop
 share/gnome/default.session
@@ -45,6 +44,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
@@ -89,3 +89,5 @@ share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
+@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index c8851379a..fc52cbb72 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.99 2005/07/05 08:37:59 mezz Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.100 2005/07/13 10:23:44 ahze Exp $
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.11.5
+PORTVERSION=	2.11.90
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.11
@@ -23,7 +23,7 @@ INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
-		libwnck gnomemenus
+		libwnck gnomemenus gnomedocutils
 WANT_GNOME=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index 34d75fcb8..12551fb14 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.11.5.tar.bz2) = bc1356213a86a89b188d01f707799469
-SIZE (gnome2/gnome-panel-2.11.5.tar.bz2) = 2365251
+MD5 (gnome2/gnome-panel-2.11.90.tar.bz2) = fbf0357b195fb9e2e925f18a3fd6f0b3
+SIZE (gnome2/gnome-panel-2.11.90.tar.bz2) = 2475693
diff --git a/x11/gnomepanel/files/patch-gnome-panel::GNOME_Panel.server.in b/x11/gnomepanel/files/patch-gnome-panel::GNOME_Panel.server.in
deleted file mode 100644
index 655ae6a68..000000000
--- a/x11/gnomepanel/files/patch-gnome-panel::GNOME_Panel.server.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-  $MCom$
-
---- gnome-panel/GNOME_Panel.server.in	2002/05/09 21:00:58	1.1
-+++ gnome-panel/GNOME_Panel.server.in	2002/05/09 21:01:11
-@@ -1,6 +1,6 @@
- <oaf_info>
- 
--<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="panel-2">
-+<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="gnome-panel">
- 	<oaf_attribute name="repo_ids" type="stringv">
- 		<item value="IDL:GNOME/Vertigo/PanelShell:1.0"/>
- 		<item value="IDL:Bonobo/Unknown:1.0"/>
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index dc44baa95..81fdf1d27 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -51,7 +51,6 @@ share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
 share/gnome/gnome-panelrc
 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/clock/de/clock.xml
 share/gnome/help/clock/de/figures/clock_applet.png
@@ -71,6 +70,8 @@ share/gnome/help/clock/ja/legal.xml
 share/gnome/help/clock/ko/clock.xml
 share/gnome/help/clock/ko/figures/clock_applet.png
 share/gnome/help/clock/ko/legal.xml
+share/gnome/help/clock/sr/clock.xml
+share/gnome/help/clock/sr/legal.xml
 share/gnome/help/clock/sv/clock.xml
 share/gnome/help/clock/sv/figures/clock_applet.png
 share/gnome/help/clock/sv/legal.xml
@@ -83,9 +84,6 @@ share/gnome/help/clock/zh_CN/legal.xml
 share/gnome/help/clock/zh_TW/clock.xml
 share/gnome/help/clock/zh_TW/figures/clock_applet.png
 share/gnome/help/clock/zh_TW/legal.xml
-share/gnome/help/fish-applet-2/C/figures/fish_applet.png
-share/gnome/help/fish-applet-2/C/fish-applet-2.xml
-share/gnome/help/fish-applet-2/C/legal.xml
 share/gnome/help/fish-applet-2/de/figures/fish_applet.png
 share/gnome/help/fish-applet-2/de/figures/fish_settings.png
 share/gnome/help/fish-applet-2/de/fish-applet-2.xml
@@ -124,8 +122,8 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png
 share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png
 share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml
 share/gnome/help/fish-applet-2/zh_TW/legal.xml
-share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group_applet.png
+share/gnome/help/fish/C/fish.xml
+share/gnome/help/fish/C/legal.xml
 share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
 share/gnome/help/window-list/de/figures/window_list_applet.png
@@ -176,7 +174,6 @@ share/gnome/help/window-list/zh_TW/figures/window_list_group.png
 share/gnome/help/window-list/zh_TW/figures/window_list_group_applet.png
 share/gnome/help/window-list/zh_TW/legal.xml
 share/gnome/help/window-list/zh_TW/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
@@ -202,6 +199,8 @@ share/gnome/help/workspace-switcher/ko/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/ko/legal.xml
 share/gnome/help/workspace-switcher/ko/workspace-switcher.xml
+share/gnome/help/workspace-switcher/nl/legal.xml
+share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
 share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/sv/legal.xml
@@ -218,7 +217,19 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_TW/legal.xml
 share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml
 share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
-share/gnome/omf/gnome-panel/clock-C.omf
+share/gnome/omf/clock/clock-C.omf
+share/gnome/omf/clock/clock-de.omf
+share/gnome/omf/clock/clock-es.omf
+share/gnome/omf/clock/clock-fr.omf
+share/gnome/omf/clock/clock-it.omf
+share/gnome/omf/clock/clock-ja.omf
+share/gnome/omf/clock/clock-ko.omf
+share/gnome/omf/clock/clock-sr.omf
+share/gnome/omf/clock/clock-sv.omf
+share/gnome/omf/clock/clock-uk.omf
+share/gnome/omf/clock/clock-zh_CN.omf
+share/gnome/omf/clock/clock-zh_TW.omf
+share/gnome/omf/fish/fish-C.omf
 share/gnome/omf/gnome-panel/clock-de.omf
 share/gnome/omf/gnome-panel/clock-es.omf
 share/gnome/omf/gnome-panel/clock-fr.omf
@@ -229,7 +240,6 @@ share/gnome/omf/gnome-panel/clock-sv.omf
 share/gnome/omf/gnome-panel/clock-uk.omf
 share/gnome/omf/gnome-panel/clock-zh_CN.omf
 share/gnome/omf/gnome-panel/clock-zh_TW.omf
-share/gnome/omf/gnome-panel/fish-applet-2-C.omf
 share/gnome/omf/gnome-panel/fish-applet-2-de.omf
 share/gnome/omf/gnome-panel/fish-applet-2-es.omf
 share/gnome/omf/gnome-panel/fish-applet-2-fr.omf
@@ -240,7 +250,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
 share/gnome/omf/gnome-panel/fish-applet-2-uk.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
-share/gnome/omf/gnome-panel/window-list-C.omf
 share/gnome/omf/gnome-panel/window-list-de.omf
 share/gnome/omf/gnome-panel/window-list-es.omf
 share/gnome/omf/gnome-panel/window-list-fr.omf
@@ -251,7 +260,6 @@ share/gnome/omf/gnome-panel/window-list-sv.omf
 share/gnome/omf/gnome-panel/window-list-uk.omf
 share/gnome/omf/gnome-panel/window-list-zh_CN.omf
 share/gnome/omf/gnome-panel/window-list-zh_TW.omf
-share/gnome/omf/gnome-panel/workspace-switcher-C.omf
 share/gnome/omf/gnome-panel/workspace-switcher-de.omf
 share/gnome/omf/gnome-panel/workspace-switcher-es.omf
 share/gnome/omf/gnome-panel/workspace-switcher-fr.omf
@@ -262,6 +270,9 @@ share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
 share/gnome/omf/gnome-panel/workspace-switcher-uk.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
+share/gnome/omf/window-list/window-list-C.omf
+share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
+share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf
 share/gnome/panel/glade/fish.glade
 share/gnome/panel/glade/panel-properties-dialog.glade
 share/gnome/panel/glade/panel-run-dialog.glade
@@ -374,7 +385,11 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true
 @dirrm share/gnome/panel/pixmaps
 @dirrm share/gnome/panel/glade
+@dirrm share/gnome/omf/workspace-switcher
+@dirrm share/gnome/omf/window-list
 @dirrm share/gnome/omf/gnome-panel
+@dirrm share/gnome/omf/fish
+@dirrm share/gnome/omf/clock
 @dirrm share/gnome/idl/gnome-panel-2.0
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
 @dirrm share/gnome/help/workspace-switcher/zh_TW
@@ -384,6 +399,7 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/workspace-switcher/uk
 @dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
+@dirrm share/gnome/help/workspace-switcher/nl
 @dirrm share/gnome/help/workspace-switcher/ko/figures
 @dirrm share/gnome/help/workspace-switcher/ko
 @dirrm share/gnome/help/workspace-switcher/ja/figures
@@ -396,7 +412,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/workspace-switcher/es
 @dirrm share/gnome/help/workspace-switcher/de/figures
 @dirrm share/gnome/help/workspace-switcher/de
-@dirrm share/gnome/help/workspace-switcher/C/figures
 @dirrm share/gnome/help/workspace-switcher/C
 @dirrm share/gnome/help/workspace-switcher
 @dirrm share/gnome/help/window-list/zh_TW/figures
@@ -419,9 +434,9 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/window-list/es
 @dirrm share/gnome/help/window-list/de/figures
 @dirrm share/gnome/help/window-list/de
-@dirrm share/gnome/help/window-list/C/figures
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
+@dirrm share/gnome/help/fish/C
 @dirrm share/gnome/help/fish-applet-2/zh_TW/figures
 @dirrm share/gnome/help/fish-applet-2/zh_TW
 @dirrm share/gnome/help/fish-applet-2/zh_CN/figures
@@ -442,9 +457,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/fish-applet-2/es
 @dirrm share/gnome/help/fish-applet-2/de/figures
 @dirrm share/gnome/help/fish-applet-2/de
-@dirrm share/gnome/help/fish-applet-2/C/figures
-@dirrm share/gnome/help/fish-applet-2/C
 @dirrm share/gnome/help/fish-applet-2
+@dirrm share/gnome/help/fish
 @dirrm share/gnome/help/clock/zh_TW/figures
 @dirrm share/gnome/help/clock/zh_TW
 @dirrm share/gnome/help/clock/zh_CN/figures
@@ -453,6 +467,7 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/uk
 @dirrm share/gnome/help/clock/sv/figures
 @dirrm share/gnome/help/clock/sv
+@dirrm share/gnome/help/clock/sr
 @dirrm share/gnome/help/clock/ko/figures
 @dirrm share/gnome/help/clock/ko
 @dirrm share/gnome/help/clock/ja/figures
@@ -465,7 +480,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/es
 @dirrm share/gnome/help/clock/de/figures
 @dirrm share/gnome/help/clock/de
-@dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
 @dirrm share/doc/panel-applet
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 90e70668e..5f9fa28d2 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomesession/Makefile,v 1.60 2005/06/28 05:40:13 adamw Exp $
+#   $MCom: ports/x11/gnomesession/Makefile,v 1.61 2005/07/01 18:08:46 marcus Exp $
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.11.1
+PORTVERSION=	2.11.90
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -31,8 +31,8 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
-		session-properties.1 gnome-session-save.1
+MAN1=		gnome-session.1 gnome-wm.1 session-properties.1 \
+		gnome-session-save.1
 MAN5=		default.session.5
 GCONF_SCHEMAS=	gnome-session.schemas
 
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 0f456184d..21b6d1072 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.11.1.tar.bz2) = c5c208e51af45d89f5bb81e40ccdabd9
-SIZE (gnome2/gnome-session-2.11.1.tar.bz2) = 814046
+MD5 (gnome2/gnome-session-2.11.90.tar.bz2) = 818720b1439f5bc98142189f78c997ad
+SIZE (gnome2/gnome-session-2.11.90.tar.bz2) = 680769
 MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34
 SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index b9d52e30e..d0543d5d4 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -2,7 +2,6 @@ bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
 bin/gnome-session-save
-bin/gnome-smproxy
 bin/gnome-wm
 share/gnome/applications/session-properties.desktop
 share/gnome/default.session
@@ -45,6 +44,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
@@ -89,3 +89,5 @@ share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
+@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true