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

[patch] patch from a git commit

nodejs-use-ssl.diff (text/plain), 2.26 KB, created by Bradley T. Hughes on 2016-07-08 12:32:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bradley T. Hughes

Created: 2016-07-08 12:32:18 UTC

Size: 2.26 KB

patch

obsolete

>commit 8a51abcd93557f36c26a2a51cf1fe3e8bd7aa46b
>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 8321b89..0c485fe 100644
>--- www/node/Makefile
>+++ www/node/Makefile
>@@ -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>
>diff --git www/node4/Makefile www/node4/Makefile
>index ed034ab..b6a6925 100644
>--- www/node4/Makefile
>+++ www/node4/Makefile
>@@ -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>

Flags:

bhughes: maintainer-approval+

Actions: View | Diff

Attachments on bug 210891: 172195 | 172199 | 172238