update to 2.20.0

This switches to the new gnome-2.20 branch.

4 files changed, 13 insertions, 12 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index aedab3bac1b..38ac1e3420b 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.72 2007/09/21 13:04:26 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2007/11/05 19:40:41 drochner Exp $
 #
 
-DISTNAME=	metacity-2.18.5
-PKGREVISION=	1
+DISTNAME=	metacity-2.20.0
 CATEGORIES=	wm x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index 5093357657b..81b4666e34c 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2007/09/25 10:54:20 hira Exp $
+@comment $NetBSD: PLIST,v 1.26 2007/11/05 19:40:42 drochner Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -17,6 +17,8 @@ man/man1/metacity-theme-viewer.1
 man/man1/metacity-window-demo.1
 man/man1/metacity.1
 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/wm-properties/metacity.desktop
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
@@ -69,6 +71,7 @@ share/locale/nb/LC_MESSAGES/metacity.mo
 share/locale/ne/LC_MESSAGES/metacity.mo
 share/locale/nl/LC_MESSAGES/metacity.mo
 share/locale/nn/LC_MESSAGES/metacity.mo
+share/locale/oc/LC_MESSAGES/metacity.mo
 share/locale/or/LC_MESSAGES/metacity.mo
 share/locale/pa/LC_MESSAGES/metacity.mo
 share/locale/pl/LC_MESSAGES/metacity.mo
@@ -77,6 +80,7 @@ share/locale/pt_BR/LC_MESSAGES/metacity.mo
 share/locale/ro/LC_MESSAGES/metacity.mo
 share/locale/ru/LC_MESSAGES/metacity.mo
 share/locale/rw/LC_MESSAGES/metacity.mo
+share/locale/si/LC_MESSAGES/metacity.mo
 share/locale/sk/LC_MESSAGES/metacity.mo
 share/locale/sl/LC_MESSAGES/metacity.mo
 share/locale/sq/LC_MESSAGES/metacity.mo
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index 9f23f3ea8fc..89ce86db1b4 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/11/05 19:40:42 drochner Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 METACITY_BUILDLINK3_MK:=	${METACITY_BUILDLINK3_MK}+
@@ -18,9 +18,7 @@ BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
 .endif	# METACITY_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 654c10bc870..d9c409aa829 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.32 2007/07/13 17:27:07 drochner Exp $
+$NetBSD: distinfo,v 1.33 2007/11/05 19:40:42 drochner Exp $
 
-SHA1 (metacity-2.18.5.tar.bz2) = 77ab171c6b84a4235ee6819049e2f0c26a15a19f
-RMD160 (metacity-2.18.5.tar.bz2) = fe7b06c38124ed5caf9fccb3d416145a6251787d
-Size (metacity-2.18.5.tar.bz2) = 1949393 bytes
+SHA1 (metacity-2.20.0.tar.bz2) = 1d515a38678f5d26568e0479d5a363c5709357e4
+RMD160 (metacity-2.20.0.tar.bz2) = 1723f6c575cf71a65918e8c2c223d0a31723be9d
+Size (metacity-2.20.0.tar.bz2) = 1882886 bytes