[pkgsrc/trunk]: pkgsrc/x11/gnome2-applets update to 2.18.0

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44b9b3c51e90
branches:  trunk
changeset: 527663:44b9b3c51e90
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Apr 11 18:28:13 2007 +0000

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

diffstat:

 x11/gnome2-applets/Makefile         |   27 +----
 x11/gnome2-applets/PLIST            |  201 ++++++++++++++++++++++++++++-------
 x11/gnome2-applets/distinfo         |    9 +-
 x11/gnome2-applets/patches/patch-ba |   18 ---
 4 files changed, 169 insertions(+), 86 deletions(-)

diffs (truncated from 657 to 300 lines):

diff -r d0b504724bf9 -r 44b9b3c51e90 x11/gnome2-applets/Makefile
--- a/x11/gnome2-applets/Makefile       Wed Apr 11 18:26:27 2007 +0000
+++ b/x11/gnome2-applets/Makefile       Wed Apr 11 18:28:13 2007 +0000
@@ -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@localhost
@@ -20,24 +19,6 @@
 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 @@
 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 -r d0b504724bf9 -r 44b9b3c51e90 x11/gnome2-applets/PLIST
--- a/x11/gnome2-applets/PLIST  Wed Apr 11 18:26:27 2007 +0000
+++ b/x11/gnome2-applets/PLIST  Wed Apr 11 18:28:13 2007 +0000
@@ -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_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_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 @@
 ${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/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-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-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-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_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_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_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/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/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-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-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/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.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