Update to 2.8.2:

New/updated translations:

2004-10-28  Mohammad DAMT  <mdamt@bisnisweb.com>
       * id.po: Updated Indonesian translation

2004-10-17  Christophe Merlet  <redfox@redfoxcenter.org>
       * fr.po: Updated French translation.

5 files changed, 52 insertions, 118 deletions

diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index d4448767862..a418bf60c38 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2004/10/26 21:09:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/12/24 10:10:34 jmmv Exp $
 #
 
-DISTNAME=		gnome-themes-2.8.1
+DISTNAME=		gnome-themes-2.8.2
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-themes/2.8/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,7 +13,7 @@ COMMENT=		Collection of themes and icons for GNOME 2
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		yes
-USE_DIRS+=		gnome2-1.5
+USE_DIRS+=		gnome2-1.5 theme-1.0
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/gnome-themes/PLIST b/x11/gnome-themes/PLIST
index df45c9bd9be..45b8b3fb1c1 100644
--- a/x11/gnome-themes/PLIST
+++ b/x11/gnome-themes/PLIST
@@ -1,85 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:58 jlam Exp $
-lib/gtk-2.0/2.4.0/engines/libcrux-engine.la
-lib/gtk-2.0/2.4.0/engines/libhcengine.la
-lib/gtk-2.0/2.4.0/engines/liblighthouseblue.la
-lib/gtk-2.0/2.4.0/engines/libmist.la
-lib/gtk-2.0/2.4.0/engines/libsmooth.la
-lib/gtk-2.0/2.4.0/engines/libthinice.la
-share/eazel-engine/arrow_down-spinner.png
-share/eazel-engine/arrow_down.png
-share/eazel-engine/arrow_left.png
-share/eazel-engine/arrow_right.png
-share/eazel-engine/arrow_up-spinner.png
-share/eazel-engine/arrow_up.png
-share/eazel-engine/check-active-default-focus.png
-share/eazel-engine/check-active-default.png
-share/eazel-engine/check-active-hilight-focus.png
-share/eazel-engine/check-active-hilight.png
-share/eazel-engine/check-active-insensitive.png
-share/eazel-engine/check-active-pressed-focus.png
-share/eazel-engine/check-active-pressed.png
-share/eazel-engine/check-default-focus.png
-share/eazel-engine/check-default.png
-share/eazel-engine/check-hilight-focus.png
-share/eazel-engine/check-hilight.png
-share/eazel-engine/check-insensitive.png
-share/eazel-engine/check-pressed-focus.png
-share/eazel-engine/check-pressed.png
-share/eazel-engine/progressbar-left.png
-share/eazel-engine/progressbar-right.png
-share/eazel-engine/progressbar.png
-share/eazel-engine/progressbar_trough.png
-share/eazel-engine/radio-active-default-focus.png
-share/eazel-engine/radio-active-default.png
-share/eazel-engine/radio-active-hilight-focus.png
-share/eazel-engine/radio-active-hilight.png
-share/eazel-engine/radio-active-insensitive.png
-share/eazel-engine/radio-active-pressed-focus.png
-share/eazel-engine/radio-active-pressed.png
-share/eazel-engine/radio-default-focus.png
-share/eazel-engine/radio-default.png
-share/eazel-engine/radio-hilight-focus.png
-share/eazel-engine/radio-hilight.png
-share/eazel-engine/radio-insensitive.png
-share/eazel-engine/radio-pressed-focus.png
-share/eazel-engine/radio-pressed.png
-share/eazel-engine/scroller-arrow-down-hilight.png
-share/eazel-engine/scroller-arrow-down-pressed.png
-share/eazel-engine/scroller-arrow-down.png
-share/eazel-engine/scroller-arrow-left-hilight.png
-share/eazel-engine/scroller-arrow-left-pressed.png
-share/eazel-engine/scroller-arrow-left.png
-share/eazel-engine/scroller-arrow-right-hilight.png
-share/eazel-engine/scroller-arrow-right-pressed.png
-share/eazel-engine/scroller-arrow-right.png
-share/eazel-engine/scroller-arrow-up-hilight.png
-share/eazel-engine/scroller-arrow-up-pressed.png
-share/eazel-engine/scroller-arrow-up.png
-share/eazel-engine/scroller-h-hilight.png
-share/eazel-engine/scroller-h-thumb-hilight.png
-share/eazel-engine/scroller-h-thumb.png
-share/eazel-engine/scroller-h-trough.png
-share/eazel-engine/scroller-h.png
-share/eazel-engine/scroller-v-hilight.png
-share/eazel-engine/scroller-v-thumb-hilight.png
-share/eazel-engine/scroller-v-thumb.png
-share/eazel-engine/scroller-v-trough.png
-share/eazel-engine/scroller-v.png
-share/eazel-engine/slider_h_thumb.png
-share/eazel-engine/slider_h_trough.png
-share/eazel-engine/slider_h_trough_focus.png
-share/eazel-engine/slider_v_thumb.png
-share/eazel-engine/slider_v_trough.png
-share/eazel-engine/slider_v_trough_focus.png
-share/eazel-engine/tab_left-unsel.png
-share/eazel-engine/tab_left.png
-share/eazel-engine/tab_right.png
-share/eazel-engine/tab_sel-bottom.png
-share/eazel-engine/tab_sel.png
-share/eazel-engine/tab_usel-bottom-left.png
-share/eazel-engine/tab_usel-bottom.png
-share/eazel-engine/tab_usel-left.png
-share/eazel-engine/tab_usel.png
+@comment $NetBSD: PLIST,v 1.10 2004/12/24 10:10:34 jmmv Exp $
 share/icons/Crux/12x12/filesystems/gnome-fs-directory.png
 share/icons/Crux/12x12/filesystems/gnome-fs-regular.png
 share/icons/Crux/192x192/filesystems/gnome-fs-directory.png
