Update to 2.24.1:

Changes in GNOME-Applets 2.24.1
===============================

Battery Applet, Mini-Commander, Stickynotes
 - Fix up the page_size attribute on the adjustments to get around
   potential problems with a GTK+ change.

Drivemount
 - Support drives that require authentication (Matthias Clasen).

Invest Applet
 - Avoid crashes on bad data.

Battery Applet, CPU Frequency Applet, Invest Applet, Keyboard Applet,
Mini Commander, Modem Lights, Stickynotes, Trash Applet
 - Ensure dialogs generated with GtkBuilder are traslated

Translations:
 - gl, sv, cs, sl, ar, pt_BR, ca, th, fr, es, it, hu, ko, zh_HK, zh_TW, et

Documentations Translations:
 - el, zh_HK, zh_TW

6 files changed, 136 insertions, 126 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index a54c83c28c6..ccd84e6f08e 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2008/10/16 15:28:13 drochner Exp $
+# $NetBSD: Makefile,v 1.63 2008/10/27 04:23:01 wiz Exp $
 #
 
-DISTNAME=		gnome-applets-2.24.0.1
+DISTNAME=		gnome-applets-2.24.1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.24/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,14 +21,10 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-applets
-PKG_SUPPORTED_OPTIONS=	inet6
-.include "../../mk/bsd.options.mk"
+.include "options.mk"
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
-PKGCONFIG_OVERRIDE+=	libgswitchit/gswitchit.pc.in
-
 EGDIR=			${PREFIX}/share/examples/gnome-applets
 
 GCONF_SCHEMAS=		charpick.schemas
@@ -41,12 +37,6 @@ GCONF_SCHEMAS+=	stickynotes.schemas
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
 PLIST_VARS+=		battstat
 .if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
     (${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h))
@@ -73,46 +63,47 @@ PRINT_PLIST_AWK+=	/[Cc][Pp][Uu][Ff]req/ { print "$${CPUFREQ}"$$0; next; }
 
 .include "../../devel/GConf/schemas.mk"
 
-BUILDLINK_API_DEPENDS.glib2+=			glib2>=2.6.0
-BUILDLINK_API_DEPENDS.libglade+=		libglade>=2.4.0
-BUILDLINK_API_DEPENDS.gstreamer0.10+=		gstreamer0.10>=0.10.2
-BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.2
-BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.16.0
-BUILDLINK_API_DEPENDS.gnome-vfs+=		gnome-vfs>=2.16.0
-BUILDLINK_API_DEPENDS.gnome-panel+=		gnome-panel>=2.13.4
-BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.6.0
-
 PY_PATCHPLIST=	yes
 PYTHON_PATCH_SCRIPTS+=	invest-applet/invest/invest-applet.py
 PYTHON_PATCH_SCRIPTS+=	invest-applet/invest/invest-chart
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=			glib2>=2.18.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgweather+=	libgweather>=2.22.1
+.include "../../devel/libgweather/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../fonts/gucharmap/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.15.91
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.2
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gstreamer0.10+=		gstreamer0.10>=0.10.2
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+BUILDLINK_API_DEPENDS.dbus+=	dbus>=1.1.2
+.include "../../sysutils/dbus/buildlink3.mk"
+BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gnome-control-center/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-panel+=	gnome-panel>=2.13.4
 .include "../../x11/gnome-panel/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.13.0
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libgnomekbd/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../x11/py-gnome2/buildlink3.mk"
 .include "../../x11/py-gnome2-desktop/buildlink3.mk"
-.include "../../devel/libgweather/buildlink3.mk"
+.include "../../x11/py-gnome2/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-applets/PLIST b/x11/gnome-applets/PLIST
index 14b00cfbcf8..7aa10a3fc9d 100644
--- a/x11/gnome-applets/PLIST
+++ b/x11/gnome-applets/PLIST
@@ -1,22 +1,5 @@
-@comment $NetBSD: PLIST,v 1.16 2008/10/16 15:28:13 drochner Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/10/27 04:23:01 wiz Exp $
 bin/invest-chart
-lib/bonobo/servers/GNOME_AccessxStatusApplet.server
-${PLIST.battstat}lib/bonobo/servers/GNOME_BattstatApplet.server
-lib/bonobo/servers/GNOME_CDPlayerApplet.server
-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_GtikApplet.server
-lib/bonobo/servers/GNOME_MailcheckApplet_Factory.server
-lib/bonobo/servers/GNOME_MiniCommanderApplet.server
-lib/bonobo/servers/GNOME_MixerApplet.server
-lib/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
-lib/bonobo/servers/GNOME_NullApplet_Factory.server
-lib/bonobo/servers/GNOME_Panel_TrashApplet.server
-lib/bonobo/servers/GNOME_Panel_WirelessApplet.server
-lib/bonobo/servers/GNOME_StickyNotesApplet.server
-lib/bonobo/servers/Invest_Applet.server
 ${PYSITELIB}/invest/__init__.py
 ${PYSITELIB}/invest/__init__.pyc
 ${PYSITELIB}/invest/__init__.pyo
@@ -41,11 +24,30 @@ ${PYSITELIB}/invest/quotes.pyo
 ${PYSITELIB}/invest/widgets.py
 ${PYSITELIB}/invest/widgets.pyc
 ${PYSITELIB}/invest/widgets.pyo
+lib/bonobo/servers/GNOME_AccessxStatusApplet.server
+${PLIST.battstat}lib/bonobo/servers/GNOME_BattstatApplet.server
+lib/bonobo/servers/GNOME_CDPlayerApplet.server
+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_GtikApplet.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
+lib/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
+lib/bonobo/servers/GNOME_NullApplet_Factory.server
+lib/bonobo/servers/GNOME_Panel_TrashApplet.server
+lib/bonobo/servers/GNOME_Panel_WirelessApplet.server
+lib/bonobo/servers/GNOME_StickyNotesApplet.server
+lib/bonobo/servers/Invest_Applet.server
 libexec/accessx-status-applet
 ${PLIST.battstat}libexec/battstat-applet-2
 libexec/charpick_applet2
 libexec/drivemount_applet2
 libexec/geyes_applet2
+libexec/gnome-keyboard-applet
 libexec/gweather-applet-2
 libexec/invest-applet
 libexec/mixer_applet2
