Update seahorse to 3.12.2. While here convert to compact options, pull

in valac for the build and remove an unneeded patch.


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

4 files changed, 150 insertions, 36 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 86e8c62ea..9b724692f 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,10 +1,9 @@
 # Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom: ports-experimental/trunk/security/seahorse/Makefile 19530 2014-04-15 14:24:24Z kwm $
+#   $MCom$
 
 PORTNAME=	seahorse
-PORTVERSION=	3.12.0
-PORTREVISION=	1
+PORTVERSION=	3.12.2
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,6 +12,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
+		valac:${PORTSDIR}/lang/vala \
 		itstool:${PORTSDIR}/textproc/itstool
 LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
@@ -34,27 +34,14 @@ GLIB_SCHEMAS=	org.gnome.seahorse.gschema.xml \
 		org.gnome.seahorse.manager.gschema.xml \
 		org.gnome.seahorse.window.gschema.xml
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	LDAP NOTIFY AVAHI
 OPTIONS_DEFAULT=LDAP NOTIFY AVAHI
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
-.else
-CONFIGURE_ARGS+=--disable-libnotify
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
-.else
-CONFIGURE_ARGS+=--disable-sharing
-.endif
+LDAP_CONFIGURE_ENABLE=	ldap
+LDAP_USE=	OPENLDAP=yes
+NOTIFY_CONFIGURE_ENABLE=	libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+AVAHI_CONFIGURE_ENABLE=	sharing
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 
 .include <bsd.port.mk>
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 3e347a52d..252080223 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/seahorse-3.12.0.tar.xz) = f78800b1d25b285ddc8928e925f9ee24f27640abba3fc9ab1cd9554c83380d0b
-SIZE (gnome3/seahorse-3.12.0.tar.xz) = 1396460
+SHA256 (gnome3/seahorse-3.12.2.tar.xz) = 5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839
+SIZE (gnome3/seahorse-3.12.2.tar.xz) = 1398292
diff --git a/security/seahorse/files/patch-pkgcs11_pkcs11-request.c b/security/seahorse/files/patch-pkgcs11_pkcs11-request.c
deleted file mode 100644
index 3b0840235..000000000
--- a/security/seahorse/files/patch-pkgcs11_pkcs11-request.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- pkcs11/pkcs11-request.c.orig	2014-03-22 11:48:55.000000000 +0100
-+++ pkcs11/pkcs11-request.c	2014-03-22 11:49:53.000000000 +0100
-@@ -1051,7 +1051,7 @@
- #line 61 "/data/src/seahorse/pkcs11/pkcs11-request.vala"
- 	_tmp18_ = self->priv->_private_key;
- #line 61 "/data/src/seahorse/pkcs11/pkcs11-request.vala"
--	g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gck_object_get_type ()));
-+	g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gck_object_get_type ()), NULL);
- #line 35 "/data/src/seahorse/pkcs11/pkcs11-request.vala"
- 	_g_object_unref0 (widget);
- #line 35 "/data/src/seahorse/pkcs11/pkcs11-request.vala"
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 03911a3c0..341e00805 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -62,6 +62,92 @@ share/help/C/seahorse/subkeys-add.page
 share/help/C/seahorse/subkeys-examine.page
 share/help/C/seahorse/subkeys-revoke.page
 share/help/C/seahorse/media/seahorse.png
