update to 2.24.0

This switches to the gnome-2.24 release branch.

4 files changed, 62 insertions, 21 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 9fbec80728d..9f643d33565 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2008/07/14 17:20:35 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2008/10/16 13:45:38 drochner Exp $
 
-DISTNAME=	gnome-keyring-2.22.3
+DISTNAME=	gnome-keyring-2.24.0
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST
index ac5204c350e..e216b3c32a9 100644
--- a/security/gnome-keyring/PLIST
+++ b/security/gnome-keyring/PLIST
@@ -1,11 +1,18 @@
-@comment $NetBSD: PLIST,v 1.13 2008/04/10 16:53:44 drochner Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/10/16 13:45:38 drochner Exp $
+bin/gnome-keyring
 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
+include/gp11/gp11.h
+include/gp11/pkcs11.h
+include/gp11/pkcs11g.h
+include/gp11/pkcs11n.h
 lib/gnome-keyring/gnome-keyring-pkcs11.la
 lib/libgnome-keyring.la
+lib/libgp11.la
 lib/pkgconfig/gnome-keyring-1.pc
+lib/pkgconfig/gp11-0.pc
 lib/security/pam_gnome_keyring.la
 libexec/gnome-keyring-ask
 share/dbus-1/services/org.gnome.keyring.service
@@ -34,6 +41,20 @@ share/gtk-doc/html/gnome-keyring/left.png
 share/gtk-doc/html/gnome-keyring/right.png
 share/gtk-doc/html/gnome-keyring/style.css
 share/gtk-doc/html/gnome-keyring/up.png
+share/gtk-doc/html/gp11/GP11Object.html
+share/gtk-doc/html/gp11/ch01.html
+share/gtk-doc/html/gp11/gp11-GP11Call.html
+share/gtk-doc/html/gp11/gp11-gp11-test.html
+share/gtk-doc/html/gp11/gp11-pkcs11.html
+share/gtk-doc/html/gp11/gp11.devhelp
+share/gtk-doc/html/gp11/gp11.devhelp2
+share/gtk-doc/html/gp11/home.png
+share/gtk-doc/html/gp11/index.html
+share/gtk-doc/html/gp11/index.sgml
+share/gtk-doc/html/gp11/left.png
+share/gtk-doc/html/gp11/right.png
+share/gtk-doc/html/gp11/style.css
+share/gtk-doc/html/gp11/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
@@ -95,7 +116,7 @@ share/locale/sk/LC_MESSAGES/gnome-keyring.mo
 share/locale/sl/LC_MESSAGES/gnome-keyring.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr/LC_MESSAGES/gnome-keyring.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
+share/locale/sr@latin/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
@@ -107,8 +128,10 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
+@dirrm share/gtk-doc/html/gp11
 @dirrm share/gtk-doc/html/gnome-keyring
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in dbus: @dirrm share/dbus-1/services
 @dirrm lib/gnome-keyring
+@dirrm include/gp11
 @dirrm include/gnome-keyring-1
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 66480ba6822..3e76390e018 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.28 2008/07/14 17:20:35 drochner Exp $
+$NetBSD: distinfo,v 1.29 2008/10/16 13:45:38 drochner Exp $
 
-SHA1 (gnome-keyring-2.22.3.tar.bz2) = 0f52095590a684920cc683d1985ac66263702114
-RMD160 (gnome-keyring-2.22.3.tar.bz2) = 551f4a4d734e0196522be9276ae7e76110a96556
-Size (gnome-keyring-2.22.3.tar.bz2) = 894308 bytes
-SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2
+SHA1 (gnome-keyring-2.24.0.tar.bz2) = 8ee43c1f5de544997cddf29f83a5419e667c5eb6
+RMD160 (gnome-keyring-2.24.0.tar.bz2) = 836164b7d18ac920dce8523c2b0fac0a6f1049e9
+Size (gnome-keyring-2.24.0.tar.bz2) = 1106086 bytes
+SHA1 (patch-aa) = 0538fdbe4b6d45e38daeefbe26b287972b208034
 SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c
 SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7
 SHA1 (patch-ad) = b251bb0479a527f18822de67a0cb0af267f5ee60
diff --git a/security/gnome-keyring/patches/patch-aa b/security/gnome-keyring/patches/patch-aa
index 9e1bf9b2cd5..548fabdd258 100644
--- a/security/gnome-keyring/patches/patch-aa
+++ b/security/gnome-keyring/patches/patch-aa
@@ -1,9 +1,27 @@
-$NetBSD: patch-aa,v 1.7 2008/04/10 16:53:44 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2008/10/16 13:45:38 drochner Exp $
 
---- configure.orig	2008-03-09 15:25:49.000000000 +0100
+--- configure.orig	2008-09-21 00:18:31.000000000 +0200
 +++ configure
-@@ -23793,7 +23793,7 @@ else
-   tests_status="no"
+@@ -17119,7 +17119,7 @@ fi
+ 
+ 	dbus_status=$DBUS_VERSION
+ fi
+- if test "$enable_dbus" == "yes"; then
++ if test "$enable_dbus" = "yes"; then
+   WITH_DBUS_TRUE=
+   WITH_DBUS_FALSE='#'
+ else
+@@ -18160,7 +18160,7 @@ if test "${enable_tests+set}" = set; the
+ fi
+ 
+ 
+-if test "$enable_tests" == "yes"; then
++if test "$enable_tests" = "yes"; then
+ 	echo "building tests and unit tests"
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -18173,7 +18173,7 @@ else
+   	tests_status="no"
  fi
  
 - if test "$enable_tests" == "yes"; then
@@ -11,12 +29,12 @@ $NetBSD: patch-aa,v 1.7 2008/04/10 16:53:44 drochner Exp $
    WITH_TESTS_TRUE=
    WITH_TESTS_FALSE='#'
  else
-@@ -25228,7 +25228,7 @@ fi
+@@ -18188,7 +18188,7 @@ if test "${enable_coverage+set}" = set; 
+ fi
  
- 	dbus_status=$DBUS_VERSION
+ 
+-if test "$enable_coverage" == "yes"; then
++if test "$enable_coverage" = "yes"; then
+ 	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+ 	LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
  fi
-- if test "$enable_dbus" == "yes"; then
-+ if test "$enable_dbus" = "yes"; then
-   WITH_DBUS_TRUE=
-   WITH_DBUS_FALSE='#'
- else