Attachment 172195 Details for Bug 210891 – patch from a git commit

patch from a git commit

nodejs-use-ssl.diff (text/plain), 2.24 KB, created by Bradley T. Hughes on 2016-07-07 13:11:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bradley T. Hughes

Created: 2016-07-07 13:11:08 UTC

Size: 2.24 KB

patch

obsolete

>commit 522abc94d7d46863477f32346560522ebc2d8578
>Author: Bradley T. Hughes <bradleythughes@fastmail.fm>
>Date:   Thu Jul 7 12:51:10 2016 +0000
>
>    www/node, www/node4: fix OpenSSL dependencies after USES=ssl changes
>    
>    Use USES=ssl (with :openssl if it ever becomes a thing) instead instead
>    of USE_OPENSSL=yes. Keep the WANT_OPENSSL_PORT=yes for now, since the
>    default is still to use base. Bump PORTREVISION since we are re-adding
>    the security/openssl dependency.
>
>diff --git www/node/Makefile www/node/Makefile
>index fed18d4..8c4f5b5 100644
>--- www/node/Makefile
>+++ www/node/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	node
> PORTVERSION=	6.2.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
>@@ -16,8 +16,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> OPTIONS_DEFINE=	BUNDLED_SSL DOCS
> 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
> 
> USES=		compiler execinfo gmake python:2,build pkgconfig localbase
> HAS_CONFIGURE=	yes
>@@ -50,8 +51,6 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
> WITH_OPENSSL_PORT=	yes
> .endif
> 
>-CONFIGURE_ARGS+=	--shared-openssl
>-
> .endif
> 
> .include <bsd.port.pre.mk>
>diff --git www/node4/Makefile www/node4/Makefile
>index e066bae..bb4106c 100644
>--- www/node4/Makefile
>+++ www/node4/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	node
> PORTVERSION=	4.4.7
>-PORTREVISION=	2
>+PORTREVISION=	3
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
>@@ -18,8 +18,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> OPTIONS_DEFINE=	BUNDLED_SSL DOCS
> 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	
> 
> USES=		compiler execinfo gmake python:2 pkgconfig localbase
> HAS_CONFIGURE=	yes
>@@ -49,8 +50,6 @@ LIB_DEPENDS+=	libicui18n.so:devel/icu \
> WITH_OPENSSL_PORT=yes
> .endif
> 
>-CONFIGURE_ARGS+=	--shared-openssl
>-
> .endif
> 
> .include <bsd.port.pre.mk>

Flags:

bhughes: maintainer-approval+

Actions: View

Attachments on bug 210891: 172195 | 172199 | 172238