+share/help/de/seahorse/glossary.page
+share/help/de/seahorse/index.page
+share/help/de/seahorse/introduction.page
+share/help/de/seahorse/key-servers-add.page
+share/help/de/seahorse/keyring-change-default.page
+share/help/de/seahorse/keyring-create.page
+share/help/de/seahorse/keyring-lock.page
+share/help/de/seahorse/keyring-unlock.page
+share/help/de/seahorse/keyring-update-password.page
+share/help/de/seahorse/keyring.page
+share/help/de/seahorse/legal.xml
+share/help/de/seahorse/misc-key-backup.page
+share/help/de/seahorse/misc-key-fingerprint.page
+share/help/de/seahorse/passwords-stored-create.page
+share/help/de/seahorse/passwords-view.page
+share/help/de/seahorse/passwords.page
+share/help/de/seahorse/pgp-create.page
+share/help/de/seahorse/pgp-delete.page
+share/help/de/seahorse/pgp-expiration-change.page
+share/help/de/seahorse/pgp-expired.page
+share/help/de/seahorse/pgp-export.page
+share/help/de/seahorse/pgp-import.page
+share/help/de/seahorse/pgp-photoid.page
+share/help/de/seahorse/pgp-publish.page
+share/help/de/seahorse/pgp-retrieve-remote.page
+share/help/de/seahorse/pgp-sign.page
+share/help/de/seahorse/pgp-subkeys.page
+share/help/de/seahorse/pgp-sync.page
+share/help/de/seahorse/pgp-userid-add.page
+share/help/de/seahorse/pgp-userid-primary.page
+share/help/de/seahorse/pgp-userid-remove.page
+share/help/de/seahorse/pgp-userid.page
+share/help/de/seahorse/pgp.page
+share/help/de/seahorse/ssh-connect-remote.page
+share/help/de/seahorse/ssh-create-vs-setup.page
+share/help/de/seahorse/ssh-create.page
+share/help/de/seahorse/ssh-export.page
+share/help/de/seahorse/ssh-import.page
+share/help/de/seahorse/ssh.page
+share/help/de/seahorse/subkeys-add.page
+share/help/de/seahorse/subkeys-examine.page
+share/help/de/seahorse/subkeys-revoke.page
+share/help/de/seahorse/media/seahorse.png
+share/help/el/seahorse/glossary.page
+share/help/el/seahorse/index.page
+share/help/el/seahorse/introduction.page
+share/help/el/seahorse/key-servers-add.page
+share/help/el/seahorse/keyring-change-default.page
+share/help/el/seahorse/keyring-create.page
+share/help/el/seahorse/keyring-lock.page
+share/help/el/seahorse/keyring-unlock.page
+share/help/el/seahorse/keyring-update-password.page
+share/help/el/seahorse/keyring.page
+share/help/el/seahorse/legal.xml
+share/help/el/seahorse/misc-key-backup.page
+share/help/el/seahorse/misc-key-fingerprint.page
+share/help/el/seahorse/passwords-stored-create.page
+share/help/el/seahorse/passwords-view.page
+share/help/el/seahorse/passwords.page
+share/help/el/seahorse/pgp-create.page
+share/help/el/seahorse/pgp-delete.page
+share/help/el/seahorse/pgp-expiration-change.page
+share/help/el/seahorse/pgp-expired.page
+share/help/el/seahorse/pgp-export.page
+share/help/el/seahorse/pgp-import.page
+share/help/el/seahorse/pgp-photoid.page
+share/help/el/seahorse/pgp-publish.page
+share/help/el/seahorse/pgp-retrieve-remote.page
+share/help/el/seahorse/pgp-sign.page
+share/help/el/seahorse/pgp-subkeys.page
+share/help/el/seahorse/pgp-sync.page
+share/help/el/seahorse/pgp-userid-add.page
+share/help/el/seahorse/pgp-userid-primary.page
+share/help/el/seahorse/pgp-userid-remove.page
+share/help/el/seahorse/pgp-userid.page
+share/help/el/seahorse/pgp.page
+share/help/el/seahorse/ssh-connect-remote.page
+share/help/el/seahorse/ssh-create-vs-setup.page
+share/help/el/seahorse/ssh-create.page
+share/help/el/seahorse/ssh-export.page
+share/help/el/seahorse/ssh-import.page
+share/help/el/seahorse/ssh.page
+share/help/el/seahorse/subkeys-add.page
+share/help/el/seahorse/subkeys-examine.page
+share/help/el/seahorse/subkeys-revoke.page
+share/help/el/seahorse/media/seahorse.png
 share/help/es/seahorse/glossary.page
 share/help/es/seahorse/index.page
 share/help/es/seahorse/introduction.page
@@ -105,6 +191,49 @@ share/help/es/seahorse/subkeys-add.page
 share/help/es/seahorse/subkeys-examine.page
 share/help/es/seahorse/subkeys-revoke.page
 share/help/es/seahorse/media/seahorse.png
+share/help/ru/seahorse/glossary.page
+share/help/ru/seahorse/index.page
+share/help/ru/seahorse/introduction.page
+share/help/ru/seahorse/key-servers-add.page
+share/help/ru/seahorse/keyring-change-default.page
+share/help/ru/seahorse/keyring-create.page
+share/help/ru/seahorse/keyring-lock.page
+share/help/ru/seahorse/keyring-unlock.page
+share/help/ru/seahorse/keyring-update-password.page
+share/help/ru/seahorse/keyring.page
+share/help/ru/seahorse/legal.xml
+share/help/ru/seahorse/misc-key-backup.page
+share/help/ru/seahorse/misc-key-fingerprint.page
+share/help/ru/seahorse/passwords-stored-create.page
+share/help/ru/seahorse/passwords-view.page
+share/help/ru/seahorse/passwords.page
+share/help/ru/seahorse/pgp-create.page
+share/help/ru/seahorse/pgp-delete.page
+share/help/ru/seahorse/pgp-expiration-change.page
+share/help/ru/seahorse/pgp-expired.page
+share/help/ru/seahorse/pgp-export.page
+share/help/ru/seahorse/pgp-import.page
+share/help/ru/seahorse/pgp-photoid.page
+share/help/ru/seahorse/pgp-publish.page
+share/help/ru/seahorse/pgp-retrieve-remote.page
+share/help/ru/seahorse/pgp-sign.page
+share/help/ru/seahorse/pgp-subkeys.page
+share/help/ru/seahorse/pgp-sync.page
+share/help/ru/seahorse/pgp-userid-add.page
+share/help/ru/seahorse/pgp-userid-primary.page
+share/help/ru/seahorse/pgp-userid-remove.page
+share/help/ru/seahorse/pgp-userid.page
+share/help/ru/seahorse/pgp.page
+share/help/ru/seahorse/ssh-connect-remote.page
+share/help/ru/seahorse/ssh-create-vs-setup.page
+share/help/ru/seahorse/ssh-create.page
+share/help/ru/seahorse/ssh-export.page
+share/help/ru/seahorse/ssh-import.page
+share/help/ru/seahorse/ssh.page
+share/help/ru/seahorse/subkeys-add.page
+share/help/ru/seahorse/subkeys-examine.page
+share/help/ru/seahorse/subkeys-revoke.page
+share/help/ru/seahorse/media/seahorse.png
 share/locale/ar/LC_MESSAGES/seahorse.mo
 share/locale/as/LC_MESSAGES/seahorse.mo
 share/locale/ast/LC_MESSAGES/seahorse.mo
@@ -272,9 +401,18 @@ share/locale/zh_TW/LC_MESSAGES/seahorse.mo
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrm share/help/ru/seahorse/media
+@dirrm share/help/ru/seahorse
+@dirrmtry share/help/ru
 @dirrm share/help/es/seahorse/media
 @dirrm share/help/es/seahorse
 @dirrmtry share/help/es
+@dirrm share/help/el/seahorse/media
+@dirrm share/help/el/seahorse
+@dirrmtry share/help/el
+@dirrm share/help/de/seahorse/media
+@dirrm share/help/de/seahorse
+@dirrmtry share/help/de
 @dirrm share/help/C/seahorse/media
 @dirrm share/help/C/seahorse
 @dirrmtry share/help/C