svn commit: r527347 - head/security/cyrus-sasl2

[Hajimu UMEMOTO]

Author: ume
Date: Fri Feb 28 18:50:44 2020
New Revision: 527347
URL: https://svnweb.freebsd.org/changeset/ports/527347

Log:
  Revert r15574.
  It was wrong, and was not approved by the maintainer.
  
  Reported by:	jkim

Modified:
  head/security/cyrus-sasl2/Makefile
  head/security/cyrus-sasl2/Makefile.common

Modified: head/security/cyrus-sasl2/Makefile
==============================================================================
--- head/security/cyrus-sasl2/Makefile	Fri Feb 28 18:20:53 2020	(r527346)
+++ head/security/cyrus-sasl2/Makefile	Fri Feb 28 18:50:44 2020	(r527347)
@@ -11,14 +11,13 @@ CYRUS_CONFIGURE_ARGS=	--with-saslauthd=${SASLAUTHD_RUN
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \
-			OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR SSL
+			OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR
 OPTIONS_RADIO=		SASLDB
 OPTIONS_RADIO_SASLDB=	BDB1 BDB GDBM LMDB
 OPTIONS_GROUP=		PLUGIN
 OPTIONS_GROUP_PLUGIN=	ANONYMOUS CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM
 OPTIONS_DEFAULT=	ANONYMOUS AUTHDAEMOND BDB1 OBSOLETE_CRAM_ATTR CRAM \
-			OBSOLETE_DIGEST_ATTR DIGEST LOGIN NTLM OTP PLAIN SCRAM \
-			SSL
+			OBSOLETE_DIGEST_ATTR DIGEST LOGIN NTLM OTP PLAIN SCRAM
 OPTIONS_SUB=		yes
 ALWAYSTRUE_DESC=	Alwaystrue password verifier (discouraged)
 ALWAYSTRUE_CONFIGURE_ENABLE=alwaystrue
@@ -62,8 +61,6 @@ PLAIN_DESC=		PLAIN authentication
 PLAIN_CONFIGURE_ENABLE=	plain
 SCRAM_DESC=		SCRAM authentication
 SCRAM_CONFIGURE_ENABLE=	scram
-SSL_DESC=		Uncheck this to use system openssl libraries
-SSL_USES=		ssl
 
 DOCS=	AUTHORS COPYING ChangeLog INSTALL INSTALL.TXT README
 

Modified: head/security/cyrus-sasl2/Makefile.common
==============================================================================
--- head/security/cyrus-sasl2/Makefile.common	Fri Feb 28 18:20:53 2020	(r527346)
+++ head/security/cyrus-sasl2/Makefile.common	Fri Feb 28 18:50:44 2020	(r527347)
@@ -13,6 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		gmake
 USE_LDCONFIG=	yes
+USES+=		ssl
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc \
@@ -72,10 +73,6 @@ PLIST_FILES+=	lib/sasl2/lib${CYRUS_BUILD_TARGET}.a \
 .endif
 
 .include <bsd.port.pre.mk>
-
-.if ! ${PORT_OPTIONS:MSSL}
-OPENSSLBASE=	/usr
-.endif
 
 .if ${OPENSSLBASE} == /usr
 CONFIGURE_ARGS+=--with-openssl=yes