Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

29 files changed, 386 insertions, 293 deletions

diff --git a/security/fpm/Makefile b/security/fpm/Makefile
index bf0ad5b1037..8ebe9e9b0b9 100644
--- a/security/fpm/Makefile
+++ b/security/fpm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fpm
 PORTVERSION=	0.60
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,8 +24,8 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 
 MAN1=		fpm.1
 PORTDOCS=	AUTHORS ChangeLog README TODO
-PLIST_FILES=	bin/fpm share/gnome/pixmaps/fpm/logo.xpm
-PLIST_DIRS=	share/gnome/pixmaps/fpm
+PLIST_FILES=	bin/fpm share/pixmaps/fpm/logo.xpm
+PLIST_DIRS=	share/pixmaps/fpm
 
 pre-build:
 	${REINPLACE_CMD} -E -e "s@encrypt\(@bfishencrypt\(@g" ${WRKSRC}/src/blowfish.c
diff --git a/security/gcipher/Makefile b/security/gcipher/Makefile
index 6825fb54f90..ef1681c30d3 100644
--- a/security/gcipher/Makefile
+++ b/security/gcipher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcipher
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,10 +21,14 @@ USE_PYTHON=	yes
 USE_XLIB=	yes
 USE_GNOME=	libgnomeui
 
-GCIPHER_PREFIX=	${PREFIX}/share/gnome/gcipher
+GCIPHER_PREFIX=	${PREFIX}/share/gcipher
 
 MAN1=	gcipher.1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		${WRKSRC}/src/Const.py ${WRKSRC}/src/gcipher
+
 do-build:
 	(cd ${WRKSRC}/src; \
 	 ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py .)
