The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

16 files changed, 113 insertions, 193 deletions

diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
deleted file mode 100644
index f7fdd7d1485b..000000000000
--- a/security/gnome-keyring-manager/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	gnomekeyringmanager
-# Date created:				2004 12 July
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.32 2007/09/18 01:27:58 ahze Exp $
-#
-
-PORTNAME=	gnome-keyring-manager
-PORTVERSION=	2.20.0
-CATEGORIES=	security gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME keyring manager
-
-LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnome-keyring
-
-USE_XLIB=	yes
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-INSTALLS_OMF=	yes
-USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui gnomedocutils
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=		gnome-keyring-manager.1
-GCONF_SCHEMAS=	gnome-keyring-manager.schemas
-
-.include <bsd.port.mk>
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
deleted file mode 100644
index 99541a9d89fd..000000000000
--- a/security/gnome-keyring-manager/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-keyring-manager-2.20.0.tar.bz2) = 61d701888f00c02490c0cd551bf3fcb1
-SHA256 (gnome2/gnome-keyring-manager-2.20.0.tar.bz2) = a4c9560f79067d528501198dd103b3df060b24f64cd878f22436031eeb113140
-SIZE (gnome2/gnome-keyring-manager-2.20.0.tar.bz2) = 455466
diff --git a/security/gnome-keyring-manager/pkg-descr b/security/gnome-keyring-manager/pkg-descr
deleted file mode 100644
index c6881629b867..000000000000
--- a/security/gnome-keyring-manager/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This a keyring management program for the GNOME Desktop.
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
deleted file mode 100644
index 5d1b24c0fb98..000000000000
--- a/security/gnome-keyring-manager/pkg-plist
+++ /dev/null
@@ -1,129 +0,0 @@
-bin/gnome-keyring-manager
-share/applications/gnome-keyring-manager.desktop
-%%DATADIR%%/gnome-keyring-manager-ui.xml
-%%DATADIR%%/gnome-keyring-manager.glade
-%%DATADIR%%/stock_delete-key.png
-%%DATADIR%%/stock_delete-keyring.png
-%%DATADIR%%/stock_new-key.png
-%%DATADIR%%/stock_new-keyring.png
-share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml
-share/gnome/help/gnome-keyring-manager/C/legal.xml
-share/gnome/help/gnome-keyring-manager/ca/gnome-keyring-manager.xml
-share/gnome/help/gnome-keyring-manager/da/gnome-keyring-manager.xml
-share/gnome/help/gnome-keyring-manager/en_GB/gnome-keyring-manager.xml
-share/gnome/help/gnome-keyring-manager/es/gnome-keyring-manager.xml
-share/gnome/help/gnome-keyring-manager/fr/gnome-keyring-manager.xml
-share/gnome/help/gnome-keyring-manager/oc/gnome-keyring-manager.xml
-share/gnome/help/gnome-keyring-manager/sv/gnome-keyring-manager.xml
-share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
-share/gnome/help/gnome-keyring-manager/vi/gnome-keyring-manager.xml
-share/locale/ar/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/be/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/be@latin/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/cs/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/cy/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/da/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/de/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/dz/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/en_CA/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/en_GB/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/es/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/et/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/eu/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/fa/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/fi/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/fr/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/gl/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/gu/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/hi/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/hu/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/id/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/it/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/ja/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/ka/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/ko/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/lt/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/lv/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/mg/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/mk/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/ml/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/mn/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/mr/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/nn/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/oc/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/or/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/pt/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/ro/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/si/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/sl/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/ta/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/te/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/vi/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
-share/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
-share/omf/gnome-keyring-manager/gnome-keyring-manager-ca.omf
-share/omf/gnome-keyring-manager/gnome-keyring-manager-da.omf
-share/omf/gnome-keyring-manager/gnome-keyring-manager-en_GB.omf
-share/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
-share/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf
-share/omf/gnome-keyring-manager/gnome-keyring-manager-oc.omf
-share/omf/gnome-keyring-manager/gnome-keyring-manager-sv.omf
-share/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
-share/omf/gnome-keyring-manager/gnome-keyring-manager-vi.omf
-@dirrm share/omf/gnome-keyring-manager
-@dirrm share/gnome/help/gnome-keyring-manager/vi
-@dirrm share/gnome/help/gnome-keyring-manager/uk
-@dirrm share/gnome/help/gnome-keyring-manager/sv
-@dirrm share/gnome/help/gnome-keyring-manager/oc
-@dirrm share/gnome/help/gnome-keyring-manager/fr
-@dirrm share/gnome/help/gnome-keyring-manager/es
-@dirrm share/gnome/help/gnome-keyring-manager/en_GB
-@dirrm share/gnome/help/gnome-keyring-manager/da
-@dirrm share/gnome/help/gnome-keyring-manager/ca
-@dirrm share/gnome/help/gnome-keyring-manager/C
-@dirrm share/gnome/help/gnome-keyring-manager
-@dirrm %%DATADIR%%
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@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/applications
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index f286bda257f9..7a93115cf71b 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,31 +3,30 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/security/gnome-keyring/Makefile,v 1.1 2007/11/30 19:09:39 marcus Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.59 2008/03/09 18:30:40 mezz Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	2.20.3
-PORTREVISION=	1
+PORTVERSION=	2.22.0
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-keyring-${PORTVERSION}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
 LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