@@ -1241,7 +1160,6 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
-share/themes/Crux/gtk-2.0/gtkrc
 share/themes/Crux/index.theme
 share/themes/Glider/gtk-2.0/gtkrc
 share/themes/Glider/gtk-2.0/iconrc
@@ -1711,7 +1629,6 @@ share/themes/LargePrint/pixmaps/volume-medium.png
 share/themes/LargePrint/pixmaps/volume-min.png
 share/themes/LargePrint/pixmaps/volume-mute.png
 share/themes/LargePrint/pixmaps/volume-zero.png
-share/themes/LighthouseBlue/gtk-2.0/gtkrc
 share/themes/LowContrast/gtk-2.0/gtkrc
 share/themes/LowContrast/index.theme.disabled
 share/themes/LowContrastLargePrint/gtk-2.0/gtkrc
@@ -1851,7 +1768,6 @@ share/themes/LowContrastLargePrint/pixmaps/volume-medium.png
 share/themes/LowContrastLargePrint/pixmaps/volume-min.png
 share/themes/LowContrastLargePrint/pixmaps/volume-mute.png
 share/themes/LowContrastLargePrint/pixmaps/volume-zero.png
-share/themes/Mist/gtk-2.0/gtkrc
 share/themes/Mist/index.theme
 share/themes/Mist/metacity-1/metacity-theme-1.xml
 share/themes/Ocean-Dream/index.theme
@@ -1953,51 +1869,43 @@ share/themes/Smokey/metacity-1/maximize.png
 share/themes/Smokey/metacity-1/metacity-theme-1.xml
 share/themes/Smokey/metacity-1/minimize.png
 share/themes/Smokey/metacity-1/stripes.png
-share/themes/ThinIce/gtk-2.0/gtkrc
 share/themes/Traditional/index.theme
-@dirrm share/themes/Traditional
-@dirrm share/themes/ThinIce/gtk-2.0
-@dirrm share/themes/ThinIce
+@comment in theme-dirs: @dirrm share/themes/Traditional
 @dirrm share/themes/Smokey/metacity-1
 @dirrm share/themes/Smokey-Blue/gtk-2.0
-@dirrm share/themes/Smokey-Blue
-@dirrm share/themes/Smokey
+@comment in theme-dirs: @dirrm share/themes/Smokey-Blue
+@comment in theme-dirs: @dirrm share/themes/Smokey
 @dirrm share/themes/Simple/gtk-2.0
-@comment in metacity: @dirrm share/themes/Simple
+@comment in theme-dirs: @dirrm share/themes/Simple
 @dirrm share/themes/Sandwish/metacity-1
-@dirrm share/themes/Sandwish
-@dirrm share/themes/Ocean-Dream
+@comment in theme-dirs: @dirrm share/themes/Sandwish
+@comment in theme-dirs: @dirrm share/themes/Ocean-Dream
 @dirrm share/themes/Mist/metacity-1
-@dirrm share/themes/Mist/gtk-2.0
-@dirrm share/themes/Mist
+@comment in theme-dirs: @dirrm share/themes/Mist
 @dirrm share/themes/LowContrastLargePrint/pixmaps
 @dirrm share/themes/LowContrastLargePrint/gtk-2.0
-@dirrm share/themes/LowContrastLargePrint
+@comment in theme-dirs: @dirrm share/themes/LowContrastLargePrint
 @dirrm share/themes/LowContrast/gtk-2.0
-@dirrm share/themes/LowContrast
-@dirrm share/themes/LighthouseBlue/gtk-2.0
-@dirrm share/themes/LighthouseBlue
+@comment in theme-dirs: @dirrm share/themes/LowContrast
 @dirrm share/themes/LargePrint/pixmaps
 @dirrm share/themes/LargePrint/gtk-2.0
