Update to 2.10.0:

2.10.0
======

Bump version number for 2.10 release; no code changes.

2.9.95
======

Fixes:
        2005-03-03  Elijah Newren  <newren@gmail.com>
        Add these files (they used to be named gnome-clock.png, but got
        lost from cvs when doing the rename).  Fixes #168905.

New/updated translations:

        2005-03-03  Abel Cheung  <maddog@linuxhall.org>
        * zh_TW.po: Updated traditional Chinese translation from GNOME HK Team

2.9.94
======

Fixes:
	Remove different-coloured buttons from Simple theme, which
	were intended for the default gtk+ theme.

2.9.93
======

Forgot to release this one :/

2.9.92
======

Fixes:
	2005-02-24  Thomas Wood  <thos@gnome.org>
       	Resolves bug 167446: Use icon theme for stock icons in Glider

New/updated translations:
	 2005-02-21  Christophe Merlet  <redfox@redfoxcenter.org>
       	* fr.po: Updated French translation.

	2005-02-13  Theppitak Karoonboonyanan  <thep@linux.thai.net>
       	* th.po: Updated Thai translation.

2.9.91
======

Fixes:
   * Replace gnome-clock.png with clock.png, fixes #156724
      <muktha.narayan@wipro.com>

New/updated translations:
	2005-01-30  Alessio Frusciante  <algol@firenze.linux.it>
       * it.po: Updated Italian translation.

	2005-01-29  Priit Laes  <plaes@cvs.gnome.org>
       * et.po: Translation updated.

2.9.90
======
2005-01-12  Thomas Wood  <thos@gnome.org>
       * Makefile.am:
       * configure.in:
       * gtk-themes/Makefile.am:

       Updated to reflect changes in gtk-engines

New/updated translations:

2005-01-19  Marcel Telka  <marcel@telka.sk>
       * sk.po: Updated Slovak translation.

2005-01-16  Alexander Winston  <alexander.winston@comcast.net>
       * en_CA.po: Updated Canadian English translation.

2.9.4
=====

2004-12-02  James Henstridge  <james@jamesh.id.au>
       * icon-themes/Smokey-Red/Makefile.am: adjust makefile to take into
       account moved icons.
       * icon-themes/Smokey-Red/index.theme.in: add directories for other
       icon sizes.
       * icon-themes/Smokey-Blue/Makefile.am: update for new file
       locations.
       * icon-themes/Smokey-Blue/index.theme.in: none of the icons were
       actually 48x48, so move them to the right directories.

New/updated translations:

2005-01-05  Pawan Chitrakar  <pawan@nplinux.org>
       * ne.po: Added Nepali Translation

2005-01-04  Žygimantas Beručka  <uid0@akl.lt>
       * lt.po: Updated Lithuanian translation.

2.9.3
=====

Not released due to Christmas holdiays... sorry :/

2.9.2.1
======

Fix Low Contrast Large Print build breakage.

2.9.2
=====

New/updated translations:

2004-11-08  Alexander Shopov  <ash@contact.bg>
       * bg.po: Updated Bulgarian translation by
       Vladimir Petkov <vpetkov@i-space.org>

2.9.1
=====

Enhancements:

- Massive build improvements from jamesh.
- Buttons now a different colour in Simple theme (Eugenia Loli-Queru)

Bugfixes:

