Update to 3.4.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16857 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 80 insertions, 69 deletions

diff --git a/security/seahorse3/Makefile b/security/seahorse3/Makefile
index 732a2a9f5..2583e3c3c 100644
--- a/security/seahorse3/Makefile
+++ b/security/seahorse3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse3/Makefile,v 1.12 2011/10/18 22:40:21 kwm Exp $
+#   $MCom: ports/security/seahorse3/Makefile,v 1.13 2011/11/17 00:02:32 kwm Exp $
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	3.2.2
+PORTVERSION=	3.4.1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -33,7 +33,7 @@ USE_LDCONFIG=	yes
 USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix gconf2 gnomedocutils
+USE_GNOME=	gnomehack intlhack gnomeprefix gtk30 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/security/seahorse3/distinfo b/security/seahorse3/distinfo
index e7dd770e8..ed283bcbb 100644
--- a/security/seahorse3/distinfo
+++ b/security/seahorse3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/seahorse-3.2.2.tar.xz) = 25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9
-SIZE (gnome3/seahorse-3.2.2.tar.xz) = 1964064
+SHA256 (gnome3/seahorse-3.4.1.tar.xz) = 841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa
+SIZE (gnome3/seahorse-3.4.1.tar.xz) = 1999472
diff --git a/security/seahorse3/files/patch-pgp_seahorse-gpgme-keyring.c b/security/seahorse3/files/patch-pgp_seahorse-gpgme-keyring.c
new file mode 100644
index 000000000..97dc24433
--- /dev/null
+++ b/security/seahorse3/files/patch-pgp_seahorse-gpgme-keyring.c
@@ -0,0 +1,11 @@
+--- pgp/seahorse-gpgme-keyring.c.orig	2012-06-02 11:06:22.000000000 -0500
++++ pgp/seahorse-gpgme-keyring.c	2012-06-02 11:06:50.000000000 -0500
+@@ -859,7 +859,7 @@
+ {
+ 	SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object);
+ 
+-	g_clear_object (self->pv->actions);
++	g_clear_object (&self->pv->actions);
+ 	g_hash_table_destroy (self->pv->keys);
+ 
+ 	/* All monitoring and scheduling should be done */
diff --git a/security/seahorse3/pkg-plist b/security/seahorse3/pkg-plist
index b0f05c222..a9afbc7de 100644
--- a/security/seahorse3/pkg-plist
+++ b/security/seahorse3/pkg-plist
@@ -58,6 +58,7 @@ share/locale/ar/LC_MESSAGES/seahorse.mo
 share/locale/as/LC_MESSAGES/seahorse.mo
 share/locale/ast/LC_MESSAGES/seahorse.mo
 share/locale/az/LC_MESSAGES/seahorse.mo
+share/locale/be/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
@@ -71,9 +72,9 @@ 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@shaw/LC_MESSAGES/seahorse.mo
 share/locale/en_CA/LC_MESSAGES/seahorse.mo
 share/locale/en_GB/LC_MESSAGES/seahorse.mo
-share/locale/en@shaw/LC_MESSAGES/seahorse.mo
 share/locale/eo/LC_MESSAGES/seahorse.mo
 share/locale/es/LC_MESSAGES/seahorse.mo
 share/locale/et/LC_MESSAGES/seahorse.mo
@@ -91,8 +92,8 @@ share/locale/id/LC_MESSAGES/seahorse.mo
 share/locale/it/LC_MESSAGES/seahorse.mo
 share/locale/ja/LC_MESSAGES/seahorse.mo
 share/locale/kn/LC_MESSAGES/seahorse.mo
-share/locale/ku/LC_MESSAGES/seahorse.mo
 share/locale/ko/LC_MESSAGES/seahorse.mo
+share/locale/ku/LC_MESSAGES/seahorse.mo
 share/locale/lt/LC_MESSAGES/seahorse.mo
 share/locale/lv/LC_MESSAGES/seahorse.mo
 share/locale/mai/LC_MESSAGES/seahorse.mo
@@ -139,9 +140,9 @@ share/omf/seahorse/seahorse-en_GB.omf
 share/omf/seahorse/seahorse-es.omf
 share/omf/seahorse/seahorse-eu.omf
 share/omf/seahorse/seahorse-fr.omf
+share/omf/seahorse/seahorse-gl.omf
 share/omf/seahorse/seahorse-it.omf
 share/omf/seahorse/seahorse-ja.omf
-share/omf/seahorse/seahorse-gl.omf
 share/omf/seahorse/seahorse-ko.omf
 share/omf/seahorse/seahorse-oc.omf
 share/omf/seahorse/seahorse-ru.omf
@@ -149,29 +150,21 @@ share/omf/seahorse/seahorse-sl.omf
 share/omf/seahorse/seahorse-sv.omf
 share/omf/seahorse/seahorse-vi.omf
 share/omf/seahorse/seahorse-zh_CN.omf
-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-sign-bad.png
-share/pixmaps/seahorse/22x22/seahorse-sign-ok.png
-share/pixmaps/seahorse/22x22/seahorse-sign.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-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/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-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
+%%DATADIR%%/icons/hicolor/22x22/apps/seahorse-key-personal.png
+%%DATADIR%%/icons/hicolor/22x22/apps/seahorse-key-ssh.png
+%%DATADIR%%/icons/hicolor/22x22/apps/seahorse-key.png
+%%DATADIR%%/icons/hicolor/22x22/apps/seahorse-person.png
+%%DATADIR%%/icons/hicolor/22x22/status/seahorse-sign-bad.png
+%%DATADIR%%/icons/hicolor/22x22/status/seahorse-sign-ok.png
+%%DATADIR%%/icons/hicolor/22x22/status/seahorse-sign.png
+%%DATADIR%%/icons/hicolor/48x48/apps/seahorse-key-personal.png
+%%DATADIR%%/icons/hicolor/48x48/apps/seahorse-key-ssh.png
+%%DATADIR%%/icons/hicolor/48x48/apps/seahorse-key.png
+%%DATADIR%%/icons/hicolor/48x48/apps/seahorse-person.png
+%%DATADIR%%/icons/hicolor/48x48/status/seahorse-sign-bad.png
+%%DATADIR%%/icons/hicolor/48x48/status/seahorse-sign-ok.png
+%%DATADIR%%/icons/hicolor/48x48/status/seahorse-sign-unknown.png
+%%DATADIR%%/icons/hicolor/48x48/status/seahorse-sign.png
 %%DATADIR%%/ui/seahorse-add-keyring.xml
 %%DATADIR%%/ui/seahorse-add-keyserver.xml
 %%DATADIR%%/ui/seahorse-add-subkey.xml
@@ -191,6 +184,8 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
 %%DATADIR%%/ui/seahorse-pgp-generate.xml
 %%DATADIR%%/ui/seahorse-pgp-private-key-properties.xml
 %%DATADIR%%/ui/seahorse-pgp-public-key-properties.xml
+%%DATADIR%%/ui/seahorse-pkcs11-generate.xml
+%%DATADIR%%/ui/seahorse-pkcs11-request.xml
 %%DATADIR%%/ui/seahorse-prefs.xml
 %%DATADIR%%/ui/seahorse-progress.xml
 %%DATADIR%%/ui/seahorse-revoke.xml
@@ -199,13 +194,52 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
 %%DATADIR%%/ui/seahorse-ssh-generate.xml
 %%DATADIR%%/ui/seahorse-ssh-key-properties.xml
 %%DATADIR%%/ui/seahorse-ssh-upload.xml
+%%DATADIR%%/ui/seahorse.css
 @dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/icons/hicolor/48x48/status
+@dirrm %%DATADIR%%/icons/hicolor/48x48/apps
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22/apps
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrm share/pixmaps/seahorse/scalable
-@dirrm share/pixmaps/seahorse/48x48
-@dirrm share/pixmaps/seahorse/22x22
-@dirrm share/pixmaps/seahorse
 @dirrm share/omf/seahorse
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@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/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
 @dirrm share/gnome/help/seahorse/zh_CN/figures
 @dirrm share/gnome/help/seahorse/zh_CN
 @dirrm share/gnome/help/seahorse/vi/figures
@@ -247,37 +281,3 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
 @dirrm share/gnome/help/seahorse
 @dirrmtry share/applications
 @dirrm lib/seahorse
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@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/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as