Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

25 files changed, 543 insertions, 206 deletions

diff --git a/security/gaim-encryption/Makefile b/security/gaim-encryption/Makefile
index 62f652b84249..60ec2c932c91 100644
--- a/security/gaim-encryption/Makefile
+++ b/security/gaim-encryption/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	encryption
 PORTVERSION=	2.39
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -29,7 +30,7 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--with-nspr-includes=${LOCALBASE}/include/nspr \
 		--with-nspr-libs=${LOCALBASE}/lib \
 		--with-nss-includes=${LOCALBASE}/include/nss/nss \
-		--with-nss-libs=${LOCALBASE}/lib
+		--with-nss-libs=${LOCALBASE}/lib/nss
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index b6d29bb0a216..8455df9454e0 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.24 2006/10/02 05:07:37 bland Exp $
+#   $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.27 2007/03/13 12:35:40 ahze Exp $
 #
 
 PORTNAME=	gnome-keyring-manager
-PORTVERSION=	2.16.0
+PORTVERSION=	2.18.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 7232f84c4134..128a495ae831 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = d63bfa5e9cfe334694438a74c157344c
-SHA256 (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = 23f0449af7cba89f4ae26c8e67f1d09bc45389f9dcd7349d2e6540620571051c
-SIZE (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = 454066
+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
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
index d81312492e16..ea050475fefa 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -8,15 +8,21 @@ share/gnome/gnome-keyring-manager/stock_new-key.png
 share/gnome/gnome-keyring-manager/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/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/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/locale/ar/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/be/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
@@ -77,14 +83,6 @@ 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
-@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/C
-@dirrm share/gnome/help/gnome-keyring-manager
-@dirrm share/gnome/gnome-keyring-manager
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -131,3 +129,15 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
 @dirrmtry share/locale/ca
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@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
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 8165fcb447cd..84fd88dcb7c1 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,10 +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 $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	0.6.0
+PORTVERSION=	0.8
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,6 +17,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
+LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
+
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index cc9681ae150a..62ba04d80468 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-0.6.0.tar.bz2) = 1e3a3a12b19fc5ebe95363658c2256d8
-SHA256 (gnome2/gnome-keyring-0.6.0.tar.bz2) = 649f2a0d5298b896781d0ac563b8ea1be7f3fe07fd17ea43b0ec0562be47769f
-SIZE (gnome2/gnome-keyring-0.6.0.tar.bz2) = 476280
+MD5 (gnome2/gnome-keyring-0.8.tar.bz2) = 9dfbe4da53f229a5b096e1ba71029f01
+SHA256 (gnome2/gnome-keyring-0.8.tar.bz2) = bfc3ea64e7393cfe644b4fe9fcde2d921b71d276f2617b161c2c070940855a41
+SIZE (gnome2/gnome-keyring-0.8.tar.bz2) = 446811
diff --git a/security/gnome-keyring/files/patch-gnome-keyring.c b/security/gnome-keyring/files/patch-gnome-keyring.c
deleted file mode 100644
index 27a981e6c083..000000000000
--- a/security/gnome-keyring/files/patch-gnome-keyring.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- gnome-keyring.c.orig	Mon Apr 24 06:21:29 2006
-+++ gnome-keyring.c	Mon Jun 12 14:24:47 2006
-@@ -275,9 +275,9 @@ write_credentials_byte_sync (int socket)
-   msg.msg_control = (caddr_t) &cmsg;
-   msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
-   memset (&cmsg, 0, sizeof (cmsg));
--  cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
--  cmsg->cmsg_level = SOL_SOCKET;
--  cmsg->cmsg_type = SCM_CREDS;
-+  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-+  cmsg.hdr.cmsg_level = SOL_SOCKET;
-+  cmsg.hdr.cmsg_type = SCM_CREDS;
- #endif
- 
-  again:
-@@ -324,10 +324,10 @@ write_credentials_byte (GnomeKeyringOper
- 
-   msg.msg_control = (caddr_t) &cmsg;
-   msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
--  memset (cmsg, 0, sizeof (cmsg));
--  cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
--  cmsg->cmsg_level = SOL_SOCKET;
--  cmsg->cmsg_type = SCM_CREDS;
-+  memset (&cmsg, 0, sizeof (cmsg));
-+  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
-+  cmsg.hdr.cmsg_level = SOL_SOCKET;
-+  cmsg.hdr.cmsg_type = SCM_CREDS;
- #endif
- 
-  again:
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 470fb7c669e8..ce9beab66841 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -18,6 +18,7 @@ libexec/gnome-keyring-ask
 %%DOCSDIR%%/up.png
 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/bg/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
@@ -77,6 +78,7 @@ share/locale/ta/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
+share/locale/vi/LC_MESSAGES/gnome-keyring.mo
 share/locale/xh/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
@@ -129,3 +131,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/ca
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/security/nss/Makefile b/security/nss/Makefile
index fd577e810831..4af25df2ef7e 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -3,10 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/security/nss/Makefile,v 1.6 2006/12/17 21:46:42 marcus Exp $
 
 PORTNAME=	nss
-PORTVERSION=	3.11.4
+PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
@@ -17,9 +18,13 @@ COMMENT=	Libraries to support development of security-enabled applications
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr
 
+_MAJOR=	3
+_MINOR=	11
+_PATCH=	4
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/mozilla/security/nss
 
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/lib/nss
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 MAKE_ENV=	BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
@@ -39,12 +44,13 @@ EXTERNALS=	CVS dbm security/nss/cmd/zlib nsprpub security/dbm
 EXTRACT_AFTER_ARGS=| ${TAR} -xf -	\
 	${EXTERNALS:C,^,--exclude ${DISTNAME}/mozilla/,}
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \
-		${WRKSRC:H:H}/security/coreconf/FreeBSD.mk
-
 BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ
 
+INSTALL_BINS=	certcgi certutil checkcert cmsutil crlutil derdump makepqg \
+		mangle modutil ocspclnt oidcalc p7content p7env p7sign \
+		p7verify pk12util rsaperf shlibsign signtool signver \
+		ssltap strsclnt symkeyutil vfychain vfyserv
+
 test:
 	cd ${WRKSRC}/tests;	\
 		${SETENV} PATH="${BINS}/bin:${PATH}" \
@@ -58,18 +64,35 @@ test:
 		echo "All tests succeeded. Good news.";	\
 	fi
 
+post-patch:
+	@${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \
+		${WRKSRC:H:H}/security/coreconf/FreeBSD.mk
+	@${SED} -e 's|@exec_prefix@|${PREFIX}|; \
+		s|@includedir@|${PREFIX}/include/nss|; \
+		s|@libdir@|${PREFIX}/lib/nss|; \
+		s|@prefix@|${PREFIX}|' \
+		${FILESDIR}/nss-config.in >${WRKDIR}/nss-config
+	@${SED} -e 's|@PREFIX@|${PREFIX}|; s|@PORTVERSION@|${PORTVERSION}|' \
+		${FILESDIR}/nss.pc.in >${WRKDIR}/nss.pc
+.for i in MAJOR MINOR PATCH
+	@${SED} -i.${i} -e 's|@${i}@|${_${i}}|' ${WRKDIR}/nss-config
+.endfor
+
 do-install:
-	${MKDIR} ${PREFIX}/include/nss
+	${MKDIR} ${PREFIX}/include/nss ${PREFIX}/lib/nss
 	${TAR} -C ${DIST}/public --dereference -cf - . | \
 		${TAR} -C ${PREFIX}/include/nss -xf -
 	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/*.so.1 \
-		${PREFIX}/lib
+		${PREFIX}/lib/nss
 	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/libcrmf.a \
-		${PREFIX}/lib
-	${INSTALL_PROGRAM} `${SED}	\
-	    -e 's|^bin/|${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/|' \
-	    -e t -e d ${PLIST}` ${PREFIX}/bin/
+	    	${PREFIX}/lib/nss
+.for bin in ${INSTALL_BINS}
+	${INSTALL_PROGRAM} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/${bin} \
+		${PREFIX}/bin
+.endfor
 	cd ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib && \
-		${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib -xf -
+	    	${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib/nss -xf -
+	${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig
 
 .include <bsd.port.post.mk>
diff --git a/security/nss/files/nss-config.in b/security/nss/files/nss-config.in
new file mode 100644
index 000000000000..d2605fec9d02
--- /dev/null
+++ b/security/nss/files/nss-config.in
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MAJOR@
+minor_version=@MINOR@
+patch_version=@PATCH@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=@exec_prefix@
+fi
+if test -z "$includedir"; then
+    includedir=@includedir@
+fi
+if test -z "$libdir"; then
+    libdir=@libdir@
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-Wl,-R$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      echo $libdirs
+fi      
+
diff --git a/security/nss/files/nss.pc.in b/security/nss/files/nss.pc.in
new file mode 100644
index 000000000000..7b17143747d4
--- /dev/null
+++ b/security/nss/files/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=@PREFIX@
+exec_prefix=@PREFIX@
+libdir=@PREFIX@/lib/nss
+includedir=@PREFIX@/include
+
+Name: NSS
+Description: Mozilla Network Security Services
+Version: @PORTVERSION@
+Requires: nspr
+Libs: -L${libdir} -lnss3 -lsmime3 -lssl3
+Cflags: -I${includedir}/nss -I${includedir}/nss/nss
diff --git a/security/nss/files/patch-..::coreconf::command.mk b/security/nss/files/patch-..::coreconf::command.mk
index 1a5bae069f27..1e3de66f7ae2 100644
--- a/security/nss/files/patch-..::coreconf::command.mk
+++ b/security/nss/files/patch-..::coreconf::command.mk
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- ../coreconf/command.mk	Mon Oct 10 19:46:12 2005
 +++ ../coreconf/command.mk	Wed Jan 18 17:23:28 2006
 @@ -46,5 +46,5 @@
diff --git a/security/nss/files/patch-..::coreconf::rules.mk b/security/nss/files/patch-..::coreconf::rules.mk
index 42663ca87070..59178ff6da50 100644
--- a/security/nss/files/patch-..::coreconf::rules.mk
+++ b/security/nss/files/patch-..::coreconf::rules.mk
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- ../coreconf/rules.mk.orig	Thu Apr  3 16:48:00 2003
 +++ ../coreconf/rules.mk	Fri Apr 11 01:01:50 2003
 @@ -110,6 +110,7 @@
diff --git a/security/nss/files/patch-cmd::platlibs.mk b/security/nss/files/patch-cmd::platlibs.mk
index 635107cd0648..4ac01e3e47e0 100644
--- a/security/nss/files/patch-cmd::platlibs.mk
+++ b/security/nss/files/patch-cmd::platlibs.mk
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- cmd/platlibs.mk	Wed Apr  6 17:35:41 2005
 +++ cmd/platlibs.mk	Wed Jul 27 22:22:59 2005
 @@ -72,5 +72,4 @@
diff --git a/security/nss/pkg-plist b/security/nss/pkg-plist
index dc892d004315..cc12145c7be2 100644
--- a/security/nss/pkg-plist
+++ b/security/nss/pkg-plist
@@ -7,6 +7,7 @@ bin/derdump
 bin/makepqg
 bin/mangle
 bin/modutil
+bin/nss-config
 bin/ocspclnt
 bin/oidcalc
 bin/p7content
@@ -113,18 +114,20 @@ include/nss/nss/sslerr.h
 include/nss/nss/sslproto.h
 include/nss/nss/sslt.h
 include/nss/nss/watcomfx.h
-lib/libcrmf.a
-lib/libfreebl3.so
-lib/libfreebl3.so.1
-lib/libnss3.so
-lib/libnss3.so.1
-lib/libnssckbi.so
-lib/libnssckbi.so.1
-lib/libsmime3.so
-lib/libsmime3.so.1
-lib/libsoftokn3.so
-lib/libsoftokn3.so.1
-lib/libssl3.so
-lib/libssl3.so.1
+lib/nss/libcrmf.a
+lib/nss/libfreebl3.so
+lib/nss/libfreebl3.so.1
+lib/nss/libnss3.so
+lib/nss/libnss3.so.1
+lib/nss/libnssckbi.so
+lib/nss/libnssckbi.so.1
+lib/nss/libsmime3.so
+lib/nss/libsmime3.so.1
+lib/nss/libsoftokn3.so
+lib/nss/libsoftokn3.so.1
+lib/nss/libssl3.so
+lib/nss/libssl3.so.1
+libdata/pkgconfig/nss.pc
+@dirrm lib/nss
 @dirrm include/nss/nss
 @dirrm include/nss
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 62f652b84249..60ec2c932c91 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	encryption
 PORTVERSION=	2.39
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -29,7 +30,7 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--with-nspr-includes=${LOCALBASE}/include/nspr \
 		--with-nspr-libs=${LOCALBASE}/lib \
 		--with-nss-includes=${LOCALBASE}/include/nss/nss \
-		--with-nss-libs=${LOCALBASE}/lib
+		--with-nss-libs=${LOCALBASE}/lib/nss
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index bf1c9556bb8e..31459f36b752 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,47 +3,56 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse/Makefile,v 1.18 2006/10/01 01:56:57 ahze Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.31 2007/03/15 16:34:55 marcus Exp $
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	0.8.2
-PORTREVISION=	3
-CATEGORIES=	security
+PORTVERSION=	1.0
+PORTREVISION=	1
+CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.8
+MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A front end for GnuPG
 
 BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS=	${BUILD_DEPENDS}
-LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme
+RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme \
+    		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GECKO=	firefox xulrunner firefox-devel<->firefox
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--disable-gpg-check
+INSTALLS_ICONS=	yes
+CONFIGURE_ARGS=	--with-gecko=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 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 \
-		HKP "Enable HKP keyserver interface" on
-#		GEDIT "Enable GEdit plug-in support" on
+		HKP "Enable HKP keyserver interface" on \
+		GEDIT "Enable GEdit 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
+## BROKEN
+WITHOUT_EPIPHANY=	yes
 
 .include <bsd.port.pre.mk>
 
-# Gedit not working right now..
-WITHOUT_GEDIT=	yes
 .if !defined(WITHOUT_GEDIT)
 BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
@@ -74,7 +83,43 @@ LIB_DEPENDS+=	soup-2.2.8:${PORTSDIR}/devel/libsoup
 CONFIGURE_ARGS+=--disable-hkp
 .endif
 
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
+.else
+CONFIGURE_ARGS+=--disable-libnotify
+.endif
+
+.if !defined(WITHOUT_EPIPHANY)
+BUILD_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
+RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
+PLIST_SUB+=	EPHY="" EPHY_VERSION="2.18"
+.else
+CONFIGURE_ARGS+=--disable-epiphany
+PLIST_SUB+=	EPHY="@comment "
+.endif
+
+.if !defined(WITHOUT_APPLET)
+USE_GNOME+=	gnomepanel
+PLIST_SUB+=	APPLET=""
+.else
+CONFIGURE_ARGS+=--disable-applet
+PLIST_SUB+=	APPLET="@comment "
+.endif
+
+.if !defined(WITHOUT_KEYRING)
+LIB_DEPENDS+=	gnome-keyring:${PORTSDIR}/security/gnome-keyring
+.else
+CONFIGURE_ARGS+=--disable-gnome-keyring
+.endif
+
+.if !defined(WITHOUT_MDNS)
+LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi
+.else
+CONFIGURE_ARGS+=--disable-sharing
+.endif
+
 post-install:
 	-@update-desktop-database
 
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 .include <bsd.port.post.mk>
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 13f59f87cacd..47541d93e334 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-0.8.2.tar.bz2) = 24d9a8c3564700d105847934020920bd
-SHA256 (gnome2/seahorse-0.8.2.tar.bz2) = 350f1a1cc5010bb81f08c6c124a24f2560a9dffea16c8a5a62e9cdeebb03c68e
-SIZE (gnome2/seahorse-0.8.2.tar.bz2) = 990284
+MD5 (gnome2/seahorse-1.0.tar.bz2) = 7afcb9b40aaa0c232ce8a9e0909fe757
+SHA256 (gnome2/seahorse-1.0.tar.bz2) = 76bcfeed3843b2357f5ecc1694a471fc45a810aa17fd0baed60f1d32142d0746
+SIZE (gnome2/seahorse-1.0.tar.bz2) = 1871080
diff --git a/security/seahorse/files/patch-agent_seahorse-agent.c b/security/seahorse/files/patch-agent_seahorse-agent.c
deleted file mode 100644
index 8ee1d8349d6b..000000000000
--- a/security/seahorse/files/patch-agent_seahorse-agent.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- agent/seahorse-agent.c.orig	Sun Aug 13 14:50:35 2006
-+++ agent/seahorse-agent.c	Wed Aug 16 02:08:05 2006
-@@ -280,7 +280,6 @@ main (int argc, char **argv)
-     GnomeProgram *program = NULL;
-     GnomeClient *client = NULL;
-     
--    secmem_init (65536);
- 
-     /* We need to drop privileges completely for security */
- #if defined(HAVE_SETRESUID) && defined(HAVE_SETRESGID)
-@@ -288,10 +287,12 @@ main (int argc, char **argv)
-     /* Not in header files for all OSs, even where present */
-     int setresuid(uid_t ruid, uid_t euid, uid_t suid);
-     int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
-+    secmem_init (65536);
-   
-     if (setresuid (getuid (), getuid (), getuid ()) == -1 ||
-         setresgid (getgid (), getgid (), getgid ()) == -1)
- #else
-+    secmem_init (65536);
-     if (setuid (getuid ()) == -1 || setgid (getgid ()) == -1)
- #endif
-         err (1, _("couldn't drop privileges properly"));
-@@ -313,7 +314,6 @@ main (int argc, char **argv)
-      * All functions after this point have to print messages 
-      * nicely and not just called exit() 
-      */
--    daemonize (sockname);
- 
-     /* Handle some signals */
-     signal (SIGINT, on_quit);
-@@ -329,6 +329,8 @@ main (int argc, char **argv)
-     /* Initialize our sub systems */
-     seahorse_agent_actions_init ();
-     seahorse_agent_cache_init ();
-+
-+    daemonize (sockname);
- 
-     if (seahorse_agent_io_init () == -1)
-         return 1;               /* message already printed */
diff --git a/security/seahorse/files/patch-configure b/security/seahorse/files/patch-configure
new file mode 100644
index 000000000000..b77fe2ddda83
--- /dev/null
+++ b/security/seahorse/files/patch-configure
@@ -0,0 +1,20 @@
+--- 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/files/patch-libseahorse_seahorse-key-store.c b/security/seahorse/files/patch-libseahorse_seahorse-key-store.c
deleted file mode 100644
index fc8b7af60033..000000000000
--- a/security/seahorse/files/patch-libseahorse_seahorse-key-store.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libseahorse/seahorse-key-store.c.orig	Wed Dec 22 15:18:27 2004
-+++ libseahorse/seahorse-key-store.c	Wed Dec 22 15:19:48 2004
-@@ -184,6 +184,8 @@
- {
-     GObject* obj = G_OBJECT_CLASS (parent_class)->constructor (type, n_props, props);
-     SeahorseKeyStore* skstore = SEAHORSE_KEY_STORE (obj);
-+    guint cols;
-+    GType* types;
- 
-     /* init private vars */
-     skstore->priv = g_new0 (SeahorseKeyStorePriv, 1);
-@@ -191,8 +193,8 @@
-                                        NULL, (GDestroyNotify)seahorse_key_row_free);
-  
-     /* Setup the store */
--    guint cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
--    GType* types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
-+    cols = SEAHORSE_KEY_STORE_GET_CLASS (skstore)->n_columns;
-+    types = (GType*)SEAHORSE_KEY_STORE_GET_CLASS (skstore)->col_types;
-     gtk_tree_store_set_column_types (GTK_TREE_STORE (obj), cols, types);
-     
-     /* Setup the sort and filter */
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-server-source.c b/security/seahorse/files/patch-libseahorse_seahorse-server-source.c
deleted file mode 100644
index d7422de5ea50..000000000000
--- a/security/seahorse/files/patch-libseahorse_seahorse-server-source.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libseahorse/seahorse-server-source.c.orig	Fri Mar 11 22:17:43 2005
-+++ libseahorse/seahorse-server-source.c	Fri Mar 11 22:17:55 2005
-@@ -518,11 +518,11 @@
- seahorse_server_source_get_state (SeahorseKeySource *src)
- {
-     SeahorseServerSource *ssrc;
-+    guint state = SEAHORSE_KEY_SOURCE_REMOTE;
-     
-     g_return_val_if_fail (SEAHORSE_IS_SERVER_SOURCE (src), 0);
-     ssrc = SEAHORSE_SERVER_SOURCE (src);
-     
--    guint state = SEAHORSE_KEY_SOURCE_REMOTE;
-     if (!seahorse_operation_is_done (ssrc->priv->operation))
-         state |= SEAHORSE_KEY_SOURCE_LOADING;
-     return state;
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c b/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c
new file mode 100644
index 000000000000..e7a7e4f605a8
--- /dev/null
+++ b/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c
@@ -0,0 +1,10 @@
+--- libseahorse/seahorse-ssh-operation.c.orig	Sun Dec  3 23:21:01 2006
++++ libseahorse/seahorse-ssh-operation.c	Sun Dec  3 23:21:10 2006
+@@ -24,6 +24,7 @@
+ #include <sys/socket.h>
+ #include <gnome.h>
+ #include <fcntl.h>
++#include <signal.h>
+ 
+ #include "seahorse-ssh-operation.h"
+ #include "seahorse-util.h"
diff --git a/security/seahorse/files/patch-src_seahorse-generate-druid.c b/security/seahorse/files/patch-src_seahorse-generate-druid.c
deleted file mode 100644
index 9e356ed1aac0..000000000000
--- a/security/seahorse/files/patch-src_seahorse-generate-druid.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/seahorse-generate-druid.c.orig	Wed Dec 22 15:22:02 2004
-+++ src/seahorse-generate-druid.c	Wed Dec 22 15:22:22 2004
-@@ -173,8 +173,9 @@
- gboolean
- on_druidpagestandard4_next (GnomeDruidPage *gnomedruidpage, GtkWidget *widget, SeahorseWidget *swidget)
- {
-+	GtkWidget *druidpage;
- 	g_print("go to finish\n");
--	GtkWidget *druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
-+	druidpage = glade_xml_get_widget (swidget->xml, "druidpagefinish1");
- 		
- 	gnome_druid_page_prepare (GNOME_DRUID_PAGE(druidpage));
- 	gtk_widget_show (druidpage);
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 363cf20d0408..46a2d2432ddc 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,24 +1,45 @@
 bin/seahorse
 bin/seahorse-agent
-bin/seahorse-pgp-preferences
+bin/seahorse-daemon
+bin/seahorse-preferences
+bin/seahorse-tool
+include/libcryptui/cryptui-key-chooser.h
+include/libcryptui/cryptui-key-combo.h
+include/libcryptui/cryptui-key-list.h
+include/libcryptui/cryptui-key-store.h
+include/libcryptui/cryptui-keyset.h
+include/libcryptui/cryptui.h
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.a
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.la
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.so
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/seahorse.ephy-extension
 %%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.a
 %%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.la
 %%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so
 %%GEDIT%%lib/gedit-2/plugins/seahorse-pgp.gedit-plugin
-lib/libseahorse-internal.a
-lib/libseahorse-internal.la
-lib/libseahorse-internal.so
-lib/libseahorse-internal.so.0
+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
+%%APPLET%%lib/seahorse/seahorse-applet
+lib/seahorse/seahorse-ssh-askpass
+lib/seahorse/xloadimage
+%%APPLET%%libdata/bonobo/servers/GNOME_SeahorseApplet.server
+libdata/pkgconfig/cryptui-0.0.pc
+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/help/seahorse-applet/C/legal.xml
+%%APPLET%%share/gnome/help/seahorse-applet/C/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
@@ -28,59 +49,197 @@ 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/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/mime-info/seahorse.keys
-share/gnome/mime-info/seahorse.mime
+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/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/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/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
+%%APPLET%%share/gnome/omf/seahorse-applet/seahorse-applet-C.omf
 share/gnome/omf/seahorse/seahorse-C.omf
-share/gnome/pixmaps/seahorse-key.png
-share/gnome/pixmaps/seahorse-secret.png
+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-adv.glade
-share/gnome/seahorse/glade/seahorse-generate-druid.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-key-properties.glade
 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-passphrase.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-preferences.glade
 share/gnome/seahorse/glade/seahorse-progress.glade
-share/gnome/seahorse/glade/seahorse-recipients.glade
 share/gnome/seahorse/glade/seahorse-revoke.glade
 share/gnome/seahorse/glade/seahorse-sign.glade
-share/gnome/seahorse/glade/seahorse-signatures.glade
 share/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/icons/hicolor/22x22/apps/seahorse-preferences.svg
+share/icons/hicolor/22x22/apps/seahorse.svg
+share/icons/hicolor/48x48/apps/seahorse-applet.png
+share/icons/hicolor/48x48/apps/seahorse-preferences.png
+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/bg/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
 share/locale/da/LC_MESSAGES/seahorse.mo
 share/locale/de/LC_MESSAGES/seahorse.mo
+share/locale/dz/LC_MESSAGES/seahorse.mo
+share/locale/el/LC_MESSAGES/seahorse.mo
 share/locale/en_CA/LC_MESSAGES/seahorse.mo
 share/locale/en_GB/LC_MESSAGES/seahorse.mo
 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/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/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/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
@@ -98,22 +257,48 @@ 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/th/LC_MESSAGES/seahorse.mo
 share/locale/tr/LC_MESSAGES/seahorse.mo
-share/locale/vi/LC_MESSAGES/seahorse.mo
 share/locale/uk/LC_MESSAGES/seahorse.mo
+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
+@dirrm share/gnome/help/seahorse/sv/figures
+@dirrm share/gnome/help/seahorse/sv
+@dirrm share/gnome/help/seahorse/it/figures
+@dirrm share/gnome/help/seahorse/it
+@dirrm share/gnome/help/seahorse/fr/figures
+@dirrm share/gnome/help/seahorse/fr
+@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/C/figures
 @dirrm share/gnome/help/seahorse/C
 @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%%
+%%EPHY%%@dirrmtry lib/epiphany
+@dirrm include/libcryptui
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/uk/LC_MESSAGES
@@ -132,9 +317,21 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
 @dirrmtry share/locale/pl
 @dirrmtry share/locale/ne/LC_MESSAGES
 @dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
 @dirrmtry share/locale/fi/LC_MESSAGES
 @dirrmtry share/locale/fi
+@dirrmtry share/locale/et/LC_MESSAGES
+@dirrmtry share/locale/et
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN