6 files changed, 56 insertions, 190 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 7e20072ec6b4..c81e5742037f 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse/Makefile,v 1.73 2008/11/24 02:44:50 marcus Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.79 2009/03/15 01:01:47 marcus Exp $
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	2.24.1
-PORTREVISION=	1
+PORTVERSION=	2.26.0
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -23,6 +22,7 @@ LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme \
 		gnome-keyring:${PORTSDIR}/security/gnome-keyring \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
 
+USE_XORG=	sm
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 0ca292a08fc0..5c23c096aad3 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-2.24.1.tar.bz2) = b35076c2ae46aa58d9b1ca76fe929515
-SHA256 (gnome2/seahorse-2.24.1.tar.bz2) = b86c045fe1d8cf7a3fd56e078175e32cd94154eb77f9fe2a4a4e1f1aa13a5d04
-SIZE (gnome2/seahorse-2.24.1.tar.bz2) = 2197087
+MD5 (gnome2/seahorse-2.26.0.tar.bz2) = ddecca2181d4c9f0dfbe412b68508e5d
+SHA256 (gnome2/seahorse-2.26.0.tar.bz2) = 7918c4fff6fa3d5fc303fdbd6bc7e7579ce47010174550d4e7fc9e0b3e69540e
+SIZE (gnome2/seahorse-2.26.0.tar.bz2) = 2151482
diff --git a/security/seahorse/files/patch-common_seahorse-registry.c b/security/seahorse/files/patch-common_seahorse-registry.c
index a9b0cc424a6e..d3ab78c0de42 100644
--- a/security/seahorse/files/patch-common_seahorse-registry.c
+++ b/security/seahorse/files/patch-common_seahorse-registry.c
@@ -1,6 +1,6 @@
---- common/seahorse-registry.c.orig	2008-11-23 18:26:38.000000000 -0500
-+++ common/seahorse-registry.c	2008-11-23 19:20:08.000000000 -0500
-@@ -49,6 +49,25 @@ cleanup_registry (void *unused)
+--- common/seahorse-registry.c.orig	2009-02-14 19:20:38.000000000 +0100
++++ common/seahorse-registry.c	2009-02-24 21:15:26.000000000 +0100
+@@ -51,6 +51,25 @@
  	registry_singleton = NULL;
  }
  
