update to 2.30.3

changes:
-bugfixes
-Add dbus activation service file for org.freedesktop.secrets

pkgsrc note: removed dependency on libgnome-keyring; child pkgs
should have been updated to list this dependency explicitely

5 files changed, 15 insertions, 23 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index e99da48d5ab..52a59ea0aa6 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2010/06/13 22:45:18 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/07/06 16:13:41 drochner Exp $
 
-DISTNAME=	gnome-keyring-2.30.1
-PKGREVISION=	1
+DISTNAME=	gnome-keyring-2.30.3
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.30/}
 EXTRACT_SUFX=	.tar.bz2
@@ -41,11 +40,6 @@ BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
-# XXX not necessary technically, just for transition,
-# can be removed when all dependant pkgs are switched to
-# libgnome-keyring if the library is needed
-.include "../../security/libgnome-keyring/buildlink3.mk"
-
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST
index f607a0b20aa..41aadb5dff3 100644
--- a/security/gnome-keyring/PLIST
+++ b/security/gnome-keyring/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2010/06/11 13:45:50 drochner Exp $
+@comment $NetBSD: PLIST,v 1.24 2010/07/06 16:13:41 drochner Exp $
 bin/gnome-keyring
 bin/gnome-keyring-daemon
 include/gcr/gcr-certificate-basics-widget.h
@@ -24,6 +24,7 @@ lib/pkgconfig/gcr-0.pc
 lib/pkgconfig/gp11-0.pc
 lib/security/pam_gnome_keyring.la
 libexec/gnome-keyring-prompt
+share/dbus-1/services/org.freedesktop.secrets.service
 share/dbus-1/services/org.gnome.keyring.service
 share/gconf/schemas/gnome-keyring.schemas
 share/gcr/ui/gcr-certificate-basics-widget.ui
diff --git a/security/gnome-keyring/buildlink3.mk b/security/gnome-keyring/buildlink3.mk
index 44d6b66a9e0..dab2bd57dcc 100644
--- a/security/gnome-keyring/buildlink3.mk
+++ b/security/gnome-keyring/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/07/06 16:13:42 drochner Exp $
 
 BUILDLINK_TREE+=	gnome-keyring
 
@@ -9,9 +9,6 @@ BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.4.0
 BUILDLINK_ABI_DEPENDS.gnome-keyring?=	gnome-keyring>=2.30.1nb1
 BUILDLINK_PKGSRCDIR.gnome-keyring?=	../../security/gnome-keyring
 
-# XXX see Makefile
-.include "../../security/libgnome-keyring/buildlink3.mk"
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index b18456628ad..ea5184d29be 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2010/06/11 13:45:50 drochner Exp $
+$NetBSD: distinfo,v 1.38 2010/07/06 16:13:42 drochner Exp $
 
-SHA1 (gnome-keyring-2.30.1.tar.bz2) = bf7623d8a2bc9013a8109e1e433d0a45e9dd759b
-RMD160 (gnome-keyring-2.30.1.tar.bz2) = 70ec1c3e033fbd6ab71bd411750c136ee2e701d1
-Size (gnome-keyring-2.30.1.tar.bz2) = 1593050 bytes
+SHA1 (gnome-keyring-2.30.3.tar.bz2) = 0e0a2a1f4127dc6a01583fb3e81386370d9335f0
+RMD160 (gnome-keyring-2.30.3.tar.bz2) = 9bd3cea25e10e1dcd93cfbc75a6a448e8ab338ca
+Size (gnome-keyring-2.30.3.tar.bz2) = 1592573 bytes
 SHA1 (patch-ad) = d49bc78227646b3de3c357cd0f1e90cd38862ee4
-SHA1 (patch-ae) = e89399e9f179fd4f7e33abbe5b9f26fa54fae849
+SHA1 (patch-ae) = f2c75eb299cd9cd6f1f4ba32da73df0ad546c4ec
 SHA1 (patch-af) = 03f4ff07a7b9830dbc5c228efb4d971adfe85d89
 SHA1 (patch-ag) = 4b6f5510124c58613c5b8ce8782f913cca43a570
diff --git a/security/gnome-keyring/patches/patch-ae b/security/gnome-keyring/patches/patch-ae
index c4c601441ab..93705aa2bcf 100644
--- a/security/gnome-keyring/patches/patch-ae
+++ b/security/gnome-keyring/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2010/06/11 13:45:50 drochner Exp $
+$NetBSD: patch-ae,v 1.4 2010/07/06 16:13:42 drochner Exp $
 
---- daemon/Makefile.in.orig	2010-04-26 19:47:36.000000000 +0000
+--- daemon/Makefile.in.orig	2010-06-20 23:35:30.000000000 +0000
 +++ daemon/Makefile.in
-@@ -418,7 +418,7 @@ desktop_in_files = \
+@@ -416,7 +416,7 @@ desktop_in_files = \
  	gnome-keyring-secrets.desktop.in \
  	gnome-keyring-ssh.desktop.in
  
 -desktopdir = $(sysconfdir)/xdg/autostart
 +desktopdir = $(PREFIX)/share/gnome/autostart
  desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- all: all-recursive
- 
+ EXTRA_DIST = \
+ 	$(service_in_files) \