Update to 2.8.2:

Overall
 * Bugfixes: #156220, #153398, #156220, #134000, ... (Sergey V. Udaltsov,
   Kjartan Maraas, Muktha Narayan)
 * AIX mixer support (Vincent Berger)

Translations
 * fr (Christophe Merlet)
 * ru (Leonid Kanter)
 * li (Žygimantas Beručka)
 * bg (Vladimir Petkov, Alexander Shopov)
 * ca (Jordi Mallach)
 * da (Martin Willemoes Hansen)
 * it (Alessio Frusciante, Marco Ciampa)
 * de (Hendrik Brandt)

4 files changed, 16 insertions, 15 deletions

diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 09f662038c3..0fa78165070 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2004/12/16 23:57:40 hira Exp $
+# $NetBSD: Makefile,v 1.38 2004/12/28 21:49:02 jmmv Exp $
 #
 
-DISTNAME=		gnome-applets-2.8.1.1
+DISTNAME=		gnome-applets-2.8.2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.8/}
 EXTRACT_SUFX=		.tar.bz2
@@ -62,7 +62,7 @@ PLIST_SUBST+=		BATTSTAT="@comment "
 CONFIGURE_ARGS+=	--disable-battstat
 .endif
 
-PRINT_PLIST_AWK+=	/battstat/ { print "$${BATTSTAT}"$$0; next; }
+PRINT_PLIST_AWK+=	/[Bb]attstat/ { print "$${BATTSTAT}"$$0; next; }
 
 .include "../../devel/GConf2/schemas.mk"
 
@@ -75,6 +75,7 @@ INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/libgtop2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/x11/gnome2-applets/PLIST b/x11/gnome2-applets/PLIST
index 7468f0026b4..5bd08dd1def 100644
--- a/x11/gnome2-applets/PLIST
+++ b/x11/gnome2-applets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/12/17 15:12:02 hira Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/12/28 21:49:02 jmmv Exp $
 bin/gkb_xmmap
 bin/gnome-keyboard-layout
 bin/gswitchit-plugins-capplet
@@ -1145,6 +1145,8 @@ share/gnome/help/wireless/zh_TW/wireless.xml
 share/gswitchit/gswitchit-plugins.glade
 share/gswitchit/gswitchit-properties.glade
 share/gweather/Locations.xml
+share/icons/hicolor/48x48/apps/gswitchit-applet.png
+share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1502,8 +1504,6 @@ share/pixmaps/gnome-cpu.png
 share/pixmaps/gnome-eyes.png
 share/pixmaps/gnome-mini-commander.png
 share/pixmaps/gnome-mixer-applet.png
-share/pixmaps/gswitchit-applet.png
-share/pixmaps/gswitchit-properties-capplet.png
 share/pixmaps/mailcheck/eclouds.png
 share/pixmaps/mailcheck/email-e.png
 share/pixmaps/mailcheck/email-eclouds.png
@@ -1631,6 +1631,7 @@ share/xmodmap/xmodmap.yu
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-applets
 @comment in scrollkeeper: @dirrm share/omf
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/gweather
 @dirrm share/gswitchit
 @dirrm share/gnome/help/wireless/zh_TW/figures
diff --git a/x11/gnome2-applets/distinfo b/x11/gnome2-applets/distinfo
index 3f1ed403b38..d3b61b872ef 100644
--- a/x11/gnome2-applets/distinfo
+++ b/x11/gnome2-applets/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2004/10/15 16:23:28 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/12/28 21:49:02 jmmv Exp $
 
-SHA1 (gnome-applets-2.8.1.1.tar.bz2) = 3b70d71d0f1f9fa305ae2b0df21ddaad8e1611e8
-Size (gnome-applets-2.8.1.1.tar.bz2) = 6405066 bytes
-SHA1 (patch-aa) = 1e5e78defaeae5c441ffdc27d3dce301f9745695
+SHA1 (gnome-applets-2.8.2.tar.bz2) = bd99a350aaccc16c76d74b75323bebd58c716d9c
+Size (gnome-applets-2.8.2.tar.bz2) = 6049108 bytes
+SHA1 (patch-aa) = fcb595c1ea153c3a464c853728253d1f41f4e857
 SHA1 (patch-ab) = 7a38278110675ebbb21f3441dd277209001768dc
-SHA1 (patch-ac) = 0801e8ed3b3a70643d990df30dc4b919ba6025d0
 SHA1 (patch-ad) = 43a3e0b6191ce07bcc0b7fc4af3a9878e059f16d
diff --git a/x11/gnome2-applets/patches/patch-aa b/x11/gnome2-applets/patches/patch-aa
index 2f436d26e72..a99f91f2029 100644
--- a/x11/gnome2-applets/patches/patch-aa
+++ b/x11/gnome2-applets/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2004/09/21 16:57:24 jmmv Exp $
+$NetBSD: patch-aa,v 1.7 2004/12/28 21:49:02 jmmv Exp $
 
---- battstat/sounds/Makefile.in.orig	2004-08-30 15:21:24.000000000 +0200
+--- battstat/sounds/Makefile.in.orig	2004-12-28 19:53:10.000000000 +0100
 +++ battstat/sounds/Makefile.in
-@@ -167,7 +167,7 @@ am__quote = @am__quote@
- gnomelocaledir = @gnomelocaledir@
+@@ -173,7 +173,7 @@ gnomelocaledir = @gnomelocaledir@
  install_sh = @install_sh@
+ mkdir_p = @mkdir_p@
  
 -soundlistdir = $(sysconfdir)/sound/events
 +soundlistdir = $(datadir)/examples/gnome-applets/sound/events