@@ -26,51 +26,19 @@
  static void
  keys_to_list (gpointer key, gpointer value, gpointer user_data)
  {
-@@ -61,6 +80,7 @@ register_type_for_category (SeahorseRegi
+@@ -63,13 +82,14 @@
+                              gpointer value, GDestroyNotify destroy_func)
  {
- 	SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry);
  	GHashTable *set;
 +	SeahorseRegistryType *rtype;
  	
- 	g_return_if_fail (SEAHORSE_IS_REGISTRY (registry));
+ 	g_return_if_fail (table);
  	g_return_if_fail (category);
-@@ -68,11 +88,14 @@ register_type_for_category (SeahorseRegi
  	
- 	set = g_hash_table_lookup (pv->categories, category);
+ 	set = g_hash_table_lookup (table, GUINT_TO_POINTER (category));
  	if (!set) {
--		set = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL);
-+		set = g_hash_table_new_full (registry_hash, registry_equal, (GDestroyNotify) g_free, NULL);
- 		g_hash_table_replace (pv->categories, g_strdup (category), set);
+-		set = g_hash_table_new_full (g_direct_hash, g_direct_equal, destroy_func, NULL);
++		set = g_hash_table_new_full (registry_hash, registry_equal, destroy_func, NULL);
+ 		g_hash_table_replace (table, GUINT_TO_POINTER (category), set);
  	}
-+
-+	rtype = g_new (SeahorseRegistryType, 1);
-+	rtype->type = type;
  	
--	g_hash_table_replace (set, GUINT_TO_POINTER (type), NO_VALUE);
-+	g_hash_table_replace (set, rtype, NO_VALUE);
- }
- 
- static GList*
-@@ -115,6 +138,7 @@ lookup_types (SeahorseRegistry *registry
- 		
- 		/* Go through each item in list and make sure it exists in this cat */
- 		for (l = types; l; l = l ? g_list_next (l) : types) {
-+			SeahorseRegistryType *rtype;
- 			type = l;
- 			if (!g_hash_table_lookup (set, type->data)) {
- 				l = g_list_previous (l);
-@@ -224,8 +248,12 @@ seahorse_registry_find_type (SeahorseReg
- 	va_end (cats);
- 
- 	type = 0;
--	if (types)
--		type = GPOINTER_TO_UINT (types->data);
-+	if (types) {
-+		SeahorseRegistryType *rtype;
-+
-+		rtype = (SeahorseRegistryType *) types->data;
-+		type = rtype->type;
-+	}
- 	g_list_free (types);
- 	return type;
- }
diff --git a/security/seahorse/files/patch-src_seahorse-generate-select.c b/security/seahorse/files/patch-src_seahorse-generate-select.c
deleted file mode 100644
index 7de1b7ff476d..000000000000
--- a/security/seahorse/files/patch-src_seahorse-generate-select.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/seahorse-generate-select.c.orig	2008-11-23 18:28:34.000000000 -0500
-+++ src/seahorse-generate-select.c	2008-11-23 18:29:30.000000000 -0500
-@@ -197,8 +197,10 @@ static GObject * seahorse_generate_selec
- 			GList* typ_it;
- 			typ_collection = types;
- 			for (typ_it = typ_collection; typ_it != NULL; typ_it = typ_it->next) {
-+				SeahorseRegistryType *rtype;
- 				GType typ;
--				typ = GPOINTER_TO_INT (typ_it->data);
-+				rtype = (SeahorseRegistryType *) typ_it->data;
-+				typ = rtype->type;
- 				{
- 					SeahorseGenerator* generator;
- 					gint _tmp5;
diff --git a/security/seahorse/files/patch-src_seahorse-viewer.c b/security/seahorse/files/patch-src_seahorse-viewer.c
deleted file mode 100644
index 5acb2e00d676..000000000000
--- a/security/seahorse/files/patch-src_seahorse-viewer.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/seahorse-viewer.c.orig	2008-11-23 18:27:49.000000000 -0500
-+++ src/seahorse-viewer.c	2008-11-23 18:28:27.000000000 -0500
-@@ -556,10 +556,13 @@ seahorse_viewer_constructor (GType type,
- 		/* Setup the commands */
- 		types = seahorse_registry_find_types (seahorse_registry_get (), "commands", NULL, NULL);
- 		for (l = types; l; l = g_list_next (l)) {
--			GType typ = GPOINTER_TO_INT (l->data);
-+			SeahorseRegistryType *rtype = (SeahorseRegistryType *) l->data;
-+			GType typ;
- 			SeahorseCommands *commands;
- 			GtkActionGroup *actions;
- 			const gchar *uidef;
-+
-+			typ = rtype->type;
- 			
- 			/* Add each commands to our hash table */
- 			commands = g_object_new (typ, "view", self, NULL);
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index a94f07390a6f..0f64a8613cca 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,5 +1,6 @@
 bin/seahorse
 bin/seahorse-daemon
+etc/xdg/autostart/seahorse-daemon.desktop
 include/libcryptui/cryptui-key-chooser.h
 include/libcryptui/cryptui-key-combo.h
 include/libcryptui/cryptui-key-list.h
@@ -15,136 +16,50 @@ lib/seahorse/xloadimage
 libdata/pkgconfig/cryptui-0.0.pc
 share/applications/seahorse.desktop
 share/dbus-1/services/org.gnome.seahorse.service
-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
-share/gnome/help/seahorse/C/figures/import.png
-share/gnome/help/seahorse/C/figures/key-manager.png
-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/doc/libcryptui/ch01.html
+share/doc/libcryptui/home.png
+share/doc/libcryptui/index.html
+share/doc/libcryptui/index.sgml
+share/doc/libcryptui/left.png
+share/doc/libcryptui/libcryptui-CryptUIKeyChooser.html
+share/doc/libcryptui/libcryptui-CryptUIKeyStore.html
+share/doc/libcryptui/libcryptui-CryptUIKeyset.html
+share/doc/libcryptui/libcryptui-cryptui-defines.html
+share/doc/libcryptui/libcryptui-cryptui-key-combo.html
+share/doc/libcryptui/libcryptui-cryptui-key-list.html
+share/doc/libcryptui/libcryptui-cryptui-marshal.html
+share/doc/libcryptui/libcryptui-cryptui.html
+share/doc/libcryptui/libcryptui.devhelp
+share/doc/libcryptui/libcryptui.devhelp2
+share/doc/libcryptui/right.png
+share/doc/libcryptui/style.css
+share/doc/libcryptui/up.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/de/figures/export.png
-share/gnome/help/seahorse/de/figures/file-manager.png
-share/gnome/help/seahorse/de/figures/generate.png
-share/gnome/help/seahorse/de/figures/import.png
-share/gnome/help/seahorse/de/figures/key-manager.png
-share/gnome/help/seahorse/de/figures/key-properties.png
-share/gnome/help/seahorse/de/figures/passphrase.png
-share/gnome/help/seahorse/de/figures/preferences.png
-share/gnome/help/seahorse/de/figures/recipients.png
+share/gnome/help/seahorse/ca/figures/seahorse-window.png
+share/gnome/help/seahorse/ca/seahorse.xml
 share/gnome/help/seahorse/de/figures/seahorse-window.png
-share/gnome/help/seahorse/de/figures/signature.png
-share/gnome/help/seahorse/de/figures/text-editor.png
 share/gnome/help/seahorse/de/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/el/figures/seahorse-window.png
+share/gnome/help/seahorse/el/seahorse.xml
 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/eu/figures/seahorse-window.png
+share/gnome/help/seahorse/eu/seahorse.xml
 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/oc/figures/export.png
-share/gnome/help/seahorse/oc/figures/file-manager.png
-share/gnome/help/seahorse/oc/figures/generate.png
-share/gnome/help/seahorse/oc/figures/import.png
-share/gnome/help/seahorse/oc/figures/key-manager.png
-share/gnome/help/seahorse/oc/figures/key-properties.png
-share/gnome/help/seahorse/oc/figures/passphrase.png
-share/gnome/help/seahorse/oc/figures/preferences.png
-share/gnome/help/seahorse/oc/figures/recipients.png
 share/gnome/help/seahorse/oc/figures/seahorse-window.png
-share/gnome/help/seahorse/oc/figures/signature.png
-share/gnome/help/seahorse/oc/figures/text-editor.png
 share/gnome/help/seahorse/oc/seahorse.xml
-share/gnome/help/seahorse/ru/figures/export.png
-share/gnome/help/seahorse/ru/figures/file-manager.png
-share/gnome/help/seahorse/ru/figures/generate.png
-share/gnome/help/seahorse/ru/figures/import.png
-share/gnome/help/seahorse/ru/figures/key-manager.png
-share/gnome/help/seahorse/ru/figures/key-properties.png
-share/gnome/help/seahorse/ru/figures/passphrase.png
-share/gnome/help/seahorse/ru/figures/preferences.png
-share/gnome/help/seahorse/ru/figures/recipients.png
 share/gnome/help/seahorse/ru/figures/seahorse-window.png
-share/gnome/help/seahorse/ru/figures/signature.png
-share/gnome/help/seahorse/ru/figures/text-editor.png
 share/gnome/help/seahorse/ru/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/gnome/help/seahorse/vi/figures/export.png
-share/gnome/help/seahorse/vi/figures/file-manager.png
-share/gnome/help/seahorse/vi/figures/generate.png
-share/gnome/help/seahorse/vi/figures/import.png
-share/gnome/help/seahorse/vi/figures/key-manager.png
-share/gnome/help/seahorse/vi/figures/key-properties.png
-share/gnome/help/seahorse/vi/figures/passphrase.png
-share/gnome/help/seahorse/vi/figures/preferences.png
-share/gnome/help/seahorse/vi/figures/recipients.png
 share/gnome/help/seahorse/vi/figures/seahorse-window.png
-share/gnome/help/seahorse/vi/figures/signature.png
-share/gnome/help/seahorse/vi/figures/text-editor.png
 share/gnome/help/seahorse/vi/seahorse.xml
 share/icons/hicolor/16x16/apps/seahorse-preferences.png
 share/icons/hicolor/16x16/apps/seahorse.png
@@ -185,6 +100,7 @@ share/locale/hu/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
+share/locale/ku/LC_MESSAGES/seahorse.mo
 share/locale/ko/LC_MESSAGES/seahorse.mo
 share/locale/lt/LC_MESSAGES/seahorse.mo
 share/locale/lv/LC_MESSAGES/seahorse.mo
@@ -221,9 +137,12 @@ 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/omf/seahorse/seahorse-C.omf
+share/omf/seahorse/seahorse-ca.omf
 share/omf/seahorse/seahorse-de.omf
+share/omf/seahorse/seahorse-el.omf
 share/omf/seahorse/seahorse-en_GB.omf
 share/omf/seahorse/seahorse-es.omf
+share/omf/seahorse/seahorse-eu.omf
 share/omf/seahorse/seahorse-fr.omf
 share/omf/seahorse/seahorse-it.omf
 share/omf/seahorse/seahorse-oc.omf
@@ -263,7 +182,8 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
 %%DATADIR%%/glade/seahorse-change-passphrase.glade
 %%DATADIR%%/glade/seahorse-expires.glade
 %%DATADIR%%/glade/seahorse-generate-select.glade
-%%DATADIR%%/glade/seahorse-gkeyring-item-properties.glade
+%%DATADIR%%/glade/seahorse-gkr-item-properties.glade
+%%DATADIR%%/glade/seahorse-gkr-keyring.glade
 %%DATADIR%%/glade/seahorse-key-manager.glade
 %%DATADIR%%/glade/seahorse-key-manager.ui
 %%DATADIR%%/glade/seahorse-keyserver-results.glade
@@ -301,15 +221,22 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
 @dirrm share/gnome/help/seahorse/it
 @dirrm share/gnome/help/seahorse/fr/figures
 @dirrm share/gnome/help/seahorse/fr
+@dirrm share/gnome/help/seahorse/eu/figures
+@dirrm share/gnome/help/seahorse/eu
 @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/el/figures
+@dirrm share/gnome/help/seahorse/el
 @dirrm share/gnome/help/seahorse/de/figures
 @dirrm share/gnome/help/seahorse/de
+@dirrm share/gnome/help/seahorse/ca/figures
+@dirrm share/gnome/help/seahorse/ca
 @dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
 @dirrm share/gnome/help/seahorse
+@dirrm share/doc/libcryptui
 @dirrmtry share/applications
 @dirrm lib/seahorse
 @dirrm include/libcryptui
@@ -327,6 +254,8 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES