aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkuriyama <kuriyama@FreeBSD.org>2014-11-22 17:53:16 +0800
committerkuriyama <kuriyama@FreeBSD.org>2014-11-22 17:53:16 +0800
commit4ace9084669c19c941b281027b496498a4a2c4d9 (patch)
tree8d539652af8f9d516a735b91d0c029eb16bf6d73
parentea23ed66813e307c90ec61b89ccf72cd80c52f0f (diff)
downloadfreebsd-ports-gnome-4ace9084669c19c941b281027b496498a4a2c4d9.tar.gz
freebsd-ports-gnome-4ace9084669c19c941b281027b496498a4a2c4d9.tar.zst
freebsd-ports-gnome-4ace9084669c19c941b281027b496498a4a2c4d9.zip
- Turn pinentry dependency mandatory, not option.
PR: ports/194788 Submitted by: donaldcallen@gmail.com
-rw-r--r--security/gnupg20/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/gnupg20/Makefile b/security/gnupg20/Makefile
index f26059943fb0..b6395d18ebdb 100644
--- a/security/gnupg20/Makefile
+++ b/security/gnupg20/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnupg
PORTVERSION= 2.0.26
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg
@@ -23,14 +23,15 @@ LIB_DEPENDS= libassuan.so:${PORTSDIR}/security/libassuan \
libksba.so:${PORTSDIR}/security/libksba \
libpth.so:${PORTSDIR}/devel/pth
BUILD_DEPENDS= libgpg-error>=1.11:${PORTSDIR}/security/libgpg-error
+RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry
GNU_CONFIGURE= YES
USES= gmake iconv tar:bzip2
USE_LDCONFIG= YES
CONFIGURE_ARGS+= --enable-symcryptrun
+CONFLICTS= gnupg-2.1.*
-OPTIONS_DEFINE= PINENTRY LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS DOCS SUID_GPG
-PINENTRY_DESC= Use pinentry
+OPTIONS_DEFINE= LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS DOCS SUID_GPG
LDAP_DESC= LDAP keyserver interface
SCDAEMON_DESC= Enable Smartcard daemon (with libusb)
CURL_DESC= Use the real curl library (worked around if no)
@@ -43,7 +44,6 @@ NO_OPTIONS_SORT= YES
OPTIONS_SUB= YES
DOCS_CONFIGURE_ENABLE= doc
-PINENTRY_RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry
GPGSM_RUN_DEPENDS= dirmngr:${PORTSDIR}/security/dirmngr
GPGSM_CONFIGURE_ENABLE= gpgsm
KDNS_LIB_DEPENDS= libadns.so:${PORTSDIR}/dns/adns