Update to 2.8.8:

This is a stable release for Gnome 2.8.2.

Fixes
  * Correct the requested number of keycodes (Rob) [#155247]
  * Make the "showing desktop" mode be per-workspace instead of
    per-screen. (Elijah) [#142198]
  * Don't try to use an ARGB visual at all if the depth isn't
    32-bit. This caused major slowdowns with Composite
    enabled. (Anders)
  * Fix the modifier key breakage introduced by an Xorg
    change. (Soeren) [#151554]
  * Fix the alt-tab order--if the most recently used window is not
    focused, start alt tabbing with that window instead of the one
    after it (Elijah) [#156251]
  * Use only numbers from the Fibonacci sequence for micro version
    numbers at Havoc's request (thus the reason this is 2.8.8 instead
    of 2.8.7--2.8.4 and 2.8.6 were mistakes that didn't comply with
    this requirement)

Translations
  * da(Martin Willemoes Hansen), fr(Christophe Merlet, Baptiste Mille-Mathias)

4 files changed, 15 insertions, 25 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index c1988e1461f..571efe2c65e 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2004/10/15 12:41:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2004/12/24 10:09:31 jmmv Exp $
 #
 
-DISTNAME=	metacity-2.8.6
+DISTNAME=	metacity-2.8.8
 CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.8/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +13,7 @@ COMMENT=	GNOME-compliant window manager
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK3=		YES
-USE_DIRS+=		gnome2-1.5
+USE_DIRS+=		gnome2-1.5 theme-1.0
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index 93ee720fbbb..d1db52dcaf1 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/09/22 08:09:56 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2004/12/24 10:09:31 jmmv Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -171,20 +171,19 @@ share/themes/Simple/metacity-1/maximized.png
 share/themes/Simple/metacity-1/metacity-theme-1.xml
 share/themes/Simple/metacity-1/minimize.png
 @dirrm share/themes/Simple/metacity-1
-@dirrm share/themes/Simple
+@comment in theme-dirs: @dirrm share/themes/Simple
 @dirrm share/themes/Metabox/metacity-1
-@dirrm share/themes/Metabox
+@comment in theme-dirs: @dirrm share/themes/Metabox
 @dirrm share/themes/Esco/metacity-1
-@dirrm share/themes/Esco
+@comment in theme-dirs: @dirrm share/themes/Esco
 @dirrm share/themes/Crux/metacity-1
-@dirrm share/themes/Crux
+@comment in theme-dirs: @dirrm share/themes/Crux
 @dirrm share/themes/Bright/metacity-1
-@dirrm share/themes/Bright
+@comment in theme-dirs: @dirrm share/themes/Bright
 @dirrm share/themes/Atlanta/metacity-1
-@dirrm share/themes/Atlanta
+@comment in theme-dirs: @dirrm share/themes/Atlanta
 @dirrm share/themes/AgingGorilla/metacity-1
-@dirrm share/themes/AgingGorilla
-@comment in xdg-dirs: @dirrm share/themes
+@comment in theme-dirs: @dirrm share/themes/AgingGorilla
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/metacity/icons
 @dirrm share/metacity/glade
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index 26ea6a7c053..26180ff87ea 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:18:23 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/12/24 10:09:31 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 METACITY_BUILDLINK3_MK:=	${METACITY_BUILDLINK3_MK}+
@@ -14,15 +14,6 @@ BUILDLINK_PACKAGES+=	metacity
 BUILDLINK_DEPENDS.metacity+=	metacity>=2.8.5
 BUILDLINK_RECOMMENDED.metacity+=	metacity>=2.8.5nb1
 BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
-
-dirs!=	${GREP} "^@dirrm share/themes" ${.CURDIR}/../../wm/metacity/PLIST | \
-	${CUT} -d ' ' -f 2
-.  for d in ${dirs}
-PRINT_PLIST_AWK+=	/^@dirrm ${d:S/\//\\\//g}$$/ \
-			{ print "@comment in metacity: " $$0; next; }
-.  endfor
-.  undef d
-.  undef dirs
 .endif	# METACITY_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 1261ec23c64..0d9a543badf 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2004/10/15 12:41:14 jmmv Exp $
+$NetBSD: distinfo,v 1.17 2004/12/24 10:09:31 jmmv Exp $
 
-SHA1 (metacity-2.8.6.tar.bz2) = 5f86472a4f8ffa4d8a72e375e41e337362e7b8e0
-Size (metacity-2.8.6.tar.bz2) = 2174175 bytes
+SHA1 (metacity-2.8.8.tar.bz2) = 1affbe79fdbf354317d0ff6af4b694de37c61308
+Size (metacity-2.8.8.tar.bz2) = 2180355 bytes