svn commit: r499617 - branches/2019Q2/security/gnutls

[Tijl Coosemans]

Author: tijl
Date: Mon Apr 22 08:48:38 2019
New Revision: 499617
URL: https://svnweb.freebsd.org/changeset/ports/499617

Log:
  MFH: r499615
  
  - Prevent detection of autogen.  It causes some files to be regenerated
    and then they require a newer header than is provided with gnutls.
  - Remove ZLIB option.  It's no longer available.
  
  PR:		237419
  Reported by:	Kevin Oberman <rkoberman at gmail.com>
  Approved by:	ports-secteam (blanket)

Modified:
  branches/2019Q2/security/gnutls/Makefile
Directory Properties:
  branches/2019Q2/   (props changed)

Modified: branches/2019Q2/security/gnutls/Makefile
==============================================================================
--- branches/2019Q2/security/gnutls/Makefile	Mon Apr 22 08:35:58 2019	(r499616)
+++ branches/2019Q2/security/gnutls/Makefile	Mon Apr 22 08:48:38 2019	(r499617)
@@ -30,13 +30,14 @@ CONFIGURE_ARGS=	--disable-guile \
 		--with-system-priority-file=${PREFIX}/etc/gnutls/default-priorities \
 		--with-default-trust-store-file=${LOCALBASE}/share/certs/ca-root-nss.crt \
 		--with-trousers-lib=${LOCALBASE}/lib/libtspi.so.1 \
+		AUTOGEN=false \
 		ac_cv_type_max_align_t=yes
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=		DANE EXAMPLES IDN NLS P11KIT TPM ZLIB
-OPTIONS_DEFAULT=	IDN P11KIT TPM ZLIB
+OPTIONS_DEFINE=		DANE EXAMPLES IDN NLS P11KIT TPM
+OPTIONS_DEFAULT=	IDN P11KIT TPM
 OPTIONS_SUB=		yes
 
 DANE_DESC=		Certificate verification via DNSSEC
@@ -58,8 +59,6 @@ P11KIT_LIB_DEPENDS=	libp11-kit.so:security/p11-kit
 TPM_DESC=		Trusted Platform Module support
 TPM_CONFIGURE_WITH=	tpm
 TPM_LIB_DEPENDS=	libtspi.so:security/trousers
-
-ZLIB_CONFIGURE_WITH=	zlib
 
 INFO=		gnutls gnutls-guile