update to 2.20.1

This switches to the new gnome-2.20 branch.

3 files changed, 29 insertions, 13 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 908790b00c9..8cd0701a81e 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.72 2007/09/21 13:04:29 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2007/11/03 16:19:08 drochner Exp $
 #
 
-DISTNAME=		gnome-desktop-2.18.3
-PKGREVISION=		2
+DISTNAME=		gnome-desktop-2.20.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.18/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index 464ef9c643e..f44b343e6ce 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2007/07/12 19:38:18 drochner Exp $
+@comment $NetBSD: PLIST,v 1.27 2007/11/03 16:19:08 drochner Exp $
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
 include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
@@ -7,6 +7,8 @@ lib/libgnome-desktop-2.la
 lib/pkgconfig/gnome-desktop-2.0.pc
 man/man1/gnome-about.1
 share/applications/gnome-about.desktop
+share/gnome-about/contributors.list
+share/gnome-about/foundation-members.list
 share/gnome-about/gnome-64.png
 share/gnome-about/gnome-version.xml
 share/gnome-about/headers/header-bg-ancient01a.png
@@ -23,8 +25,10 @@ share/gnome/help/fdl/ar/fdl.xml
 share/gnome/help/fdl/es/fdl.xml
 share/gnome/help/fdl/fr/fdl.xml
 share/gnome/help/fdl/ko/fdl.xml
+share/gnome/help/fdl/oc/fdl.xml
 share/gnome/help/fdl/sv/fdl.xml
 share/gnome/help/fdl/uk/fdl.xml
+share/gnome/help/fdl/vi/fdl.xml
 share/gnome/help/gpl/C/gpl.xml
 share/gnome/help/gpl/ar/gpl.xml
 share/gnome/help/gpl/ca/gpl.xml
@@ -32,6 +36,7 @@ share/gnome/help/gpl/es/gpl.xml
 share/gnome/help/gpl/fi/gpl.xml
 share/gnome/help/gpl/fr/gpl.xml
 share/gnome/help/gpl/ko/gpl.xml
+share/gnome/help/gpl/oc/gpl.xml
 share/gnome/help/gpl/pa/gpl.xml
 share/gnome/help/gpl/sv/gpl.xml
 share/gnome/help/gpl/uk/gpl.xml
@@ -42,9 +47,11 @@ share/gnome/help/lgpl/ar/lgpl.xml
 share/gnome/help/lgpl/es/lgpl.xml
 share/gnome/help/lgpl/fr/lgpl.xml
 share/gnome/help/lgpl/ko/lgpl.xml
+share/gnome/help/lgpl/oc/lgpl.xml
 share/gnome/help/lgpl/pa/lgpl.xml
 share/gnome/help/lgpl/sv/lgpl.xml
 share/gnome/help/lgpl/uk/lgpl.xml
+share/gnome/help/lgpl/vi/lgpl.xml
 share/gnome/help/lgpl/zh_CN/lgpl.xml
 share/gtk-doc/html/gnome-desktop/GnomeDItemEdit.html
 share/gtk-doc/html/gnome-desktop/GnomeHint.html
@@ -128,6 +135,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -142,7 +150,7 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -157,8 +165,10 @@ share/omf/fdl/fdl-ar.omf
 share/omf/fdl/fdl-es.omf
 share/omf/fdl/fdl-fr.omf
 share/omf/fdl/fdl-ko.omf
+share/omf/fdl/fdl-oc.omf
 share/omf/fdl/fdl-sv.omf
 share/omf/fdl/fdl-uk.omf
+share/omf/fdl/fdl-vi.omf
 share/omf/gpl/gpl-C.omf
 share/omf/gpl/gpl-ar.omf
 share/omf/gpl/gpl-ca.omf
@@ -166,6 +176,7 @@ share/omf/gpl/gpl-es.omf
 share/omf/gpl/gpl-fi.omf
 share/omf/gpl/gpl-fr.omf
 share/omf/gpl/gpl-ko.omf
+share/omf/gpl/gpl-oc.omf
 share/omf/gpl/gpl-pa.omf
 share/omf/gpl/gpl-sv.omf
 share/omf/gpl/gpl-uk.omf
