Update to 2.6.0. Changes since previous stable branch (2.4.x):

Changes in GNOME-Applets 2.5.90
===============================

Overall
* Major docs updates and cleanups. (Glynn Foster, SUN Microsystems doc team)
* Build tree cleanups. (Glynn Foster)

Translations
* Brazilian (Raphael Higino)
* Russian (Leonid Kanter)
* Bengali (Sayamindu Dasgupta)
* Dutch (Elros Cyriatan)

Changes in GNOME-Applets 2.5.8
==============================
Needs to be updated.

Changes in GNOME-Applets 2.5.7
==============================
Needs to be updated.

Changes in GNOME-Applets 2.5.6
==============================

Overall
* Docs updates (Breda McColgan)
* BSD fixes - bug #134654 (Julio M. Merino Vidal)
* Fix disable-schemas_install (Jason Leach)
* Fix cleaning up .servin.in files - bug #132071 (Jason, Padraig O'Briain)
* Depracation fixes (Kjartan Maraas)
* Fix compilation - bug #133213 (Alexander Winston)
* Add documentor credits (Chee Bin Hoh)

Battery Charge Monitor
* BSD fixes - bug #134661 (Julio M. Merino Vidal)

CD Player
* BSD fixes - bug #134657 (Julio M. Merino Vidal)
* Reduce cpu useage with accesability on - bug #133619 (Pardraig O'Briain)

Character Palette
* Multihead fix - bug #133587 (Dennis)

Disk Mounter
* multihead fixes - bug #134019 (Dennis Smit)

Geyes
* Allow for user installed themes in home directory - bug #122872 (Dennis)
* properly install themes - bug #133100 (Chee Bin Hoh)

GKB
* Keypress fixes - bug #101960 (Egmont Koblinger)

GSwitchit
* Multihead awareness - bug #134025 (Dennis Smit)
* HIG fixes - bugs #133701, 133702, 133570 (Dennis Cranston)
* Fix keynav - bug #132851 (Padraig)

Inbox Monitor
* Fix auto updateing - bug #131407 (Srinivasa Ragavan)
* Gettext fixes - bug #134398 (Gustavo)
* Fix multihead issues - bug #111837 (Leena Gunda)

Keyboard Assesibility
* Fix bug #124153 (Kjartan Maraas)
* mark strings for translation - bug #132579 (Kjartan)

Modem Lights
* Multihead fixes (Dennis)

Stickynotes
* Gconf snaity checks - bug #124024 (Kevin Vandersloot)
* Fix initial placement of notes - bug #125675 (Kevin)
* Multihead fixes - bug #128258 (Dennis, Leena Gunda )

Stock Ticker
* Fix compilation (Jody Goldberg)
* Fix data retrieval - bug #123125  Remi Cohen-Scali.

System Monitor
* install and fix docs - bug #87496 (Dennis, Alexander Winston)

Volume Control
* Fix hadow type - bug #133136 (Richard Hult)

Weather Monitor
* Fix help - bug #134826 (Vijaykumar Patwari)
* More Swedish locations - bug 134479 (Andre Dahlgvist)
* Add Ukraine locations - bug #126101 (Yury Umanets)
* Fix wind display direction - bug #132230 (corwashere yahoo com)
* Divide areas into regions, states, cities etc - bug #81391 (Michael Terry)

Translations
* Albanian (Elian Myftiu)
* Arabic (Arafat Medini)
* Canadian English (Adam Weinberger)
* Croation (Robert Sedak)
* Czech (Miloslav Trmac)
* Danish (Ole Laursen)
* Dutch (Vincent van Adrighem)
* Finnish (Jarkko Ranta)
* French (Christophe Merlet)
* German (Christian Neumair)
* Greek (Kostas Papadimas, Nikos Charonitakis)
* Irish (Alastair McKinstry)
* Italian (Leandro sul clementino)
* Japanese (T.Aihana)
* Lithuanian (Zygimantas Berucka)
* Korean (Changwoo Ryu)
* Malay (Hasbullah Bin Pit)
* Norwegian (Kjartan Maraas)
* Polish (GNOME PL Team)
* Portuguese (Duarte Loreto)
* Serbian (Danilo Segan)
* Spanish (Francisco Javier F. Serrador)
* Ukrainian (Maxim Dziumanenko)

Changes in GNOME-Applets 2.5.5
==============================

Overall
* Keynav (Bill Haneman)
* Help fixes (Chee Bin HOH)
* Docs update (Breda McColgan)
* Generalize the way about windows are handled
  between all applets (Archana Shah, Dennis Smit)
* Multi head fixes (Arvind Samptur)
* Build fixes (Jason Leach)
* UI fixes (Sergey V. Oudaltsov, Calum Benson, Shakti Sen)
* I18N fixes (Maxim Dziumanenko)

Gweather
* Fix help, Bug #131894 (Muktha Narayan)
* Add support for forecasts from the Australian Bureau of Meteorology (James Henstridge)

Geyes
* Popup an error dialog when there is a major problem
  with the theme files, Bug #132635 (Dennis Smit)

Mini Commander
* Fix crasher bug #132270 (Fernando Herrera)

Charpick
* Removed "Add a palette.." item from pop
  down menu. Fixes #131887 and #129757 (Michael Terry)
* Make the property window it's dialogs be event
  driven instead of using gtk_dialog_run. Fixes #133087 and #131889
  (Dennis Smit)

Stickynotes
* Property window gets destroyed after applet removal (Vijaykumar Patwari)
* App icon make use of icon theme (SUN Microsystems)