+		tasn1.3:${PORTSDIR}/security/libtasn1 \
     		gcrypt.15:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack
+USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+GCONF_SCHEMAS=	gnome-keyring.schemas
 
 .include <bsd.port.mk>
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 53d4eb46d43a..43065d85acc2 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.20.3.tar.bz2) = 2205177a168e745fa803c96a4fb62102
-SHA256 (gnome2/gnome-keyring-2.20.3.tar.bz2) = 5bfb69897c9042968637c33beca098a4bbabcb4b9863f3f49504bc82089fa970
-SIZE (gnome2/gnome-keyring-2.20.3.tar.bz2) = 541431
+MD5 (gnome2/gnome-keyring-2.22.0.tar.bz2) = d27c5bf11579069eb694f93b71364bb4
+SHA256 (gnome2/gnome-keyring-2.22.0.tar.bz2) = d5aa2c467fcb842b035a4fc424031dcc5a67ece01bc8f1c38fe10cbc3adbbd42
+SIZE (gnome2/gnome-keyring-2.22.0.tar.bz2) = 882416
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
new file mode 100644
index 000000000000..235656df1b7e
--- /dev/null
+++ b/security/gnome-keyring/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2008-02-11 21:29:42.000000000 -0500
++++ configure	2008-02-11 21:29:51.000000000 -0500
+@@ -23793,7 +23793,7 @@ else
+   tests_status="no"
+ fi
+ 
+- if test "$enable_tests" == "yes"; then
++ if test "$enable_tests" = "yes"; then
+   WITH_TESTS_TRUE=
+   WITH_TESTS_FALSE='#'
+ else
+@@ -25228,7 +25228,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
diff --git a/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c b/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c
new file mode 100644
index 000000000000..185e929dd298
--- /dev/null
+++ b/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c
@@ -0,0 +1,10 @@
+--- keyrings/gkr-keyrings.c.orig	2008-02-11 21:30:10.000000000 -0500
++++ keyrings/gkr-keyrings.c	2008-02-11 21:30:19.000000000 -0500
+@@ -35,6 +35,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/types.h>
diff --git a/security/gnome-keyring/files/patch-library_gnome-keyring.c b/security/gnome-keyring/files/patch-library_gnome-keyring.c
new file mode 100644
index 000000000000..625a65cc72c0
--- /dev/null
+++ b/security/gnome-keyring/files/patch-library_gnome-keyring.c
@@ -0,0 +1,11 @@
+--- library/gnome-keyring.c.orig	2008-02-26 22:05:10.000000000 -0600
++++ library/gnome-keyring.c	2008-02-26 22:05:30.000000000 -0600
+@@ -50,6 +50,8 @@
+ #include <dbus/dbus.h>
+ #endif
+ 
++extern char **environ;
++
+ typedef enum {
+ 	CALLBACK_DONE,
+ 	CALLBACK_GET_STRING,
diff --git a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c
new file mode 100644
index 000000000000..4bd5a923f4f4
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c
@@ -0,0 +1,10 @@
+--- pkcs11/gkr-pkcs11-daemon.c.orig	2008-02-11 21:30:48.000000000 -0500
++++ pkcs11/gkr-pkcs11-daemon.c	2008-02-11 21:30:58.000000000 -0500
+@@ -35,6 +35,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <string.h>
+ #include <errno.h>
+ #include <unistd.h>
+ 
diff --git a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c
new file mode 100644
index 000000000000..57d2f1888016
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c
@@ -0,0 +1,10 @@
+--- 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/pkg-plist b/security/gnome-keyring/pkg-plist
index bde5f3d2a70e..1607e5fcbb6a 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -2,6 +2,9 @@ bin/gnome-keyring-daemon
 include/gnome-keyring-1/gnome-keyring-memory.h
 include/gnome-keyring-1/gnome-keyring-result.h
 include/gnome-keyring-1/gnome-keyring.h
+lib/gnome-keyring/gnome-keyring-pkcs11.a
+lib/gnome-keyring/gnome-keyring-pkcs11.la
+lib/gnome-keyring/gnome-keyring-pkcs11.so
 lib/libgnome-keyring.a
 lib/libgnome-keyring.la
 lib/libgnome-keyring.so
@@ -11,9 +14,11 @@ lib/security/pam_gnome_keyring.la
 lib/security/pam_gnome_keyring.so
 libdata/pkgconfig/gnome-keyring-1.pc
 libexec/gnome-keyring-ask
+share/dbus-1/services/org.gnome.keyring.service
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/gnome-keyring-gnome-keyring-acl.html
 %%DOCSDIR%%/gnome-keyring-gnome-keyring-attributes.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-daemon.html
 %%DOCSDIR%%/gnome-keyring-gnome-keyring-find.html
 %%DOCSDIR%%/gnome-keyring-gnome-keyring-generic-callbacks.html
 %%DOCSDIR%%/gnome-keyring-gnome-keyring-item-info.html
@@ -23,6 +28,7 @@ libexec/gnome-keyring-ask
 %%DOCSDIR%%/gnome-keyring-gnome-keyring-memory.html
 %%DOCSDIR%%/gnome-keyring-gnome-keyring-misc.html
 %%DOCSDIR%%/gnome-keyring-gnome-keyring-network.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-password.html
 %%DOCSDIR%%/gnome-keyring-gnome-keyring-result.html
 %%DOCSDIR%%/gnome-keyring.devhelp
 %%DOCSDIR%%/gnome-keyring.devhelp2
@@ -58,6 +64,7 @@ share/locale/fi/LC_MESSAGES/gnome-keyring.mo
 share/locale/fr/LC_MESSAGES/gnome-keyring.mo
 share/locale/gl/LC_MESSAGES/gnome-keyring.mo
 share/locale/gu/LC_MESSAGES/gnome-keyring.mo
+share/locale/he/LC_MESSAGES/gnome-keyring.mo
 share/locale/hi/LC_MESSAGES/gnome-keyring.mo
 share/locale/hr/LC_MESSAGES/gnome-keyring.mo
 share/locale/hu/LC_MESSAGES/gnome-keyring.mo
@@ -78,6 +85,7 @@ share/locale/ms/LC_MESSAGES/gnome-keyring.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring.mo
+share/locale/nn/LC_MESSAGES/gnome-keyring.mo
 share/locale/oc/LC_MESSAGES/gnome-keyring.mo
 share/locale/or/LC_MESSAGES/gnome-keyring.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring.mo
@@ -106,6 +114,7 @@ share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrm %%DOCSDIR%%
 @dirrmtry lib/security
+@dirrm lib/gnome-keyring
 @dirrm include/gnome-keyring-1
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 2f7e873bc884..7427f32a851a 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse/Makefile,v 1.47 2007/10/15 17:59:07 mezz Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.61 2008/03/14 14:13:03 mezz Exp $
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	2.20.3
+PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -38,15 +38,15 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 GCONF_SCHEMAS=	seahorse.schemas
 MAN1=		seahorse-agent.1 seahorse-daemon.1 seahorse-tool.1
 
-OPTIONS=	NAUTILUS "Enable the Nautilus component" on \
-		LDAP "Enable LDAP support" on \
+OPTIONS=	LDAP "Enable LDAP support" on \
 		HKP "Enable HKP keyserver interface" on \
-		EPIPHANY "Enable Epiphany plug-in support" on \
 		NOTIFY "Enable libnotify support" on \
 		APPLET "Enable clipboard encryption applet" on \
 		KEYRING "Enable GNOME Keyring support" on \
 		MDNS "Enable mDNS key sharing" on \
-		GEDIT "Enable GEdit plug-in support" on
+		GEDIT "Enable GEdit plug-in support" on \
+		NAUTILUS "Enable the Nautilus component" on \
+		EPIPHANY "Enable Epiphany plug-in support" on
 
 .include <bsd.port.pre.mk>
 
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+=--disable-ldap
 .endif
 
 .if !defined(WITHOUT_HKP)
-LIB_DEPENDS+=	soup-2.2.8:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
 .else
 CONFIGURE_ARGS+=--disable-hkp
 .endif
@@ -92,7 +92,7 @@ CONFIGURE_ARGS+=--disable-libnotify
 .if !defined(WITHOUT_EPIPHANY)
 BUILD_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
 RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
-PLIST_SUB+=	EPHY="" EPHY_VERSION="2.20"
+PLIST_SUB+=	EPHY="" EPHY_VERSION="2.22"
 .else
 CONFIGURE_ARGS+=--disable-epiphany
 PLIST_SUB+=	EPHY="@comment "
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index df8b50d5389a..044eca969bb7 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-2.20.3.tar.bz2) = 6f03b38cb0a52e682c73be49f244f83b
-SHA256 (gnome2/seahorse-2.20.3.tar.bz2) = 26aadb8fbd03c2971fdbcbf686dffd93a1f7fe82495510a64f38e53a49ce8442
-SIZE (gnome2/seahorse-2.20.3.tar.bz2) = 2273106
+MD5 (gnome2/seahorse-2.22.0.tar.bz2) = 5dd87139d872c51c17de55ab4779a52a
+SHA256 (gnome2/seahorse-2.22.0.tar.bz2) = 31284f8d5a22d4af263fceb7bef4fc3d1df91ad8821d3dbef507111ef84a5275
+SIZE (gnome2/seahorse-2.22.0.tar.bz2) = 2126861
diff --git a/security/seahorse/files/patch-agent_Makefile.in b/security/seahorse/files/patch-agent_Makefile.in
new file mode 100644
index 000000000000..0ea3f6cf5c84
--- /dev/null
+++ b/security/seahorse/files/patch-agent_Makefile.in
@@ -0,0 +1,11 @@
+--- agent/Makefile.in.orig	2008-03-07 00:35:27.000000000 -0500
++++ agent/Makefile.in	2008-03-07 00:35:44.000000000 -0500
+@@ -686,7 +686,7 @@ uninstall-man: uninstall-man1
+ # Don't make the agent setuid
+ # Make the agent setuid
+ @HAVE_USER_MLOCK_FALSE@install-exec-hook:
+-@HAVE_USER_MLOCK_FALSE@	chmod u+s $(DESTDIR)$(bindir)/seahorse-agent
++#@HAVE_USER_MLOCK_FALSE@	chmod u+s $(DESTDIR)$(bindir)/seahorse-agent
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index cd02f7a7af86..4f564b5604cb 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -21,9 +21,9 @@ lib/libcryptui.a
 lib/libcryptui.la
 lib/libcryptui.so
 lib/libcryptui.so.0
-%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.a
-%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.la
-%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.so
+%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.a
+%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.la
+%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.so
 %%APPLET%%lib/seahorse/seahorse-applet
 lib/seahorse/seahorse-ssh-askpass
 lib/seahorse/xloadimage
@@ -176,6 +176,7 @@ 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/ga/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
@@ -184,11 +185,13 @@ 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/kn/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
 share/locale/mk/LC_MESSAGES/seahorse.mo
 share/locale/ml/LC_MESSAGES/seahorse.mo
+share/locale/mr/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
@@ -285,6 +288,7 @@ 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
+%%DATADIR%%/glade/seahorse-add-keyring.glade
 %%DATADIR%%/glade/seahorse-add-keyserver.glade
 %%DATADIR%%/glade/seahorse-add-subkey.glade
 %%DATADIR%%/glade/seahorse-add-uid.glade
@@ -355,6 +359,7 @@ share/pixmaps/seahorse/scalable/seahorse.svg
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
@@ -365,10 +370,11 @@ share/pixmaps/seahorse/scalable/seahorse.svg
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @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/applications