update to 2.20.1

This switches to the new gnome-2.20 branch.
(While this is not part of the "platform" subset formally, it is used
by platform -- this looks like an inconsistency in gnome packaging.)

4 files changed, 42 insertions, 9 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 181e1b2987f..87550efcc25 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2007/04/10 18:30:05 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2007/10/31 20:20:30 drochner Exp $
 #
 
-DISTNAME=	gnome-keyring-0.8.1
+DISTNAME=	gnome-keyring-2.20.1
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/0.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -24,6 +24,7 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST
index 8ddf86b0b57..50eca606f86 100644
--- a/security/gnome-keyring/PLIST
+++ b/security/gnome-keyring/PLIST
@@ -1,11 +1,25 @@
-@comment $NetBSD: PLIST,v 1.11 2007/03/21 12:04:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/10/31 20:20:30 drochner Exp $
 bin/gnome-keyring-daemon
+include/gnome-keyring-1/gnome-keyring-memory.h
+include/gnome-keyring-1/gnome-keyring-result.h
 include/gnome-keyring-1/gnome-keyring.h
 lib/libgnome-keyring.la
 lib/pkgconfig/gnome-keyring-1.pc
+lib/security/pam_gnome_keyring.la
 libexec/gnome-keyring-ask
 share/gtk-doc/html/gnome-keyring/ch01.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-acl.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-attributes.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-find.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-generic-callbacks.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-item-info.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-items.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-keyring-info.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-keyrings.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-memory.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-misc.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-network.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-result.html
 share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp
 share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp2
 share/gtk-doc/html/gnome-keyring/home.png
@@ -18,6 +32,7 @@ share/gtk-doc/html/gnome-keyring/up.png
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
 share/locale/az/LC_MESSAGES/gnome-keyring.mo
 share/locale/be/LC_MESSAGES/gnome-keyring.mo
+share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
 share/locale/bg/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
@@ -59,6 +74,7 @@ share/locale/ms/LC_MESSAGES/gnome-keyring.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring.mo
+share/locale/oc/LC_MESSAGES/gnome-keyring.mo
 share/locale/or/LC_MESSAGES/gnome-keyring.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring.mo
@@ -67,6 +83,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
 share/locale/ro/LC_MESSAGES/gnome-keyring.mo
 share/locale/ru/LC_MESSAGES/gnome-keyring.mo
 share/locale/rw/LC_MESSAGES/gnome-keyring.mo
+share/locale/si/LC_MESSAGES/gnome-keyring.mo
 share/locale/sk/LC_MESSAGES/gnome-keyring.mo
 share/locale/sl/LC_MESSAGES/gnome-keyring.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring.mo
@@ -74,6 +91,7 @@ share/locale/sr/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring.mo
 share/locale/ta/LC_MESSAGES/gnome-keyring.mo
+share/locale/te/LC_MESSAGES/gnome-keyring.mo
 share/locale/th/LC_MESSAGES/gnome-keyring.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring.mo
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 02e319db44c..74d49e6ad7d 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.19 2007/04/10 18:30:05 drochner Exp $
+$NetBSD: distinfo,v 1.20 2007/10/31 20:20:30 drochner Exp $
 
-SHA1 (gnome-keyring-0.8.1.tar.bz2) = 6473106b3621c5e6b7cbc16f5955ec704a1a39c2
-RMD160 (gnome-keyring-0.8.1.tar.bz2) = 7f9b100aa59b26fee7b761d2705ad9725b87a031
-Size (gnome-keyring-0.8.1.tar.bz2) = 448558 bytes
+SHA1 (gnome-keyring-2.20.1.tar.bz2) = 7026d22cd457c99bb0c973a79b7bc0d08430e739
+RMD160 (gnome-keyring-2.20.1.tar.bz2) = 770a9633d67b205b61148e5acc6d55d0b3f3d285
+Size (gnome-keyring-2.20.1.tar.bz2) = 546007 bytes
+SHA1 (patch-aa) = ba8a85a0f1c66c72a6084aa0677074fa74017039
diff --git a/security/gnome-keyring/patches/patch-aa b/security/gnome-keyring/patches/patch-aa
new file mode 100644
index 00000000000..54e4bd5ec01
--- /dev/null
+++ b/security/gnome-keyring/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.6 2007/10/31 20:20:30 drochner Exp $
+
+--- configure.orig	2007-09-27 20:36:29.000000000 +0200
++++ configure
+@@ -23462,7 +23462,7 @@ else
+   echo "not building tests and unit tests"
+ fi
+ 
+- if test "$enable_tests" == "yes"; then
++ if test "$enable_tests" = "yes"; then
+   WITH_TESTS_TRUE=
+   WITH_TESTS_FALSE='#'
+ else