update to 1.0.1

This moves this pkg to the new stable gnome branch, too much to list here.

12 files changed, 274 insertions, 184 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 8bdd7c594d2..b47b51405f3 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2007/03/21 12:05:52 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2007/04/11 21:48:02 drochner Exp $
 
-DISTNAME=	seahorse-0.8.1
-PKGREVISION=	4
+DISTNAME=	seahorse-1.0.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/0.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/1.0/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -14,20 +13,18 @@ DEPENDS+=		gnupg>=1.2.1:../../security/gnupg
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake intltool msgfmt pkg-config autoconf
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--disable-gedit
 CONFIGURE_ARGS+=	--disable-nautilus
 
-GCONF2_SCHEMAS=	seahorse.schemas
+PKGCONFIG_OVERRIDE+=	libcryptui/cryptui.pc.in
+GCONF2_SCHEMAS= 	seahorse.schemas
 
 BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 
-pre-configure:
-	cd ${WRKSRC} && autoconf
-
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf2/schemas.mk"
@@ -35,7 +32,13 @@ pre-configure:
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+# XXX
+.include "../../x11/libSM/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index ca233f83969..1191736eefc 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,14 +1,29 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/17 07:07:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/04/11 21:48:02 drochner Exp $
 bin/seahorse
 bin/seahorse-agent
-bin/seahorse-pgp-preferences
-lib/libseahorse-internal.la
+bin/seahorse-daemon
+bin/seahorse-preferences
+bin/seahorse-tool
+include/libcryptui/cryptui-key-chooser.h
+include/libcryptui/cryptui-key-combo.h
+include/libcryptui/cryptui-key-list.h
+include/libcryptui/cryptui-key-store.h
+include/libcryptui/cryptui-keyset.h
+include/libcryptui/cryptui.h
+lib/libcryptui.la
+lib/pkgconfig/cryptui-0.0.pc
+lib/seahorse/seahorse-ssh-askpass
+lib/seahorse/xloadimage
+man/man1/seahorse-agent.1
+man/man1/seahorse-daemon.1
+man/man1/seahorse-tool.1
 share/applications/seahorse-pgp-encrypted.desktop
 share/applications/seahorse-pgp-keys.desktop
 share/applications/seahorse-pgp-preferences.desktop
 share/applications/seahorse-pgp-signature.desktop
 share/applications/seahorse.desktop
 share/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
+share/dbus-1/services/org.gnome.seahorse.service
 share/gconf/schemas/seahorse.schemas
 share/gnome/help/seahorse/C/figures/export.png
 share/gnome/help/seahorse/C/figures/file-manager.png
@@ -19,32 +34,116 @@ share/gnome/help/seahorse/C/figures/key-properties.png
 share/gnome/help/seahorse/C/figures/passphrase.png
 share/gnome/help/seahorse/C/figures/preferences.png
 share/gnome/help/seahorse/C/figures/recipients.png
+share/gnome/help/seahorse/C/figures/seahorse-window.png
 share/gnome/help/seahorse/C/figures/signature.png
 share/gnome/help/seahorse/C/figures/text-editor.png
 share/gnome/help/seahorse/C/legal.xml
 share/gnome/help/seahorse/C/seahorse.xml
+share/gnome/help/seahorse/en_GB/figures/export.png
+share/gnome/help/seahorse/en_GB/figures/file-manager.png
+share/gnome/help/seahorse/en_GB/figures/generate.png
+share/gnome/help/seahorse/en_GB/figures/import.png
+share/gnome/help/seahorse/en_GB/figures/key-manager.png
+share/gnome/help/seahorse/en_GB/figures/key-properties.png
+share/gnome/help/seahorse/en_GB/figures/passphrase.png
+share/gnome/help/seahorse/en_GB/figures/preferences.png
+share/gnome/help/seahorse/en_GB/figures/recipients.png
+share/gnome/help/seahorse/en_GB/figures/seahorse-window.png
+share/gnome/help/seahorse/en_GB/figures/signature.png
+share/gnome/help/seahorse/en_GB/figures/text-editor.png
+share/gnome/help/seahorse/en_GB/seahorse.xml
+share/gnome/help/seahorse/es/figures/export.png
+share/gnome/help/seahorse/es/figures/file-manager.png
+share/gnome/help/seahorse/es/figures/generate.png
+share/gnome/help/seahorse/es/figures/import.png
+share/gnome/help/seahorse/es/figures/key-manager.png
+share/gnome/help/seahorse/es/figures/key-properties.png
+share/gnome/help/seahorse/es/figures/passphrase.png
+share/gnome/help/seahorse/es/figures/preferences.png
+share/gnome/help/seahorse/es/figures/recipients.png
+share/gnome/help/seahorse/es/figures/seahorse-window.png
+share/gnome/help/seahorse/es/figures/signature.png
+share/gnome/help/seahorse/es/figures/text-editor.png
+share/gnome/help/seahorse/es/seahorse.xml
+share/gnome/help/seahorse/fr/figures/export.png
+share/gnome/help/seahorse/fr/figures/file-manager.png
+share/gnome/help/seahorse/fr/figures/generate.png
+share/gnome/help/seahorse/fr/figures/import.png
+share/gnome/help/seahorse/fr/figures/key-manager.png
+share/gnome/help/seahorse/fr/figures/key-properties.png
+share/gnome/help/seahorse/fr/figures/passphrase.png
+share/gnome/help/seahorse/fr/figures/preferences.png
+share/gnome/help/seahorse/fr/figures/recipients.png
+share/gnome/help/seahorse/fr/figures/seahorse-window.png
+share/gnome/help/seahorse/fr/figures/signature.png
+share/gnome/help/seahorse/fr/figures/text-editor.png
+share/gnome/help/seahorse/fr/seahorse.xml
+share/gnome/help/seahorse/it/figures/export.png
+share/gnome/help/seahorse/it/figures/file-manager.png
+share/gnome/help/seahorse/it/figures/generate.png
+share/gnome/help/seahorse/it/figures/import.png
+share/gnome/help/seahorse/it/figures/key-manager.png
+share/gnome/help/seahorse/it/figures/key-properties.png
+share/gnome/help/seahorse/it/figures/passphrase.png
+share/gnome/help/seahorse/it/figures/preferences.png
+share/gnome/help/seahorse/it/figures/recipients.png
+share/gnome/help/seahorse/it/figures/seahorse-window.png
+share/gnome/help/seahorse/it/figures/signature.png
+share/gnome/help/seahorse/it/figures/text-editor.png
+share/gnome/help/seahorse/it/seahorse.xml
+share/gnome/help/seahorse/sv/figures/export.png
+share/gnome/help/seahorse/sv/figures/file-manager.png
+share/gnome/help/seahorse/sv/figures/generate.png
+share/gnome/help/seahorse/sv/figures/import.png
+share/gnome/help/seahorse/sv/figures/key-manager.png
+share/gnome/help/seahorse/sv/figures/key-properties.png
+share/gnome/help/seahorse/sv/figures/passphrase.png
+share/gnome/help/seahorse/sv/figures/preferences.png
+share/gnome/help/seahorse/sv/figures/recipients.png
+share/gnome/help/seahorse/sv/figures/seahorse-window.png
+share/gnome/help/seahorse/sv/figures/signature.png
+share/gnome/help/seahorse/sv/figures/text-editor.png
+share/gnome/help/seahorse/sv/seahorse.xml
+share/icons/hicolor/22x22/apps/seahorse-preferences.svg
+share/icons/hicolor/22x22/apps/seahorse.svg
+share/icons/hicolor/48x48/apps/seahorse-applet.png
+share/icons/hicolor/48x48/apps/seahorse-preferences.png
+share/icons/hicolor/48x48/apps/seahorse.png
+share/icons/hicolor/scalable/apps/seahorse-applet.svg
+share/icons/hicolor/scalable/apps/seahorse-preferences.svg
+share/icons/hicolor/scalable/apps/seahorse.svg
+share/locale/ar/LC_MESSAGES/seahorse.mo
 share/locale/az/LC_MESSAGES/seahorse.mo
 share/locale/bg/LC_MESSAGES/seahorse.mo
+share/locale/bn_IN/LC_MESSAGES/seahorse.mo
 share/locale/ca/LC_MESSAGES/seahorse.mo
 share/locale/cs/LC_MESSAGES/seahorse.mo
 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_CA/LC_MESSAGES/seahorse.mo
 share/locale/en_GB/LC_MESSAGES/seahorse.mo
 share/locale/es/LC_MESSAGES/seahorse.mo
+share/locale/et/LC_MESSAGES/seahorse.mo
 share/locale/eu/LC_MESSAGES/seahorse.mo
 share/locale/fi/LC_MESSAGES/seahorse.mo
 share/locale/fr/LC_MESSAGES/seahorse.mo
+share/locale/gl/LC_MESSAGES/seahorse.mo
+share/locale/gu/LC_MESSAGES/seahorse.mo
+share/locale/he/LC_MESSAGES/seahorse.mo
 share/locale/hr/LC_MESSAGES/seahorse.mo
 share/locale/hu/LC_MESSAGES/seahorse.mo
 share/locale/it/LC_MESSAGES/seahorse.mo
 share/locale/ja/LC_MESSAGES/seahorse.mo
+share/locale/ko/LC_MESSAGES/seahorse.mo
+share/locale/lt/LC_MESSAGES/seahorse.mo
+share/locale/mk/LC_MESSAGES/seahorse.mo
 share/locale/ml/LC_MESSAGES/seahorse.mo
 share/locale/ms/LC_MESSAGES/seahorse.mo
 share/locale/nb/LC_MESSAGES/seahorse.mo
 share/locale/ne/LC_MESSAGES/seahorse.mo
 share/locale/nl/LC_MESSAGES/seahorse.mo
-share/locale/no/LC_MESSAGES/seahorse.mo
 share/locale/pa/LC_MESSAGES/seahorse.mo
 share/locale/pl/LC_MESSAGES/seahorse.mo
 share/locale/pt/LC_MESSAGES/seahorse.mo
@@ -57,54 +156,128 @@ share/locale/sq/LC_MESSAGES/seahorse.mo
 share/locale/sr/LC_MESSAGES/seahorse.mo
 share/locale/sr@Latn/LC_MESSAGES/seahorse.mo
 share/locale/sv/LC_MESSAGES/seahorse.mo
+share/locale/th/LC_MESSAGES/seahorse.mo
 share/locale/tr/LC_MESSAGES/seahorse.mo
 share/locale/uk/LC_MESSAGES/seahorse.mo
+share/locale/vi/LC_MESSAGES/seahorse.mo
 share/locale/zh_CN/LC_MESSAGES/seahorse.mo
+share/locale/zh_HK/LC_MESSAGES/seahorse.mo
 share/locale/zh_TW/LC_MESSAGES/seahorse.mo
-share/mime-info/seahorse.keys
-share/mime-info/seahorse.mime
 share/mime/packages/seahorse.xml
 share/omf/seahorse/seahorse-C.omf
-share/pixmaps/seahorse-key.png
-share/pixmaps/seahorse-secret.png
+share/omf/seahorse/seahorse-en_GB.omf
+share/omf/seahorse/seahorse-es.omf
+share/omf/seahorse/seahorse-fr.omf
+share/omf/seahorse/seahorse-it.omf
+share/omf/seahorse/seahorse-sv.omf
+share/pixmaps/seahorse-applet.svg
+share/pixmaps/seahorse-preferences.png
 share/pixmaps/seahorse.png
+share/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png
+share/pixmaps/seahorse/22x22/seahorse-applet-key.png
+share/pixmaps/seahorse/22x22/seahorse-applet-signed.png
+share/pixmaps/seahorse/22x22/seahorse-applet-text.png
+share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png
+share/pixmaps/seahorse/22x22/seahorse-key-personal.png
+share/pixmaps/seahorse/22x22/seahorse-key-ssh.png
+share/pixmaps/seahorse/22x22/seahorse-key.png
+share/pixmaps/seahorse/22x22/seahorse-preferences.png
+share/pixmaps/seahorse/22x22/seahorse-share-keys.png
+share/pixmaps/seahorse/22x22/seahorse-sign-bad.png
+share/pixmaps/seahorse/22x22/seahorse-sign-ok.png
+share/pixmaps/seahorse/22x22/seahorse.png
+share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png
+share/pixmaps/seahorse/48x48/seahorse-applet-key.png
+share/pixmaps/seahorse/48x48/seahorse-applet-signed.png
+share/pixmaps/seahorse/48x48/seahorse-applet-text.png
+share/pixmaps/seahorse/48x48/seahorse-applet-unknown.png
+share/pixmaps/seahorse/48x48/seahorse-applet.png
+share/pixmaps/seahorse/48x48/seahorse-key-personal.png
+share/pixmaps/seahorse/48x48/seahorse-key-ssh.png
+share/pixmaps/seahorse/48x48/seahorse-key.png
+share/pixmaps/seahorse/48x48/seahorse-person.png
+share/pixmaps/seahorse/48x48/seahorse-preferences.png
+share/pixmaps/seahorse/48x48/seahorse-share-keys.png
+share/pixmaps/seahorse/48x48/seahorse-sign-bad.png
+share/pixmaps/seahorse/48x48/seahorse-sign-ok.png
+share/pixmaps/seahorse/48x48/seahorse-sign-unknown.png
+share/pixmaps/seahorse/48x48/seahorse-sign.png
+share/pixmaps/seahorse/48x48/seahorse.png
+share/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-key.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-signed.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-text.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg
+share/pixmaps/seahorse/scalable/seahorse-applet.svg
+share/pixmaps/seahorse/scalable/seahorse-key-personal.svg
+share/pixmaps/seahorse/scalable/seahorse-key-ssh.svg
+share/pixmaps/seahorse/scalable/seahorse-key.svg
+share/pixmaps/seahorse/scalable/seahorse-person.svg
+share/pixmaps/seahorse/scalable/seahorse-preferences.svg
+share/pixmaps/seahorse/scalable/seahorse-share-keys.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
+share/pixmaps/seahorse/scalable/seahorse-sign.svg
+share/pixmaps/seahorse/scalable/seahorse.svg
 share/seahorse/glade/seahorse-add-keyserver.glade
 share/seahorse/glade/seahorse-add-subkey.glade
 share/seahorse/glade/seahorse-add-uid.glade
 share/seahorse/glade/seahorse-agent-cache.glade
 share/seahorse/glade/seahorse-change-passphrase.glade
 share/seahorse/glade/seahorse-expires.glade
-share/seahorse/glade/seahorse-generate-adv.glade
-share/seahorse/glade/seahorse-generate-druid.glade
 share/seahorse/glade/seahorse-generate-select.glade
+share/seahorse/glade/seahorse-gkeyring-item-properties.glade
 share/seahorse/glade/seahorse-key-manager.glade
 share/seahorse/glade/seahorse-key-manager.ui
-share/seahorse/glade/seahorse-key-properties.glade
 share/seahorse/glade/seahorse-keyserver-results.glade
 share/seahorse/glade/seahorse-keyserver-results.ui
 share/seahorse/glade/seahorse-keyserver-search.glade
 share/seahorse/glade/seahorse-keyserver-sync.glade
 share/seahorse/glade/seahorse-multi-encrypt.glade
-share/seahorse/glade/seahorse-passphrase.glade
-share/seahorse/glade/seahorse-preferences.glade
+share/seahorse/glade/seahorse-notify.glade
+share/seahorse/glade/seahorse-pgp-generate.glade
+share/seahorse/glade/seahorse-pgp-private-key-properties.glade
+share/seahorse/glade/seahorse-pgp-public-key-properties.glade
 share/seahorse/glade/seahorse-prefs.glade
 share/seahorse/glade/seahorse-progress.glade
-share/seahorse/glade/seahorse-recipients.glade
 share/seahorse/glade/seahorse-revoke.glade
 share/seahorse/glade/seahorse-sign.glade
-share/seahorse/glade/seahorse-signatures.glade
 share/seahorse/glade/seahorse-signer.glade
+share/seahorse/glade/seahorse-ssh-generate.glade
+share/seahorse/glade/seahorse-ssh-key-properties.glade
+share/seahorse/glade/seahorse-ssh-upload.glade
 @dirrm share/seahorse/glade
 @dirrm share/seahorse
+@dirrm share/pixmaps/seahorse/scalable
+@dirrm share/pixmaps/seahorse/48x48
+@dirrm share/pixmaps/seahorse/22x22
+@dirrm share/pixmaps/seahorse
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/seahorse
 @comment in scrollkeeper: @dirrm share/omf
 @comment in shared-mime-info: @dirrm share/mime/packages
-@comment in xdg-dirs: @dirrm share/mime-info
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@dirrm share/gnome/help/seahorse/sv/figures
+@dirrm share/gnome/help/seahorse/sv
+@dirrm share/gnome/help/seahorse/it/figures
+@dirrm share/gnome/help/seahorse/it
+@dirrm share/gnome/help/seahorse/fr/figures
+@dirrm share/gnome/help/seahorse/fr
+@dirrm share/gnome/help/seahorse/es/figures
+@dirrm share/gnome/help/seahorse/es
+@dirrm share/gnome/help/seahorse/en_GB/figures
+@dirrm share/gnome/help/seahorse/en_GB
 @dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
 @dirrm share/gnome/help/seahorse
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf2: @dirrm share/gconf/schemas
+@comment in dbus: @dirrm share/dbus-1/services
 @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/seahorse
+@dirrm include/libcryptui
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 974e8a47d0d..b0501cba85b 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.17 2006/12/06 19:51:52 joerg Exp $
+$NetBSD: distinfo,v 1.18 2007/04/11 21:48:02 drochner Exp $
 
