update to 2.18.0

This moves this pkg to the new stable gnome branch, too much to list here.

4 files changed, 169 insertions, 86 deletions

diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 711a3fc54db..aad3b5c0db0 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.75 2007/04/05 19:03:02 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/04/11 18:28:13 drochner Exp $
 #
 
-DISTNAME=		gnome-applets-2.16.2
-PKGREVISION=		1
+DISTNAME=		gnome-applets-2.18.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.16/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -20,24 +19,6 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 
-# XXX: only needed in 2.16.x, 2.18.x is fixed.
-SUBST_CLASSES+=		gdu
-SUBST_FILES.gdu=	mixer/docs/C/mixer_applet2.xml
-SUBST_FILES.gdu+=	drivemount/help/C/drivemount.xml
-SUBST_FILES.gdu+=	geyes/docs/C/geyes.xml
-SUBST_FILES.gdu+=	mini-commander/help/C/command-line.xml
-SUBST_FILES.gdu+=	battstat/docs/C/battstat.xml
-SUBST_FILES.gdu+=	multiload/docs/C/multiload.xml
-SUBST_FILES.gdu+=	gweather/docs/C/gweather.xml
-SUBST_FILES.gdu+=	accessx-status/docs/C/accessx-status.xml
-SUBST_FILES.gdu+=	stickynotes/docs/C/stickynotes_applet.xml
-SUBST_FILES.gdu+=	gswitchit/help/C/gswitchit.xml
-SUBST_FILES.gdu+=	trashapplet/docs/C/trashapplet.xml
-SUBST_FILES.gdu+=	cpufreq/help/C/cpufreq-applet.xml
-SUBST_SED.gdu=		-e 's/<publisher>/<publisher role="maintainer">/g'
-SUBST_STAGE.gdu=	pre-configure
-SUBST_MESSAGE.gdu=	Fixing for gnome-doc-utils-0.10.1.
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome2-applets
 PKG_SUPPORTED_OPTIONS=	inet6
 .include "../../mk/bsd.options.mk"
@@ -52,7 +33,7 @@ EGDIR=			${PREFIX}/share/examples/gnome-applets
 GCONF2_SCHEMAS=		charpick.schemas
 GCONF2_SCHEMAS+=	drivemount.schemas
 GCONF2_SCHEMAS+=	geyes.schemas
-GCONF2_SCHEMAS+=	gswitchit.schemas
+#GCONF2_SCHEMAS+=	gswitchit.schemas
 GCONF2_SCHEMAS+=	gweather.schemas
 GCONF2_SCHEMAS+=	mixer.schemas
 GCONF2_SCHEMAS+=	multiload.schemas
diff --git a/x11/gnome2-applets/PLIST b/x11/gnome2-applets/PLIST
index fb11c37f5ae..1f5ad45ee38 100644
--- a/x11/gnome2-applets/PLIST
+++ b/x11/gnome2-applets/PLIST
@@ -1,11 +1,5 @@
-@comment $NetBSD: PLIST,v 1.20 2006/11/28 22:11:57 drochner Exp $
-bin/gswitchit-plugins-capplet
-include/libgswitchit/gnome-kbd-indicator.h
-include/libgswitchit/gswitchit-config.h
-include/libgswitchit/gswitchit-plugin.h
-include/libgswitchit/gswitchit-plugins-app.h
-include/libgswitchit/keyboard-config-registry-client.h
-include/libgswitchit/keyboard-config-registry.h
+@comment $NetBSD: PLIST,v 1.21 2007/04/11 18:28:13 drochner Exp $
+${BATTSTAT}etc/sound/events/battstat_applet.soundlist
 include/libgweather/gweather-gconf.h
 include/libgweather/gweather-prefs.h
 include/libgweather/weather.h
@@ -16,7 +10,6 @@ lib/bonobo/servers/GNOME_CharpickerApplet.server
 lib/bonobo/servers/GNOME_DriveMountApplet.server
 lib/bonobo/servers/GNOME_GWeatherApplet_Factory.server
 lib/bonobo/servers/GNOME_GeyesApplet.server
