19 files changed, 152 insertions, 416 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index ccccabba4c4d..def4e8097bc8 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.71 2009/01/10 01:59:21 mezz Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.76 2009/03/15 00:23:43 marcus Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	2.24.1
-PORTREVISION=	2
+PORTVERSION=	2.26.0
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index ca5144c4a5e6..f34ad439b1c5 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.24.1.tar.bz2) = aa5552dc129f3509ee39145b7f0bf977
-SHA256 (gnome2/gnome-keyring-2.24.1.tar.bz2) = 3c9eb7f45dd0026340635b9e1ee18c36a47541610aa5a7ef604ca645aa4763f9
-SIZE (gnome2/gnome-keyring-2.24.1.tar.bz2) = 1125993
+MD5 (gnome2/gnome-keyring-2.26.0.tar.bz2) = 0395fcf79b990465030a2795dcddacb9
+SHA256 (gnome2/gnome-keyring-2.26.0.tar.bz2) = 7acda11db2eb07b2f68a1a506203fe95141954acb10c394850418fd04ed80a07
+SIZE (gnome2/gnome-keyring-2.26.0.tar.bz2) = 1211953
diff --git a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h b/security/gnome-keyring/files/patch-common_gkr-daemon-util.h
deleted file mode 100644
index ebc3f9680b4c..000000000000
--- a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/gkr-daemon-util.h.orig	2008-08-04 13:36:06.000000000 -0400
-+++ common/gkr-daemon-util.h	2008-08-04 13:36:18.000000000 -0400
-@@ -26,6 +26,8 @@
- 
- G_BEGIN_DECLS
- 
-+#include <sys/types.h>
-+
- #include <glib.h>
- #include <glib-object.h>
- 
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
index 75016a356fcb..9aff6d9ebf19 100644
--- a/security/gnome-keyring/files/patch-configure
+++ b/security/gnome-keyring/files/patch-configure
@@ -1,24 +1,15 @@
---- configure.orig	2008-07-22 21:14:15.000000000 -0400
-+++ configure	2008-07-22 21:14:35.000000000 -0400
-@@ -25963,7 +25963,7 @@ fi
- 
- 	dbus_status=$DBUS_VERSION
- fi
-- if test "$enable_dbus" == "yes"; then
-+ if test "$enable_dbus" = "yes"; then
-   WITH_DBUS_TRUE=
-   WITH_DBUS_FALSE='#'
- else
-@@ -27001,7 +27001,7 @@ if test "${enable_tests+set}" = set; the
- fi
- 
+--- configure.orig	2009-02-24 21:18:47.000000000 +0100
++++ configure	2009-02-24 21:19:24.000000000 +0100
+@@ -18069,7 +18069,7 @@
  
+ { echo "$as_me:$LINENO: checking build test tools, unit tests, and -Werror" >&5
+ echo $ECHO_N "checking build test tools, unit tests, and -Werror... $ECHO_C" >&6; }
 -if test "$enable_tests" == "yes"; then
 +if test "$enable_tests" = "yes"; then
- 	echo "building tests and unit tests"
  
  cat >>confdefs.h <<_ACEOF
-@@ -27014,7 +27014,7 @@ else
+ #define WITH_TESTS 1
+@@ -18085,7 +18085,7 @@
    	tests_status="no"
  fi
  
@@ -27,7 +18,7 @@
    WITH_TESTS_TRUE=
    WITH_TESTS_FALSE='#'
  else
-@@ -27029,7 +27029,7 @@ if test "${enable_coverage+set}" = set; 
+@@ -18100,7 +18100,7 @@
  fi
  
  
