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

[Kurt Jaeger]

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

Log:
  www/node[4]: Use NLS option to enable system-icu
  
  PR:		210786
  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 12:52:40 2016	(r418275)
+++ head/www/node/Makefile	Sat Jul  9 13:06:53 2016	(r418276)
@@ -2,8 +2,8 @@
 
 PORTNAME=	node
 PORTVERSION=	6.2.2
-PORTREVISION=	2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 
@@ -13,12 +13,15 @@ COMMENT=	V8 JavaScript for client and se
 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
@@ -28,7 +31,6 @@ CONFLICTS_INSTALL=	node4-* node-0.[02-9]
 ONLY_FOR_ARCHS=	i386 amd64 armv6
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--without-npm \
-		--with-intl=system-icu \
 		--shared-cares \
 		--shared-libuv \
 		--shared-zlib
@@ -38,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>

Modified: head/www/node4/Makefile
==============================================================================
--- head/www/node4/Makefile	Sat Jul  9 12:52:40 2016	(r418275)
+++ head/www/node4/Makefile	Sat Jul  9 13:06:53 2016	(r418276)
@@ -3,8 +3,8 @@
 
 PORTNAME=	node
 PORTVERSION=	4.4.7
-PORTREVISION=	2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	4
@@ -15,12 +15,15 @@ COMMENT=	V8 JavaScript for client and se
 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
@@ -29,7 +32,6 @@ CONFLICTS_INSTALL=	node-[0-9]* node-deve
 
 ONLY_FOR_ARCHS=	i386 amd64
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
-		--with-intl=system-icu \
 	 	--without-npm \
 		--shared-libuv \
 		--shared-zlib
@@ -37,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>