-lib/bonobo/servers/GNOME_KeyboardApplet.server
 lib/bonobo/servers/GNOME_MailcheckApplet_Factory.server
 lib/bonobo/servers/GNOME_MiniCommanderApplet.server
 lib/bonobo/servers/GNOME_MixerApplet.server
@@ -26,27 +19,23 @@ lib/bonobo/servers/GNOME_Panel_TrashApplet.server
 lib/bonobo/servers/GNOME_Panel_WirelessApplet.server
 lib/bonobo/servers/GNOME_StickyNotesApplet.server
 lib/libgweather.la
-lib/pkgconfig/gswitchit.pc
 lib/pkgconfig/gweather.pc
 libexec/accessx-status-applet
 ${BATTSTAT}libexec/battstat-applet-2
 libexec/charpick_applet2
 libexec/drivemount_applet2
 libexec/geyes_applet2
-libexec/gnome-keyboard-applet
 libexec/gweather-applet-2
 libexec/mixer_applet2
 libexec/multiload-applet-2
 libexec/null_applet
 libexec/stickynotes_applet
 libexec/trashapplet
-share/applications/gswitchit-plugins.desktop
 ${BATTSTAT}share/examples/gnome-applets/sound/events/battstat_applet.soundlist
 ${BATTSTAT}share/gconf/schemas/battstat.schemas
 share/gconf/schemas/charpick.schemas
 share/gconf/schemas/drivemount.schemas
 share/gconf/schemas/geyes.schemas
-share/gconf/schemas/gswitchit.schemas
 share/gconf/schemas/gweather.schemas
 share/gconf/schemas/mixer.schemas
 share/gconf/schemas/multiload.schemas
@@ -55,7 +44,6 @@ share/gnome-2.0/ui/GNOME_AccessxApplet.xml
 ${BATTSTAT}share/gnome-2.0/ui/GNOME_BattstatApplet.xml
 share/gnome-2.0/ui/GNOME_CharpickerApplet.xml
 share/gnome-2.0/ui/GNOME_DriveMountApplet.xml
-share/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
 share/gnome-2.0/ui/GNOME_GWeatherApplet.xml
 share/gnome-2.0/ui/GNOME_GeyesApplet.xml
 share/gnome-2.0/ui/GNOME_MixerApplet.xml
@@ -81,8 +69,6 @@ share/gnome-applets/geyes/Tango/config
 share/gnome-applets/geyes/Tango/tango-eye.png
 share/gnome-applets/geyes/Tango/tango-pupil.png
 ${BATTSTAT}share/gnome-applets/glade/battstat_applet.glade
-share/gnome-applets/glade/gswitchit-plugins.glade
-share/gnome-applets/glade/gswitchit.glade
 share/gnome-applets/glade/stickynotes.glade
 share/gnome-applets/glade/trashapplet.glade
 share/gnome-applets/gweather/Locations.xml
@@ -112,6 +98,18 @@ share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/en_GB/accessx-status.xml
+share/gnome/help/accessx-status/en_GB/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/en_GB/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/en_GB/figures/accessx_sticky-windows-key.png
 share/gnome/help/accessx-status/es/accessx-status.xml
 share/gnome/help/accessx-status/es/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png
