svn commit: r373068 - in head/security/seahorse: . files

[Koop Mast]

Author: kwm
Date: Sat Nov 22 16:04:24 2014
New Revision: 373068
URL: https://svnweb.freebsd.org/changeset/ports/373068
QAT: https://qat.redports.org/buildarchive/r373068/

Log:
  Switch back to gnupg 2.1.
  
  Turns out that other dependancies also pull in the new gnupg so we end up
  with a conflict. But this allows the port to build.

Added:
  head/security/seahorse/files/
  head/security/seahorse/files/patch-configure   (contents, props changed)
Modified:
  head/security/seahorse/Makefile

Modified: head/security/seahorse/Makefile
==============================================================================
--- head/security/seahorse/Makefile	Sat Nov 22 15:53:25 2014	(r373067)
+++ head/security/seahorse/Makefile	Sat Nov 22 16:04:24 2014	(r373068)
@@ -4,7 +4,7 @@
 
 PORTNAME=	seahorse
 PORTVERSION=	3.14.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
-BUILD_DEPENDS=	gnupg20>=0:${PORTSDIR}/security/gnupg20 \
+BUILD_DEPENDS=	gnupg>=2.1:${PORTSDIR}/security/gnupg \
 		valac:${PORTSDIR}/lang/vala \
 		itstool:${PORTSDIR}/textproc/itstool
 LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/sec
 		libgcr-3.so:${PORTSDIR}/security/gcr \
 		libsecret-1.so:${PORTSDIR}/security/libsecret \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	gnupg20>=0:${PORTSDIR}/security/gnupg20
+RUN_DEPENDS=	gnupg>=2.1:${PORTSDIR}/security/gnupg
 
 USE_XORG=	sm
 USE_LDCONFIG=	yes

Added: head/security/seahorse/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/seahorse/files/patch-configure	Sat Nov 22 16:04:24 2014	(r373068)
@@ -0,0 +1,11 @@
+--- configure.orig	2014-11-22 16:52:37.804032295 +0100
++++ configure	2014-11-22 16:52:48.509032582 +0100
+@@ -2527,7 +2527,7 @@
+ GTK_REQ=3.4.0
+ GTK_MAX=GTK_VERSION_3_4
+ 
+-GNUPG_ACCEPTED="1.2 1.4 2.0"
++GNUPG_ACCEPTED="1.2 1.4 2.0 2.1"
+ GPGME_REQUIRED=1.0.0
+ LIBSECRET_REQUIRED=0.16
+ AVAHI_GLIB_REQUIRED=0.6