-SHA1 (seahorse-0.8.1.tar.bz2) = 43b91153c708e536e00ef38aa12f33eff524b0f7
-RMD160 (seahorse-0.8.1.tar.bz2) = 1442bf55617a08e7357d1b40e64f4d3d3c777bdc
-Size (seahorse-0.8.1.tar.bz2) = 971378 bytes
-SHA1 (patch-aa) = b7dbb53b1a012345b13426f50f76a523ff839536
-SHA1 (patch-ac) = a17c31e312b10d7ba781289b70060ed34a1c006b
-SHA1 (patch-ad) = a7abc7a29a422ec229545f626f37ae173ba56db7
-SHA1 (patch-ae) = cb7e6555d94adc9d2d6a4e0250bd7717c8207f87
-SHA1 (patch-af) = 33876b96f74591ff85e3244ee2070ee12b88a502
-SHA1 (patch-ag) = 15bc9780b30326216e0897700594446b8d459411
+SHA1 (seahorse-1.0.1.tar.bz2) = 03e5232d47e0d9d16fe7a713b00533859583a8d8
+RMD160 (seahorse-1.0.1.tar.bz2) = c11d2b0ae114cb41d52a3dc068f8a4fafc322603
+Size (seahorse-1.0.1.tar.bz2) = 1857602 bytes
+SHA1 (patch-ab) = 8d391aecd0edc78dbbcc6638a76bc29b0a2fba9c
+SHA1 (patch-ae) = a0a85645b1df89ffb992c9191c30b228d2c5bd6f
+SHA1 (patch-ah) = 4a60c47ffd0de18fc423e317e870d08e8295a95c
+SHA1 (patch-ai) = 435ed5231c352f01ed4d83e4c5447cfef6468953
diff --git a/security/seahorse/patches/patch-aa b/security/seahorse/patches/patch-aa
deleted file mode 100644
index 138dc80b239..00000000000
--- a/security/seahorse/patches/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/05/19 21:14:11 jmmv Exp $
-
---- libseahorse/seahorse-util.c.orig	2005-05-01 19:30:09.000000000 +0000
-+++ libseahorse/seahorse-util.c
-@@ -230,11 +230,12 @@ seahorse_util_write_data_to_file (const 
- 	gchar *buffer;
- 	gint nread;
-    
--    /* 
--     * TODO: gpgme_data_seek doesn't work for us right now
--     * probably because of different off_t sizes 
--     */
--    gpgme_data_rewind (data);
-+    /* Reset the read pointer in data */
-+    if (gpgme_data_seek (data, 0, SEEK_SET) == -1)
-+    {
-+        gpg_err_code_t e = gpg_err_code_from_errno (errno);
-+        return GPG_E (e);
-+    }
- 	
-     file = seahorse_vfs_data_create (path, SEAHORSE_VFS_WRITE, &err);
-     if (file != NULL) {
-@@ -275,11 +276,11 @@ seahorse_util_write_data_to_text (gpgme_
-     guint nread = 0;
- 	GString *string;
- 
--    /* 
--     * TODO: gpgme_data_seek doesn't work for us right now
--     * probably because of different off_t sizes 
--     */
--    gpgme_data_rewind (data);
-+        /* Reset the read pointer in data */
-+        if (gpgme_data_seek (data, 0, SEEK_SET) == -1)
-+        {
-+            return NULL;
-+        }
- 
- 	string = g_string_new ("");
- 	buffer = g_new (gchar, size);
diff --git a/security/seahorse/patches/patch-ab b/security/seahorse/patches/patch-ab
new file mode 100644
index 00000000000..03ff5b2bb54
--- /dev/null
+++ b/security/seahorse/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.7 2007/04/11 21:48:02 drochner Exp $
+
+--- configure.orig	2006-10-31 18:32:35.000000000 +0100
++++ configure
+@@ -30737,7 +30737,7 @@ fi
+ 
+ 
+ 
+-if test "$enable_ssh" == "yes"; then
++if test "$enable_ssh" = "yes"; then
+   WITH_SSH_TRUE=
+   WITH_SSH_FALSE='#'
+ else
+@@ -30797,7 +30797,7 @@ fi
+ 
+ 
+ 
+-if test "$enable_tests" == "yes"; then
++if test "$enable_tests" = "yes"; then
+   WITH_TESTS_TRUE=
+   WITH_TESTS_FALSE='#'
+ else
diff --git a/security/seahorse/patches/patch-ac b/security/seahorse/patches/patch-ac
deleted file mode 100644
index 885da37f89b..00000000000
--- a/security/seahorse/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/03/16 12:04:12 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- libseahorse/seahorse-key-store.c.orig	Fri Oct 29 23:56:12 2004
-+++ libseahorse/seahorse-key-store.c	Wed Mar 16 10:54:37 2005
-@@ -184,6 +184,8 @@ seahorse_key_store_constructor (GType ty
- {
-     GObject* obj = G_OBJECT_CLASS (parent_class)->constructor (type, n_props, props);
-     SeahorseKeyStore* skstore = SEAHORSE_KEY_STORE (obj);
-+    guint cols;
-+    GType *types;
- 
-     /* init private vars */
-     skstore->priv = g_new0 (SeahorseKeyStorePriv, 1);
-@@ -191,8 +193,8 @@ seahorse_key_store_constructor (GType ty
-                                        NULL, (GDestroyNotify)seahorse_key_row_free);
-  
-     /* Setup the store */
--    guint cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
--    GType* types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
-+    cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
-+    types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
-     gtk_tree_store_set_column_types (GTK_TREE_STORE (obj), cols, types);
-     
-     /* Setup the sort and filter */
diff --git a/security/seahorse/patches/patch-ad b/security/seahorse/patches/patch-ad
deleted file mode 100644
index c2aeb5ff313..00000000000
--- a/security/seahorse/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/03/16 12:04:12 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- src/seahorse-generate-druid.c.orig	Thu Oct 28 18:15:26 2004
-+++ src/seahorse-generate-druid.c	Wed Mar 16 11:07:16 2005
-@@ -173,8 +173,9 @@ on_druid_finish (GnomeDruidPage *gnomedr
- gboolean
- on_druidpagestandard4_next (GnomeDruidPage *gnomedruidpage, GtkWidget *widget, SeahorseWidget *swidget)
- {
-+	GtkWidget *druidpage;
- 	g_print("go to finish\n");
--	GtkWidget *druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
-+	druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
- 		
- 	gnome_druid_page_prepare (GNOME_DRUID_PAGE(druidpage));
- 	gtk_widget_show (druidpage);
diff --git a/security/seahorse/patches/patch-ae b/security/seahorse/patches/patch-ae
index d7c24206b3d..d657febc752 100644
--- a/security/seahorse/patches/patch-ae
+++ b/security/seahorse/patches/patch-ae
@@ -1,18 +1,18 @@
-$NetBSD: patch-ae,v 1.1 2005/06/14 00:58:45 kristerw Exp $
+$NetBSD: patch-ae,v 1.2 2007/04/11 21:48:03 drochner Exp $
 
---- libseahorse/seahorse-server-source.c.orig	Tue Jun 14 02:26:00 2005
-+++ libseahorse/seahorse-server-source.c	Tue Jun 14 02:26:25 2005
-@@ -519,11 +519,12 @@
+--- libseahorse/seahorse-server-source.c.orig	2006-08-24 22:13:08.000000000 +0200
++++ libseahorse/seahorse-server-source.c
+@@ -346,11 +346,12 @@ static guint
  seahorse_server_source_get_state (SeahorseKeySource *src)
  {
      SeahorseServerSource *ssrc;
 +    guint state;
      
-     g_return_val_if_fail (SEAHORSE_IS_SERVER_SOURCE (src), 0);
+     g_assert (SEAHORSE_IS_SERVER_SOURCE (src));
      ssrc = SEAHORSE_SERVER_SOURCE (src);
      
--    guint state = SEAHORSE_KEY_SOURCE_REMOTE;
-+    state = SEAHORSE_KEY_SOURCE_REMOTE;
-     if (!seahorse_operation_is_done (ssrc->priv->operation))
-         state |= SEAHORSE_KEY_SOURCE_LOADING;
+-    guint state = SKSRC_REMOTE;
++    state = SKSRC_REMOTE;
+     if (seahorse_operation_is_running (SEAHORSE_OPERATION (ssrc->priv->mop)))
+         state |= SKSRC_LOADING;
      return state;
diff --git a/security/seahorse/patches/patch-af b/security/seahorse/patches/patch-af
deleted file mode 100644
index 54769dafd7c..00000000000
--- a/security/seahorse/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/03/14 15:00:57 drochner Exp $
-
---- plugins/gedit/Makefile.in.orig	2006-03-11 19:14:15.000000000 +0100
-+++ plugins/gedit/Makefile.in
-@@ -58,7 +58,7 @@ pluginLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(plugin_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libseahorse_pgp_la_DEPENDENCIES =  \
--	$(top_builddir)/libseahorse/libseahorse-internal.la \
-+	$(LOCALBASE)/lib/libseahorse-internal.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am__libseahorse_pgp_la_SOURCES_DIST = seahorse-gedit.c \
- 	seahorse-gedit.h seahorse-gedit-plugin.c \
-@@ -286,7 +286,7 @@ plugin_LTLIBRARIES = libseahorse-pgp.la
- libseahorse_pgp_la_SOURCES = seahorse-gedit.c seahorse-gedit.h $(PLUGIN_SRCS)
- libseahorse_pgp_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- libseahorse_pgp_la_LIBADD = \
--	$(top_builddir)/libseahorse/libseahorse-internal.la \
-+	$(LOCALBASE)/lib/libseahorse-internal.la \
- 	$(SEAHORSE_LIBS) \
- 	$(GEDIT_LIBS)
- 
diff --git a/security/seahorse/patches/patch-ag b/security/seahorse/patches/patch-ag
deleted file mode 100644
index e70f5ca169c..00000000000
--- a/security/seahorse/patches/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/12/06 19:51:52 joerg Exp $
-
---- configure.in.orig	2006-01-26 12:26:52.000000000 +0000
-+++ configure.in
-@@ -125,7 +125,10 @@ if test $GPGME_CONFIG != "failed" ; then
- 		 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
- 
- 	if test "$major" -eq "$req_major"; then
--	   if test "$minor" -ge "$req_minor"; then
-+	   if test "$minor" -gt "$req_minor"; then
-+	       ok="yes"
-+	   fi
-+	   if test "$minor" -eq "$req_minor"; then
- 	     if test "$micro" -ge "$req_micro"; then
- 	       ok="yes"
- 	     fi
-@@ -284,12 +287,13 @@ else
- 	# - Bonobo plugins <= 2.12. 
- 	# - Glib type plugins > 2.13
- 	
--	PKG_CHECK_MODULES(GEDIT, gedit-2.14 >= 2.13.0, [with_gedit_plugin=yes],
--		[PKG_CHECK_MODULES(GEDIT, gedit-2.12 >= 2.12.0, [with_gedit_bonobo=yes],
--			[PKG_CHECK_MODULES(GEDIT, gedit-2.10 >= 2.9.0, [with_gedit_bonobo=yes], 
--		    		[PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, [with_gedit_bonobo=yes], 
--			    		[PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0, [with_gedit_bonobo=yes],
--							[enable_gedit=no])])])])])
-+	PKG_CHECK_MODULES(GEDIT, gedit-2.16 >= 2.13.0, [with_gedit_plugin=yes],
-+		[PKG_CHECK_MODULES(GEDIT, gedit-2.14 >= 2.13.0, [with_gedit_plugin=yes],
-+			[PKG_CHECK_MODULES(GEDIT, gedit-2.12 >= 2.12.0, [with_gedit_bonobo=yes],
-+				[PKG_CHECK_MODULES(GEDIT, gedit-2.10 >= 2.9.0, [with_gedit_bonobo=yes], 
-+		    			[PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, [with_gedit_bonobo=yes], 
-+			    			[PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0, [with_gedit_bonobo=yes],
-+								[enable_gedit=no])])])])])])
- 	
- 	if test "$enable_gedit" = "yes"; then
- 		echo "enabling gedit plugin..."
diff --git a/security/seahorse/patches/patch-ah b/security/seahorse/patches/patch-ah
new file mode 100644
index 00000000000..4ac387667b9
--- /dev/null
+++ b/security/seahorse/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1 2007/04/11 21:48:03 drochner Exp $
+
+--- plugins/gedit/Makefile.in.orig	2006-05-03 18:35:46.000000000 +0200
++++ plugins/gedit/Makefile.in
+@@ -61,7 +61,7 @@ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libseahorse_pgp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/libcryptui/libcryptui.la
++	$(am__DEPENDENCIES_1)
+ am__libseahorse_pgp_la_SOURCES_DIST = seahorse-gedit.c \
+ 	seahorse-gedit.h seahorse-gedit-plugin.c \
+ 	seahorse-gedit-bonobo.c
+@@ -319,7 +319,7 @@ plugin_LTLIBRARIES = libseahorse-pgp.la
+ libseahorse_pgp_la_SOURCES = seahorse-gedit.c seahorse-gedit.h $(PLUGIN_SRCS)
+ libseahorse_pgp_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+ libseahorse_pgp_la_LIBADD = $(GEDIT_LIBS) $(LIBCRYPTUI_LIBS) \
+-    $(top_builddir)/libcryptui/libcryptui.la
++    -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lcryptui
+ 
+ plugin_in_files = seahorse-pgp.gedit-plugin.desktop.in
+ plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
diff --git a/security/seahorse/patches/patch-ai b/security/seahorse/patches/patch-ai
new file mode 100644
index 00000000000..d78664926e1
--- /dev/null
+++ b/security/seahorse/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2007/04/11 21:48:04 drochner Exp $
+
+--- libseahorse/seahorse-ssh-operation.c.orig	2006-08-24 22:13:08.000000000 +0200
++++ libseahorse/seahorse-ssh-operation.c
+@@ -24,6 +24,7 @@
+ #include <sys/socket.h>
+ #include <gnome.h>
+ #include <fcntl.h>
++#include <signal.h>
+ 
+ #include "seahorse-ssh-operation.h"
+ #include "seahorse-util.h"