@@ -197,6 +195,12 @@ ${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-applet.png
 ${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-credits-hal.png
 ${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-preferences.png
 ${BATTSTAT}share/gnome/help/battstat/bg/figures/context-menu.png
+${BATTSTAT}share/gnome/help/battstat/en_GB/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-applet-expanded.png
+${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-credits-hal.png
+${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-preferences.png
+${BATTSTAT}share/gnome/help/battstat/en_GB/figures/context-menu.png
 ${BATTSTAT}share/gnome/help/battstat/es/battstat.xml
 ${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-applet-expanded.png
 ${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-applet.png
@@ -209,6 +213,12 @@ ${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-applet.png
 ${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-credits-hal.png
 ${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-preferences.png
 ${BATTSTAT}share/gnome/help/battstat/fr/figures/context-menu.png
+${BATTSTAT}share/gnome/help/battstat/pa/battstat.xml
+${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png
+${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-applet.png
+${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-credits-hal.png
+${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-preferences.png
+${BATTSTAT}share/gnome/help/battstat/pa/figures/context-menu.png
 ${BATTSTAT}share/gnome/help/battstat/sv/battstat.xml
 ${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png
 ${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-applet.png
@@ -232,6 +242,11 @@ share/gnome/help/char-palette/bg/figures/charpalette_applet.png
 share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/bg/figures/charpick-preferences.png
 share/gnome/help/char-palette/bg/figures/charpick_characters.png
+share/gnome/help/char-palette/en_GB/char-palette.xml
+share/gnome/help/char-palette/en_GB/figures/charpalette_applet.png
+share/gnome/help/char-palette/en_GB/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/en_GB/figures/charpick-preferences.png
+share/gnome/help/char-palette/en_GB/figures/charpick_characters.png
 share/gnome/help/char-palette/es/char-palette.xml
 share/gnome/help/char-palette/es/figures/charpalette_applet.png
 share/gnome/help/char-palette/es/figures/charpalette_chargroup.png
@@ -274,6 +289,12 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/C/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/C/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/C/legal.xml
+share/gnome/help/drivemount/en_GB/drivemount.xml
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/en_GB/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/es/drivemount.xml
 share/gnome/help/drivemount/es/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/es/figures/drivemount-applet_example.png
@@ -298,6 +319,12 @@ share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/ru/drivemount.xml
+share/gnome/help/drivemount/ru/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/ru/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/sv/drivemount.xml
 share/gnome/help/drivemount/sv/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/sv/figures/drivemount-applet_example.png
@@ -321,6 +348,8 @@ share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
 share/gnome/help/geyes/bg/figures/geyes_applet.png
 share/gnome/help/geyes/bg/geyes.xml
+share/gnome/help/geyes/en_GB/figures/geyes_applet.png
+share/gnome/help/geyes/en_GB/geyes.xml
 share/gnome/help/geyes/es/figures/geyes_applet.png
 share/gnome/help/geyes/es/geyes.xml
 share/gnome/help/geyes/fr/figures/geyes_applet.png
@@ -333,12 +362,6 @@ share/gnome/help/geyes/sv/figures/geyes_applet.png
 share/gnome/help/geyes/sv/geyes.xml
 share/gnome/help/geyes/uk/figures/geyes_applet.png
 share/gnome/help/geyes/uk/geyes.xml
-share/gnome/help/gswitchit/C/gswitchit.xml
-share/gnome/help/gswitchit/C/legal.xml
-share/gnome/help/gswitchit/es/gswitchit.xml
-share/gnome/help/gswitchit/fr/gswitchit.xml
-share/gnome/help/gswitchit/sv/gswitchit.xml
-share/gnome/help/gswitchit/uk/gswitchit.xml
 share/gnome/help/gweather/C/figures/gweather-details.png
 share/gnome/help/gweather/C/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/C/figures/gweather-prefs-general.png
@@ -355,6 +378,21 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png
 share/gnome/help/gweather/C/figures/stock_weather-sunny.png
 share/gnome/help/gweather/C/gweather.xml
 share/gnome/help/gweather/C/legal.xml
+share/gnome/help/gweather/en_GB/figures/gweather-details.png
+share/gnome/help/gweather/en_GB/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/en_GB/figures/gweather-prefs-general.png
+share/gnome/help/gweather/en_GB/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/en_GB/figures/gweather_applet.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-fog.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-showers.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-snow.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-storm.png
+share/gnome/help/gweather/en_GB/figures/stock_weather-sunny.png
+share/gnome/help/gweather/en_GB/gweather.xml
 share/gnome/help/gweather/es/figures/gweather-details.png
 share/gnome/help/gweather/es/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/es/figures/gweather-prefs-general.png
@@ -400,6 +438,21 @@ share/gnome/help/gweather/nl/figures/stock_weather-snow.png
 share/gnome/help/gweather/nl/figures/stock_weather-storm.png
 share/gnome/help/gweather/nl/figures/stock_weather-sunny.png
 share/gnome/help/gweather/nl/gweather.xml
+share/gnome/help/gweather/pa/figures/gweather-details.png
+share/gnome/help/gweather/pa/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/pa/figures/gweather-prefs-general.png
+share/gnome/help/gweather/pa/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/pa/figures/gweather_applet.png
+share/gnome/help/gweather/pa/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/pa/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/pa/figures/stock_weather-fog.png
+share/gnome/help/gweather/pa/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/pa/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/pa/figures/stock_weather-showers.png
+share/gnome/help/gweather/pa/figures/stock_weather-snow.png
+share/gnome/help/gweather/pa/figures/stock_weather-storm.png
+share/gnome/help/gweather/pa/figures/stock_weather-sunny.png
+share/gnome/help/gweather/pa/gweather.xml
 share/gnome/help/gweather/sv/figures/gweather-details.png
 share/gnome/help/gweather/sv/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/sv/figures/gweather-prefs-general.png
@@ -433,12 +486,18 @@ share/gnome/help/gweather/uk/gweather.xml
 share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml
 share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/es/mixer_applet2.xml
 share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
 share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/it/mixer_applet2.xml
+share/gnome/help/mixer_applet2/pa/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/pa/mixer_applet2.xml
+share/gnome/help/mixer_applet2/ru/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/ru/mixer_applet2.xml
 share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/sv/mixer_applet2.xml
 share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png
@@ -448,6 +507,10 @@ share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/C/figures/system_monitor.png
 share/gnome/help/multiload/C/legal.xml
 share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/en_GB/figures/multiload-preferences.png
+share/gnome/help/multiload/en_GB/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/en_GB/figures/system_monitor.png
+share/gnome/help/multiload/en_GB/multiload.xml
 share/gnome/help/multiload/es/figures/multiload-preferences.png
 share/gnome/help/multiload/es/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/es/figures/system_monitor.png
@@ -456,6 +519,14 @@ share/gnome/help/multiload/fr/figures/multiload-preferences.png
 share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/fr/figures/system_monitor.png
 share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/pa/figures/multiload-preferences.png
+share/gnome/help/multiload/pa/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/pa/figures/system_monitor.png
+share/gnome/help/multiload/pa/multiload.xml
+share/gnome/help/multiload/ru/figures/multiload-preferences.png
+share/gnome/help/multiload/ru/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/ru/figures/system_monitor.png
+share/gnome/help/multiload/ru/multiload.xml
 share/gnome/help/multiload/sv/figures/multiload-preferences.png
 share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/sv/figures/system_monitor.png
@@ -471,6 +542,12 @@ share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png
 share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/en_GB/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png
@@ -483,6 +560,12 @@ share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/pa/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/pa/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/sv/figures/stickynotes-note-prefs.png
@@ -498,6 +581,8 @@ share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml
 share/gnome/help/trashapplet/C/figures/trash-applet.png
 share/gnome/help/trashapplet/C/legal.xml
 share/gnome/help/trashapplet/C/trashapplet.xml
+share/gnome/help/trashapplet/en_GB/figures/trash-applet.png
+share/gnome/help/trashapplet/en_GB/trashapplet.xml
 share/gnome/help/trashapplet/es/figures/trash-applet.png
 share/gnome/help/trashapplet/es/trashapplet.xml
 share/gnome/help/trashapplet/fr/figures/trash-applet.png
@@ -524,8 +609,6 @@ share/icons/hicolor/32x32/apps/gnome-eyes-applet.png
 share/icons/hicolor/32x32/apps/gnome-sticky-notes-applet.png
 share/icons/hicolor/48x48/apps/ax-applet.png
 share/icons/hicolor/48x48/apps/charpick.png
-share/icons/hicolor/48x48/apps/gswitchit-applet.png
-share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png
 share/icons/hicolor/svgxsvg/apps/gnome-eyes-applet
 share/icons/hicolor/svgxsvg/apps/gnome-sticky-notes-applet
 share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
@@ -623,6 +706,7 @@ share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 share/omf/accessx-status/accessx-status-C.omf
 share/omf/accessx-status/accessx-status-bg.omf
+share/omf/accessx-status/accessx-status-en_GB.omf
 share/omf/accessx-status/accessx-status-es.omf
 share/omf/accessx-status/accessx-status-fr.omf
 share/omf/accessx-status/accessx-status-it.omf
@@ -631,12 +715,15 @@ share/omf/accessx-status/accessx-status-sv.omf
 share/omf/accessx-status/accessx-status-uk.omf
 ${BATTSTAT}share/omf/battstat/battstat-C.omf
 ${BATTSTAT}share/omf/battstat/battstat-bg.omf
+${BATTSTAT}share/omf/battstat/battstat-en_GB.omf
 ${BATTSTAT}share/omf/battstat/battstat-es.omf
 ${BATTSTAT}share/omf/battstat/battstat-fr.omf
+${BATTSTAT}share/omf/battstat/battstat-pa.omf
 ${BATTSTAT}share/omf/battstat/battstat-sv.omf
 ${BATTSTAT}share/omf/battstat/battstat-uk.omf
 share/omf/char-palette/char-palette-C.omf
 share/omf/char-palette/char-palette-bg.omf
+share/omf/char-palette/char-palette-en_GB.omf
 share/omf/char-palette/char-palette-es.omf
 share/omf/char-palette/char-palette-fr.omf
 share/omf/char-palette/char-palette-it.omf
@@ -645,49 +732,58 @@ share/omf/char-palette/char-palette-pt_BR.omf
 share/omf/char-palette/char-palette-sv.omf
 share/omf/char-palette/char-palette-uk.omf
 share/omf/drivemount/drivemount-C.omf
+share/omf/drivemount/drivemount-en_GB.omf
 share/omf/drivemount/drivemount-es.omf
 share/omf/drivemount/drivemount-fr.omf
 share/omf/drivemount/drivemount-it.omf
 share/omf/drivemount/drivemount-pa.omf
+share/omf/drivemount/drivemount-ru.omf
 share/omf/drivemount/drivemount-sv.omf
 share/omf/drivemount/drivemount-uk.omf
 share/omf/drivemount/drivemount-zh_CN.omf
 share/omf/geyes/geyes-C.omf
 share/omf/geyes/geyes-bg.omf
+share/omf/geyes/geyes-en_GB.omf
 share/omf/geyes/geyes-es.omf
 share/omf/geyes/geyes-fr.omf
 share/omf/geyes/geyes-it.omf
 share/omf/geyes/geyes-ru.omf
 share/omf/geyes/geyes-sv.omf
 share/omf/geyes/geyes-uk.omf
-share/omf/gswitchit/gswitchit-C.omf
-share/omf/gswitchit/gswitchit-es.omf
-share/omf/gswitchit/gswitchit-fr.omf
-share/omf/gswitchit/gswitchit-sv.omf
-share/omf/gswitchit/gswitchit-uk.omf
 share/omf/gweather/gweather-C.omf
+share/omf/gweather/gweather-en_GB.omf
 share/omf/gweather/gweather-es.omf
 share/omf/gweather/gweather-fr.omf
 share/omf/gweather/gweather-nl.omf
+share/omf/gweather/gweather-pa.omf
 share/omf/gweather/gweather-sv.omf
 share/omf/gweather/gweather-uk.omf
 share/omf/mixer_applet2/mixer_applet2-C.omf
+share/omf/mixer_applet2/mixer_applet2-en_GB.omf
 share/omf/mixer_applet2/mixer_applet2-es.omf
 share/omf/mixer_applet2/mixer_applet2-fr.omf
 share/omf/mixer_applet2/mixer_applet2-it.omf
+share/omf/mixer_applet2/mixer_applet2-pa.omf
+share/omf/mixer_applet2/mixer_applet2-ru.omf
 share/omf/mixer_applet2/mixer_applet2-sv.omf
 share/omf/mixer_applet2/mixer_applet2-uk.omf
 share/omf/multiload/multiload-C.omf
+share/omf/multiload/multiload-en_GB.omf
 share/omf/multiload/multiload-es.omf
 share/omf/multiload/multiload-fr.omf
+share/omf/multiload/multiload-pa.omf
+share/omf/multiload/multiload-ru.omf
 share/omf/multiload/multiload-sv.omf
 share/omf/multiload/multiload-uk.omf
 share/omf/stickynotes_applet/stickynotes_applet-C.omf
+share/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
 share/omf/stickynotes_applet/stickynotes_applet-es.omf
 share/omf/stickynotes_applet/stickynotes_applet-fr.omf
+share/omf/stickynotes_applet/stickynotes_applet-pa.omf
 share/omf/stickynotes_applet/stickynotes_applet-sv.omf
 share/omf/stickynotes_applet/stickynotes_applet-uk.omf
 share/omf/trashapplet/trashapplet-C.omf
+share/omf/trashapplet/trashapplet-en_GB.omf
 share/omf/trashapplet/trashapplet-es.omf
 share/omf/trashapplet/trashapplet-fr.omf
 share/omf/trashapplet/trashapplet-it.omf
@@ -832,15 +928,12 @@ share/xmodmap/xmodmap.yu
 @dirrm share/omf/multiload
 @dirrm share/omf/mixer_applet2
 @dirrm share/omf/gweather
-@dirrm share/omf/gswitchit
 @dirrm share/omf/geyes
 @dirrm share/omf/drivemount
 @dirrm share/omf/char-palette
 ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/omf/accessx-status
 @comment in scrollkeeper: @dirrm share/omf
-@dirrm share/icons/hicolor/svgxsvg/apps
-@dirrm share/icons/hicolor/svgxsvg
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
@@ -863,6 +956,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/trashapplet/fr
 @dirrm share/gnome/help/trashapplet/es/figures
 @dirrm share/gnome/help/trashapplet/es
+@dirrm share/gnome/help/trashapplet/en_GB/figures
+@dirrm share/gnome/help/trashapplet/en_GB
 @dirrm share/gnome/help/trashapplet/C/figures
 @dirrm share/gnome/help/trashapplet/C
 @dirrm share/gnome/help/trashapplet
@@ -870,10 +965,14 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/stickynotes_applet/uk
 @dirrm share/gnome/help/stickynotes_applet/sv/figures
 @dirrm share/gnome/help/stickynotes_applet/sv
+@dirrm share/gnome/help/stickynotes_applet/pa/figures
+@dirrm share/gnome/help/stickynotes_applet/pa
 @dirrm share/gnome/help/stickynotes_applet/fr/figures
 @dirrm share/gnome/help/stickynotes_applet/fr
 @dirrm share/gnome/help/stickynotes_applet/es/figures
 @dirrm share/gnome/help/stickynotes_applet/es
+@dirrm share/gnome/help/stickynotes_applet/en_GB/figures
+@dirrm share/gnome/help/stickynotes_applet/en_GB
 @dirrm share/gnome/help/stickynotes_applet/C/figures
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
@@ -881,10 +980,16 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/multiload/uk
 @dirrm share/gnome/help/multiload/sv/figures
 @dirrm share/gnome/help/multiload/sv
+@dirrm share/gnome/help/multiload/ru/figures
+@dirrm share/gnome/help/multiload/ru
+@dirrm share/gnome/help/multiload/pa/figures
+@dirrm share/gnome/help/multiload/pa
 @dirrm share/gnome/help/multiload/fr/figures
 @dirrm share/gnome/help/multiload/fr
 @dirrm share/gnome/help/multiload/es/figures
 @dirrm share/gnome/help/multiload/es
+@dirrm share/gnome/help/multiload/en_GB/figures
+@dirrm share/gnome/help/multiload/en_GB
 @dirrm share/gnome/help/multiload/C/figures
 @dirrm share/gnome/help/multiload/C
 @dirrm share/gnome/help/multiload
@@ -892,12 +997,18 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/mixer_applet2/uk
 @dirrm share/gnome/help/mixer_applet2/sv/figures
 @dirrm share/gnome/help/mixer_applet2/sv
+@dirrm share/gnome/help/mixer_applet2/ru/figures
+@dirrm share/gnome/help/mixer_applet2/ru
+@dirrm share/gnome/help/mixer_applet2/pa/figures
+@dirrm share/gnome/help/mixer_applet2/pa
 @dirrm share/gnome/help/mixer_applet2/it/figures
 @dirrm share/gnome/help/mixer_applet2/it
 @dirrm share/gnome/help/mixer_applet2/fr/figures
 @dirrm share/gnome/help/mixer_applet2/fr
 @dirrm share/gnome/help/mixer_applet2/es/figures
 @dirrm share/gnome/help/mixer_applet2/es
+@dirrm share/gnome/help/mixer_applet2/en_GB/figures
+@dirrm share/gnome/help/mixer_applet2/en_GB
 @dirrm share/gnome/help/mixer_applet2/C/figures
 @dirrm share/gnome/help/mixer_applet2/C
 @dirrm share/gnome/help/mixer_applet2
@@ -905,21 +1016,19 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/gweather/uk
 @dirrm share/gnome/help/gweather/sv/figures
 @dirrm share/gnome/help/gweather/sv
+@dirrm share/gnome/help/gweather/pa/figures
+@dirrm share/gnome/help/gweather/pa
 @dirrm share/gnome/help/gweather/nl/figures
 @dirrm share/gnome/help/gweather/nl
 @dirrm share/gnome/help/gweather/fr/figures
 @dirrm share/gnome/help/gweather/fr
 @dirrm share/gnome/help/gweather/es/figures
 @dirrm share/gnome/help/gweather/es
+@dirrm share/gnome/help/gweather/en_GB/figures
+@dirrm share/gnome/help/gweather/en_GB
 @dirrm share/gnome/help/gweather/C/figures
 @dirrm share/gnome/help/gweather/C
 @dirrm share/gnome/help/gweather
-@dirrm share/gnome/help/gswitchit/uk
-@dirrm share/gnome/help/gswitchit/sv
-@dirrm share/gnome/help/gswitchit/fr
-@dirrm share/gnome/help/gswitchit/es
-@dirrm share/gnome/help/gswitchit/C
-@dirrm share/gnome/help/gswitchit
 @dirrm share/gnome/help/geyes/uk/figures
 @dirrm share/gnome/help/geyes/uk
 @dirrm share/gnome/help/geyes/sv/figures
@@ -932,6 +1041,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/geyes/fr
 @dirrm share/gnome/help/geyes/es/figures
 @dirrm share/gnome/help/geyes/es
+@dirrm share/gnome/help/geyes/en_GB/figures
+@dirrm share/gnome/help/geyes/en_GB
 @dirrm share/gnome/help/geyes/bg/figures
 @dirrm share/gnome/help/geyes/bg
 @dirrm share/gnome/help/geyes/C/figures
@@ -943,6 +1054,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/drivemount/uk
 @dirrm share/gnome/help/drivemount/sv/figures
 @dirrm share/gnome/help/drivemount/sv
+@dirrm share/gnome/help/drivemount/ru/figures
+@dirrm share/gnome/help/drivemount/ru
 @dirrm share/gnome/help/drivemount/pa/figures
 @dirrm share/gnome/help/drivemount/pa
 @dirrm share/gnome/help/drivemount/it/figures
@@ -951,6 +1064,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/drivemount/fr
 @dirrm share/gnome/help/drivemount/es/figures
 @dirrm share/gnome/help/drivemount/es
+@dirrm share/gnome/help/drivemount/en_GB/figures
+@dirrm share/gnome/help/drivemount/en_GB
 @dirrm share/gnome/help/drivemount/C/figures
 @dirrm share/gnome/help/drivemount/C
 @dirrm share/gnome/help/drivemount
@@ -968,6 +1083,8 @@ ${BATTSTAT}@dirrm share/omf/battstat
 @dirrm share/gnome/help/char-palette/fr
 @dirrm share/gnome/help/char-palette/es/figures
 @dirrm share/gnome/help/char-palette/es
+@dirrm share/gnome/help/char-palette/en_GB/figures
+@dirrm share/gnome/help/char-palette/en_GB
 @dirrm share/gnome/help/char-palette/bg/figures
 @dirrm share/gnome/help/char-palette/bg
 @dirrm share/gnome/help/char-palette/C/figures
@@ -977,10 +1094,14 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat/uk/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/uk
 ${BATTSTAT}@dirrm share/gnome/help/battstat/sv/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/sv
+${BATTSTAT}@dirrm share/gnome/help/battstat/pa/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/pa
 ${BATTSTAT}@dirrm share/gnome/help/battstat/fr/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/fr
 ${BATTSTAT}@dirrm share/gnome/help/battstat/es/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/es
+${BATTSTAT}@dirrm share/gnome/help/battstat/en_GB/figures
+${BATTSTAT}@dirrm share/gnome/help/battstat/en_GB
 ${BATTSTAT}@dirrm share/gnome/help/battstat/bg/figures
 ${BATTSTAT}@dirrm share/gnome/help/battstat/bg
 ${BATTSTAT}@dirrm share/gnome/help/battstat/C/figures
@@ -998,6 +1119,8 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat
 @dirrm share/gnome/help/accessx-status/fr
 @dirrm share/gnome/help/accessx-status/es/figures
 @dirrm share/gnome/help/accessx-status/es
+@dirrm share/gnome/help/accessx-status/en_GB/figures
+@dirrm share/gnome/help/accessx-status/en_GB
 @dirrm share/gnome/help/accessx-status/bg/figures
 @dirrm share/gnome/help/accessx-status/bg
 @dirrm share/gnome/help/accessx-status/C/figures
@@ -1019,7 +1142,5 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat
 ${BATTSTAT}@dirrm share/examples/gnome-applets/sound/events
 ${BATTSTAT}@dirrm share/examples/gnome-applets/sound
 ${BATTSTAT}@dirrm share/examples/gnome-applets
-@comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/libgweather
-@dirrm include/libgswitchit
diff --git a/x11/gnome2-applets/distinfo b/x11/gnome2-applets/distinfo
index ef9eafa76df..8c42d4d28b2 100644
--- a/x11/gnome2-applets/distinfo
+++ b/x11/gnome2-applets/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.22 2007/04/05 19:03:02 wiz Exp $
+$NetBSD: distinfo,v 1.23 2007/04/11 18:28:14 drochner Exp $
 
-SHA1 (gnome-applets-2.16.2.tar.bz2) = 8b912c21e7c390c9aae96bb81fe017fa1f9bf006
-RMD160 (gnome-applets-2.16.2.tar.bz2) = b8706c57b37702b0bfc64cb549fc594b05da5e5b
-Size (gnome-applets-2.16.2.tar.bz2) = 7127753 bytes
+SHA1 (gnome-applets-2.18.0.tar.bz2) = 7bec1f642e827634f74859e81e1502799d3c05a2
+RMD160 (gnome-applets-2.18.0.tar.bz2) = c9a18c717fd01ede9476a70784a8522968e52211
+Size (gnome-applets-2.18.0.tar.bz2) = 7133902 bytes
 SHA1 (patch-aa) = d4683f2d1273c4202ee336be436b9fd237610b7b
 SHA1 (patch-ab) = f880abec6df2254b6541d4e5a894559763ef674b
 SHA1 (patch-ac) = 8244d73dd62973fdc022947a62e9ce6211a3561b
 SHA1 (patch-ad) = 42fb64b30a031a1ea8f57f47cabdf63475b7987e
-SHA1 (patch-ba) = 326aaacd55fa6644882a2888e3c43ba7dbee4f19
diff --git a/x11/gnome2-applets/patches/patch-ba b/x11/gnome2-applets/patches/patch-ba
deleted file mode 100644
index d9ecb3e8cfe..00000000000
--- a/x11/gnome2-applets/patches/patch-ba
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2007/04/05 19:03:02 wiz Exp $
-
---- gswitchit/help/C/gswitchit.xml.orig	2007-04-05 18:06:35.000000000 +0000
-+++ gswitchit/help/C/gswitchit.xml
-@@ -45,6 +45,13 @@ Template last modified Feb 12, 2002
-     <publishername>GNOME Documentation Project</publishername> 
-   </publisher> 
- 
-+  <revhistory>
-+    <revision>
-+      <revnumber>2.8</revnumber>
-+      <date>2004-08</date>
-+    </revision>
-+  </revhistory>
-+
-   &legal;
-   <!-- This file  contains link to license for the documentation (GNU FDL), and 
-        other legal stuff such as "NO WARRANTY" statement. Please do not change