svn commit: r418843 - head/mail/dovecot2

[Adam Weinberger]

Author: adamw
Date: Wed Jul 20 17:07:55 2016
New Revision: 418843
URL: https://svnweb.freebsd.org/changeset/ports/418843

Log:
  Remove the SSL option and make it mandatory.
  
  I received a report that the build is broken on 9.x with SSL disabled.
  I think the right solution here is just to remove the SSL option entirely.
  I really can't think of a use-case where IMAP/POP/LMTP without TLS
  capability is a good idea. Plus, NetBSD and OpenBSD both have SSL
  mandatory.
  
  PORTREVISION bump is necessary here, because it was possible to have
  no SSL on 10.x with a successful build.
  
  Discussed with:	Larry Rosenman, maintainer of dovecot2-pigeonhole

Modified:
  head/mail/dovecot2/Makefile

Modified: head/mail/dovecot2/Makefile
==============================================================================
--- head/mail/dovecot2/Makefile	Wed Jul 20 15:56:32 2016	(r418842)
+++ head/mail/dovecot2/Makefile	Wed Jul 20 17:07:55 2016	(r418843)
@@ -14,7 +14,7 @@
 
 PORTNAME=	dovecot
 PORTVERSION=	2.2.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 PKGNAMESUFFIX=	2
@@ -27,13 +27,14 @@ LICENSE_COMB=	dual
 
 CONFLICTS=	dovecot-1.[0-9]*
 
-USES=		cpe iconv libtool
+USES=		cpe iconv libtool ssl
 USE_RC_SUBR=	dovecot
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-statedir=/var/db/dovecot \
 		--without-shadow \
+		--with-ssl=openssl \
 		--with-docs
 
 USE_LDCONFIG=	${PREFIX}/lib/dovecot
@@ -42,8 +43,8 @@ INSTALL_TARGET=	install-strip
 USERS=		dovecot dovenull
 GROUPS=		${USERS}
 
-OPTIONS_DEFINE=	KQUEUE LIBWRAP LZ4 SSL VPOPMAIL DOCS EXAMPLES
-OPTIONS_DEFAULT=KQUEUE SSL GSSAPI_NONE
+OPTIONS_DEFINE=	KQUEUE LIBWRAP LZ4 VPOPMAIL DOCS EXAMPLES
+OPTIONS_DEFAULT=KQUEUE GSSAPI_NONE
 OPTIONS_SUB=	yes
 
 OPTIONS_GROUP=		DB FTS
@@ -110,9 +111,6 @@ SOLR_LIB_DEPENDS=	libexpat.so:textproc/e
 SQLITE_USES=		sqlite:3
 SQLITE_CONFIGURE_WITH=	sqlite
 
-SSL_USES=		ssl
-SSL_CONFIGURE_WITH=	ssl=openssl
-
 TEXTCAT_CONFIGURE_WITH=	textcat
 TEXTCAT_LIB_DEPENDS=	libtextcat.so:textproc/libtextcat