CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Thu May  3 21:12:23 UTC 2018

Modified Files:
        pkgsrc/lang/nodejs6: Makefile options.mk
        pkgsrc/lang/nodejs8: Makefile options.mk

Log Message:
lang/nodejs{6,8}: Decouple respective options.mk from main package.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/nodejs6/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/nodejs6/options.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/nodejs8/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/nodejs8/options.mk

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

Modified files:

Index: pkgsrc/lang/nodejs6/Makefile
diff -u pkgsrc/lang/nodejs6/Makefile:1.25 pkgsrc/lang/nodejs6/Makefile:1.26
--- pkgsrc/lang/nodejs6/Makefile:1.25   Thu May  3 10:29:16 2018
+++ pkgsrc/lang/nodejs6/Makefile        Thu May  3 21:12:23 2018
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2018/05/03 10:29:16 fhajny Exp $
+# $NetBSD: Makefile,v 1.26 2018/05/03 21:12:23 fhajny Exp $
 
 DISTNAME=      node-v6.14.2
 
+.include "options.mk"
+
 .include "../../lang/nodejs/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/nodejs6/options.mk
diff -u pkgsrc/lang/nodejs6/options.mk:1.1 pkgsrc/lang/nodejs6/options.mk:1.2
--- pkgsrc/lang/nodejs6/options.mk:1.1  Tue Oct 25 19:54:00 2016
+++ pkgsrc/lang/nodejs6/options.mk      Thu May  3 21:12:23 2018
@@ -1,9 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2016/10/25 19:54:00 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2018/05/03 21:12:23 fhajny Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.node
 PKG_SUPPORTED_OPTIONS= openssl dtrace
 PKG_SUGGESTED_OPTIONS= openssl
 
+.include "../../mk/bsd.prefs.mk"
+
 .if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin") \
     && exists(/usr/sbin/dtrace)
 PKG_SUGGESTED_OPTIONS+=        dtrace

Index: pkgsrc/lang/nodejs8/Makefile
diff -u pkgsrc/lang/nodejs8/Makefile:1.10 pkgsrc/lang/nodejs8/Makefile:1.11
--- pkgsrc/lang/nodejs8/Makefile:1.10   Wed May  2 16:33:02 2018
+++ pkgsrc/lang/nodejs8/Makefile        Thu May  3 21:12:23 2018
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2018/05/02 16:33:02 fhajny Exp $
+# $NetBSD: Makefile,v 1.11 2018/05/03 21:12:23 fhajny Exp $
 
 DISTNAME=      node-v8.11.1
 
 # Stated by the changelog as of 8.2.0
 GCC_REQD+=     4.9.4
 
+.include "options.mk"
+
 CONFIGURE_ARGS+=       --with-intl=system-icu
 
 PKGREVISION= 2

Index: pkgsrc/lang/nodejs8/options.mk
diff -u pkgsrc/lang/nodejs8/options.mk:1.1 pkgsrc/lang/nodejs8/options.mk:1.2
--- pkgsrc/lang/nodejs8/options.mk:1.1  Wed Nov  1 12:07:31 2017
+++ pkgsrc/lang/nodejs8/options.mk      Thu May  3 21:12:23 2018
@@ -1,9 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2017/11/01 12:07:31 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2018/05/03 21:12:23 fhajny Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.node
 PKG_SUPPORTED_OPTIONS= openssl dtrace
 PKG_SUGGESTED_OPTIONS= openssl
 
+.include "../../mk/bsd.prefs.mk"
+
 .if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin") \
     && exists(/usr/sbin/dtrace)
 PKG_SUGGESTED_OPTIONS+=        dtrace