- Crux crasher (#116693, Robert Basch)
- Large Print themes now change desktop and terminal fonts too (#155566, Muktha Narayan)

New/updated translations:

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

2004-09-22  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
       * ru.po: Updated Russian translation
       from Russian team <gnome-cyr@gnome.org>.

2004-09-14  Mətin Əmirov  <metin@karegen.com>
       * az.po: Translation updated.

5 files changed, 53 insertions, 65 deletions

diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index a418bf60c38..5e8f1e21b04 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/12/24 10:10:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2005/03/22 16:20:22 jmmv Exp $
 #
 
-DISTNAME=		gnome-themes-2.8.2
+DISTNAME=		gnome-themes-2.10.0
 CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-themes/2.8/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-themes/2.10/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -25,6 +25,7 @@ GNU_CONFIGURE=		yes
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../wm/metacity/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk2-engines/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-themes/PLIST b/x11/gnome-themes/PLIST
index 45b8b3fb1c1..1bd2a35fbf0 100644
--- a/x11/gnome-themes/PLIST
+++ b/x11/gnome-themes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/12/24 10:10:34 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/03/22 16:20:22 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
@@ -94,6 +94,7 @@ share/icons/HighContrastLargePrint/48x48/apps/administration.png
 share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png
 share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png
 share/icons/HighContrastLargePrint/48x48/apps/charpick.png
+share/icons/HighContrastLargePrint/48x48/apps/clock.png
 share/icons/HighContrastLargePrint/48x48/apps/config-language.png
 share/icons/HighContrastLargePrint/48x48/apps/config-users.png
 share/icons/HighContrastLargePrint/48x48/apps/config-xfree.png
@@ -126,7 +127,6 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-ccscreensaver.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-cd.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-character-map.png
-share/icons/HighContrastLargePrint/48x48/apps/gnome-clock.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-desktop-config.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-devel.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-eog.png
@@ -165,7 +165,12 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-pdf.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-planner.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-remote-desktop.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-run.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-screensaver.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-screenshot.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-server-config.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-session.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png
@@ -458,6 +463,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/administration.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/ax-applet.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/clock.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/config-language.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/config-users.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/config-xfree.png
@@ -490,7 +496,6 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccscreensaver.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cd.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cdplayer-icon.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-character-map.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-clock.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-desktop-config.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-devel.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-eog.png
@@ -529,7 +534,12 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-pdf.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-planner.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-remote-desktop.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-run.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-screensaver.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-screenshot.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation-rest.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-server-config.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-session.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-keyboard.png
@@ -821,6 +831,7 @@ share/icons/LowContrastLargePrint/48x48/apps/accessibility-directory.png
 share/icons/LowContrastLargePrint/48x48/apps/advanced-directory.png
 share/icons/LowContrastLargePrint/48x48/apps/ax-applet.png
 share/icons/LowContrastLargePrint/48x48/apps/charpick.png
+share/icons/LowContrastLargePrint/48x48/apps/clock.png
 share/icons/LowContrastLargePrint/48x48/apps/display-capplet.png
 share/icons/LowContrastLargePrint/48x48/apps/file-manager.png
 share/icons/LowContrastLargePrint/48x48/apps/file-roller.png
@@ -836,7 +847,6 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-ccscreensaver.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-cd.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-character-map.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-clock.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-devel.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-eog.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-ghex.png
@@ -856,6 +866,11 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer-applet.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-multimedia.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-panel.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-run.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-screenshot.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-session.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png
@@ -1078,24 +1093,25 @@ share/icons/Sandy/96x96/filesystems/gnome-fs-directory-accept.png
 share/icons/Sandy/96x96/filesystems/gnome-fs-directory.png
 share/icons/Sandy/index.theme
 share/icons/Smokey-Blue/48x48/emblems/emblem-nowrite.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-72.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-96.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-nfs.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty-accept.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full-accept.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-nfs.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-empty-accept.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-empty.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-full-accept.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-full.png
+share/icons/Smokey-Blue/72x72/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Blue/96x96/filesystems/gnome-fs-directory.png
 share/icons/Smokey-Blue/index.theme
 share/icons/Smokey-Red/48x48/emblems/emblem-nowrite.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-72.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-96.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-nfs.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty-accept.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png
+share/icons/Smokey-Red/64x64/filesystems/gnome-fs-directory.icon
+share/icons/Smokey-Red/64x64/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Red/64x64/filesystems/gnome-fs-nfs.png
+share/icons/Smokey-Red/72x72/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Red/96x96/filesystems/gnome-fs-directory.png
 share/icons/Smokey-Red/index.theme
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-themes.mo
@@ -1137,6 +1153,7 @@ ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnome-themes.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-themes.mo
@@ -1162,19 +1179,6 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
 share/themes/Crux/index.theme
 share/themes/Glider/gtk-2.0/gtkrc
-share/themes/Glider/gtk-2.0/iconrc
-share/themes/Glider/gtk-2.0/stock_apply.png
-share/themes/Glider/gtk-2.0/stock_bottom.png
-share/themes/Glider/gtk-2.0/stock_cancel.png
-share/themes/Glider/gtk-2.0/stock_down.png
-share/themes/Glider/gtk-2.0/stock_first.png
-share/themes/Glider/gtk-2.0/stock_last.png
-share/themes/Glider/gtk-2.0/stock_left.png
-share/themes/Glider/gtk-2.0/stock_ok.png
-share/themes/Glider/gtk-2.0/stock_refresh.png
-share/themes/Glider/gtk-2.0/stock_right.png
-share/themes/Glider/gtk-2.0/stock_top.png
-share/themes/Glider/gtk-2.0/stock_up.png
 share/themes/Glider/index.theme
 share/themes/Glider/metacity-1/metacity-theme-1.xml
 share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png
@@ -1906,11 +1910,22 @@ share/themes/Traditional/index.theme
 @dirrm share/themes/Glider/gtk-2.0
 @comment in theme-dirs: @dirrm share/themes/Glider
 @comment in theme-dirs: @dirrm share/themes/Crux
+@dirrm share/icons/Smokey-Red/96x96/filesystems
+@dirrm share/icons/Smokey-Red/96x96
+@dirrm share/icons/Smokey-Red/72x72/filesystems
+@dirrm share/icons/Smokey-Red/72x72
+@dirrm share/icons/Smokey-Red/64x64/filesystems
+@dirrm share/icons/Smokey-Red/64x64
 @dirrm share/icons/Smokey-Red/48x48/filesystems
 @dirrm share/icons/Smokey-Red/48x48/emblems
 @dirrm share/icons/Smokey-Red/48x48
 @dirrm share/icons/Smokey-Red
-@dirrm share/icons/Smokey-Blue/48x48/filesystems
+@dirrm share/icons/Smokey-Blue/96x96/filesystems
+@dirrm share/icons/Smokey-Blue/96x96
+@dirrm share/icons/Smokey-Blue/72x72/filesystems
+@dirrm share/icons/Smokey-Blue/72x72
+@dirrm share/icons/Smokey-Blue/64x64/filesystems
+@dirrm share/icons/Smokey-Blue/64x64
 @dirrm share/icons/Smokey-Blue/48x48/emblems
 @dirrm share/icons/Smokey-Blue/48x48
 @dirrm share/icons/Smokey-Blue
diff --git a/x11/gnome-themes/distinfo b/x11/gnome-themes/distinfo
index ae211b48283..70173c7d35e 100644
--- a/x11/gnome-themes/distinfo
+++ b/x11/gnome-themes/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:11 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/22 16:20:22 jmmv Exp $
 
-SHA1 (gnome-themes-2.8.2.tar.bz2) = db235ad7c9a7263b6f7b464bf4fe486b43c31c3c
-RMD160 (gnome-themes-2.8.2.tar.bz2) = 11b63dbdb91c82045f51f5063bc36be40f0f127e
-Size (gnome-themes-2.8.2.tar.bz2) = 2716583 bytes
-SHA1 (patch-aa) = 92a43b74f7bcdc2df5bc80e64f4f0ab97b61c719
-SHA1 (patch-ab) = 20e691626766b4f1d0e8d10588f4d709c0844dc0
+SHA1 (gnome-themes-2.10.0.tar.bz2) = aaf545e98ff713aa0e92b92515b9c1e60722dfb4
+RMD160 (gnome-themes-2.10.0.tar.bz2) = ef8ddcc688d503e4b2501b043a10e4ed1b5871f0
+Size (gnome-themes-2.10.0.tar.bz2) = 2569321 bytes
diff --git a/x11/gnome-themes/patches/patch-aa b/x11/gnome-themes/patches/patch-aa
deleted file mode 100644
index 772653047bd..00000000000
--- a/x11/gnome-themes/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index fa7891b8055..00000000000
--- a/x11/gnome-themes/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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