Update to 0.7.3.

Submitted by:	maintainer

5 files changed, 74 insertions, 37 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index ecc022750d6e..0cf3b5161b8b 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTVERSION=	0.7.3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.7
@@ -23,14 +22,13 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix eel2
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${CP} ${WRKSRC}/data/seahorse.desktop.in ${WRKSRC}/data/seahorse.desktop
 	@${CP} ${WRKSRC}/data/seahorse.schemas.in ${WRKSRC}/data/seahorse.schemas
 
 .include <bsd.port.mk>
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 69ca5bc0f391..c7b9e900e33f 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1 +1 @@
-MD5 (gnome2/seahorse-0.7.2.tar.bz2) = fd5b2d5e379db0cde1642d99693df807
+MD5 (gnome2/seahorse-0.7.3.tar.bz2) = 9cebb904b22d739dc527443e417c0f78
diff --git a/security/seahorse/files/patch-configure b/security/seahorse/files/patch-configure
new file mode 100644
index 000000000000..f195f07b43c6
--- /dev/null
+++ b/security/seahorse/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Wed Dec 11 18:31:51 2002
++++ configure	Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/security/seahorse/files/patch-src_main.c b/security/seahorse/files/patch-src_main.c
new file mode 100644
index 000000000000..df57a9756d63
--- /dev/null
+++ b/security/seahorse/files/patch-src_main.c
@@ -0,0 +1,31 @@
+--- src/main.c.orig	Mon May  5 02:45:14 2003
++++ src/main.c	Mon May  5 02:45:47 2003
+@@ -29,7 +29,7 @@
+ #include "seahorse-libdialogs.h"
+ 
+ static gchar *import = NULL;
+-static gchar *encrypt = NULL;
++static gchar *sea_encrypt = NULL;
+ static gchar *sign = NULL;
+ static gchar *encrypt_sign = NULL;
+ static gchar *decrypt = NULL;
+@@ -40,7 +40,7 @@
+ 	{ "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, &sea_encrypt, 0,
+ 	  N_("Encrypt file"), N_("FILE") },
+ 
+ 	{ "sign", 's', POPT_ARG_STRING, &sign, 0,
+@@ -137,8 +137,8 @@
+ 			return 0;
+ 		}
+ 	}
+-	if (encrypt != NULL)
+-		do_encrypt (sctx, encrypt, seahorse_op_encrypt_file, _("Encrypt file is %s"));
++	if (sea_encrypt != NULL)
++		do_encrypt (sctx, sea_encrypt, seahorse_op_encrypt_file, _("Encrypt file is %s"));
+ 	if (sign != NULL) {
+ 		new_path = seahorse_op_sign_file (sctx, sign, &err);
+ 		
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index fa72267c1e8f..308ca19f11dc 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,16 +1,18 @@
 bin/seahorse
+bin/seahorse-pgp-preferences
 etc/gconf/gconf.xml.defaults/apps/seahorse/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/seahorse/listing/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/seahorse/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/seahorse/recipients/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/seahorse/ui/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/pgp/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/listing/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/recipients/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/ui/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/pgp/%gconf.xml
 etc/gconf/schemas/seahorse.schemas
+lib/bonobo/libseahorse-pgp-file-listener.so
+libdata/bonobo/servers/Seahorse_PGP_File_Listener.server
 share/gnome/applications/seahorse.desktop
+share/gnome/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
 share/gnome/help/seahorse/C/figures/export.png
 share/gnome/help/seahorse/C/figures/file-manager.png
 share/gnome/help/seahorse/C/figures/generate.png
@@ -24,30 +26,27 @@ 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/mime-info/seahorse.keys
+share/gnome/mime-info/seahorse.mime
 share/gnome/omf/seahorse/seahorse-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/seahorse/seahorse-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/seahorse.png
-share/gnome/seahorse/glade/seahorse-add-subkey.glade2
-share/gnome/seahorse/glade/seahorse-add-uid.glade2
-share/gnome/seahorse/glade/seahorse-change-passphrase.glade2
-share/gnome/seahorse/glade/seahorse-decrypt-file.glade2
-share/gnome/seahorse/glade/seahorse-decrypt-verify-file.glade2
-share/gnome/seahorse/glade/seahorse-encrypt-file.glade2
-share/gnome/seahorse/glade/seahorse-encrypt-sign-file.glade2
-share/gnome/seahorse/glade/seahorse-export.glade2
-share/gnome/seahorse/glade/seahorse-generate.glade2
-share/gnome/seahorse/glade/seahorse-import.glade2
-share/gnome/seahorse/glade/seahorse-key-manager.glade2
-share/gnome/seahorse/glade/seahorse-key-properties.glade2
-share/gnome/seahorse/glade/seahorse-passphrase.glade2
-share/gnome/seahorse/glade/seahorse-preferences.glade2
-share/gnome/seahorse/glade/seahorse-recipients.glade2
-share/gnome/seahorse/glade/seahorse-revoke.glade2
-share/gnome/seahorse/glade/seahorse-sign-file.glade2
-share/gnome/seahorse/glade/seahorse-sign.glade2
-share/gnome/seahorse/glade/seahorse-signatures.glade2
-share/gnome/seahorse/glade/seahorse-text-editor.glade2
-share/gnome/seahorse/glade/seahorse-verify-file.glade2
+share/gnome/seahorse/glade/seahorse-add-subkey.glade
+share/gnome/seahorse/glade/seahorse-add-uid.glade
+share/gnome/seahorse/glade/seahorse-change-passphrase.glade
+share/gnome/seahorse/glade/seahorse-export.glade
+share/gnome/seahorse/glade/seahorse-generate.glade
+share/gnome/seahorse/glade/seahorse-import.glade
+share/gnome/seahorse/glade/seahorse-key-manager.glade
+share/gnome/seahorse/glade/seahorse-key-properties.glade
+share/gnome/seahorse/glade/seahorse-passphrase.glade
+share/gnome/seahorse/glade/seahorse-pgp-preferences.glade
+share/gnome/seahorse/glade/seahorse-preferences.glade
+share/gnome/seahorse/glade/seahorse-recipients.glade
+share/gnome/seahorse/glade/seahorse-revoke.glade
+share/gnome/seahorse/glade/seahorse-sign.glade
+share/gnome/seahorse/glade/seahorse-signatures.glade
+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
@@ -56,6 +55,7 @@ share/locale/fi/LC_MESSAGES/seahorse.mo
 share/locale/fr/LC_MESSAGES/seahorse.mo
 share/locale/hu/LC_MESSAGES/seahorse.mo
 share/locale/ja/LC_MESSAGES/seahorse.mo
+share/locale/ms/LC_MESSAGES/seahorse.mo
 share/locale/nl/LC_MESSAGES/seahorse.mo
 share/locale/no/LC_MESSAGES/seahorse.mo
 share/locale/pt_BR/LC_MESSAGES/seahorse.mo
@@ -65,20 +65,18 @@ share/locale/sv/LC_MESSAGES/seahorse.mo
 share/locale/tr/LC_MESSAGES/seahorse.mo
 share/locale/uk/LC_MESSAGES/seahorse.mo
 share/locale/zh_CN/LC_MESSAGES/seahorse.mo
-@dirrm share/gnome/seahorse/glade
-@dirrm share/gnome/seahorse
-@dirrm share/gnome/omf/seahorse
 @dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
 @dirrm share/gnome/help/seahorse
+@dirrm share/gnome/omf/seahorse
+@dirrm share/gnome/seahorse/glade
+@dirrm share/gnome/seahorse
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/pgp
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/recipients
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/preferences
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/listing
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse
+@dirrm etc/gconf/gconf.xml.defaults/desktop/pgp
 @dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/recipients
-@dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/preferences
 @dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/listing
 @dirrm etc/gconf/gconf.xml.defaults/apps/seahorse
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/seahorse/seahorse-C.omf 2>/dev/null || /usr/bin/true