-@dirrm share/themes/LargePrint
+@comment in theme-dirs: @dirrm share/themes/LargePrint
 @dirrm share/themes/HighContrastLargePrintInverse/pixmaps
 @dirrm share/themes/HighContrastLargePrintInverse/gtk-2.0
-@dirrm share/themes/HighContrastLargePrintInverse
+@comment in theme-dirs: @dirrm share/themes/HighContrastLargePrintInverse
 @dirrm share/themes/HighContrastLargePrint/pixmaps
 @dirrm share/themes/HighContrastLargePrint/gtk-2.0
-@dirrm share/themes/HighContrastLargePrint
+@comment in theme-dirs: @dirrm share/themes/HighContrastLargePrint
 @dirrm share/themes/HighContrastInverse/gtk-2.0
-@dirrm share/themes/HighContrastInverse
+@comment in theme-dirs: @dirrm share/themes/HighContrastInverse
 @dirrm share/themes/HighContrast/gtk-2.0
-@dirrm share/themes/HighContrast
+@comment in theme-dirs: @dirrm share/themes/HighContrast
 @dirrm share/themes/Grand-Canyon/gtk-2.0
-@dirrm share/themes/Grand-Canyon
+@comment in theme-dirs: @dirrm share/themes/Grand-Canyon
 @dirrm share/themes/Glider/metacity-1
 @dirrm share/themes/Glider/gtk-2.0
-@dirrm share/themes/Glider
-@dirrm share/themes/Crux/gtk-2.0
-@comment in metacity: @dirrm share/themes/Crux
-@comment in xdg-dirs: @dirrm share/themes
+@comment in theme-dirs: @dirrm share/themes/Glider
+@comment in theme-dirs: @dirrm share/themes/Crux
 @dirrm share/icons/Smokey-Red/48x48/filesystems
 @dirrm share/icons/Smokey-Red/48x48/emblems
 @dirrm share/icons/Smokey-Red/48x48
@@ -2090,5 +1998,3 @@ share/themes/Traditional/index.theme
 @dirrm share/icons/Crux/12x12
 @dirrm share/icons/Crux
 @comment in xdg-dirs: @dirrm share/icons
-@dirrm share/eazel-engine
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/engines
diff --git a/x11/gnome-themes/distinfo b/x11/gnome-themes/distinfo
index a65cfa4444c..f56e13604b2 100644
--- a/x11/gnome-themes/distinfo
+++ b/x11/gnome-themes/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.7 2004/10/26 21:09:04 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2004/12/24 10:10:34 jmmv Exp $
 
-SHA1 (gnome-themes-2.8.1.tar.bz2) = 89c7a5e16d036f19280ed6666e0074811c550b86
-Size (gnome-themes-2.8.1.tar.bz2) = 2718430 bytes
+SHA1 (gnome-themes-2.8.2.tar.bz2) = db235ad7c9a7263b6f7b464bf4fe486b43c31c3c
+Size (gnome-themes-2.8.2.tar.bz2) = 2716583 bytes
+SHA1 (patch-aa) = 92a43b74f7bcdc2df5bc80e64f4f0ab97b61c719
+SHA1 (patch-ab) = 20e691626766b4f1d0e8d10588f4d709c0844dc0
diff --git a/x11/gnome-themes/patches/patch-aa b/x11/gnome-themes/patches/patch-aa
new file mode 100644
index 00000000000..772653047bd
--- /dev/null
+++ b/x11/gnome-themes/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/12/24 10:10:34 jmmv Exp $
+
+--- Makefile.in.orig	2004-12-03 18:47:52.000000000 +0100
++++ Makefile.in
+@@ -184,7 +184,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = gtk-themes gtk-engines metacity-themes icon-themes \
++SUBDIRS = gtk-themes metacity-themes icon-themes \
+ 	       	desktop-themes \
+ 		common HighContrast LargePrint LowContrastLargePrint \
+ 		HighContrastLargePrint  LowContrast \
diff --git a/x11/gnome-themes/patches/patch-ab b/x11/gnome-themes/patches/patch-ab
new file mode 100644
index 00000000000..fa7891b8055
--- /dev/null
+++ b/x11/gnome-themes/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/12/24 10:10:34 jmmv Exp $
+
+--- gtk-themes/Makefile.in.orig	2004-12-03 18:47:57.000000000 +0100
++++ gtk-themes/Makefile.in
+@@ -184,7 +184,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = Crux Glider Grand-Canyon LightHouseBlue Mist Simple Smokey-Blue ThinIce
++SUBDIRS = Glider Grand-Canyon Simple Smokey-Blue
+ subdir = gtk-themes
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs