svn commit: r431213 - head/mail/alpine

[Adam Weinberger]

Author: adamw
Date: Wed Jan 11 22:15:48 2017
New Revision: 431213
URL: https://svnweb.freebsd.org/changeset/ports/431213

Log:
  USE_OPENSSL=no is not a thing. Neither is OPTIONS helpers after bsd.port.pre.mk.
  
  This Makefile is a complete mess.

Modified:
  head/mail/alpine/Makefile

Modified: head/mail/alpine/Makefile
==============================================================================
--- head/mail/alpine/Makefile	Wed Jan 11 21:51:26 2017	(r431212)
+++ head/mail/alpine/Makefile	Wed Jan 11 22:15:48 2017	(r431213)
@@ -35,6 +35,12 @@ MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
 
+THREADS_CONFIGURE_WITH=	pthread
+MOUSE_CONFIGURE_ENABLE=	mouse
+NLS_CONFIGURE_ENABLE=	nls
+IPV6_CONFIGURE_WITH=	ipv6
+SSL_USES=		ssl
+
 .if !defined(PICO_ALPINE_SLAVE)
 
 PORTDOCSbase=	LICENSE NOTICE README
@@ -60,15 +66,12 @@ MAKE_ARGS+=	CC="${CC}" CXX="${CXX}" GCCC
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
-
 CONFIGURE_ARGS+=	--with-ssl-dir=${OPENSSLDIR} \
 			--with-ssl-include-dir=${OPENSSLINC} \
 			--with-ssl-lib-dir=${OPENSSLLIB} \
 			--with-ssl-certs-dir=${OPENSSLDIR}/certs
 .else
 CONFIGURE_ARGS+=	--without-ssl
-USE_OPENSSL=		no
 .endif
 
 .include <bsd.port.pre.mk>
@@ -77,11 +80,6 @@ USE_OPENSSL=		no
 BROKEN=		Does not build with openssl-devel
 .endif
 
-THREADS_CONFIGURE_WITH=	pthread
-MOUSE_CONFIGURE_ENABLE=	mouse
-NLS_CONFIGURE_ENABLE=	nls
-IPV6_CONFIGURE_WITH=	ipv6
-
 .if ! ${PORT_OPTIONS:MNOSPELL}
 .if ! ${PORT_OPTIONS:MISPELL}
 CONFIGURE_ARGS+=--with-interactive-spellcheck=${LOCALBASE}/bin/aspell