Update to 3.6.3.

Submitted by:	Gustau Perez (based on)


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

4 files changed, 129 insertions, 124 deletions

diff --git a/security/seahorse3/Makefile b/security/seahorse3/Makefile
index ec47a07f2..7605b3b75 100644
--- a/security/seahorse3/Makefile
+++ b/security/seahorse3/Makefile
@@ -1,10 +1,9 @@
 # Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/security/seahorse3/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#   $MCom$
 
 PORTNAME=	seahorse
-PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTVERSION=	3.6.3
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,13 +11,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
-BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
+		itstool:${PORTSDIR}/textproc/itstool
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
     		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
 		cryptui:${PORTSDIR}/security/libcryptui \
 		gcr-3:${PORTSDIR}/security/gcr \
 		gcrypt:${PORTSDIR}/security/libgcrypt \
+		secret-1:${PORTSDIR}/security/libsecret \
 		soup-2.4:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
@@ -30,9 +31,8 @@ USE_LDCONFIG=	yes
 USE_XZ=		yes
 USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	intlhack gnomeprefix gtk30 gnomedocutils
+USE_GNOME=	intlhack gnomeprefix gtk30
 GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -42,25 +42,24 @@ GLIB_SCHEMAS=	org.gnome.seahorse.gschema.xml \
 		org.gnome.seahorse.window.gschema.xml
 MAN1=		seahorse.1
 
-OPTIONS=	LDAP "Enable LDAP support" on \
-		NOTIFY "Enable libnotify support" on \
-		MDNS "Enable mDNS key sharing" on
+OPTIONS_DEFINE=	LDAP NOTIFY AVAHI
+OPTIONS_DEFAULT=LDAP NOTIFY AVAHI
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 .else
 CONFIGURE_ARGS+=--disable-ldap
 .endif
 
-.if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
+.if ${PORT_OPTIONS:MNOTIFY}
+LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
 .else
 CONFIGURE_ARGS+=--disable-libnotify
 .endif
 
-.if !defined(WITHOUT_MDNS)
+.if ${PORT_OPTIONS:MAVAHI}
 LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
 .else
 CONFIGURE_ARGS+=--disable-sharing
diff --git a/security/seahorse3/distinfo b/security/seahorse3/distinfo
index ed283bcbb..550f21983 100644
--- a/security/seahorse3/distinfo
+++ b/security/seahorse3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/seahorse-3.4.1.tar.xz) = 841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa
-SIZE (gnome3/seahorse-3.4.1.tar.xz) = 1999472
+SHA256 (gnome3/seahorse-3.6.3.tar.xz) = 9b712da1989725547a8093e638725ee6de74d7870661545a15374c7ebf335cc1
+SIZE (gnome3/seahorse-3.6.3.tar.xz) = 1995252
diff --git a/security/seahorse3/files/patch-pgp_seahorse-gpgme-keyring.c b/security/seahorse3/files/patch-pgp_seahorse-gpgme-keyring.c
deleted file mode 100644
index 97dc24433..000000000
--- a/security/seahorse3/files/patch-pgp_seahorse-gpgme-keyring.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 a9afbc7de..832d60a21 100644
--- a/security/seahorse3/pkg-plist
+++ b/security/seahorse3/pkg-plist
@@ -4,45 +4,63 @@ lib/seahorse/xloadimage
 share/GConf/gsettings/org.gnome.seahorse.convert
 share/GConf/gsettings/org.gnome.seahorse.manager.convert
 share/applications/seahorse.desktop