Mixer
* Merge patch from gnome-mixer for gsteamer part. (Kevin Vandersloot)

Translations
* Azerbaijani (Metin Amiroff)
* Spanish (Francisco Javier F. Serrador)
* Czech (Miloslav Trmac)
* Polish (Artur Flinta)
* Albanian (Elian Myftiu)
* Slovenian (Andraz Tori)
* Greek (Kostas Papadimas)
* Serbian (Serbian team (Prevod.org))
* Irish (Alastair McKinstry)
* Dutch (Vincent van Adrighem)
* Korean (Changwoo Ryu)
* Portuguese (Duarte Loreto)
* German (Christian Neumair)
* Japanese (Takeshi AIHANA)
* Norwegian (Kjartan Maraas)

Changes in GNOME-Applets 2.5.0
==============================

Overall
* Docs update (Breda McColgan)
* Fix numerous leaks (Kjartan Maraas)
* Lock down improvements (George Lebl)

Battery Monitor
* Fix high cpu usage and other weird things - bug #88553 (David Moore)

Keyboard Accesibility Status
* Fix many leaks (Jody Goldberg)

Keyboard Layout Switcher
* New international US keyboard (Szbolacs Ban)

x11/gnome2-applets/Makefile

@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/03/26 02:27:59 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/01 18:50:52 jmmv Exp $
 #
 
-DISTNAME=		gnome-applets-2.4.2
-PKGREVISION=		6
+DISTNAME=		gnome-applets-2.6.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -21,10 +20,11 @@ USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+PKGCONFIG_OVERRIDE+=	libgswitchit/gswitchit.pc.in
+
 EGDIR=			${PREFIX}/share/examples/gnome-applets
 CONF_FILES=		${EGDIR}/sound/events/mailcheck.soundlist \
 			${PKG_SYSCONFDIR}/sound/events/mailcheck.soundlist
@@ -34,6 +34,7 @@ GCONF2_SCHEMAS+=	charpick.schemas
 GCONF2_SCHEMAS+=	drivemount.schemas
 GCONF2_SCHEMAS+=	geyes.schemas
 GCONF2_SCHEMAS+=	gkb.schemas
+GCONF2_SCHEMAS+=	gswitchit.schemas
 GCONF2_SCHEMAS+=	gtik.schemas
 GCONF2_SCHEMAS+=	gweather.schemas
 GCONF2_SCHEMAS+=	mailcheck.schemas
@@ -51,10 +52,11 @@ BUILD_DEFS+=		USE_INET6
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-.if ${OPSYS} == "Linux"
+.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" ||
+    ${OPSYS} == "OpenBSD"
 GCONF2_SCHEMAS+=	battstat.schemas
-PLIST_SUBST+=		BATTSTAT=""
-CONF_FILES+=		${EGDIR}/sound/events/batt_stat_applet.soundlist \
+PLIST_SUBST+=		BATTSTAT=
+CONF_FILES+=		${EGDIR}/sound/events/battstat_applet.soundlist \
 			${PKG_SYSCONFDIR}/sound/events/battstat_applet.soundlist
 .else
 PLIST_SUBST+=		BATTSTAT="@comment "
@@ -75,6 +77,7 @@ INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/libxklavier/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 

x11/gnome2-applets/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2004/04/01 18:50:53 jmmv Exp $
 
-SHA1 (gnome-applets-2.4.2.tar.bz2) = bf752ae4caca9851bd4c1d64b244e3da24092b21
-Size (gnome-applets-2.4.2.tar.bz2) = 4057266 bytes
-SHA1 (patch-aa) = 675bb1b89eb8fd3abec24020959ffbfa36ea5872
-SHA1 (patch-ab) = 9532d2e30a375efc22194e92347b67aa876fee8e
+SHA1 (gnome-applets-2.6.0.tar.bz2) = 835d220a3c330b6da81947071e92308751eaa445
+Size (gnome-applets-2.6.0.tar.bz2) = 4643605 bytes
+SHA1 (patch-aa) = 4805b1cc7ed960ad6672f447636565c5ddc6fc93
+SHA1 (patch-ab) = 7a38278110675ebbb21f3441dd277209001768dc

x11/gnome2-applets/patches/patch-aa

@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/01 18:50:53 jmmv Exp $
 
---- battstat/sounds/Makefile.in.orig	2003-12-13 15:42:24.000000000 -0600
+--- battstat/sounds/Makefile.in.orig	2004-03-10 13:58:12.000000000 +0100
 +++ battstat/sounds/Makefile.in
-@@ -148,7 +148,7 @@ WARN_CXXFLAGS = @WARN_CXXFLAGS@
- X_LIBS = @X_LIBS@
+@@ -166,7 +166,7 @@ am__quote = @am__quote@
  gnomelocaledir = @gnomelocaledir@
+ install_sh = @install_sh@
  
 -soundlistdir = $(sysconfdir)/sound/events
 +soundlistdir = $(datadir)/examples/gnome-applets/sound/events

x11/gnome2-applets/patches/patch-ab

@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
+$NetBSD: patch-ab,v 1.4 2004/04/01 18:50:53 jmmv Exp $
 
---- mailcheck/Makefile.in.orig	2003-12-13 15:40:45.000000000 -0600
+--- mailcheck/Makefile.in.orig	2004-03-10 13:59:15.000000000 +0100
 +++ mailcheck/Makefile.in
-@@ -198,7 +198,7 @@ MAILCHECK_BITMAPS = \
+@@ -214,7 +214,7 @@ MAILCHECK_BITMAPS = \
  mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck
  mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)