update to 2.30.1

This switches to the gnome-2.30 release branch.

5 files changed, 20 insertions, 38 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 58d215729b7..27554edcbaf 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2010/06/15 16:32:11 drochner Exp $
+# $NetBSD: Makefile,v 1.89 2010/07/06 15:12:37 drochner Exp $
 
-DISTNAME=	seahorse-2.28.1
-PKGREVISION=	2
+DISTNAME=	seahorse-2.30.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -39,6 +38,9 @@ CONFIGURE_ENV+=		ac_cv_path_GNUPG=${GPGME_GPG}
 PKGCONFIG_OVERRIDE+=	libcryptui/cryptui.pc.in
 GCONF_SCHEMAS= 	seahorse.schemas
 
+# for PKCS11
+.include "../../security/gnome-keyring/buildlink3.mk"
+
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/schemas.mk"
@@ -46,7 +48,6 @@ GCONF_SCHEMAS= 	seahorse.schemas
 #.include "../../net/avahi/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/libgnome-keyring/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index 777a8085d3a..5dd0a0d8f2b 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2010/04/11 22:19:56 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.25 2010/07/06 15:12:37 drochner Exp $
 bin/seahorse
 bin/seahorse-daemon
 include/libcryptui/cryptui-key-chooser.h
@@ -12,10 +12,10 @@ lib/pkgconfig/cryptui-0.0.pc
 lib/seahorse/seahorse-ssh-askpass
 lib/seahorse/xloadimage
 man/man1/seahorse-daemon.1
+man/man1/seahorse.1
 share/applications/seahorse.desktop
 share/dbus-1/services/org.gnome.seahorse.service
 share/gconf/schemas/seahorse.schemas
-share/gnome/autostart/seahorse-daemon.desktop
 share/gnome/help/seahorse/C/figures/seahorse-window.png
 share/gnome/help/seahorse/C/legal.xml
 share/gnome/help/seahorse/C/seahorse.xml
@@ -120,6 +120,7 @@ share/icons/hicolor/48x48/apps/seahorse-preferences.png
 share/icons/hicolor/48x48/apps/seahorse.png
 share/locale/ar/LC_MESSAGES/seahorse.mo
 share/locale/as/LC_MESSAGES/seahorse.mo
+share/locale/ast/LC_MESSAGES/seahorse.mo
 share/locale/az/LC_MESSAGES/seahorse.mo
 share/locale/be@latin/LC_MESSAGES/seahorse.mo
 share/locale/bg/LC_MESSAGES/seahorse.mo
@@ -134,6 +135,7 @@ share/locale/da/LC_MESSAGES/seahorse.mo
 share/locale/de/LC_MESSAGES/seahorse.mo
 share/locale/dz/LC_MESSAGES/seahorse.mo
 share/locale/el/LC_MESSAGES/seahorse.mo
+share/locale/en@shaw/LC_MESSAGES/seahorse.mo
 share/locale/en_CA/LC_MESSAGES/seahorse.mo
 share/locale/en_GB/LC_MESSAGES/seahorse.mo
 share/locale/es/LC_MESSAGES/seahorse.mo
@@ -148,6 +150,7 @@ share/locale/he/LC_MESSAGES/seahorse.mo
 share/locale/hi/LC_MESSAGES/seahorse.mo
 share/locale/hr/LC_MESSAGES/seahorse.mo
 share/locale/hu/LC_MESSAGES/seahorse.mo
+share/locale/id/LC_MESSAGES/seahorse.mo
 share/locale/it/LC_MESSAGES/seahorse.mo
 share/locale/ja/LC_MESSAGES/seahorse.mo
 share/locale/kn/LC_MESSAGES/seahorse.mo
@@ -170,6 +173,7 @@ share/locale/pa/LC_MESSAGES/seahorse.mo
 share/locale/pl/LC_MESSAGES/seahorse.mo
 share/locale/pt/LC_MESSAGES/seahorse.mo
 share/locale/pt_BR/LC_MESSAGES/seahorse.mo
