update to 2.20.0

This switches to the new gnome-2.20 branch.

4 files changed, 19 insertions, 16 deletions

diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index d6700d7f3a8..4bb9cc5b227 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2007/09/21 13:04:30 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/11/05 19:45:50 drochner Exp $
 #
 
-DISTNAME=	gnome-screensaver-2.18.2
-PKGREVISION=	2
+DISTNAME=	gnome-screensaver-2.20.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.20/}
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/GnomeScreensaver/
diff --git a/x11/gnome-screensaver/PLIST b/x11/gnome-screensaver/PLIST
index d49f5383113..361069fa71b 100644
--- a/x11/gnome-screensaver/PLIST
+++ b/x11/gnome-screensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/09/25 10:54:23 hira Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/11/05 19:45:50 drochner Exp $
 bin/gnome-screensaver
 bin/gnome-screensaver-command
 bin/gnome-screensaver-preferences
@@ -60,12 +60,15 @@ share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
 share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
+share/locale/oc/LC_MESSAGES/gnome-screensaver.mo
 share/locale/or/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pa/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pl/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pt/LC_MESSAGES/gnome-screensaver.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ro/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ru/LC_MESSAGES/gnome-screensaver.mo
+share/locale/si/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sk/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sl/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sq/LC_MESSAGES/gnome-screensaver.mo
@@ -73,6 +76,7 @@ share/locale/sr/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo
 share/locale/sv/LC_MESSAGES/gnome-screensaver.mo
 share/locale/ta/LC_MESSAGES/gnome-screensaver.mo
+share/locale/te/LC_MESSAGES/gnome-screensaver.mo
 share/locale/th/LC_MESSAGES/gnome-screensaver.mo
 share/locale/tr/LC_MESSAGES/gnome-screensaver.mo
 share/locale/uk/LC_MESSAGES/gnome-screensaver.mo
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index b93bd77266c..be7d54ecce5 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2007/07/13 17:38:44 drochner Exp $
+$NetBSD: distinfo,v 1.11 2007/11/05 19:45:50 drochner Exp $
 
-SHA1 (gnome-screensaver-2.18.2.tar.gz) = f087e3522abe2ea928e40dc48dbe580f4ce1d7a4
-RMD160 (gnome-screensaver-2.18.2.tar.gz) = c87939e2070d9c6887a6b918fd3441612abb6576
-Size (gnome-screensaver-2.18.2.tar.gz) = 2296317 bytes
-SHA1 (patch-aa) = 8cb55b6b916e4d49c6a2107012dd07fae528bf53
+SHA1 (gnome-screensaver-2.20.0.tar.gz) = 9bffb8fc57faa960377ec3d482d9662d767141a4
+RMD160 (gnome-screensaver-2.20.0.tar.gz) = bfb97ad28b34f241b80a9015c82459c0ae35fc3f
+Size (gnome-screensaver-2.20.0.tar.gz) = 2320018 bytes
+SHA1 (patch-aa) = 2ae4a97f1d51ff20f4002fca9e01c4d70624b696
 SHA1 (patch-ab) = 5b5f9d69fd071bfd6f9b316626e23585841dad9d
diff --git a/x11/gnome-screensaver/patches/patch-aa b/x11/gnome-screensaver/patches/patch-aa
index fdadc165d47..3a6cae734d7 100644
--- a/x11/gnome-screensaver/patches/patch-aa
+++ b/x11/gnome-screensaver/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2006/05/19 08:10:02 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2007/11/05 19:45:50 drochner Exp $
 
---- savers/floaters.c.orig	2006-02-17 17:59:33.000000000 +0100
+--- savers/floaters.c.orig	2007-09-17 23:15:12.000000000 +0200
 +++ savers/floaters.c
-@@ -69,6 +69,10 @@
+@@ -72,6 +72,10 @@
  #define GAMMA 2.2
  #endif
  
@@ -10,6 +10,6 @@ $NetBSD: patch-aa,v 1.2 2006/05/19 08:10:02 joerg Exp $
 +#  define trunc(x) ((double)floor(x))
 +#endif
 +
- typedef struct _Point Point;
- typedef struct _Path Path;
- typedef struct _Rectangle Rectangle;
+ static gboolean should_show_paths = FALSE;
+ static gboolean should_do_rotations = FALSE;
+ static gboolean should_print_stats = FALSE;