Update to 0.7.3:

Changes in 0.7.3:
* More key loading optimizations
* Import and Export dialogs now use the clipboard instead of a text view
* Nautilus component that provides a context menu for crypto operations
* Removed Tools menu in favor of nautilus component
* PGP gconf schemas in /desktop/pgp
* Depends on gnome-mime-data for mime types
* Widgets no longer insensitive during progress operations
* Key edit dialogs are key modal so operations do not conflict
* Can do concurrent operations, except for editing the same key
* Can sign, export, and delete multiple keys
* Export dialog has a default filename
* Control center capplet for configuring pgp
* Can select keys & do operations while keys are loading

Changes in 0.7.2:
* GConf notification for preferences and ui settings
* More gnome preferences
* More listing improvements and optimizations for large key rings
* Key properties now a property window
* Owner trust values are restricted based on key type
* Key manager toolbar preferences
* General interface updates
* Nicer passphrase entry dialog
* Nicer change passphrase dialog
* More columns available in key-manager, can customize which ones are shown,
  and each column is sortable
* Main window not completely insensitive during progress and startup
* Key Properties shows a formatted fingerprint, tabs are scrollable
* Recipients allows multiple selection, has statusbars to show number selected
* Can expand and collapse all rows in key-manager

4 files changed, 73 insertions, 36 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 647949c5ffc..630d900f6cd 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2003/05/27 17:17:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/30 15:25:08 jmmv Exp $
 
-DISTNAME=	seahorse-0.7.1
+DISTNAME=	seahorse-0.7.3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=seahorse/}
 
@@ -20,20 +20,13 @@ USE_PKGLOCALEDIR=	yes
 
 GCONF2_SCHEMAS= 	seahorse.schemas
 
-post-patch:
-.for f in Makefile.in seahorse-context.c seahorse-marshal.c seahorse-marshal.h
-	${MV} ${WRKSRC}/src/$f ${WRKSRC}/src/$f.orig
-	${SED} -e 's/seahorse-marshal/seahorse_marshal/g' \
-		< ${WRKSRC}/src/$f.orig > ${WRKSRC}/src/$f
-.endfor
-	${MV} ${WRKSRC}/src/seahorse-marshal.c ${WRKSRC}/src/seahorse_marshal.c
-	${MV} ${WRKSRC}/src/seahorse-marshal.h ${WRKSRC}/src/seahorse_marshal.h
-	${MV} ${WRKSRC}/src/seahorse-marshal.list \
-		${WRKSRC}/src/seahorse_marshal.list
-
+.include "../../databases/gnome-mime-data/buildlink2.mk"
 .include "../../devel/GConf2/schemas.mk"
+.include "../../devel/bonobo-activation/buildlink2.mk"
+.include "../../devel/eel2/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../security/gpgme/buildlink2.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index 2b93d99a4db..bce5035a2f9 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,6 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/27 17:17:38 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/05/30 15:25:08 jmmv Exp $
 bin/seahorse
+bin/seahorse-pgp-preferences
+lib/bonobo/libseahorse-pgp-file-listener.a
+lib/bonobo/libseahorse-pgp-file-listener.la
+lib/bonobo/libseahorse-pgp-file-listener.so
+lib/bonobo/servers/Seahorse_PGP_File_Listener.server
 share/applications/seahorse.desktop
+share/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
 share/gconf/schemas/seahorse.schemas
 share/gnome/help/seahorse/C/figures/export.png
 share/gnome/help/seahorse/C/figures/file-manager.png
@@ -15,6 +21,7 @@ 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
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/seahorse.mo
@@ -23,6 +30,7 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/seahorse.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/seahorse.mo
@@ -32,34 +40,36 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/seahorse.mo
+share/mime-info/seahorse.keys
+share/mime-info/seahorse.mime
 share/omf/seahorse/seahorse-C.omf
 share/pixmaps/seahorse.png
-share/seahorse/glade/seahorse-add-subkey.glade2
-share/seahorse/glade/seahorse-add-uid.glade2
-share/seahorse/glade/seahorse-decrypt-file.glade2
-share/seahorse/glade/seahorse-decrypt-verify-file.glade2
-share/seahorse/glade/seahorse-encrypt-file.glade2
-share/seahorse/glade/seahorse-encrypt-sign-file.glade2
-share/seahorse/glade/seahorse-export.glade2
-share/seahorse/glade/seahorse-generate.glade2
-share/seahorse/glade/seahorse-import.glade2
-share/seahorse/glade/seahorse-key-manager.glade2
-share/seahorse/glade/seahorse-key-properties.glade2
-share/seahorse/glade/seahorse-preferences.glade2
-share/seahorse/glade/seahorse-recipients.glade2
-share/seahorse/glade/seahorse-revoke.glade2
-share/seahorse/glade/seahorse-sign-file.glade2
-share/seahorse/glade/seahorse-sign.glade2
-share/seahorse/glade/seahorse-signatures.glade2
-share/seahorse/glade/seahorse-text-editor.glade2
-share/seahorse/glade/seahorse-verify-file.glade2
+share/seahorse/glade/seahorse-add-subkey.glade
+share/seahorse/glade/seahorse-add-uid.glade
+share/seahorse/glade/seahorse-change-passphrase.glade
+share/seahorse/glade/seahorse-export.glade
+share/seahorse/glade/seahorse-generate.glade
+share/seahorse/glade/seahorse-import.glade
+share/seahorse/glade/seahorse-key-manager.glade
+share/seahorse/glade/seahorse-key-properties.glade
+share/seahorse/glade/seahorse-passphrase.glade
+share/seahorse/glade/seahorse-pgp-preferences.glade
+share/seahorse/glade/seahorse-preferences.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
 @dirrm share/seahorse/glade
 @dirrm share/seahorse
 @dirrm share/omf/seahorse
 @comment in scrollkeeper: @dirrm share/omf
+@exec ${RMDIR} %D/share/mime-info >/dev/null || ${TRUE}
 @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 gnome2-dirs: @dirrm share/control-center-2.0/capplets
 @comment in gnome2-dirs: @dirrm share/applications
+@comment in bonobo-activation: @dirrm lib/bonobo/servers
+@comment in bonobo-activation: @dirrm lib/bonobo
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 4307fc4f7c9..6fad2cbe8b5 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/05/27 17:17:38 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/05/30 15:25:08 jmmv Exp $
 
-SHA1 (seahorse-0.7.1.tar.gz) = 5b73b647c057336ec9ea485bff7d6448536454fc
-Size (seahorse-0.7.1.tar.gz) = 683022 bytes
+SHA1 (seahorse-0.7.3.tar.gz) = 1323b2b4b49bca9d9733b1ee38e811238c29e1b2
+Size (seahorse-0.7.3.tar.gz) = 706411 bytes
+SHA1 (patch-aa) = 0fed5d18bed7747ea37ed4ce43ee22501bb2a78e
diff --git a/security/seahorse/patches/patch-aa b/security/seahorse/patches/patch-aa
new file mode 100644
index 00000000000..a62d0f6fe14
--- /dev/null
+++ b/security/seahorse/patches/patch-aa
@@ -0,0 +1,33 @@
+$NetBSD: patch-aa,v 1.4 2003/05/30 15:25:09 jmmv Exp $
+
+--- src/main.c.orig	2003-04-14 16:22:32.000000000 +0200
++++ src/main.c
+@@ -29,7 +29,7 @@
+ #include "seahorse-libdialogs.h"
+ 
+ static gchar *import = NULL;
+-static gchar *encrypt = NULL;
++static gchar *encrypt_opt = NULL;
+ static gchar *sign = NULL;
+ static gchar *encrypt_sign = NULL;
+ static gchar *decrypt = NULL;
+@@ -40,7 +40,7 @@ static const struct poptOption options[]
+ 	{ "import", 'i', POPT_ARG_STRING, &import, 0,
+ 	  N_("Import keys from the file"), N_("FILE") },
+ 
+-	{ "encrypt", 'e', POPT_ARG_STRING, &encrypt, 0,
++	{ "encrypt", 'e', POPT_ARG_STRING, &encrypt_opt, 0,
+ 	  N_("Encrypt file"), N_("FILE") },
+ 
+ 	{ "sign", 's', POPT_ARG_STRING, &sign, 0,
+@@ -137,8 +137,8 @@ main (int argc, char **argv)
+ 			return 0;
+ 		}
+ 	}
+-	if (encrypt != NULL)
+-		do_encrypt (sctx, encrypt, seahorse_op_encrypt_file, _("Encrypt file is %s"));
++	if (encrypt_opt != NULL)
++		do_encrypt (sctx, encrypt_opt, seahorse_op_encrypt_file, _("Encrypt file is %s"));
+ 	if (sign != NULL) {
+ 		new_path = seahorse_op_sign_file (sctx, sign, &err);
+