@@ -65,6 +67,7 @@ share/gnome-2.0/ui/GNOME_AccessxApplet.xml
 ${PLIST.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
@@ -74,6 +77,7 @@ share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
 share/gnome-2.0/ui/Invest_Applet.xml
 ${PLIST.battstat}share/gnome-applets/builder/battstat_applet.ui
 share/gnome-applets/builder/financialchart.ui
+share/gnome-applets/builder/gswitchit.ui
 share/gnome-applets/builder/prefs-dialog.ui
 share/gnome-applets/builder/stickynotes.ui
 share/gnome-applets/builder/trashapplet-empty-progress.ui
@@ -139,6 +143,18 @@ share/gnome/help/accessx-status/ca/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/ca/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/ca/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/ca/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/el/accessx-status.xml
+share/gnome/help/accessx-status/el/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/el/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/el/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/el/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/el/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/el/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/el/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
@@ -524,6 +540,18 @@ 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/ca/gswitchit.xml
+share/gnome/help/gswitchit/el/gswitchit.xml
+share/gnome/help/gswitchit/en_GB/gswitchit.xml
+share/gnome/help/gswitchit/es/gswitchit.xml
+share/gnome/help/gswitchit/fi/gswitchit.xml
+share/gnome/help/gswitchit/fr/gswitchit.xml
+share/gnome/help/gswitchit/oc/gswitchit.xml
+share/gnome/help/gswitchit/ru/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
@@ -722,6 +750,7 @@ share/gnome/help/gweather/uk/figures/stock_weather-sunny.png
 share/gnome/help/gweather/uk/gweather.xml
 share/gnome/help/invest-applet/C/invest-applet.xml
 share/gnome/help/invest-applet/C/legal.xml
+share/gnome/help/invest-applet/el/invest-applet.xml
 share/gnome/help/invest-applet/es/invest-applet.xml
 share/gnome/help/invest-applet/fi/invest-applet.xml
 share/gnome/help/invest-applet/sv/invest-applet.xml
@@ -787,6 +816,10 @@ share/gnome/help/multiload/ko/figures/multiload-preferences.png
 share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/ko/figures/system_monitor.png
 share/gnome/help/multiload/ko/multiload.xml
+share/gnome/help/multiload/nl/figures/multiload-preferences.png
+share/gnome/help/multiload/nl/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/nl/figures/system_monitor.png
+share/gnome/help/multiload/nl/multiload.xml
 share/gnome/help/multiload/oc/figures/multiload-preferences.png
 share/gnome/help/multiload/oc/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/oc/figures/system_monitor.png
@@ -933,6 +966,10 @@ share/gnome/help/trashapplet/sv/figures/trash-applet.png
 share/gnome/help/trashapplet/sv/trashapplet.xml
 share/gnome/help/trashapplet/uk/figures/trash-applet.png
 share/gnome/help/trashapplet/uk/trashapplet.xml
+share/gnome/help/trashapplet/zh_HK/figures/trash-applet.png
+share/gnome/help/trashapplet/zh_HK/trashapplet.xml
+share/gnome/help/trashapplet/zh_TW/figures/trash-applet.png
+share/gnome/help/trashapplet/zh_TW/trashapplet.xml
 share/icons/hicolor/16x16/apps/gnome-eyes-applet.png
 share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png
 share/icons/hicolor/16x16/apps/invest-applet.png
@@ -1051,6 +1088,7 @@ 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-ca.omf
+share/omf/accessx-status/accessx-status-el.omf
 share/omf/accessx-status/accessx-status-en_GB.omf
 share/omf/accessx-status/accessx-status-es.omf
 share/omf/accessx-status/accessx-status-fi.omf
@@ -1117,6 +1155,17 @@ share/omf/geyes/geyes-oc.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-ca.omf
+share/omf/gswitchit/gswitchit-el.omf
+share/omf/gswitchit/gswitchit-en_GB.omf
+share/omf/gswitchit/gswitchit-es.omf
+share/omf/gswitchit/gswitchit-fi.omf
+share/omf/gswitchit/gswitchit-fr.omf
+share/omf/gswitchit/gswitchit-oc.omf
+share/omf/gswitchit/gswitchit-ru.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
@@ -1131,6 +1180,7 @@ share/omf/gweather/gweather-ru.omf
 share/omf/gweather/gweather-sv.omf
 share/omf/gweather/gweather-uk.omf
 share/omf/invest-applet/invest-applet-C.omf
+share/omf/invest-applet/invest-applet-el.omf
 share/omf/invest-applet/invest-applet-es.omf
 share/omf/invest-applet/invest-applet-fi.omf
 share/omf/invest-applet/invest-applet-sv.omf
@@ -1157,6 +1207,7 @@ share/omf/multiload/multiload-es.omf
 share/omf/multiload/multiload-fi.omf
 share/omf/multiload/multiload-fr.omf
 share/omf/multiload/multiload-ko.omf
+share/omf/multiload/multiload-nl.omf
 share/omf/multiload/multiload-oc.omf
 share/omf/multiload/multiload-pa.omf
 share/omf/multiload/multiload-pt_BR.omf
@@ -1195,6 +1246,8 @@ share/omf/trashapplet/trashapplet-pt_BR.omf
 share/omf/trashapplet/trashapplet-ru.omf
 share/omf/trashapplet/trashapplet-sv.omf
 share/omf/trashapplet/trashapplet-uk.omf
+share/omf/trashapplet/trashapplet-zh_HK.omf
+share/omf/trashapplet/trashapplet-zh_TW.omf
 share/pixmaps/accessx-status-applet/ax-applet.png
 share/pixmaps/accessx-status-applet/ax-bouncekeys.png
 share/pixmaps/accessx-status-applet/ax-key-base.png
@@ -1332,6 +1385,7 @@ share/xmodmap/xmodmap.yu
 @dirrm share/omf/mixer_applet2
 @dirrm share/omf/invest-applet
 @dirrm share/omf/gweather
+@dirrm share/omf/gswitchit
 @dirrm share/omf/geyes
 @dirrm share/omf/drivemount
 @dirrm share/omf/char-palette
@@ -1346,6 +1400,10 @@ ${PLIST.battstat}@dirrm share/omf/battstat
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/trashapplet/uk/figures
+@dirrm share/gnome/help/trashapplet/zh_TW/figures
+@dirrm share/gnome/help/trashapplet/zh_TW
+@dirrm share/gnome/help/trashapplet/zh_HK/figures
+@dirrm share/gnome/help/trashapplet/zh_HK
 @dirrm share/gnome/help/trashapplet/uk
 @dirrm share/gnome/help/trashapplet/sv/figures
 @dirrm share/gnome/help/trashapplet/sv
@@ -1423,6 +1481,8 @@ ${PLIST.battstat}@dirrm share/omf/battstat
 @dirrm share/gnome/help/multiload/pa
 @dirrm share/gnome/help/multiload/oc/figures
 @dirrm share/gnome/help/multiload/oc
+@dirrm share/gnome/help/multiload/nl/figures
+@dirrm share/gnome/help/multiload/nl
 @dirrm share/gnome/help/multiload/ko/figures
 @dirrm share/gnome/help/multiload/ko
 @dirrm share/gnome/help/multiload/fr/figures
@@ -1474,6 +1534,7 @@ ${PLIST.battstat}@dirrm share/omf/battstat
 @dirrm share/gnome/help/invest-applet/sv
 @dirrm share/gnome/help/invest-applet/fi
 @dirrm share/gnome/help/invest-applet/es
+@dirrm share/gnome/help/invest-applet/el
 @dirrm share/gnome/help/invest-applet/C
 @dirrm share/gnome/help/invest-applet
 @dirrm share/gnome/help/gweather/uk/figures
@@ -1503,6 +1564,18 @@ ${PLIST.battstat}@dirrm share/omf/battstat
 @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/ru
+@dirrm share/gnome/help/gswitchit/oc
+@dirrm share/gnome/help/gswitchit/fr
+@dirrm share/gnome/help/gswitchit/fi
+@dirrm share/gnome/help/gswitchit/es
+@dirrm share/gnome/help/gswitchit/en_GB
+@dirrm share/gnome/help/gswitchit/el
+@dirrm share/gnome/help/gswitchit/ca
+@dirrm share/gnome/help/gswitchit/C
+@dirrm share/gnome/help/gswitchit
 @dirrm share/gnome/help/geyes/uk/figures
 @dirrm share/gnome/help/geyes/uk
 @dirrm share/gnome/help/geyes/sv/figures
@@ -1639,6 +1712,8 @@ ${PLIST.battstat}@dirrm share/gnome/help/battstat
 @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/el/figures
+@dirrm share/gnome/help/accessx-status/el
 @dirrm share/gnome/help/accessx-status/ca/figures
 @dirrm share/gnome/help/accessx-status/ca
 @dirrm share/gnome/help/accessx-status/bg/figures
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index c0d69b1c151..399ed102e22 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.16 2008/10/16 15:28:13 drochner Exp $
+$NetBSD: distinfo,v 1.17 2008/10/27 04:23:01 wiz Exp $
 
-SHA1 (gnome-applets-2.24.0.1.tar.bz2) = eda6719b05acb33c2b7ccdfd9f9e82031be036e8
-RMD160 (gnome-applets-2.24.0.1.tar.bz2) = 36dfb599e86d7dcbf835c236c109fddeb1d3d330
-Size (gnome-applets-2.24.0.1.tar.bz2) = 7576056 bytes
-SHA1 (patch-aa) = a85cd943aa982c385b01e24cb2f867e4cba71685
+SHA1 (gnome-applets-2.24.1.tar.bz2) = 16d715fb437378ea26236699bea0cdd0e253c798
+RMD160 (gnome-applets-2.24.1.tar.bz2) = aba4c1744e0e9c888c87b6a0c982cf125bf184fa
+Size (gnome-applets-2.24.1.tar.bz2) = 7489513 bytes
+SHA1 (patch-aa) = 331bd330c6a19ba1647f302419374e140c269d95
 SHA1 (patch-ab) = f880abec6df2254b6541d4e5a894559763ef674b
-SHA1 (patch-ac) = 19daa453e0144d5d389451f3a0eb930b7f66e075
 SHA1 (patch-ad) = 42fb64b30a031a1ea8f57f47cabdf63475b7987e
diff --git a/x11/gnome-applets/options.mk b/x11/gnome-applets/options.mk
new file mode 100644
index 00000000000..9b3d7ec2a99
--- /dev/null
+++ b/x11/gnome-applets/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2008/10/27 04:23:01 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-applets
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
diff --git a/x11/gnome-applets/patches/patch-aa b/x11/gnome-applets/patches/patch-aa
index decc920146e..a05946cd4f3 100644
--- a/x11/gnome-applets/patches/patch-aa
+++ b/x11/gnome-applets/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.7 2008/10/16 15:28:13 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2008/10/27 04:23:01 wiz Exp $
 
---- battstat/sounds/Makefile.in.orig	2008-09-24 18:45:43.000000000 +0200
+--- battstat/sounds/Makefile.in.orig	2008-09-25 23:51:38.000000000 +0000
 +++ battstat/sounds/Makefile.in
-@@ -305,7 +305,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -306,7 +306,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -soundlistdir = $(sysconfdir)/sound/events
diff --git a/x11/gnome-applets/patches/patch-ac b/x11/gnome-applets/patches/patch-ac
deleted file mode 100644
index 4d1fff663ce..00000000000
--- a/x11/gnome-applets/patches/patch-ac
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2008/10/16 15:28:13 drochner Exp $
-
---- configure.orig	2008-09-24 18:45:40.000000000 +0200
-+++ configure
-@@ -26245,7 +26245,7 @@ _ACEOF
- 
-   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_dir=`eval echo $"${datadir}/locale"`
-+  ac_define_dir=`eval echo "${datadir}/locale"`
-   ac_define_dir=`eval echo $ac_define_dir`
-   GNOMELOCALEDIR="$ac_define_dir"
- 
-@@ -29784,7 +29784,7 @@ builderdir="${pkgdatadir}/builder"
- 
-   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_dir=`eval echo $"${iconsdir}"`
-+  ac_define_dir=`eval echo "${iconsdir}"`
-   ac_define_dir=`eval echo $ac_define_dir`
-   GNOME_ICONDIR="$ac_define_dir"
- 
-@@ -29797,7 +29797,7 @@ _ACEOF
- 
-   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_dir=`eval echo $"${pixmapsdir}"`
-+  ac_define_dir=`eval echo "${pixmapsdir}"`
-   ac_define_dir=`eval echo $ac_define_dir`
-   GNOME_PIXMAPSDIR="$ac_define_dir"
- 
-@@ -29823,7 +29823,7 @@ _ACEOF
- 
-   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_dir=`eval echo $"${datadir}"`
-+  ac_define_dir=`eval echo "${datadir}"`
-   ac_define_dir=`eval echo $ac_define_dir`
-   DATADIR="$ac_define_dir"
- 
-@@ -29836,7 +29836,7 @@ _ACEOF
- 
-   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_dir=`eval echo $"${sysconfdir}"`
-+  ac_define_dir=`eval echo "${sysconfdir}"`
-   ac_define_dir=`eval echo $ac_define_dir`
-   SYSCONFDIR="$ac_define_dir"
- 
-@@ -29849,7 +29849,7 @@ _ACEOF
- 
-   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_dir=`eval echo $"${libdir}"`
-+  ac_define_dir=`eval echo "${libdir}"`
-   ac_define_dir=`eval echo $ac_define_dir`
-   LIBDIR="$ac_define_dir"
- 
-@@ -29862,7 +29862,7 @@ _ACEOF
- 
-   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_dir=`eval echo $"$prefix"`
-+  ac_define_dir=`eval echo "$prefix"`
-   ac_define_dir=`eval echo $ac_define_dir`
-   PREFIX="$ac_define_dir"
-