diff options
author | Koop Mast <kwm@FreeBSD.org> | 2014-11-22 16:04:24 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2014-11-22 16:04:24 +0000 |
commit | c132ed0706675e6ecd31ebdbff38e9797be6174f (patch) | |
tree | d4fcacac64a4f9aaf41314954a18459258dd6519 /security/seahorse | |
parent | Add argyllcms (diff) |
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.
Notes
Notes:
svn path=/head/; revision=373068
Diffstat (limited to 'security/seahorse')
-rw-r--r-- | security/seahorse/Makefile | 6 | ||||
-rw-r--r-- | security/seahorse/files/patch-configure | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index b23ea3801233..60a99e75a90d 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -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@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}/security/gpgme \ 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 diff --git a/security/seahorse/files/patch-configure b/security/seahorse/files/patch-configure new file mode 100644 index 000000000000..094cd84537f2 --- /dev/null +++ b/security/seahorse/files/patch-configure @@ -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 |