diff --git a/security/gnome-keyring/files/patch-egg_egg-asn1.h b/security/gnome-keyring/files/patch-egg_egg-asn1.h
new file mode 100644
index 000000000000..a3d4296af2e4
--- /dev/null
+++ b/security/gnome-keyring/files/patch-egg_egg-asn1.h
@@ -0,0 +1,14 @@
+--- egg/egg-asn1.h.orig	2009-02-25 16:40:49.000000000 -0500
++++ egg/egg-asn1.h	2009-02-25 16:41:21.000000000 -0500
+@@ -75,9 +75,9 @@ gchar*             egg_asn1_read_dn     
+ gchar*             egg_asn1_read_dn_part                  (ASN1_TYPE asn, const gchar *part, const gchar *match);
+ 
+ 
+-glong              egg_asn1_time_parse_utc                (const gchar* value);
++time_t              egg_asn1_time_parse_utc                (const gchar* value);
+ 
+-glong              egg_asn1_time_parse_general            (const gchar* value);
++time_t              egg_asn1_time_parse_general            (const gchar* value);
+ 
+ 
+ typedef void       (*EggAsn1DnCallback)                   (guint index, GQuark oid, const guchar *value,
diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
deleted file mode 100644
index 05a0306e6913..000000000000
--- a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- pam/gkr-pam-client.c.orig	2008-10-07 12:25:23.000000000 -0400
-+++ pam/gkr-pam-client.c	2008-10-07 12:38:36.000000000 -0400
-@@ -96,12 +96,12 @@ check_peer_same_uid (int sock)
-         struct xucred xuc;
-         socklen_t xuc_len = sizeof (xuc);
- 
--	if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && 
--	    xuc_len == sizeof (xuc)) {
-+	if (getsockopt (sock, 0, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && 
-+	    xuc.cr_version == XUCRED_VERSION) {
- 	    	uid = xuc.cr_uid;
- 	} else {
- 		syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, "
--		        "(returned len %d/%d)\n", xuc_len, (int)sizeof (xuc));
-+		        "(returned version %d/%d)\n", xuc.cr_version, XUCRED_VERSION);
- 		return -1;   
- 	}
- 	
diff --git a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c
deleted file mode 100644
index 57d2f1888016..000000000000
--- a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- pkcs11/gkr-pkcs11-module.c.orig	2008-02-11 21:26:56.000000000 -0500
-+++ pkcs11/gkr-pkcs11-module.c	2008-02-11 21:27:08.000000000 -0500
-@@ -36,6 +36,7 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- 
-+#include <string.h>
- #include <stdlib.h>
- #include <stdint.h>
- #include <pthread.h>
diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
new file mode 100644
index 000000000000..32ffb1b09819
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
@@ -0,0 +1,11 @@
+--- pkcs11/rpc-layer/Makefile.in.orig	2009-02-24 21:22:45.000000000 +0100
++++ pkcs11/rpc-layer/Makefile.in	2009-02-24 21:22:52.000000000 +0100
+@@ -348,7 +348,7 @@ gck_rpc_daemon_standalone_SOURCES = \
+ 	gck-rpc-daemon-standalone.c
+ 
+ gck_rpc_daemon_standalone_LDADD = \
+-	-ldl libgck-rpc-layer.la \
++	libgck-rpc-layer.la \
+ 	$(top_builddir)/common/libgkr-common.la
+ 
+ all: all-am
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 2b3fe4715134..9ba05cb2fa2c 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,5 +1,13 @@
 bin/gnome-keyring
 bin/gnome-keyring-daemon
+etc/xdg/autostart/gnome-keyring-daemon.desktop
+include/gcr/gcr-certificate-basics-widget.h
+include/gcr/gcr-certificate-details-widget.h
+include/gcr/gcr-certificate.h
+include/gcr/gcr-importer.h
+include/gcr/gcr-parser.h
+include/gcr/gcr-types.h
+include/gcr/gcr.h
 include/gnome-keyring-1/gnome-keyring-memory.h
 include/gnome-keyring-1/gnome-keyring-result.h
 include/gnome-keyring-1/gnome-keyring.h
@@ -7,9 +15,22 @@ include/gp11/gp11.h
 include/gp11/pkcs11.h
 include/gp11/pkcs11g.h
 include/gp11/pkcs11n.h
