CVS commit: pkgsrc/lang/nodejs

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri May 12 20:55:40 UTC 2017

Modified Files:
        pkgsrc/lang/nodejs: Makefile Makefile.common

Log Message:
Only node.js 7.x builds with icu>=0.59. Go back to use limited/embedded icu for lang/nodejs4 and lang/nodejs6.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/nodejs/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/nodejs/Makefile
diff -u pkgsrc/lang/nodejs/Makefile:1.96 pkgsrc/lang/nodejs/Makefile:1.97
--- pkgsrc/lang/nodejs/Makefile:1.96    Thu May  4 16:39:36 2017
+++ pkgsrc/lang/nodejs/Makefile Fri May 12 20:55:40 2017
@@ -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"

Index: pkgsrc/lang/nodejs/Makefile.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.13 pkgsrc/lang/nodejs/Makefile.common:1.14
--- pkgsrc/lang/nodejs/Makefile.common:1.13     Sun Jan  1 14:43:45 2017
+++ pkgsrc/lang/nodejs/Makefile.common  Fri May 12 20:55:40 2017
@@ -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"