-share/gnome/help/seahorse/C/figures/seahorse-window.png
-share/gnome/help/seahorse/C/legal.xml
-share/gnome/help/seahorse/C/seahorse.xml
-share/gnome/help/seahorse/ca/figures/seahorse-window.png
-share/gnome/help/seahorse/ca/seahorse.xml
-share/gnome/help/seahorse/cs/figures/seahorse-window.png
-share/gnome/help/seahorse/cs/seahorse.xml
-share/gnome/help/seahorse/de/figures/seahorse-window.png
-share/gnome/help/seahorse/de/seahorse.xml
-share/gnome/help/seahorse/el/figures/seahorse-window.png
-share/gnome/help/seahorse/el/seahorse.xml
-share/gnome/help/seahorse/en_GB/figures/seahorse-window.png
-share/gnome/help/seahorse/en_GB/seahorse.xml
-share/gnome/help/seahorse/es/figures/seahorse-window.png
-share/gnome/help/seahorse/es/seahorse.xml
-share/gnome/help/seahorse/eu/figures/seahorse-window.png
-share/gnome/help/seahorse/eu/seahorse.xml
-share/gnome/help/seahorse/fr/figures/seahorse-window.png
-share/gnome/help/seahorse/fr/seahorse.xml
-share/gnome/help/seahorse/gl/figures/seahorse-window.png
-share/gnome/help/seahorse/gl/seahorse.xml
-share/gnome/help/seahorse/it/figures/seahorse-window.png
-share/gnome/help/seahorse/it/seahorse.xml
-share/gnome/help/seahorse/ja/figures/seahorse-window.png
-share/gnome/help/seahorse/ja/seahorse.xml
-share/gnome/help/seahorse/ko/figures/seahorse-window.png
-share/gnome/help/seahorse/ko/seahorse.xml
-share/gnome/help/seahorse/oc/figures/seahorse-window.png
-share/gnome/help/seahorse/oc/seahorse.xml
-share/gnome/help/seahorse/ru/figures/seahorse-window.png
-share/gnome/help/seahorse/ru/seahorse.xml
-share/gnome/help/seahorse/sl/figures/seahorse-window.png
-share/gnome/help/seahorse/sl/seahorse.xml
-share/gnome/help/seahorse/sv/figures/seahorse-window.png
-share/gnome/help/seahorse/sv/seahorse.xml
-share/gnome/help/seahorse/vi/figures/seahorse-window.png
-share/gnome/help/seahorse/vi/seahorse.xml
-share/gnome/help/seahorse/zh_CN/figures/seahorse-window.png
-share/gnome/help/seahorse/zh_CN/seahorse.xml
+share/help/C/seahorse/figures/seahorse-window.png
+share/help/C/seahorse/index.docbook
+share/help/C/seahorse/legal.xml
+share/help/ca/seahorse/figures/seahorse-window.png
+share/help/ca/seahorse/index.docbook
+share/help/ca/seahorse/legal.xml
+share/help/cs/seahorse/figures/seahorse-window.png
+share/help/cs/seahorse/index.docbook
+share/help/cs/seahorse/legal.xml
+share/help/de/seahorse/figures/seahorse-window.png
+share/help/de/seahorse/index.docbook
+share/help/de/seahorse/legal.xml
+share/help/el/seahorse/figures/seahorse-window.png
+share/help/el/seahorse/index.docbook
+share/help/el/seahorse/legal.xml
+share/help/en_GB/seahorse/figures/seahorse-window.png
+share/help/en_GB/seahorse/index.docbook
+share/help/en_GB/seahorse/legal.xml
+share/help/es/seahorse/figures/seahorse-window.png
+share/help/es/seahorse/index.docbook
+share/help/es/seahorse/legal.xml
+share/help/eu/seahorse/figures/seahorse-window.png
+share/help/eu/seahorse/index.docbook
+share/help/eu/seahorse/legal.xml
+share/help/fr/seahorse/figures/seahorse-window.png
+share/help/fr/seahorse/index.docbook
+share/help/fr/seahorse/legal.xml
+share/help/gl/seahorse/figures/seahorse-window.png
+share/help/gl/seahorse/index.docbook
+share/help/gl/seahorse/legal.xml
+share/help/it/seahorse/figures/seahorse-window.png
+share/help/it/seahorse/index.docbook
+share/help/it/seahorse/legal.xml
+share/help/ja/seahorse/figures/seahorse-window.png
+share/help/ja/seahorse/index.docbook
+share/help/ja/seahorse/legal.xml
+share/help/ko/seahorse/figures/seahorse-window.png
+share/help/ko/seahorse/index.docbook
+share/help/ko/seahorse/legal.xml
+share/help/oc/seahorse/figures/seahorse-window.png
+share/help/oc/seahorse/index.docbook
+share/help/oc/seahorse/legal.xml
+share/help/ru/seahorse/figures/seahorse-window.png
+share/help/ru/seahorse/index.docbook
+share/help/ru/seahorse/legal.xml
+share/help/sl/seahorse/figures/seahorse-window.png
+share/help/sl/seahorse/index.docbook
+share/help/sl/seahorse/legal.xml
+share/help/sv/seahorse/figures/seahorse-window.png
+share/help/sv/seahorse/index.docbook
+share/help/sv/seahorse/legal.xml
+share/help/vi/seahorse/figures/seahorse-window.png
+share/help/vi/seahorse/index.docbook
+share/help/vi/seahorse/legal.xml
+share/help/zh_CN/seahorse/figures/seahorse-window.png
+share/help/zh_CN/seahorse/index.docbook
+share/help/zh_CN/seahorse/legal.xml
 share/icons/hicolor/16x16/apps/seahorse-preferences.png
 share/icons/hicolor/16x16/apps/seahorse.png
 share/icons/hicolor/22x22/apps/seahorse-preferences.png
@@ -131,25 +149,6 @@ 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
-share/omf/seahorse/seahorse-C.omf
-share/omf/seahorse/seahorse-ca.omf
-share/omf/seahorse/seahorse-cs.omf
-share/omf/seahorse/seahorse-de.omf
-share/omf/seahorse/seahorse-el.omf
-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-ko.omf
-share/omf/seahorse/seahorse-oc.omf
-share/omf/seahorse/seahorse-ru.omf
-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
 %%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
