update to 2.34.1

This switches to the latest release branch.

4 files changed, 15 insertions, 25 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 15302078e8b..4cf5be5c99b 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.92 2011/04/22 13:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.93 2011/07/13 20:06:15 drochner Exp $
 #
 
-DISTNAME=	metacity-2.30.3
-PKGREVISION=	2
+DISTNAME=	metacity-2.34.1
 CATEGORIES=	wm x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.34/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index f6bf6ab8c74..b2af8e96568 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2010/11/24 20:27:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.34 2011/07/13 20:06:15 drochner Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -18,9 +18,13 @@ man/man1/metacity-window-demo.1
 man/man1/metacity.1
 share/applications/metacity.desktop
 share/gconf/schemas/metacity.schemas
-share/gnome-control-center/keybindings/50-metacity-desktop-key.xml
-share/gnome-control-center/keybindings/50-metacity-key.xml
+share/gnome-control-center/keybindings/50-metacity-launchers.xml
+share/gnome-control-center/keybindings/50-metacity-navigation.xml
+share/gnome-control-center/keybindings/50-metacity-screenshot.xml
+share/gnome-control-center/keybindings/50-metacity-system.xml
+share/gnome-control-center/keybindings/50-metacity-windows.xml
 share/gnome/help/creating-metacity-themes/C/creating-metacity-themes.xml
+share/gnome/help/creating-metacity-themes/de/creating-metacity-themes.xml
 share/gnome/wm-properties/metacity-wm.desktop
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
@@ -107,6 +111,7 @@ share/locale/te/LC_MESSAGES/metacity.mo
 share/locale/th/LC_MESSAGES/metacity.mo
 share/locale/tk/LC_MESSAGES/metacity.mo
 share/locale/tr/LC_MESSAGES/metacity.mo
+share/locale/ug/LC_MESSAGES/metacity.mo
 share/locale/uk/LC_MESSAGES/metacity.mo
 share/locale/vi/LC_MESSAGES/metacity.mo
 share/locale/wa/LC_MESSAGES/metacity.mo
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 8cb982d1ddb..15594f846d8 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.43 2010/11/24 20:27:37 drochner Exp $
+$NetBSD: distinfo,v 1.44 2011/07/13 20:06:15 drochner Exp $
 
-SHA1 (metacity-2.30.3.tar.bz2) = 32848d34473375ca27ef12be9f41e924d8af177d
-RMD160 (metacity-2.30.3.tar.bz2) = ce4a994c7b1e7b95e493fc67082a4cbb6458329f
-Size (metacity-2.30.3.tar.bz2) = 2358537 bytes
+SHA1 (metacity-2.34.1.tar.bz2) = 2b691c4a2c98be0b53deed2274b901880d3d6c84
+RMD160 (metacity-2.34.1.tar.bz2) = 965fcef1affb2308e54d99990909194780291b52
+Size (metacity-2.34.1.tar.bz2) = 2411563 bytes
 SHA1 (patch-aa) = e57853437a8485399f302553a4a4289e607d3780
-SHA1 (patch-ab) = 6e3f56831d152a2144a8970a5c17b37be70ca117
 SHA1 (patch-ac) = bfdb91948f619a7021a6d1d7d0ff4b7995c8e91d
diff --git a/wm/metacity/patches/patch-ab b/wm/metacity/patches/patch-ab
deleted file mode 100644
index fa851ddcaf6..00000000000
--- a/wm/metacity/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/10/22 17:33:57 drochner Exp $
-
---- src/core/main.c.orig	2009-10-21 21:56:47.000000000 +0200
-+++ src/core/main.c
-@@ -58,7 +58,7 @@
- 
- #include <stdlib.h>
- #include <sys/types.h>
--#include <wait.h>
-+#include <sys/wait.h>
- #include <stdio.h>
- #include <string.h>
- #include <signal.h>