Update to 2.6.0:

Overview of Changes in 2.6.0 (since 2.2.0)
==========================================
* Autogen.sh updates [ James Henstridge ]
* Pixbuf Engine Moved to GTK+ 2.6 [ Matthias Clasen ]
* Remove old Pixbuf, and Notif Sources [ Thomas Wood ]
* Add COPYING.GPL/COPYING.LGPL [ Thomas ]
* Rewrite/Cleanup Redmond95 Engine [ Andrew Johnson ]
* Replace Redmond95 Theme with Redmond Theme [ Andrew ]
* Revise Engine/Theme Build Layout [ Andrew/Thomas ]
* Add Crux Engine and Theme [ Andrew, Thomas ]
* Add HC Engine [ Andrew, Thomas ]
* Add Industrial Engine and Theme [ Andrew, Thomas]
* Add LightHouseBlue Engine and Theme [ Andrew, Thomas ]
* Add Mist Engine and Theme [ Andrew, Thomas ]
* Add Smooth Engine [ Andrew, Thomas ]
* Add ThinIce Engine and Theme [ Andrew, Thomas ]
* Improve Smooth/Redmond/Industrial Engines for RTL Locales [ Andrew ]
* Update README, add COPYING list of licences [ Andrew ]

4 files changed, 118 insertions, 19 deletions

diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 93933c5703c..b5188491ef0 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2004/10/03 00:18:33 tv Exp $
+# $NetBSD: Makefile,v 1.25 2004/12/24 10:07:23 jmmv Exp $
 
-DISTNAME=		gtk-engines-2.2.0
+DISTNAME=		gtk-engines-2.6.0
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		8
 CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -12,12 +11,16 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Theme engines for GTK+ version 2
 
 CONFLICTS+=		gtk-engines-*
+CONFLICTS+=		gtk2-engines-industrial-*
+
+BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
-USE_DIRS+=		xdg-1.1
+USE_DIRS+=		theme-1.0 xdg-1.1
 USE_X11=		yes
 USE_LIBTOOL=		yes
+
 PKGCONFIG_OVERRIDE=	gtk-engines-2.pc.in
 
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/x11/gtk2-engines/PLIST b/x11/gtk2-engines/PLIST
index b5a9ed479c7..6e1a7abdc0b 100644
--- a/x11/gtk2-engines/PLIST
+++ b/x11/gtk2-engines/PLIST
@@ -1,15 +1,111 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/12/24 10:07:23 jmmv 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/libindustrial.la
+lib/gtk-2.0/2.4.0/engines/liblighthouseblue.la
 lib/gtk-2.0/2.4.0/engines/libmetal.la
-lib/gtk-2.0/2.4.0/engines/libpixmap.la
+lib/gtk-2.0/2.4.0/engines/libmist.la
 lib/gtk-2.0/2.4.0/engines/libredmond95.la
+lib/gtk-2.0/2.4.0/engines/libsmooth.la
+lib/gtk-2.0/2.4.0/engines/libthinice.la
 lib/pkgconfig/gtk-engines-2.pc
-share/themes/Metal/README.html
+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
+share/themes/Crux/gtk-2.0/gtkrc
+share/themes/Industrial/gtk-2.0/gtkrc
+share/themes/LighthouseBlue/gtk-2.0/gtkrc
 share/themes/Metal/gtk-2.0/gtkrc
-share/themes/Redmond95/README.html
-share/themes/Redmond95/gtk-2.0/gtkrc
-@dirrm share/themes/Redmond95/gtk-2.0
-@dirrm share/themes/Redmond95
+share/themes/Mist/gtk-2.0/gtkrc
+share/themes/Redmond/gtk-2.0/gtkrc
+share/themes/Redmond/gtk/gtkrc
+share/themes/ThinIce/gtk-2.0/gtkrc
+@dirrm share/themes/ThinIce/gtk-2.0
+@comment in theme-dirs: @dirrm share/themes/ThinIce
+@dirrm share/themes/Redmond/gtk-2.0
+@dirrm share/themes/Redmond/gtk
+@comment in theme-dirs: @dirrm share/themes/Redmond
+@dirrm share/themes/Mist/gtk-2.0
+@comment in theme-dirs: @dirrm share/themes/Mist
 @dirrm share/themes/Metal/gtk-2.0
-@dirrm share/themes/Metal
+@comment in theme-dirs: @dirrm share/themes/Metal
+@dirrm share/themes/LighthouseBlue/gtk-2.0
+@comment in theme-dirs: @dirrm share/themes/LighthouseBlue
+@dirrm share/themes/Industrial/gtk-2.0
+@comment in theme-dirs: @dirrm share/themes/Industrial
+@dirrm share/themes/Crux/gtk-2.0
+@comment in theme-dirs: @dirrm share/themes/Crux
+@dirrm share/eazel-engine
 @comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/engines
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 6355106f3a9..44ac994f839 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 19:02:34 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/12/24 10:07:23 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK2_ENGINES_BUILDLINK3_MK:=	${GTK2_ENGINES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2-engines}
 BUILDLINK_PACKAGES+=	gtk2-engines
 
 .if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2-engines+=	gtk2-engines>=2.2.0nb6
+BUILDLINK_DEPENDS.gtk2-engines+=	gtk2-engines>=2.6.0
 BUILDLINK_PKGSRCDIR.gtk2-engines?=	../../x11/gtk2-engines
 .endif	# GTK2_ENGINES_BUILDLINK3_MK
 
diff --git a/x11/gtk2-engines/distinfo b/x11/gtk2-engines/distinfo
index 08f31078aca..05f57319b6c 100644
--- a/x11/gtk2-engines/distinfo
+++ b/x11/gtk2-engines/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/05/09 10:12:08 recht Exp $
+$NetBSD: distinfo,v 1.5 2004/12/24 10:07:23 jmmv Exp $
 
-SHA1 (gtk-engines-2.2.0.tar.bz2) = 963e9fe91a9819b8a073d33c7facf441bae0c928
-Size (gtk-engines-2.2.0.tar.bz2) = 401883 bytes
+SHA1 (gtk-engines-2.6.0.tar.bz2) = afcfa78e32cbd0801dd04abf1c88524d825521da
+Size (gtk-engines-2.6.0.tar.bz2) = 453089 bytes