+share/locale/ro/LC_MESSAGES/seahorse.mo
 share/locale/ru/LC_MESSAGES/seahorse.mo
 share/locale/rw/LC_MESSAGES/seahorse.mo
 share/locale/si/LC_MESSAGES/seahorse.mo
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 343a4b3ef47..bded87c0bcd 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.32 2010/06/15 16:32:11 drochner Exp $
+$NetBSD: distinfo,v 1.33 2010/07/06 15:12:37 drochner Exp $
 
-SHA1 (seahorse-2.28.1.tar.bz2) = 8d849f9e95241be3eefb54f3b64a18017c7bb8fc
-RMD160 (seahorse-2.28.1.tar.bz2) = 40e33550233f81a7adf152d8ba72a095c3a822bd
-Size (seahorse-2.28.1.tar.bz2) = 2397687 bytes
-SHA1 (patch-ab) = 2c785a8088dec9786f6c9d9ebbdf7cc2102f609c
-SHA1 (patch-ac) = ab2cae2de896c0b9508dad5e056c2f64f0ac1d59
+SHA1 (seahorse-2.30.1.tar.bz2) = 1754a447d48837bc8a0a657a6bcdd65666704ccb
+RMD160 (seahorse-2.30.1.tar.bz2) = 70cdcc18798e405deb0164d098c57d22adc2f5f5
+Size (seahorse-2.30.1.tar.bz2) = 2422214 bytes
+SHA1 (patch-ab) = 999c135e1815be5608caacb077dc9b881226dd30
diff --git a/security/seahorse/patches/patch-ab b/security/seahorse/patches/patch-ab
index c59abd49c06..c0b77ab8949 100644
--- a/security/seahorse/patches/patch-ab
+++ b/security/seahorse/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2009/10/24 12:53:56 drochner Exp $
+$NetBSD: patch-ab,v 1.12 2010/07/06 15:12:37 drochner Exp $
 
---- daemon/Makefile.in.orig	2009-10-18 01:15:31.000000000 +0200
+--- daemon/Makefile.in.orig	2010-04-27 01:16:56.000000000 +0000
 +++ daemon/Makefile.in
-@@ -336,7 +336,7 @@ INCLUDES = -I$(top_builddir) \
+@@ -342,7 +342,7 @@ INCLUDES = -I$(top_builddir) \
  	-DLOCALEDIR=\""$(localedir)"\" \
  	-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
  	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
@@ -11,12 +11,3 @@ $NetBSD: patch-ab,v 1.11 2009/10/24 12:53:56 drochner Exp $
  
  BUILT_SOURCES = \
  	seahorse-service-bindings.h \
-@@ -371,7 +371,7 @@ seahorse_daemon_LDADD = \
- man_MANS = seahorse-daemon.1
- 
- #autostart
--desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(PREFIX)/share/gnome/autostart
- desktop_in_files = seahorse-daemon.desktop.in 
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- EXTRA_DIST = \
diff --git a/security/seahorse/patches/patch-ac b/security/seahorse/patches/patch-ac
deleted file mode 100644
index 6d63d37d7cc..00000000000
--- a/security/seahorse/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2010/06/15 16:32:12 drochner Exp $
-
---- pkcs11/seahorse-pkcs11-operations.c.orig	2009-04-18 03:22:13.000000000 +0000
-+++ pkcs11/seahorse-pkcs11-operations.c
-@@ -181,7 +181,7 @@ seahorse_pkcs11_refresher_constructor (G
- 
- 	/* Step 1. Load the session */
- 	slot = seahorse_pkcs11_source_get_slot (self->source);
--	gp11_slot_open_session_async (slot, CKF_RW_SESSION, self->cancellable, 
-+	gp11_slot_open_session_async (slot, CKF_RW_SESSION, NULL, NULL, self->cancellable, 
- 	                              (GAsyncReadyCallback)on_open_session, self);
- 	seahorse_operation_mark_start (SEAHORSE_OPERATION (self));
-