diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 452308c269a0..3d35189e46ba 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,69 +1,77 @@ PORTNAME= gnupg -PORTVERSION= 2.3.0 +PORTVERSION= 2.3.1 CATEGORIES= security MASTER_SITES= GNUPG MAINTAINER= adamw@FreeBSD.org COMMENT= Complete and free PGP implementation LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPL3 LIB_DEPENDS= libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libksba.so:security/libksba \ libnpth.so:devel/npth RUN_DEPENDS= pinentry:security/pinentry USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite tar:bzip2 CONFLICTS= gnupg-2.0.* dirmngr-[0-9]* CPE_VENDOR= gnupg CONFIGURE_ARGS= --disable-ntbtls --enable-gpg-is-gpg2 --enable-symcryptrun GNU_CONFIGURE= yes INFO= gnupg TEST_TARGET= check TEST_ARGS= TESTARGS=--parallel SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS GNUTLS LARGE_RSA LDAP NLS SCDAEMON SUID_GPG WKS_SERVER OPTIONS_DEFAULT=GNUTLS SCDAEMON WKS_SERVER OPTIONS_SUB= yes LARGE_RSA_DESC= Enable support for 8192-bit RSA keys LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) SUID_GPG_DESC= Install GPG as SUID root WKS_SERVER_DESC=Install the Web Key Service server GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LARGE_RSA_CONFIGURE_ENABLE= large-secmem LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext SCDAEMON_CONFIGURE_ENABLE= scdaemon WKS_SERVER_CONFIGURE_ENABLE= wks-tools +.include + +.if ${PORT_OPTIONS:MGNUTLS} && ${PORT_OPTIONS:MLDAP} +PLIST_SUB+= DIRMNGRLDAP="" +.else +PLIST_SUB+= DIRMNGRLDAP="@comment " +.endif + # Touch the texinfo files to force makeinfo to run. This fixes Linuxisms in # the paths in the man pages. pre-build: ${TOUCH} ${WRKSRC}/doc/*.texi post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/gpgsplit ${STAGEDIR}${PREFIX}/bin/gpgsplit2 ${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR} .include diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 61cff8e4eaa3..9957f765fff3 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617905248 -SHA256 (gnupg-2.3.0.tar.bz2) = 84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4 -SIZE (gnupg-2.3.0.tar.bz2) = 7557228 +TIMESTAMP = 1618925954 +SHA256 (gnupg-2.3.1.tar.bz2) = c498db346a9b9a4b399e514c8f56dfc0a888ce8f327f10376ff984452cd154ec +SIZE (gnupg-2.3.1.tar.bz2) = 7570431 diff --git a/security/gnupg/files/pkg-message.in b/security/gnupg/files/pkg-message.in index 26f67eb103cc..41ae1967a461 100644 --- a/security/gnupg/files/pkg-message.in +++ b/security/gnupg/files/pkg-message.in @@ -1,16 +1,16 @@ [ { type: install message: <