From 130d2d472fc5057c99010d6d19b28fd746d91c62 Mon Sep 17 00:00:00 2001
From: fhajny <fhajny>
Date: Fri, 12 May 2017 20:55:40 +0000
Subject: Only node.js 7.x builds with icu>=0.59. Go back to use
 limited/embedded icu for lang/nodejs4 and lang/nodejs6.

---
 lang/nodejs/Makefile        | 5 ++++-
 lang/nodejs/Makefile.common | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lang')

diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile
index 2e8bf9af986..d11fba0bffd 100644
--- a/lang/nodejs/Makefile
+++ b/lang/nodejs/Makefile
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.96 2017/05/04 16:39:36 fhajny Exp $
+# $NetBSD: Makefile,v 1.97 2017/05/12 20:55:40 fhajny Exp $
 
 DISTNAME=	node-v7.10.0
 
+CONFIGURE_ARGS+=        --with-intl=system-icu
+
 .include "../../lang/nodejs/Makefile.common"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nodejs/Makefile.common b/lang/nodejs/Makefile.common
index 4f131d37211..bb08bd3bebf 100644
--- a/lang/nodejs/Makefile.common
+++ b/lang/nodejs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2017/01/01 14:43:45 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2017/05/12 20:55:40 fhajny Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs4/Makefile
 # used by lang/nodejs6/Makefile
@@ -26,7 +26,6 @@ GCC_REQD+=		4.8
 CONFIG_SHELL=		${PYTHONBIN}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--shared-zlib
-CONFIGURE_ARGS+=	--with-intl=system-icu
 PTHREAD_AUTO_VARS=	yes
 
 CONFIGURE_ENV.NetBSD+=	GYP_DEFINES="OS=netbsd"
@@ -73,5 +72,4 @@ post-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"
-.include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-- 
cgit v1.2.3