svn commit: r417767 - in head: security/letskencrypt www/node www/node4 www/node5 www/obhttpd

[Mathieu Arnold]

Author: mat
Date: Wed Jun 29 14:22:47 2016
New Revision: 417767
URL: https://svnweb.freebsd.org/changeset/ports/417767

Log:
  Remove all usage of OPENSSL_PORT from ports, this is deprecated, and
  always was a user defined variable.
  
  Sponsored by:	Absolight

Modified:
  head/security/letskencrypt/Makefile   (contents, props changed)
  head/www/node/Makefile   (contents, props changed)
  head/www/node4/Makefile   (contents, props changed)
  head/www/node5/Makefile   (contents, props changed)
  head/www/obhttpd/Makefile   (contents, props changed)

Modified: head/security/letskencrypt/Makefile
==============================================================================
--- head/security/letskencrypt/Makefile	Wed Jun 29 14:00:33 2016	(r417766)
+++ head/security/letskencrypt/Makefile	Wed Jun 29 14:22:47 2016	(r417767)
@@ -20,7 +20,6 @@ MAKEFILE=	GNUmakefile
 MAKE_ARGS=	PREFIX=${STAGEDIR}/${PREFIX}
 
 WITH_OPENSSL_PORT=	yes
-OPENSSL_PORT=	security/libressl
 
 WWWDIR=		${PREFIX}/www/letsencrypt
 
@@ -50,4 +49,10 @@ post-stage:
 		${INSTALL_SCRIPT} ${WRKDIR}/${d} ${STAGEDIR}${PREFIX}/etc/letsencrypt/${d}
 .	endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if empty(SSL_DEFAULT:Mlibressl*)
+IGNORE=		Need LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything.
+.endif
+
+.include <bsd.port.post.mk>

Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile	Wed Jun 29 14:00:33 2016	(r417766)
+++ head/www/node/Makefile	Wed Jun 29 14:22:47 2016	(r417767)
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+=	--shared-openssl
 .include <bsd.port.pre.mk>
 
 .if empty(PORT_OPTIONS:MBUNDLED_SSL)
-.if defined(OPENSSL_PORT) && (${OPENSSL_PORT} == "security/libressl" || ${OPENSSL_PORT} == "security/libressl-devel")
+.if !empty(SSL_DEFAULT:Mlibressl*)
 IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
 .endif
 .endif

Modified: head/www/node4/Makefile
==============================================================================
--- head/www/node4/Makefile	Wed Jun 29 14:00:33 2016	(r417766)
+++ head/www/node4/Makefile	Wed Jun 29 14:22:47 2016	(r417767)
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--shared-openssl
 .include <bsd.port.pre.mk>
 
 .if empty(PORT_OPTIONS:MBUNDLED_SSL)
-.if defined(OPENSSL_PORT) && (${OPENSSL_PORT} == "security/libressl" || ${OPENSSL_PORT} == "security/libressl-devel")
+.if !empty(SSL_DEFAULT:Mlibressl*)
 IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
 .endif
 .endif

Modified: head/www/node5/Makefile
==============================================================================
--- head/www/node5/Makefile	Wed Jun 29 14:00:33 2016	(r417766)
+++ head/www/node5/Makefile	Wed Jun 29 14:22:47 2016	(r417767)
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--shared-openssl
 .include <bsd.port.pre.mk>
 
 .if empty(PORT_OPTIONS:MBUNDLED_SSL)
-.if defined(OPENSSL_PORT) && (${OPENSSL_PORT} == "security/libressl" || ${OPENSSL_PORT} == "security/libressl-devel")
+.if !empty(SSL_DEFAULT:Mlibressl*)
 IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
 .endif
 .endif

Modified: head/www/obhttpd/Makefile
==============================================================================
--- head/www/obhttpd/Makefile	Wed Jun 29 14:00:33 2016	(r417766)
+++ head/www/obhttpd/Makefile	Wed Jun 29 14:22:47 2016	(r417767)
@@ -20,7 +20,6 @@ USE_RC_SUBR=	obhttpd
 USES=		uidfix
 
 WITH_OPENSSL_PORT=yes
-OPENSSL_PORT=	security/libressl
 
 CFLAGS+=	-Wall
 
@@ -48,4 +47,10 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/etc/examples/httpd.conf \
 		${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if empty(SSL_DEFAULT:Mlibressl*)
+IGNORE=		Need LibreSSL to build. set DEFAULT_VERSIONS+=ssl=libressl and rebuild everything.
+.endif
+
+.include <bsd.port.post.mk>