+lib/gnome-keyring/devel/gck-ssh-store-standalone.a
+lib/gnome-keyring/devel/gck-ssh-store-standalone.la
+lib/gnome-keyring/devel/gck-ssh-store-standalone.so
+lib/gnome-keyring/devel/gck-user-store-standalone.a
+lib/gnome-keyring/devel/gck-user-store-standalone.la
+lib/gnome-keyring/devel/gck-user-store-standalone.so
 lib/gnome-keyring/gnome-keyring-pkcs11.a
 lib/gnome-keyring/gnome-keyring-pkcs11.la
 lib/gnome-keyring/gnome-keyring-pkcs11.so
+lib/gnome-keyring/standalone/gck-roots-store-standalone.a
+lib/gnome-keyring/standalone/gck-roots-store-standalone.la
+lib/gnome-keyring/standalone/gck-roots-store-standalone.so
+lib/libgcr.a
+lib/libgcr.la
+lib/libgcr.so
+lib/libgcr.so.0
 lib/libgnome-keyring.a
 lib/libgnome-keyring.la
 lib/libgnome-keyring.so
@@ -21,6 +42,7 @@ lib/libgp11.so.0
 lib/pam_gnome_keyring.a
 lib/pam_gnome_keyring.la
 lib/pam_gnome_keyring.so
+libdata/pkgconfig/gcr-0.pc
 libdata/pkgconfig/gnome-keyring-1.pc
 libdata/pkgconfig/gp11-0.pc
 libexec/gnome-keyring-ask
@@ -63,7 +85,10 @@ share/doc/gp11/left.png
 share/doc/gp11/right.png
 share/doc/gp11/style.css
 share/doc/gp11/up.png
+share/gcr/ui/gcr-certificate-basics-widget.ui
+share/gcr/ui/gcr-import-dialog.ui
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
+share/locale/ast/LC_MESSAGES/gnome-keyring.mo
 share/locale/az/LC_MESSAGES/gnome-keyring.mo
 share/locale/be/LC_MESSAGES/gnome-keyring.mo
 share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
@@ -139,9 +164,14 @@ share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrm share/doc/gp11
 @dirrm %%DOCSDIR%%
+@dirrm lib/gnome-keyring/standalone
+@dirrm lib/gnome-keyring/devel
 @dirrm lib/gnome-keyring
 @dirrm include/gp11
 @dirrm include/gnome-keyring-1
+@dirrm include/gcr
+@dirrm share/gcr/ui
+@dirrm share/gcr
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -166,3 +196,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index 15527cbd175d..478708eb1900 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse-plugins/Makefile,v 1.4 2008/10/20 03:02:56 mezz Exp $
+#   $MCom: ports/security/seahorse-plugins/Makefile,v 1.10 2009/03/30 05:54:57 marcus Exp $
 #
 
 PORTNAME=	seahorse-plugins
-PORTVERSION=	2.24.1
-PORTREVISION=	2
+PORTVERSION=	2.26.0
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,7 +20,7 @@ LIB_DEPENDS=	cryptui.0:${PORTSDIR}/security/seahorse
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GECKO=	firefox xulrunner
+USE_GECKO=	firefox libxul
 USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -39,6 +38,12 @@ MAN1=		seahorse-agent.1 seahorse-tool.1
 
 .include <bsd.port.pre.mk>
 
+.if ${GECKO}=="libxul"
+CONFIGURE_ARGS+=--with-gecko=libxul-unstable
+.else
+CONFIGURE_ARGS+=--with-gecko=${GECKO}
+.endif
+
 .if !defined(WITHOUT_GEDIT)
 BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
@@ -60,7 +65,7 @@ CONFIGURE_ARGS+=--disable-nautilus
 .if !defined(WITHOUT_EPIPHANY)
 BUILD_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
 RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
-PLIST_SUB+=	EPIPHANY="" EPHY_VERSION="2.24"
+PLIST_SUB+=	EPIPHANY="" EPHY_VERSION="2.26"
 .else
 CONFIGURE_ARGS+=--disable-epiphany
 PLIST_SUB+=	EPHY="@comment "
@@ -76,6 +81,8 @@ PLIST_SUB+=	APPLET="@comment "
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|" == "|" = "|g' \
+		-e 's|epiphany-2.24|epiphany-2.26|g' \
+		-e 's|2.24|2.26|g' \
 			${WRKSRC}/configure
 
 post-install:
diff --git a/security/seahorse-plugins/distinfo b/security/seahorse-plugins/distinfo
index e9ffdd587f4a..7897b7b5507a 100644
--- a/security/seahorse-plugins/distinfo
+++ b/security/seahorse-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 842b7b7424c2a5cfe56db5960133f0a1
-SHA256 (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 0a9ee63adc7ad01e9c3d9a3432d467a4df24889b7bd41b065e89bec74ccd7676
-SIZE (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 1843996
+MD5 (gnome2/seahorse-plugins-2.26.0.tar.bz2) = 8936feb29cf9e4b935d1059ee4e416c6
+SHA256 (gnome2/seahorse-plugins-2.26.0.tar.bz2) = b56c3c947204dac0802332332feea6eee282616a654b92d3135340cb842bf377
+SIZE (gnome2/seahorse-plugins-2.26.0.tar.bz2) = 1350051
diff --git a/security/seahorse-plugins/pkg-plist b/security/seahorse-plugins/pkg-plist
index f17cd1ca5426..1ff664f8cc7b 100644
--- a/security/seahorse-plugins/pkg-plist
+++ b/security/seahorse-plugins/pkg-plist
@@ -28,166 +28,24 @@ share/gnome/help/seahorse-applet/oc/seahorse-applet.xml
 share/gnome/help/seahorse-applet/ru/seahorse-applet.xml
 share/gnome/help/seahorse-applet/sv/seahorse-applet.xml
 share/gnome/help/seahorse-applet/vi/seahorse-applet.xml
-share/gnome/help/seahorse-plugins/C/figures/export.png
-share/gnome/help/seahorse-plugins/C/figures/file-manager.png
-share/gnome/help/seahorse-plugins/C/figures/generate.png
-share/gnome/help/seahorse-plugins/C/figures/import.png
-share/gnome/help/seahorse-plugins/C/figures/key-manager.png
-share/gnome/help/seahorse-plugins/C/figures/key-properties.png
-share/gnome/help/seahorse-plugins/C/figures/passphrase.png
-share/gnome/help/seahorse-plugins/C/figures/preferences.png
-share/gnome/help/seahorse-plugins/C/figures/recipients.png
-share/gnome/help/seahorse-plugins/C/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/C/figures/signature.png
-share/gnome/help/seahorse-plugins/C/figures/text-editor.png
 share/gnome/help/seahorse-plugins/C/legal.xml
 share/gnome/help/seahorse-plugins/C/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/cs/figures/export.png
-share/gnome/help/seahorse-plugins/cs/figures/file-manager.png
-share/gnome/help/seahorse-plugins/cs/figures/generate.png
-share/gnome/help/seahorse-plugins/cs/figures/import.png
-share/gnome/help/seahorse-plugins/cs/figures/key-manager.png
-share/gnome/help/seahorse-plugins/cs/figures/key-properties.png
-share/gnome/help/seahorse-plugins/cs/figures/passphrase.png
-share/gnome/help/seahorse-plugins/cs/figures/preferences.png
-share/gnome/help/seahorse-plugins/cs/figures/recipients.png
-share/gnome/help/seahorse-plugins/cs/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/cs/figures/signature.png
-share/gnome/help/seahorse-plugins/cs/figures/text-editor.png
+share/gnome/help/seahorse-plugins/ca/seahorse-plugins.xml
 share/gnome/help/seahorse-plugins/cs/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/de/figures/export.png
-share/gnome/help/seahorse-plugins/de/figures/file-manager.png
-share/gnome/help/seahorse-plugins/de/figures/generate.png
-share/gnome/help/seahorse-plugins/de/figures/import.png
-share/gnome/help/seahorse-plugins/de/figures/key-manager.png
-share/gnome/help/seahorse-plugins/de/figures/key-properties.png
-share/gnome/help/seahorse-plugins/de/figures/passphrase.png
-share/gnome/help/seahorse-plugins/de/figures/preferences.png
-share/gnome/help/seahorse-plugins/de/figures/recipients.png
-share/gnome/help/seahorse-plugins/de/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/de/figures/signature.png
-share/gnome/help/seahorse-plugins/de/figures/text-editor.png
 share/gnome/help/seahorse-plugins/de/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/el/figures/export.png
-share/gnome/help/seahorse-plugins/el/figures/file-manager.png
-share/gnome/help/seahorse-plugins/el/figures/generate.png
-share/gnome/help/seahorse-plugins/el/figures/import.png
-share/gnome/help/seahorse-plugins/el/figures/key-manager.png
-share/gnome/help/seahorse-plugins/el/figures/key-properties.png
-share/gnome/help/seahorse-plugins/el/figures/passphrase.png
-share/gnome/help/seahorse-plugins/el/figures/preferences.png
-share/gnome/help/seahorse-plugins/el/figures/recipients.png
-share/gnome/help/seahorse-plugins/el/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/el/figures/signature.png
-share/gnome/help/seahorse-plugins/el/figures/text-editor.png
 share/gnome/help/seahorse-plugins/el/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/en_GB/figures/export.png
-share/gnome/help/seahorse-plugins/en_GB/figures/file-manager.png
-share/gnome/help/seahorse-plugins/en_GB/figures/generate.png
-share/gnome/help/seahorse-plugins/en_GB/figures/import.png
-share/gnome/help/seahorse-plugins/en_GB/figures/key-manager.png
-share/gnome/help/seahorse-plugins/en_GB/figures/key-properties.png
-share/gnome/help/seahorse-plugins/en_GB/figures/passphrase.png
-share/gnome/help/seahorse-plugins/en_GB/figures/preferences.png
-share/gnome/help/seahorse-plugins/en_GB/figures/recipients.png
-share/gnome/help/seahorse-plugins/en_GB/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/en_GB/figures/signature.png
-share/gnome/help/seahorse-plugins/en_GB/figures/text-editor.png
 share/gnome/help/seahorse-plugins/en_GB/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/es/figures/export.png
-share/gnome/help/seahorse-plugins/es/figures/file-manager.png
-share/gnome/help/seahorse-plugins/es/figures/generate.png
-share/gnome/help/seahorse-plugins/es/figures/import.png
-share/gnome/help/seahorse-plugins/es/figures/key-manager.png
-share/gnome/help/seahorse-plugins/es/figures/key-properties.png
-share/gnome/help/seahorse-plugins/es/figures/passphrase.png
-share/gnome/help/seahorse-plugins/es/figures/preferences.png
-share/gnome/help/seahorse-plugins/es/figures/recipients.png
-share/gnome/help/seahorse-plugins/es/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/es/figures/signature.png
-share/gnome/help/seahorse-plugins/es/figures/text-editor.png
 share/gnome/help/seahorse-plugins/es/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/fr/figures/export.png
-share/gnome/help/seahorse-plugins/fr/figures/file-manager.png
-share/gnome/help/seahorse-plugins/fr/figures/generate.png
-share/gnome/help/seahorse-plugins/fr/figures/import.png
-share/gnome/help/seahorse-plugins/fr/figures/key-manager.png
-share/gnome/help/seahorse-plugins/fr/figures/key-properties.png
-share/gnome/help/seahorse-plugins/fr/figures/passphrase.png
-share/gnome/help/seahorse-plugins/fr/figures/preferences.png
-share/gnome/help/seahorse-plugins/fr/figures/recipients.png
-share/gnome/help/seahorse-plugins/fr/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/fr/figures/signature.png
-share/gnome/help/seahorse-plugins/fr/figures/text-editor.png
 share/gnome/help/seahorse-plugins/fr/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/it/figures/export.png
-share/gnome/help/seahorse-plugins/it/figures/file-manager.png
-share/gnome/help/seahorse-plugins/it/figures/generate.png
-share/gnome/help/seahorse-plugins/it/figures/import.png
-share/gnome/help/seahorse-plugins/it/figures/key-manager.png
-share/gnome/help/seahorse-plugins/it/figures/key-properties.png
-share/gnome/help/seahorse-plugins/it/figures/passphrase.png
-share/gnome/help/seahorse-plugins/it/figures/preferences.png
-share/gnome/help/seahorse-plugins/it/figures/recipients.png
-share/gnome/help/seahorse-plugins/it/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/it/figures/signature.png
-share/gnome/help/seahorse-plugins/it/figures/text-editor.png
 share/gnome/help/seahorse-plugins/it/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/oc/figures/export.png
-share/gnome/help/seahorse-plugins/oc/figures/file-manager.png
-share/gnome/help/seahorse-plugins/oc/figures/generate.png
-share/gnome/help/seahorse-plugins/oc/figures/import.png
-share/gnome/help/seahorse-plugins/oc/figures/key-manager.png
-share/gnome/help/seahorse-plugins/oc/figures/key-properties.png
-share/gnome/help/seahorse-plugins/oc/figures/passphrase.png
-share/gnome/help/seahorse-plugins/oc/figures/preferences.png
-share/gnome/help/seahorse-plugins/oc/figures/recipients.png
-share/gnome/help/seahorse-plugins/oc/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/oc/figures/signature.png
-share/gnome/help/seahorse-plugins/oc/figures/text-editor.png
 share/gnome/help/seahorse-plugins/oc/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/ru/figures/export.png
-share/gnome/help/seahorse-plugins/ru/figures/file-manager.png
-share/gnome/help/seahorse-plugins/ru/figures/generate.png
-share/gnome/help/seahorse-plugins/ru/figures/import.png
-share/gnome/help/seahorse-plugins/ru/figures/key-manager.png
-share/gnome/help/seahorse-plugins/ru/figures/key-properties.png
-share/gnome/help/seahorse-plugins/ru/figures/passphrase.png
-share/gnome/help/seahorse-plugins/ru/figures/preferences.png
-share/gnome/help/seahorse-plugins/ru/figures/recipients.png
-share/gnome/help/seahorse-plugins/ru/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/ru/figures/signature.png
-share/gnome/help/seahorse-plugins/ru/figures/text-editor.png
 share/gnome/help/seahorse-plugins/ru/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/sv/figures/export.png
-share/gnome/help/seahorse-plugins/sv/figures/file-manager.png
-share/gnome/help/seahorse-plugins/sv/figures/generate.png
-share/gnome/help/seahorse-plugins/sv/figures/import.png
-share/gnome/help/seahorse-plugins/sv/figures/key-manager.png
-share/gnome/help/seahorse-plugins/sv/figures/key-properties.png
-share/gnome/help/seahorse-plugins/sv/figures/passphrase.png
-share/gnome/help/seahorse-plugins/sv/figures/preferences.png
-share/gnome/help/seahorse-plugins/sv/figures/recipients.png
-share/gnome/help/seahorse-plugins/sv/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/sv/figures/signature.png
-share/gnome/help/seahorse-plugins/sv/figures/text-editor.png
 share/gnome/help/seahorse-plugins/sv/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/vi/figures/export.png
-share/gnome/help/seahorse-plugins/vi/figures/file-manager.png
-share/gnome/help/seahorse-plugins/vi/figures/generate.png
-share/gnome/help/seahorse-plugins/vi/figures/import.png
-share/gnome/help/seahorse-plugins/vi/figures/key-manager.png
-share/gnome/help/seahorse-plugins/vi/figures/key-properties.png
-share/gnome/help/seahorse-plugins/vi/figures/passphrase.png
-share/gnome/help/seahorse-plugins/vi/figures/preferences.png
-share/gnome/help/seahorse-plugins/vi/figures/recipients.png
-share/gnome/help/seahorse-plugins/vi/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/vi/figures/signature.png
-share/gnome/help/seahorse-plugins/vi/figures/text-editor.png
 share/gnome/help/seahorse-plugins/vi/seahorse-plugins.xml
 share/icons/hicolor/48x48/apps/seahorse-applet.png
 share/icons/hicolor/scalable/apps/seahorse-applet.svg
 share/locale/ar/LC_MESSAGES/seahorse-plugins.mo
+share/locale/as/LC_MESSAGES/seahorse-plugins.mo
 share/locale/az/LC_MESSAGES/seahorse-plugins.mo
 share/locale/be@latin/LC_MESSAGES/seahorse-plugins.mo
 share/locale/bg/LC_MESSAGES/seahorse-plugins.mo
@@ -217,6 +75,7 @@ share/locale/it/LC_MESSAGES/seahorse-plugins.mo
 share/locale/ja/LC_MESSAGES/seahorse-plugins.mo
 share/locale/kn/LC_MESSAGES/seahorse-plugins.mo
 share/locale/ko/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ku/LC_MESSAGES/seahorse-plugins.mo
 share/locale/lt/LC_MESSAGES/seahorse-plugins.mo
 share/locale/lv/LC_MESSAGES/seahorse-plugins.mo
 share/locale/mk/LC_MESSAGES/seahorse-plugins.mo
@@ -261,6 +120,7 @@ share/omf/seahorse-applet/seahorse-applet-ru.omf
 share/omf/seahorse-applet/seahorse-applet-sv.omf
 share/omf/seahorse-applet/seahorse-applet-vi.omf
 share/omf/seahorse-plugins/seahorse-plugins-C.omf
+share/omf/seahorse-plugins/seahorse-plugins-ca.omf
 share/omf/seahorse-plugins/seahorse-plugins-cs.omf
 share/omf/seahorse-plugins/seahorse-plugins-de.omf
 share/omf/seahorse-plugins/seahorse-plugins-el.omf
@@ -325,29 +185,18 @@ share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg
 @dirrmtry share/pixmaps/seahorse-plugins
 @dirrm share/omf/seahorse-plugins
 @dirrm share/omf/seahorse-applet
-@dirrm share/gnome/help/seahorse-plugins/vi/figures
 @dirrm share/gnome/help/seahorse-plugins/vi
-@dirrm share/gnome/help/seahorse-plugins/sv/figures
 @dirrm share/gnome/help/seahorse-plugins/sv
-@dirrm share/gnome/help/seahorse-plugins/ru/figures
 @dirrm share/gnome/help/seahorse-plugins/ru
-@dirrm share/gnome/help/seahorse-plugins/oc/figures
 @dirrm share/gnome/help/seahorse-plugins/oc
-@dirrm share/gnome/help/seahorse-plugins/it/figures
 @dirrm share/gnome/help/seahorse-plugins/it
-@dirrm share/gnome/help/seahorse-plugins/fr/figures
 @dirrm share/gnome/help/seahorse-plugins/fr
-@dirrm share/gnome/help/seahorse-plugins/es/figures
 @dirrm share/gnome/help/seahorse-plugins/es
-@dirrm share/gnome/help/seahorse-plugins/en_GB/figures
 @dirrm share/gnome/help/seahorse-plugins/en_GB
-@dirrm share/gnome/help/seahorse-plugins/el/figures
 @dirrm share/gnome/help/seahorse-plugins/el
-@dirrm share/gnome/help/seahorse-plugins/de/figures
 @dirrm share/gnome/help/seahorse-plugins/de
-@dirrm share/gnome/help/seahorse-plugins/cs/figures
 @dirrm share/gnome/help/seahorse-plugins/cs
-@dirrm share/gnome/help/seahorse-plugins/C/figures
+@dirrm share/gnome/help/seahorse-plugins/ca
 @dirrm share/gnome/help/seahorse-plugins/C
 @dirrm share/gnome/help/seahorse-plugins
 @dirrm share/gnome/help/seahorse-applet/vi
@@ -378,9 +227,13 @@ share/pixmaps/seahorse-plugins/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
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
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
diff --git a/security/tuntun/Makefile b/security/tuntun/Makefile
index 450737825e0c..acdfb884cea4 100644
--- a/security/tuntun/Makefile
+++ b/security/tuntun/Makefile
@@ -14,6 +14,8 @@ MAINTAINER=	anderson@cnpm.embrapa.br
 COMMENT=	A Gnome applet gui for OpenVPN
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
+		LIBS="`pkg-config --libs libgnomeui-2.0`"
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libdata/servers
 USE_GMAKE=	yes