Attachment 172069 Details for Bug 210786 – patch from a git commit

patch from a git commit

nodejs-nls-option-adds-icu-dependency.diff (text/plain), 2.97 KB, created by Bradley T. Hughes on 2016-07-03 18:14:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bradley T. Hughes

Created: 2016-07-03 18:14:34 UTC

Size: 2.97 KB

patch

obsolete

>commit f6d3395896f32e3bd4e0056e22b8083cb1f5d85a
>Author: Bradley T. Hughes <bradleythughes@fastmail.fm>
>Date:   Tue Jun 28 07:42:53 2016 +0000
>
>    www/node, www/node4: use NLS option to enable system-icu
>    
>    Add the NLS option, which enables the --with-intl=system-icu configure
>    option and ICU dependency. Bump PORTREVISION due to the new option.
>
>diff --git www/node/Makefile www/node/Makefile
>index 3b221ec..3fea100 100644
>--- www/node/Makefile
>+++ www/node/Makefile
>@@ -3,6 +3,7 @@
> PORTNAME=	node
> PORTVERSION=	6.2.2
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> 
>@@ -12,12 +13,15 @@ COMMENT=	V8 JavaScript for client and server (6.x)
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-OPTIONS_DEFINE=	BUNDLED_SSL DOCS
>+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
> 
>+NLS_CONFIGURE_ON=	--with-intl=system-icu
>+NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
>+
> USES=		compiler execinfo gmake python:2,build pkgconfig localbase
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>@@ -27,7 +31,6 @@ CONFLICTS_INSTALL=	node4-* node-0.[02-9][0-9]* node-devel-0.[0-9]* node010-[0-9]
> ONLY_FOR_ARCHS=	i386 amd64 armv6
> CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
> 		--without-npm \
>-		--with-intl=system-icu \
> 		--shared-cares \
> 		--shared-libuv \
> 		--shared-zlib
>@@ -37,7 +40,6 @@ REINPLACE_ARGS=	-i ''
> MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
> 
> LIB_DEPENDS+=	libcares.so:dns/c-ares\
>-		libicui18n.so:devel/icu \
> 		libuv.so:devel/libuv
> 
> .include <bsd.port.options.mk>
>diff --git www/node4/Makefile www/node4/Makefile
>index 3d4aaca..fef765c 100644
>--- www/node4/Makefile
>+++ www/node4/Makefile
>@@ -4,6 +4,7 @@
> PORTNAME=	node
> PORTVERSION=	4.4.7
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> PKGNAMESUFFIX=	4
>@@ -14,12 +15,15 @@ COMMENT=	V8 JavaScript for client and server (4.x LTS)
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-OPTIONS_DEFINE=	BUNDLED_SSL DOCS
>+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
> 
>+NLS_CONFIGURE_ON=	--with-intl=system-icu
>+NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
>+
> USES=		compiler execinfo gmake python:2 pkgconfig localbase
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>@@ -28,7 +32,6 @@ CONFLICTS_INSTALL=	node-[0-9]* node-devel-0.[0-9]* node010-[0-9]* node012-[0-9]*
> 
> ONLY_FOR_ARCHS=	i386 amd64
> CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
>-		--with-intl=system-icu \
> 	 	--without-npm \
> 		--shared-libuv \
> 		--shared-zlib
>@@ -36,8 +39,7 @@ PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
> REINPLACE_ARGS=	-i ''
> MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
> 
>-LIB_DEPENDS+=	libicui18n.so:devel/icu \
>-		libuv.so:devel/libuv
>+LIB_DEPENDS+=	libuv.so:devel/libuv
> 
> .include <bsd.port.options.mk>
>

Flags:

bhughes: maintainer-approval+

Actions: View

Attachments on bug 210786: 172069 | 172197 | 172198