update to 2.20.0

This switches to the new gnome-2.20 branch.

4 files changed, 35 insertions, 9 deletions

diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index b2ff651d166..4570c999adb 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2007/09/21 13:04:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/11/03 17:35:40 drochner Exp $
 #
 
-DISTNAME=	gnome-keyring-manager-2.18.0
-PKGREVISION=	3
+DISTNAME=	gnome-keyring-manager-2.20.0
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring-manager/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring-manager/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/security/gnome-keyring-manager/PLIST b/security/gnome-keyring-manager/PLIST
index 1744582f2c6..f289b695a50 100644
--- a/security/gnome-keyring-manager/PLIST
+++ b/security/gnome-keyring-manager/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/09/25 10:54:17 hira Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/11/03 17:35:40 drochner Exp $
 bin/gnome-keyring-manager
 man/man1/gnome-keyring-manager.1
 share/applications/gnome-keyring-manager.desktop
@@ -11,14 +11,18 @@ share/gnome-keyring-manager/stock_new-key.png
 share/gnome-keyring-manager/stock_new-keyring.png
 share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/C/legal.xml
+share/gnome/help/gnome-keyring-manager/ca/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/da/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/en_GB/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/es/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/fr/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/oc/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/sv/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/vi/gnome-keyring-manager.xml
 share/locale/ar/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/be/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/be@latin/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-keyring-manager.mo
@@ -57,6 +61,7 @@ share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/oc/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/or/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo
@@ -65,6 +70,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ro/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/si/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo
@@ -72,6 +78,7 @@ share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ta/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/te/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
@@ -80,20 +87,26 @@ share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
 share/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-ca.omf
 share/omf/gnome-keyring-manager/gnome-keyring-manager-da.omf
 share/omf/gnome-keyring-manager/gnome-keyring-manager-en_GB.omf
 share/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
 share/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-oc.omf
 share/omf/gnome-keyring-manager/gnome-keyring-manager-sv.omf
 share/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-vi.omf
 @dirrm share/omf/gnome-keyring-manager
 @comment in scrollkeeper: @dirrm share/omf
+@dirrm share/gnome/help/gnome-keyring-manager/vi
 @dirrm share/gnome/help/gnome-keyring-manager/uk
 @dirrm share/gnome/help/gnome-keyring-manager/sv
+@dirrm share/gnome/help/gnome-keyring-manager/oc
 @dirrm share/gnome/help/gnome-keyring-manager/fr
 @dirrm share/gnome/help/gnome-keyring-manager/es
 @dirrm share/gnome/help/gnome-keyring-manager/en_GB
 @dirrm share/gnome/help/gnome-keyring-manager/da
+@dirrm share/gnome/help/gnome-keyring-manager/ca
 @dirrm share/gnome/help/gnome-keyring-manager/C
 @dirrm share/gnome/help/gnome-keyring-manager
 @comment in gnome2-dirs: @dirrm share/gnome/help
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
index 8bee53eb9a3..978044fcbe1 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/04/11 17:59:48 drochner Exp $
+$NetBSD: distinfo,v 1.5 2007/11/03 17:35:41 drochner Exp $
 
-SHA1 (gnome-keyring-manager-2.18.0.tar.bz2) = aad959b7e2f13c880fbea336ab903845daef110b
-RMD160 (gnome-keyring-manager-2.18.0.tar.bz2) = 7211106e0227de7e1e15ebb373510b7005d1396c
-Size (gnome-keyring-manager-2.18.0.tar.bz2) = 455431 bytes
+SHA1 (gnome-keyring-manager-2.20.0.tar.bz2) = b6badc1e2d334b44622534c2e328b20333a6a1c2
+RMD160 (gnome-keyring-manager-2.20.0.tar.bz2) = 0724413c81caab8c21590cfe27d1ed99655c20c3
+Size (gnome-keyring-manager-2.20.0.tar.bz2) = 455466 bytes
+SHA1 (patch-aa) = 68a4d38f1529919af667782926bb0224346377f7
diff --git a/security/gnome-keyring-manager/patches/patch-aa b/security/gnome-keyring-manager/patches/patch-aa
new file mode 100644
index 00000000000..d2f5912a842
--- /dev/null
+++ b/security/gnome-keyring-manager/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2007/11/03 17:35:41 drochner Exp $
+
+--- src/gnome-keyring-manager-main-ui.c.orig	2007-10-27 18:10:51.000000000 +0200
++++ src/gnome-keyring-manager-main-ui.c
+@@ -777,7 +777,7 @@ on_help_activate (GtkWidget *widget G_GN
+   gnome_help_display ("gnome-keyring-manager", NULL, &error);
+ 
+   if (error != NULL) {
+-    g_error ("Unable to load help: %s", error->message);
++    g_warning ("Unable to load help: %s", error->message);
+ 
+     g_error_free (error);
+   }