@@ -205,7 +204,6 @@ share/omf/seahorse/seahorse-zh_CN.omf
 @dirrm %%DATADIR%%/icons/hicolor
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrm share/omf/seahorse
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ug/LC_MESSAGES
@@ -240,44 +238,63 @@ share/omf/seahorse/seahorse-zh_CN.omf
 @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
-@dirrm share/gnome/help/seahorse/vi
-@dirrm share/gnome/help/seahorse/sv/figures
-@dirrm share/gnome/help/seahorse/sv
-@dirrm share/gnome/help/seahorse/sl/figures
-@dirrm share/gnome/help/seahorse/sl
-@dirrm share/gnome/help/seahorse/ru/figures
-@dirrm share/gnome/help/seahorse/ru
-@dirrm share/gnome/help/seahorse/oc/figures
-@dirrm share/gnome/help/seahorse/oc
-@dirrm share/gnome/help/seahorse/ko/figures
-@dirrm share/gnome/help/seahorse/ko
-@dirrm share/gnome/help/seahorse/ja/figures
-@dirrm share/gnome/help/seahorse/ja
-@dirrm share/gnome/help/seahorse/it/figures
-@dirrm share/gnome/help/seahorse/it
-@dirrm share/gnome/help/seahorse/gl/figures
-@dirrm share/gnome/help/seahorse/gl
-@dirrm share/gnome/help/seahorse/fr/figures
-@dirrm share/gnome/help/seahorse/fr
-@dirrm share/gnome/help/seahorse/eu/figures
-@dirrm share/gnome/help/seahorse/eu
-@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/el/figures
-@dirrm share/gnome/help/seahorse/el
-@dirrm share/gnome/help/seahorse/de/figures
-@dirrm share/gnome/help/seahorse/de
-@dirrm share/gnome/help/seahorse/cs/figures
-@dirrm share/gnome/help/seahorse/cs
-@dirrm share/gnome/help/seahorse/ca/figures
-@dirrm share/gnome/help/seahorse/ca
-@dirrm share/gnome/help/seahorse/C/figures
-@dirrm share/gnome/help/seahorse/C
-@dirrm share/gnome/help/seahorse
+@dirrm share/help/zh_CN/seahorse/figures
+@dirrm share/help/zh_CN/seahorse
+@dirrmtry share/help/zh_CN
+@dirrm share/help/vi/seahorse/figures
+@dirrm share/help/vi/seahorse
+@dirrmtry share/help/vi
+@dirrm share/help/sv/seahorse/figures
+@dirrm share/help/sv/seahorse
+@dirrmtry share/help/sv
+@dirrm share/help/sl/seahorse/figures
+@dirrm share/help/sl/seahorse
+@dirrmtry share/help/sl
+@dirrm share/help/ru/seahorse/figures
+@dirrm share/help/ru/seahorse
+@dirrmtry share/help/ru
+@dirrm share/help/oc/seahorse/figures
+@dirrm share/help/oc/seahorse
+@dirrmtry share/help/oc
+@dirrm share/help/ko/seahorse/figures
+@dirrm share/help/ko/seahorse
+@dirrmtry share/help/ko
+@dirrm share/help/ja/seahorse/figures
+@dirrm share/help/ja/seahorse
+@dirrmtry share/help/ja
+@dirrm share/help/it/seahorse/figures
+@dirrm share/help/it/seahorse
+@dirrmtry share/help/it
+@dirrm share/help/gl/seahorse/figures
+@dirrm share/help/gl/seahorse
+@dirrmtry share/help/gl
+@dirrm share/help/fr/seahorse/figures
+@dirrm share/help/fr/seahorse
+@dirrmtry share/help/fr
+@dirrm share/help/eu/seahorse/figures
+@dirrm share/help/eu/seahorse
+@dirrmtry share/help/eu
+@dirrm share/help/es/seahorse/figures
+@dirrm share/help/es/seahorse
+@dirrmtry share/help/es
+@dirrm share/help/en_GB/seahorse/figures
+@dirrm share/help/en_GB/seahorse
+@dirrmtry share/help/en_GB
+@dirrm share/help/el/seahorse/figures
+@dirrm share/help/el/seahorse
+@dirrmtry share/help/el
+@dirrm share/help/de/seahorse/figures
+@dirrm share/help/de/seahorse
+@dirrmtry share/help/de
+@dirrm share/help/cs/seahorse/figures
+@dirrm share/help/cs/seahorse
+@dirrmtry share/help/cs
+@dirrm share/help/ca/seahorse/figures
+@dirrm share/help/ca/seahorse
+@dirrmtry share/help/ca
+@dirrm share/help/C/seahorse/figures
+@dirrm share/help/C/seahorse
+@dirrmtry share/help/C
+@dirrmtry share/help
 @dirrmtry share/applications
 @dirrm lib/seahorse