svn commit: r418280 - in head/www: node node4

[Kurt Jaeger]

Author: pi
Date: Sat Jul  9 13:42:53 2016
New Revision: 418280
URL: https://svnweb.freebsd.org/changeset/ports/418280

Log:
  www/node[4]: Fix OpenSSL dependencies after USES=ssl changes
  
  PR:		210891
  Submitted by:	Bradley T. Hughes <bradleythughes at fastmail.fm> (maintainer)

Modified:
  head/www/node/Makefile
  head/www/node4/Makefile

Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile	Sat Jul  9 13:38:48 2016	(r418279)
+++ head/www/node/Makefile	Sat Jul  9 13:42:53 2016	(r418280)
@@ -3,7 +3,7 @@
 PORTNAME=	node
 PORTVERSION=	6.2.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 
@@ -16,8 +16,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS
 OPTIONS_SUB=	yes
 
-BUNDLED_SSL_DESC=	Use node.js's bundled OpenSSL implementation
-BUNDLED_SSL_USE_OFF=	OPENSSL=yes
+BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
+BUNDLED_SSL_USES_OFF=		ssl:openssl
+BUNDLED_SSL_CONFIGURE_OFF+=	--shared-openssl
 
 NLS_CONFIGURE_ON=	--with-intl=system-icu
 NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
@@ -51,8 +52,6 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
 WITH_OPENSSL_PORT=	yes
 .endif
 
-CONFIGURE_ARGS+=	--shared-openssl
-
 .endif
 
 .include <bsd.port.pre.mk>

Modified: head/www/node4/Makefile
==============================================================================
--- head/www/node4/Makefile	Sat Jul  9 13:38:48 2016	(r418279)
+++ head/www/node4/Makefile	Sat Jul  9 13:42:53 2016	(r418280)
@@ -4,7 +4,7 @@
 PORTNAME=	node
 PORTVERSION=	4.4.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	4
@@ -18,8 +18,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS
 OPTIONS_SUB=	yes
 
-BUNDLED_SSL_DESC=	Use node.js's bundled OpenSSL implementation
-BUNDLED_SSL_USE_OFF=	OPENSSL=yes
+BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
+BUNDLED_SSL_USES_OFF=		ssl:openssl
+BUNDLED_SSL_CONFIGURE_OFF=	--shared-openssl
 
 NLS_CONFIGURE_ON=	--with-intl=system-icu
 NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
@@ -50,8 +51,6 @@ LIB_DEPENDS+=	libuv.so:devel/libuv
 WITH_OPENSSL_PORT=yes
 .endif
 
-CONFIGURE_ARGS+=	--shared-openssl
-
 .endif
 
 .include <bsd.port.pre.mk>