@@ -42,7 +46,7 @@ do-install:
 
 	(cd ${WRKSRC}/src; \
 	 ${INSTALL_SCRIPT} gcipher ${PREFIX}/bin/gcipher; \
-	 ${INSTALL_DATA} gcipher.desktop ${PREFIX}/share/gnome/applications; \
+	 ${INSTALL_DATA} gcipher.desktop ${PREFIX}/share/applications; \
 	 for i in `${FIND} . -name '*.py' \
 		       -o -name '*.pyc' \
 		       -o -name '*.glade' \
diff --git a/security/gcipher/files/patch-Const.py b/security/gcipher/files/patch-Const.py
index eac9b1ae6d1..b4b94da306d 100644
--- a/security/gcipher/files/patch-Const.py
+++ b/security/gcipher/files/patch-Const.py
@@ -6,4 +6,4 @@ diff -ur ../gcipher-1.0.orig/src/Const.py ./src/Const.py
  as a command line filter or as a network proxy."""
  AUTHORS = ["Shannon -jj Behrens <jjinux@yahoo.com>"]
 -GLADEDIR = "."
-+GLADEDIR = "/usr/X11R6/share/gnome/gcipher/lib"
++GLADEDIR = "%%PREFIX%%/share/gcipher/lib"
diff --git a/security/gcipher/files/patch-gcipher b/security/gcipher/files/patch-gcipher
index cb48ac1009f..2e7ba1abc05 100644
--- a/security/gcipher/files/patch-gcipher
+++ b/security/gcipher/files/patch-gcipher
@@ -10,7 +10,7 @@ diff -ur ../gcipher-1.0.orig/src/gcipher ./src/gcipher
  # Edit the path below if you need to port GCipher.
  import sys
 -# sys.path.append("/usr/share/gcipher/lib")
-+sys.path.append("/usr/X11R6/share/gnome/gcipher/lib")
++sys.path.append("%%PREFIX%%/share/gcipher/lib")
  
  from os import environ 
  from os.path import join
diff --git a/security/gcipher/files/patch-gcipher.desktop b/security/gcipher/files/patch-gcipher.desktop
index 6027a262a8d..fa076993d6c 100644
--- a/security/gcipher/files/patch-gcipher.desktop
+++ b/security/gcipher/files/patch-gcipher.desktop
@@ -6,7 +6,7 @@ diff -ur ../gcipher-1.0.orig/src/gcipher.desktop ./src/gcipher.desktop
  Comment[en_US.ISO8859-15]=A simple encryption tool
  Exec=gcipher
 -Icon=/usr/share/pixmaps/gnome-lockscreen.png
-+Icon=/usr/X11R6/share/gnome/pixmaps/gnome-lockscreen.png
++Icon=gnome-lockscreen.png
  Terminal=false
  Type=Application
  StartupNotify=true
diff --git a/security/gcipher/pkg-plist b/security/gcipher/pkg-plist
index 640f01df3d0..2e0d6874038 100644
--- a/security/gcipher/pkg-plist
+++ b/security/gcipher/pkg-plist
@@ -1,65 +1,66 @@
 bin/gcipher
-share/gnome/applications/gcipher.desktop
-share/gnome/gcipher/CONTRIB
-share/gnome/gcipher/LICENSE
-share/gnome/gcipher/README
-share/gnome/gcipher/lib/cipher/__init__.pyc
-share/gnome/gcipher/lib/cipher/Ceasar.py
-share/gnome/gcipher/lib/cipher/CharacterCipher.py
-share/gnome/gcipher/lib/cipher/Gie.py
-share/gnome/gcipher/lib/cipher/KeyedCipher.py
-share/gnome/gcipher/lib/cipher/Rot.py
-share/gnome/gcipher/lib/cipher/Tools.py
-share/gnome/gcipher/lib/cipher/Vigenere.py
-share/gnome/gcipher/lib/cipher/__init__.py
-share/gnome/gcipher/lib/cipher/KeyedCipher.pyc
-share/gnome/gcipher/lib/cipher/Vigenere.pyc
-share/gnome/gcipher/lib/cipher/CharacterCipher.pyc
-share/gnome/gcipher/lib/cipher/Tools.pyc
-share/gnome/gcipher/lib/cipher/Gie.pyc
-share/gnome/gcipher/lib/cipher/Ceasar.pyc
-share/gnome/gcipher/lib/cipher/Rot.pyc
-share/gnome/gcipher/lib/AutomaticClass.py
-share/gnome/gcipher/lib/Const.py
-share/gnome/gcipher/lib/GtkAttributesFacade.py
-share/gnome/gcipher/lib/LibGladeApplication.py
-share/gnome/gcipher/lib/MainCLI.py
-share/gnome/gcipher/lib/MainGUI.py
-share/gnome/gcipher/lib/Proxy.py
-share/gnome/gcipher/lib/gcipher.glade
-share/gnome/gcipher/lib/gcipher.gladep
-share/gnome/gcipher/lib/ciphergui/__init__.pyc
-share/gnome/gcipher/lib/ciphergui/Ceasar.py
-share/gnome/gcipher/lib/ciphergui/CipherGUIList.py
-share/gnome/gcipher/lib/ciphergui/Gie.py
-share/gnome/gcipher/lib/ciphergui/KeyDialog.py
-share/gnome/gcipher/lib/ciphergui/Rot.py
-share/gnome/gcipher/lib/ciphergui/Vigenere.py
-share/gnome/gcipher/lib/ciphergui/__init__.py
-share/gnome/gcipher/lib/ciphergui/rot.glade
-share/gnome/gcipher/lib/ciphergui/rot.gladep
-share/gnome/gcipher/lib/ciphergui/vigenere.glade
-share/gnome/gcipher/lib/ciphergui/vigenere.gladep
-share/gnome/gcipher/lib/ciphergui/CipherGUIList.pyc
-share/gnome/gcipher/lib/ciphergui/Vigenere.pyc
-share/gnome/gcipher/lib/ciphergui/KeyDialog.pyc
-share/gnome/gcipher/lib/ciphergui/Gie.pyc
-share/gnome/gcipher/lib/ciphergui/Ceasar.pyc
-share/gnome/gcipher/lib/ciphergui/Rot.pyc
-share/gnome/gcipher/lib/Const.pyc
-share/gnome/gcipher/lib/MainCLI.pyc
-share/gnome/gcipher/lib/AutomaticClass.pyc
-share/gnome/gcipher/lib/MainGUI.pyc
-share/gnome/gcipher/lib/LibGladeApplication.pyc
-share/gnome/gcipher/lib/GtkAttributesFacade.pyc
-share/gnome/gcipher/lib/Proxy.pyc
-share/gnome/gcipher/plugins/cipher/Identity.py
-share/gnome/gcipher/plugins/ciphergui/Identity.py
-share/gnome/gcipher/plugins/ciphergui/PluginCipherGUIList.py
-@dirrm share/gnome/gcipher/lib/cipher
-@dirrm share/gnome/gcipher/lib/ciphergui
-@dirrm share/gnome/gcipher/lib
-@dirrm share/gnome/gcipher/plugins/cipher
-@dirrm share/gnome/gcipher/plugins/ciphergui
-@dirrm share/gnome/gcipher/plugins
-@dirrm share/gnome/gcipher
+share/applications/gcipher.desktop
+share/gcipher/CONTRIB
+share/gcipher/LICENSE
+share/gcipher/README
+share/gcipher/lib/cipher/__init__.pyc
+share/gcipher/lib/cipher/Ceasar.py
+share/gcipher/lib/cipher/CharacterCipher.py
+share/gcipher/lib/cipher/Gie.py
+share/gcipher/lib/cipher/KeyedCipher.py
+share/gcipher/lib/cipher/Rot.py
+share/gcipher/lib/cipher/Tools.py
+share/gcipher/lib/cipher/Vigenere.py
+share/gcipher/lib/cipher/__init__.py
+share/gcipher/lib/cipher/KeyedCipher.pyc
+share/gcipher/lib/cipher/Vigenere.pyc
+share/gcipher/lib/cipher/CharacterCipher.pyc
+share/gcipher/lib/cipher/Tools.pyc
+share/gcipher/lib/cipher/Gie.pyc
+share/gcipher/lib/cipher/Ceasar.pyc
+share/gcipher/lib/cipher/Rot.pyc
+share/gcipher/lib/AutomaticClass.py
+share/gcipher/lib/Const.py
+share/gcipher/lib/GtkAttributesFacade.py
+share/gcipher/lib/LibGladeApplication.py
+share/gcipher/lib/MainCLI.py
+share/gcipher/lib/MainGUI.py
+share/gcipher/lib/Proxy.py
+share/gcipher/lib/gcipher.glade
+share/gcipher/lib/gcipher.gladep
+share/gcipher/lib/ciphergui/__init__.pyc
+share/gcipher/lib/ciphergui/Ceasar.py
+share/gcipher/lib/ciphergui/CipherGUIList.py
+share/gcipher/lib/ciphergui/Gie.py
+share/gcipher/lib/ciphergui/KeyDialog.py
+share/gcipher/lib/ciphergui/Rot.py
+share/gcipher/lib/ciphergui/Vigenere.py
+share/gcipher/lib/ciphergui/__init__.py
+share/gcipher/lib/ciphergui/rot.glade
+share/gcipher/lib/ciphergui/rot.gladep
+share/gcipher/lib/ciphergui/vigenere.glade
+share/gcipher/lib/ciphergui/vigenere.gladep
+share/gcipher/lib/ciphergui/CipherGUIList.pyc
+share/gcipher/lib/ciphergui/Vigenere.pyc
+share/gcipher/lib/ciphergui/KeyDialog.pyc
+share/gcipher/lib/ciphergui/Gie.pyc
+share/gcipher/lib/ciphergui/Ceasar.pyc
+share/gcipher/lib/ciphergui/Rot.pyc
+share/gcipher/lib/Const.pyc
+share/gcipher/lib/MainCLI.pyc
+share/gcipher/lib/AutomaticClass.pyc
+share/gcipher/lib/MainGUI.pyc
+share/gcipher/lib/LibGladeApplication.pyc
+share/gcipher/lib/GtkAttributesFacade.pyc
+share/gcipher/lib/Proxy.pyc
+share/gcipher/plugins/cipher/Identity.py
+share/gcipher/plugins/ciphergui/Identity.py
+share/gcipher/plugins/ciphergui/PluginCipherGUIList.py
+@dirrm share/gcipher/lib/cipher
+@dirrm share/gcipher/lib/ciphergui
+@dirrm share/gcipher/lib
+@dirrm share/gcipher/plugins/cipher
+@dirrm share/gcipher/plugins/ciphergui
+@dirrm share/gcipher/plugins
+@dirrm share/gcipher
+@dirrmtry share/applications
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 42346cf6b2c..f7fdd7d1485 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.27 2007/03/13 12:35:40 ahze Exp $
+#   $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.32 2007/09/18 01:27:58 ahze Exp $
 #
 
 PORTNAME=	gnome-keyring-manager
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
index 128a495ae83..99541a9d89f 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.18.0.tar.bz2) = 05183cdea9d933cb1e9a8f4202c6ffc0
-SHA256 (gnome2/gnome-keyring-manager-2.18.0.tar.bz2) = a8d90a900a137434467a3d5c9f618249f1520ec3a86a998e62f648235f0ae611
-SIZE (gnome2/gnome-keyring-manager-2.18.0.tar.bz2) = 455431
+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-plist b/security/gnome-keyring-manager/pkg-plist
index aae072ad233..5d1b24c0fb9 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -1,28 +1,25 @@
 bin/gnome-keyring-manager
-share/gnome/applications/gnome-keyring-manager.desktop
-share/gnome/gnome-keyring-manager/gnome-keyring-manager-ui.xml
-share/gnome/gnome-keyring-manager/gnome-keyring-manager.glade
-share/gnome/gnome-keyring-manager/stock_delete-key.png
-share/gnome/gnome-keyring-manager/stock_delete-keyring.png
-share/gnome/gnome-keyring-manager/stock_new-key.png
-share/gnome/gnome-keyring-manager/stock_new-keyring.png
+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/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-da.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-en_GB.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-sv.omf
-share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
+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
@@ -61,6 +58,7 @@ 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
@@ -69,6 +67,7 @@ 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
@@ -76,6 +75,7 @@ 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
@@ -83,10 +83,39 @@ 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
@@ -95,13 +124,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrm share/gnome/omf/gnome-keyring-manager
-@dirrm share/gnome/help/gnome-keyring-manager/uk
-@dirrm share/gnome/help/gnome-keyring-manager/sv
-@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/C
-@dirrm share/gnome/help/gnome-keyring-manager
-@dirrm share/gnome/gnome-keyring-manager
+@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 4656b6c5420..8deb19ee081 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.31 2007/03/12 19:28:27 mezz Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.47 2007/10/15 17:36:20 mezz Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	2.20.1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,16 +17,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
+    		gcrypt.13:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack gtk20
+USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-html-dir=${GNOME_HTML_DIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 7be87150cd2..d390c1f0bcd 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-0.8.1.tar.bz2) = 24b15dedcf40c1c60d0fb989370d80ff
-SHA256 (gnome2/gnome-keyring-0.8.1.tar.bz2) = ad28558e2c0e5496cdfec3f8badf84d64af3aebc3fc9f5632066591e20ce3943
-SIZE (gnome2/gnome-keyring-0.8.1.tar.bz2) = 448558
+MD5 (gnome2/gnome-keyring-2.20.1.tar.bz2) = 16eb73c4a23db11ee8f20a731cf2a92b
+SHA256 (gnome2/gnome-keyring-2.20.1.tar.bz2) = 69208630af42bc3eb7561161067e24eb6bfb8afc2eb73e526efd0bbe337868f8
+SIZE (gnome2/gnome-keyring-2.20.1.tar.bz2) = 546007
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 65d9dffbcae..bde5f3d2a70 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,12 +1,29 @@
 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/libgnome-keyring.a
 lib/libgnome-keyring.la
 lib/libgnome-keyring.so
 lib/libgnome-keyring.so.0
+lib/security/pam_gnome_keyring.a
+lib/security/pam_gnome_keyring.la
+lib/security/pam_gnome_keyring.so
 libdata/pkgconfig/gnome-keyring-1.pc
 libexec/gnome-keyring-ask
 %%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/gnome-keyring-gnome-keyring.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-acl.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-attributes.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-find.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-generic-callbacks.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-item-info.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-items.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyring-info.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyrings.html
+%%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-result.html
 %%DOCSDIR%%/gnome-keyring.devhelp
 %%DOCSDIR%%/gnome-keyring.devhelp2
 %%DOCSDIR%%/home.png
@@ -19,6 +36,7 @@ libexec/gnome-keyring-ask
 share/locale/ar/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
 share/locale/bg/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
@@ -60,6 +78,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/oc/LC_MESSAGES/gnome-keyring.mo
 share/locale/or/LC_MESSAGES/gnome-keyring.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring.mo
@@ -68,6 +87,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
 share/locale/ro/LC_MESSAGES/gnome-keyring.mo
 share/locale/ru/LC_MESSAGES/gnome-keyring.mo
 share/locale/rw/LC_MESSAGES/gnome-keyring.mo
+share/locale/si/LC_MESSAGES/gnome-keyring.mo
 share/locale/sk/LC_MESSAGES/gnome-keyring.mo
 share/locale/sl/LC_MESSAGES/gnome-keyring.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring.mo
@@ -75,6 +95,7 @@ share/locale/sr/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring.mo
 share/locale/ta/LC_MESSAGES/gnome-keyring.mo
+share/locale/te/LC_MESSAGES/gnome-keyring.mo
 share/locale/th/LC_MESSAGES/gnome-keyring.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring.mo
@@ -84,13 +105,20 @@ share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrm %%DOCSDIR%%
+@dirrmtry lib/security
 @dirrm include/gnome-keyring-1
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@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
@@ -99,3 +127,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @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
diff --git a/security/gnome-password-generator/Makefile b/security/gnome-password-generator/Makefile
index bf3bbeabecc..d2950c52b6d 100644
--- a/security/gnome-password-generator/Makefile
+++ b/security/gnome-password-generator/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-password-generator
 PORTVERSION=	1.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnome-password
@@ -20,7 +20,7 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|prefix=/usr|prefix=${PREFIX}|g' -e 's|(prefix)/share|(prefix)/share/gnome|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|prefix=/usr|prefix=${PREFIX}|g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' ${WRKSRC}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/gnome-password-generator/pkg-plist b/security/gnome-password-generator/pkg-plist
index 623d99f9453..7762ffe8fc8 100644
--- a/security/gnome-password-generator/pkg-plist
+++ b/security/gnome-password-generator/pkg-plist
@@ -1,3 +1,4 @@
 bin/gnome-password-generator
-share/gnome/pixmaps/gnome-password-generator.png
-share/gnome/applications/gnome-password-generator.desktop
+share/pixmaps/gnome-password-generator.png
+share/applications/gnome-password-generator.desktop
+@dirrmtry share/applications
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index 2f94e387f7c..205ff66a8be 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpass
 PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security gnome
 MASTER_SITES=	http://projects.netlab.jp/gpass/release/
 
diff --git a/security/gpass/pkg-plist b/security/gpass/pkg-plist
index 9910308dc5b..4400601aeb0 100644
--- a/security/gpass/pkg-plist
+++ b/security/gpass/pkg-plist
@@ -1,7 +1,7 @@
 bin/gpass
 bin/gpass-convert
-share/gnome/applications/gpass.desktop
-share/gnome/pixmaps/gpass-icon.png
+share/applications/gpass.desktop
+share/pixmaps/gpass-icon.png
 %%DATADIR%%/attribute-editor.glade
 %%DATADIR%%/authentication.glade
 %%DATADIR%%/change-master-password.glade
@@ -15,3 +15,4 @@ share/gnome/pixmaps/gpass-icon.png
 @dirrm %%DATADIR%%
 @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
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index b6fb10d98d2..e7d0852836e 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gringotts
 PORTVERSION=	1.2.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	http://devel.pluto.linux.it/projects/Gringotts/current/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -37,7 +37,6 @@ PLIST_SUB+=	GNOMEHIER='@comment '
 
 post-patch:
 	${REINPLACE_CMD} -E -e "s|^(gringottsdocdir =).*|\1 ${DOCSDIR}|;s|md5sum|md5|g" ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -E -e "s|^(pixmapdir =).*|\1 ${PREFIX}/share/gnome/pixmaps|" ${WRKSRC}/pixmaps/Makefile.in
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-D.*_DISABLE_DEPRECATED||g'
 .if defined(NOPORTDOCS)
diff --git a/security/gringotts/pkg-plist b/security/gringotts/pkg-plist
index 4cfe3580d89..b7dfbba3d74 100644
--- a/security/gringotts/pkg-plist
+++ b/security/gringotts/pkg-plist
@@ -1,12 +1,10 @@
 bin/gringotts
-share/gnome/pixmaps/gringotts.xpm
+share/pixmaps/gringotts.xpm
 share/locale/de/LC_MESSAGES/gringotts.mo
 share/locale/fr/LC_MESSAGES/gringotts.mo
 share/locale/it/LC_MESSAGES/gringotts.mo
 %%GNOMEHIER%%share/gnome/apps/Utilities/gringotts.desktop
 %%GNOMEHIER%%@unexec rmdir -p %D/share/gnome/apps/Utilities 2>/dev/null || true
-@dirrmtry share/gnome/pixmaps
-@dirrmtry share/gnome
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index a6cf086befa..521d48dae1d 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/security/libgnomesu/Makefile,v 1.2 2007/05/19 21:36:21 marcus Exp $
 
 PORTNAME=	libgnomesu
 PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security gnome
 MASTER_SITES=	http://members.chello.nl/~h.lai/libgnomesu/
 
diff --git a/security/libgnomesu/pkg-message b/security/libgnomesu/pkg-message
index f2fe9a5a4a3..c7c9cf5d933 100644
--- a/security/libgnomesu/pkg-message
+++ b/security/libgnomesu/pkg-message
@@ -8,7 +8,7 @@ you must perform the following:
 On 4.x:
   cat %%EXAMPLESDIR%%/gnomesu-pam.4.x.sample >> /etc/pam.conf
 
-On 5.x:
+On 5.x/6.x:
   cp %%EXAMPLESDIR%%/gnomesu-pam.5.x.sample \
   	/etc/pam.d/gnomesu-pam
 
diff --git a/security/libgnomesu/pkg-plist b/security/libgnomesu/pkg-plist
index e6ef9927de1..0c8487288ac 100644
--- a/security/libgnomesu/pkg-plist
+++ b/security/libgnomesu/pkg-plist
@@ -12,8 +12,8 @@ libexec/gnomesu-pam-backend
 %%PORTDOCS%%%%DOCSDIR%%/libgnomesu.css
 %%EXAMPLESDIR%%/gnomesu-pam.4.x.sample
 %%EXAMPLESDIR%%/gnomesu-pam.5.x.sample
-share/gnome/application-registry/gnomesu-nautilus.applications
-share/gnome/mime-info/gnomesu-nautilus.keys
+share/application-registry/gnomesu-nautilus.applications
+share/mime-info/gnomesu-nautilus.keys
 share/locale/az/LC_MESSAGES/libgnomesu-1.0.mo
 share/locale/bg/LC_MESSAGES/libgnomesu-1.0.mo
 share/locale/bs/LC_MESSAGES/libgnomesu-1.0.mo
diff --git a/security/nofgpg/Makefile b/security/nofgpg/Makefile
index a3f0b7d7432..c223f9370a2 100644
--- a/security/nofgpg/Makefile
+++ b/security/nofgpg/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nofgpg
 PORTVERSION=	0.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security python
 MASTER_SITES=	http://www.cgabriel.org/download/nofgpg/
 
@@ -25,7 +25,7 @@ MAN1=		nofgpg.1
 PLIST_FILES=	bin/nofgpg
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,/usr/share,${LOCALBASE}/share/gnome,g" \
+	@${REINPLACE_CMD} -e "s,/usr/share,${LOCALBASE}/share,g" \
 		${WRKSRC}/nofgpg
 
 do-install:
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index cf054647fb7..ded0f90c5a9 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	revelation
 PORTVERSION=	0.4.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security gnome
 MASTER_SITES=	ftp://oss.codepoet.no/revelation/
 
diff --git a/security/revelation/pkg-plist b/security/revelation/pkg-plist
index 64864814025..19de610e3d5 100644
--- a/security/revelation/pkg-plist
+++ b/security/revelation/pkg-plist
@@ -76,17 +76,17 @@ share/locale/fr/LC_MESSAGES/revelation.mo
 share/locale/sv/LC_MESSAGES/revelation.mo
 share/locale/zh/LC_MESSAGES/revelation.mo
 share/locale/cs/LC_MESSAGES/revelation.mo
-share/gnome/applications/revelation.desktop
+share/applications/revelation.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/revelation/ui/menubar.xml
-share/gnome/revelation/ui/popup-tree.xml
-share/gnome/revelation/ui/toolbar.xml
-@dirrm share/gnome/revelation/ui
-share/gnome/revelation/pwdict.hwm
-share/gnome/revelation/pwdict.pwd
-share/gnome/revelation/pwdict.pwi
-@dirrm share/gnome/revelation
+share/revelation/ui/menubar.xml
+share/revelation/ui/popup-tree.xml
+share/revelation/ui/toolbar.xml
+@dirrm share/revelation/ui
+share/revelation/pwdict.hwm
+share/revelation/pwdict.pwd
+share/revelation/pwdict.pwi
+@dirrm share/revelation
 share/icons/hicolor/16x16/apps/revelation.png
 share/icons/hicolor/24x24/apps/revelation.png
 share/icons/hicolor/24x24/apps/revelation-locked.png
@@ -99,3 +99,4 @@ share/mime/packages/revelation.xml
 share/mime/application/x-revelation.xml
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 179509b0a95..30ea939904a 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.31 2007/03/15 16:34:55 marcus Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.47 2007/10/15 17:59:07 mezz Exp $
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTVERSION=	2.20.1
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,8 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
-BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme \
     		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
@@ -42,12 +41,12 @@ MAN1=		seahorse-agent.1 seahorse-daemon.1 seahorse-tool.1
 OPTIONS=	NAUTILUS "Enable the Nautilus component" on \
 		LDAP "Enable LDAP support" on \
 		HKP "Enable HKP keyserver interface" on \
-		GEDIT "Enable GEdit plug-in support" 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 \
-		EPIPHANY "Enable Epiphany plug-in support" on
+		GEDIT "Enable GEdit plug-in support" on
 
 .include <bsd.port.pre.mk>
 
@@ -93,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.18"
+PLIST_SUB+=	EPHY="" EPHY_VERSION="2.20"
 .else
 CONFIGURE_ARGS+=--disable-epiphany
 PLIST_SUB+=	EPHY="@comment "
@@ -119,6 +118,10 @@ LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi
 CONFIGURE_ARGS+=--disable-sharing
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|" == "|" = "|g' \
+			${WRKSRC}/configure
+
 post-install:
 	-@update-desktop-database
 
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index e478f73c1d1..d2ebdad70d1 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-1.0.1.tar.bz2) = 687b44dff0cf765d193af79de7fe856f
-SHA256 (gnome2/seahorse-1.0.1.tar.bz2) = 6afdbba1629b054c93c9a657f797c574a2bf96c0a6ab15a5d99c5b8ee5601a1b
-SIZE (gnome2/seahorse-1.0.1.tar.bz2) = 1857602
+MD5 (gnome2/seahorse-2.20.1.tar.bz2) = e4266963ee9d2ffc6185938a7eaf474d
+SHA256 (gnome2/seahorse-2.20.1.tar.bz2) = 718ff187c1951d0a2baa6dd1b9e97ddf9c5d845ebd356b502437a83582843dbf
+SIZE (gnome2/seahorse-2.20.1.tar.bz2) = 2287702
diff --git a/security/seahorse/files/patch-agent_Makefile.in b/security/seahorse/files/patch-agent_Makefile.in
deleted file mode 100644
index be068d34e25..00000000000
--- a/security/seahorse/files/patch-agent_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- agent/Makefile.in.orig	Sun Apr  8 10:04:58 2007
-+++ agent/Makefile.in	Sun Apr  8 10:05:12 2007
-@@ -739,10 +739,6 @@ uninstall-man: uninstall-man1
- 	uninstall-man uninstall-man1
- 
- 
--# Don't make the daemon setuid
--# Make the daemon setuid
--@HAVE_USER_MLOCK_FALSE@install-exec-hook:
--@HAVE_USER_MLOCK_FALSE@	chmod u+s $(DESTDIR)$(bindir)/seahorse-daemon
- # 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/files/patch-configure b/security/seahorse/files/patch-configure
deleted file mode 100644
index b77fe2ddda8..00000000000
--- a/security/seahorse/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Sun Dec  3 23:18:17 2006
-+++ configure	Sun Dec  3 23:18:57 2006
-@@ -30954,7 +30954,7 @@ fi
- 
- 
- 
--if test "$enable_ssh" == "yes"; then
-+if test "$enable_ssh" = "yes"; then
-   WITH_SSH_TRUE=
-   WITH_SSH_FALSE='#'
- else
-@@ -31014,7 +31014,7 @@ fi
- 
- 
- 
--if test "$enable_tests" == "yes"; then
-+if test "$enable_tests" = "yes"; then
-   WITH_TESTS_TRUE=
-   WITH_TESTS_FALSE='#'
- else
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index b06be456a0a..cd02f7a7af8 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -29,17 +29,21 @@ lib/seahorse/seahorse-ssh-askpass
 lib/seahorse/xloadimage
 %%APPLET%%libdata/bonobo/servers/GNOME_SeahorseApplet.server
 libdata/pkgconfig/cryptui-0.0.pc
+share/applications/seahorse-pgp-encrypted.desktop
+share/applications/seahorse-pgp-keys.desktop
+share/applications/seahorse-pgp-preferences.desktop
+share/applications/seahorse-pgp-signature.desktop
+share/applications/seahorse.desktop
 share/dbus-1/services/org.gnome.seahorse.service
-share/gnome/applications/seahorse-pgp-preferences.desktop
-share/gnome/applications/seahorse.desktop
-share/gnome/applications/seahorse-pgp-encrypted.desktop
-share/gnome/applications/seahorse-pgp-keys.desktop
-share/gnome/applications/seahorse-pgp-signature.desktop
-share/gnome/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
-%%APPLET%%share/gnome/gnome-2.0/ui/GNOME_SeahorseApplet.xml
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%APPLET%%share/gnome-2.0/ui/GNOME_SeahorseApplet.xml
 %%APPLET%%share/gnome/help/seahorse-applet/C/legal.xml
 %%APPLET%%share/gnome/help/seahorse-applet/C/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/es/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/fr/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/it/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/oc/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/sv/seahorse-applet.xml
+%%APPLET%%share/gnome/help/seahorse-applet/vi/seahorse-applet.xml
 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
@@ -106,6 +110,19 @@ 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/sv/figures/export.png
 share/gnome/help/seahorse/sv/figures/file-manager.png
 share/gnome/help/seahorse/sv/figures/generate.png
@@ -119,91 +136,19 @@ 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
-%%APPLET%%share/gnome/omf/seahorse-applet/seahorse-applet-C.omf
-share/gnome/omf/seahorse/seahorse-C.omf
-share/gnome/omf/seahorse/seahorse-en_GB.omf
-share/gnome/omf/seahorse/seahorse-es.omf
-share/gnome/omf/seahorse/seahorse-fr.omf
-share/gnome/omf/seahorse/seahorse-it.omf
-share/gnome/omf/seahorse/seahorse-sv.omf
-share/gnome/pixmaps/seahorse-applet.svg
-share/gnome/pixmaps/seahorse-preferences.png
-share/gnome/pixmaps/seahorse.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-key.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-signed.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-text.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-applet-unknown.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-key-personal.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-key-ssh.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-key.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-preferences.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-share-keys.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-sign-bad.png
-share/gnome/pixmaps/seahorse/22x22/seahorse-sign-ok.png
-share/gnome/pixmaps/seahorse/22x22/seahorse.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-key.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-signed.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-text.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet-unknown.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-applet.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-key-personal.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-key-ssh.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-key.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-person.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-preferences.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-share-keys.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-sign-bad.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-sign-ok.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-sign-unknown.png
-share/gnome/pixmaps/seahorse/48x48/seahorse-sign.png
-share/gnome/pixmaps/seahorse/48x48/seahorse.png
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-key.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-signed.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-text.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-applet.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-key-personal.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-key-ssh.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-key.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-person.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-preferences.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-share-keys.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse-sign.svg
-share/gnome/pixmaps/seahorse/scalable/seahorse.svg
-share/gnome/seahorse/glade/seahorse-add-keyserver.glade
-share/gnome/seahorse/glade/seahorse-add-subkey.glade
-share/gnome/seahorse/glade/seahorse-add-uid.glade
-share/gnome/seahorse/glade/seahorse-agent-cache.glade
-%%APPLET%%share/gnome/seahorse/glade/seahorse-applet-preferences.glade
-share/gnome/seahorse/glade/seahorse-change-passphrase.glade
-share/gnome/seahorse/glade/seahorse-expires.glade
-share/gnome/seahorse/glade/seahorse-generate-select.glade
-share/gnome/seahorse/glade/seahorse-gkeyring-item-properties.glade
-share/gnome/seahorse/glade/seahorse-key-manager.glade
-share/gnome/seahorse/glade/seahorse-key-manager.ui
-share/gnome/seahorse/glade/seahorse-keyserver-results.glade
-share/gnome/seahorse/glade/seahorse-keyserver-results.ui
-share/gnome/seahorse/glade/seahorse-keyserver-search.glade
-share/gnome/seahorse/glade/seahorse-keyserver-sync.glade
-share/gnome/seahorse/glade/seahorse-multi-encrypt.glade
-share/gnome/seahorse/glade/seahorse-notify.glade
-share/gnome/seahorse/glade/seahorse-pgp-generate.glade
-share/gnome/seahorse/glade/seahorse-pgp-private-key-properties.glade
-share/gnome/seahorse/glade/seahorse-pgp-public-key-properties.glade
-share/gnome/seahorse/glade/seahorse-prefs.glade
-share/gnome/seahorse/glade/seahorse-progress.glade
-share/gnome/seahorse/glade/seahorse-revoke.glade
-share/gnome/seahorse/glade/seahorse-sign.glade
-share/gnome/seahorse/glade/seahorse-signer.glade
-share/gnome/seahorse/glade/seahorse-ssh-generate.glade
-share/gnome/seahorse/glade/seahorse-ssh-key-properties.glade
-share/gnome/seahorse/glade/seahorse-ssh-upload.glade
+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/22x22/apps/seahorse-preferences.svg
 share/icons/hicolor/22x22/apps/seahorse.svg
 share/icons/hicolor/48x48/apps/seahorse-applet.png
@@ -212,10 +157,11 @@ share/icons/hicolor/48x48/apps/seahorse.png
 share/icons/hicolor/scalable/apps/seahorse-applet.svg
 share/icons/hicolor/scalable/apps/seahorse-preferences.svg
 share/icons/hicolor/scalable/apps/seahorse.svg
-share/mime/packages/seahorse.xml
 share/locale/ar/LC_MESSAGES/seahorse.mo
 share/locale/az/LC_MESSAGES/seahorse.mo
+share/locale/be@latin/LC_MESSAGES/seahorse.mo
 share/locale/bg/LC_MESSAGES/seahorse.mo
+share/locale/bn/LC_MESSAGES/seahorse.mo
 share/locale/bn_IN/LC_MESSAGES/seahorse.mo
 share/locale/ca/LC_MESSAGES/seahorse.mo
 share/locale/cs/LC_MESSAGES/seahorse.mo
@@ -229,34 +175,41 @@ share/locale/es/LC_MESSAGES/seahorse.mo
 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/gl/LC_MESSAGES/seahorse.mo
 share/locale/gu/LC_MESSAGES/seahorse.mo
-share/locale/fr/LC_MESSAGES/seahorse.mo
 share/locale/he/LC_MESSAGES/seahorse.mo
+share/locale/hi/LC_MESSAGES/seahorse.mo
 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/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/ms/LC_MESSAGES/seahorse.mo
 share/locale/nb/LC_MESSAGES/seahorse.mo
 share/locale/ne/LC_MESSAGES/seahorse.mo
 share/locale/nl/LC_MESSAGES/seahorse.mo
+share/locale/oc/LC_MESSAGES/seahorse.mo
+share/locale/or/LC_MESSAGES/seahorse.mo
 share/locale/pa/LC_MESSAGES/seahorse.mo
 share/locale/pl/LC_MESSAGES/seahorse.mo
 share/locale/pt/LC_MESSAGES/seahorse.mo
 share/locale/pt_BR/LC_MESSAGES/seahorse.mo
 share/locale/ru/LC_MESSAGES/seahorse.mo
 share/locale/rw/LC_MESSAGES/seahorse.mo
+share/locale/si/LC_MESSAGES/seahorse.mo
 share/locale/sk/LC_MESSAGES/seahorse.mo
 share/locale/sl/LC_MESSAGES/seahorse.mo
 share/locale/sq/LC_MESSAGES/seahorse.mo
 share/locale/sr/LC_MESSAGES/seahorse.mo
 share/locale/sr@Latn/LC_MESSAGES/seahorse.mo
 share/locale/sv/LC_MESSAGES/seahorse.mo
+share/locale/ta/LC_MESSAGES/seahorse.mo
+share/locale/te/LC_MESSAGES/seahorse.mo
 share/locale/th/LC_MESSAGES/seahorse.mo
 share/locale/tr/LC_MESSAGES/seahorse.mo
 share/locale/uk/LC_MESSAGES/seahorse.mo
@@ -264,14 +217,116 @@ share/locale/vi/LC_MESSAGES/seahorse.mo
 share/locale/zh_CN/LC_MESSAGES/seahorse.mo
 share/locale/zh_HK/LC_MESSAGES/seahorse.mo
 share/locale/zh_TW/LC_MESSAGES/seahorse.mo
-@dirrm share/gnome/pixmaps/seahorse/scalable
-@dirrm share/gnome/pixmaps/seahorse/48x48
-@dirrm share/gnome/pixmaps/seahorse/22x22
-@dirrm share/gnome/pixmaps/seahorse
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/C
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet
+share/mime/packages/seahorse.xml
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-C.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-es.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-fr.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-it.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-oc.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-sv.omf
+%%APPLET%%share/omf/seahorse-applet/seahorse-applet-vi.omf
+share/omf/seahorse/seahorse-C.omf
+share/omf/seahorse/seahorse-en_GB.omf
+share/omf/seahorse/seahorse-es.omf
+share/omf/seahorse/seahorse-fr.omf
+share/omf/seahorse/seahorse-it.omf
+share/omf/seahorse/seahorse-oc.omf
+share/omf/seahorse/seahorse-sv.omf
+share/omf/seahorse/seahorse-vi.omf
+share/pixmaps/seahorse-applet.svg
+share/pixmaps/seahorse-preferences.png
+share/pixmaps/seahorse.png
+share/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png
+share/pixmaps/seahorse/22x22/seahorse-applet-key.png
+share/pixmaps/seahorse/22x22/seahorse-applet-signed.png
+share/pixmaps/seahorse/22x22/seahorse-applet-text.png
+share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png
+share/pixmaps/seahorse/22x22/seahorse-key-personal.png
+share/pixmaps/seahorse/22x22/seahorse-key-ssh.png
+share/pixmaps/seahorse/22x22/seahorse-key.png
+share/pixmaps/seahorse/22x22/seahorse-person.png
+share/pixmaps/seahorse/22x22/seahorse-preferences.png
+share/pixmaps/seahorse/22x22/seahorse-share-keys.png
+share/pixmaps/seahorse/22x22/seahorse-sign-bad.png
+share/pixmaps/seahorse/22x22/seahorse-sign-ok.png
+share/pixmaps/seahorse/22x22/seahorse-sign.png
+share/pixmaps/seahorse/22x22/seahorse.png
+share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png
+share/pixmaps/seahorse/48x48/seahorse-applet-key.png
+share/pixmaps/seahorse/48x48/seahorse-applet-signed.png
+share/pixmaps/seahorse/48x48/seahorse-applet-text.png
+share/pixmaps/seahorse/48x48/seahorse-applet-unknown.png
+share/pixmaps/seahorse/48x48/seahorse-applet.png
+share/pixmaps/seahorse/48x48/seahorse-key-personal.png
+share/pixmaps/seahorse/48x48/seahorse-key-ssh.png
+share/pixmaps/seahorse/48x48/seahorse-key.png
+share/pixmaps/seahorse/48x48/seahorse-person.png
+share/pixmaps/seahorse/48x48/seahorse-preferences.png
+share/pixmaps/seahorse/48x48/seahorse-share-keys.png
+share/pixmaps/seahorse/48x48/seahorse-sign-bad.png
+share/pixmaps/seahorse/48x48/seahorse-sign-ok.png
+share/pixmaps/seahorse/48x48/seahorse-sign-unknown.png
+share/pixmaps/seahorse/48x48/seahorse-sign.png
+share/pixmaps/seahorse/48x48/seahorse.png
+share/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-key.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-signed.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-text.svg
+share/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg
+share/pixmaps/seahorse/scalable/seahorse-applet.svg
+share/pixmaps/seahorse/scalable/seahorse-key-personal.svg
+share/pixmaps/seahorse/scalable/seahorse-key-ssh.svg
+share/pixmaps/seahorse/scalable/seahorse-key.svg
+share/pixmaps/seahorse/scalable/seahorse-person.svg
+share/pixmaps/seahorse/scalable/seahorse-preferences.svg
+share/pixmaps/seahorse/scalable/seahorse-share-keys.svg
+share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
+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-keyserver.glade
+%%DATADIR%%/glade/seahorse-add-subkey.glade
+%%DATADIR%%/glade/seahorse-add-uid.glade
+%%DATADIR%%/glade/seahorse-agent-cache.glade
+%%APPLET%%%%DATADIR%%/glade/seahorse-applet-preferences.glade
+%%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-key-manager.glade
+%%DATADIR%%/glade/seahorse-key-manager.ui
+%%DATADIR%%/glade/seahorse-keyserver-results.glade
+%%DATADIR%%/glade/seahorse-keyserver-results.ui
+%%DATADIR%%/glade/seahorse-keyserver-search.glade
+%%DATADIR%%/glade/seahorse-keyserver-sync.glade
+%%DATADIR%%/glade/seahorse-multi-encrypt.glade
+%%DATADIR%%/glade/seahorse-notify.glade
+%%DATADIR%%/glade/seahorse-pgp-generate.glade
+%%DATADIR%%/glade/seahorse-pgp-private-key-properties.glade
+%%DATADIR%%/glade/seahorse-pgp-public-key-properties.glade
+%%DATADIR%%/glade/seahorse-prefs.glade
+%%DATADIR%%/glade/seahorse-progress.glade
+%%DATADIR%%/glade/seahorse-revoke.glade
+%%DATADIR%%/glade/seahorse-sign.glade
+%%DATADIR%%/glade/seahorse-signer.glade
+%%DATADIR%%/glade/seahorse-ssh-generate.glade
+%%DATADIR%%/glade/seahorse-ssh-key-properties.glade
+%%DATADIR%%/glade/seahorse-ssh-upload.glade
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
+@dirrm share/pixmaps/seahorse/scalable
+@dirrm share/pixmaps/seahorse/48x48
+@dirrm share/pixmaps/seahorse/22x22
+@dirrm share/pixmaps/seahorse
+%%APPLET%%@dirrm share/omf/seahorse-applet
+@dirrm share/omf/seahorse
+@dirrm share/gnome/help/seahorse/vi/figures
+@dirrm share/gnome/help/seahorse/vi
 @dirrm share/gnome/help/seahorse/sv/figures
 @dirrm share/gnome/help/seahorse/sv
+@dirrm share/gnome/help/seahorse/oc/figures
+@dirrm share/gnome/help/seahorse/oc
 @dirrm share/gnome/help/seahorse/it/figures
 @dirrm share/gnome/help/seahorse/it
 @dirrm share/gnome/help/seahorse/fr/figures
@@ -282,11 +337,15 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
 @dirrm share/gnome/help/seahorse/en_GB
 @dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/vi
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/sv
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/oc
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/it
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/fr
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/es
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet/C
+%%APPLET%%@dirrm share/gnome/help/seahorse-applet
 @dirrm share/gnome/help/seahorse
-%%APPLET%%@dirrm share/gnome/omf/seahorse-applet
-@dirrm share/gnome/omf/seahorse
-@dirrm share/gnome/seahorse/glade
-@dirrm share/gnome/seahorse
 @dirrm lib/seahorse
 %%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%/extensions
 %%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%
@@ -294,12 +353,22 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
 @dirrm include/libcryptui
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @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/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/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