@@ -176,9 +187,11 @@ share/omf/lgpl/lgpl-ar.omf
 share/omf/lgpl/lgpl-es.omf
 share/omf/lgpl/lgpl-fr.omf
 share/omf/lgpl/lgpl-ko.omf
+share/omf/lgpl/lgpl-oc.omf
 share/omf/lgpl/lgpl-pa.omf
 share/omf/lgpl/lgpl-sv.omf
 share/omf/lgpl/lgpl-uk.omf
+share/omf/lgpl/lgpl-vi.omf
 share/omf/lgpl/lgpl-zh_CN.omf
 share/pixmaps/apple-green.png
 share/pixmaps/apple-red.png
@@ -251,8 +264,8 @@ share/pixmaps/gnome-xterm.png
 share/pixmaps/gtkvim.png
 share/pixmaps/kterm.xpm
 share/pixmaps/monitor.png
-share/pixmaps/netbsd-logo-icon-transparent.png
-share/pixmaps/netbsd-logo-icon.png
+share/pixmaps/${LOWER_OPSYS}-logo-icon-transparent.png
+share/pixmaps/${LOWER_OPSYS}-logo-icon.png
 share/pixmaps/vnterm.xpm
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/lgpl
@@ -261,9 +274,11 @@ share/pixmaps/vnterm.xpm
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gtk-doc/html/gnome-desktop
 @dirrm share/gnome/help/lgpl/zh_CN
+@dirrm share/gnome/help/lgpl/vi
 @dirrm share/gnome/help/lgpl/uk
 @dirrm share/gnome/help/lgpl/sv
 @dirrm share/gnome/help/lgpl/pa
+@dirrm share/gnome/help/lgpl/oc
 @dirrm share/gnome/help/lgpl/ko
 @dirrm share/gnome/help/lgpl/fr
 @dirrm share/gnome/help/lgpl/es
@@ -275,6 +290,7 @@ share/pixmaps/vnterm.xpm
 @dirrm share/gnome/help/gpl/uk
 @dirrm share/gnome/help/gpl/sv
 @dirrm share/gnome/help/gpl/pa
+@dirrm share/gnome/help/gpl/oc
 @dirrm share/gnome/help/gpl/ko
 @dirrm share/gnome/help/gpl/fr
 @dirrm share/gnome/help/gpl/fi
@@ -283,15 +299,16 @@ share/pixmaps/vnterm.xpm
 @dirrm share/gnome/help/gpl/ar
 @comment in gnome2-dirs: @dirrm share/gnome/help/gpl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/gpl
+@dirrm share/gnome/help/fdl/vi
 @dirrm share/gnome/help/fdl/uk
 @dirrm share/gnome/help/fdl/sv
+@dirrm share/gnome/help/fdl/oc
 @dirrm share/gnome/help/fdl/ko
 @dirrm share/gnome/help/fdl/fr
 @dirrm share/gnome/help/fdl/es
 @dirrm share/gnome/help/fdl/ar
 @comment in gnome2-dirs: @dirrm share/gnome/help/fdl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/fdl
-@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome-about/headers
 @dirrm share/gnome-about
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index d3cb21467c6..8c2b8e89ba6 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.30 2007/07/12 19:38:18 drochner Exp $
+$NetBSD: distinfo,v 1.31 2007/11/03 16:19:08 drochner Exp $
 
-SHA1 (gnome-desktop-2.18.3.tar.bz2) = e466fb1619423d185772d0052562a2e66dc2e01e
-RMD160 (gnome-desktop-2.18.3.tar.bz2) = fb3cc9047ab4678607e9cae6cc18f0803b03ace3
-Size (gnome-desktop-2.18.3.tar.bz2) = 1306654 bytes
+SHA1 (gnome-desktop-2.20.1.tar.bz2) = be035617bf66dbff87f220d419d77d55124b5314
+RMD160 (gnome-desktop-2.20.1.tar.bz2) = c5df55634541f4cf6e41c9ed35199724e2a3a388
+Size (gnome-desktop-2.20.1.tar.bz2) = 1356668 bytes