CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri May  4 14:28:32 UTC 2018

Modified Files:
        pkgsrc/lang/nodejs: nodeversion.mk
Added Files:
        pkgsrc/lang/nodejs: buildlink3.mk
        pkgsrc/lang/nodejs6: buildlink3.mk
        pkgsrc/lang/nodejs8: buildlink3.mk

Log Message:
lang/nodejs*: Provide bl3 to nodejs packages to provide headers.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/nodejs/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/nodejs/nodeversion.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/nodejs6/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/nodejs8/buildlink3.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/nodejs/nodeversion.mk
diff -u pkgsrc/lang/nodejs/nodeversion.mk:1.2 pkgsrc/lang/nodejs/nodeversion.mk:1.3
--- pkgsrc/lang/nodejs/nodeversion.mk:1.2       Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/nodeversion.mk   Fri May  4 14:28:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: nodeversion.mk,v 1.2 2018/05/03 21:19:16 fhajny Exp $
+# $NetBSD: nodeversion.mk,v 1.3 2018/05/04 14:28:32 fhajny Exp $
 
 # This file determins which nodejs version is used as a dependency for
 # a package.
@@ -89,11 +89,11 @@ _NODE_VERSION?=             ${v}
 _NODE_VERSION?=                none
 
 .if ${_NODE_VERSION} == "8"
-DEPENDS+=      nodejs>=8<9:../../lang/nodejs8
+.include "../../lang/nodejs8/buildlink3.mk"
 .elif ${_NODE_VERSION} == "6"
-DEPENDS+=      nodejs>=6<7:../../lang/nodejs6
+.include "../../lang/nodejs6/buildlink3.mk"
 .elif ${_NODE_VERSION} == "10"
-DEPENDS+=      nodejs>=10:../../lang/nodejs
+.include "../../lang/nodejs/buildlink3.mk"
 .else
 PKG_FAIL_REASON+=      "No valid node version found"
 .endif

Added files:

Index: pkgsrc/lang/nodejs/buildlink3.mk
diff -u /dev/null pkgsrc/lang/nodejs/buildlink3.mk:1.1
--- /dev/null   Fri May  4 14:28:32 2018
+++ pkgsrc/lang/nodejs/buildlink3.mk    Fri May  4 14:28:32 2018
@@ -0,0 +1,31 @@
+# $NetBSD: buildlink3.mk,v 1.1 2018/05/04 14:28:32 fhajny Exp $
+
+BUILDLINK_TREE+=       nodejs
+
+.if !defined(NODEJS_BUILDLINK3_MK)
+NODEJS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.nodejs+= nodejs>=10
+BUILDLINK_PKGSRCDIR.nodejs?=   ../../lang/nodejs
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.endif
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../www/nghttp2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+pkgbase := nodejs
+.include "../../mk/pkg-build-options.mk"
+
+# Enable when we start using pkgsrc openssl-1.1.x
+#.if !empty(PKG_BUILD_OPTIONS.nodejs:Mopenssl)
+#.  include "../../security/openssl/buildlink3.mk"
+#.endif
+
+.endif # NODEJS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -nodejs

Index: pkgsrc/lang/nodejs6/buildlink3.mk
diff -u /dev/null pkgsrc/lang/nodejs6/buildlink3.mk:1.1
--- /dev/null   Fri May  4 14:28:32 2018
+++ pkgsrc/lang/nodejs6/buildlink3.mk   Fri May  4 14:28:32 2018
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2018/05/04 14:28:32 fhajny Exp $
+
+BUILDLINK_TREE+=       nodejs
+
+.if !defined(NODEJS_BUILDLINK3_MK)
+NODEJS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.nodejs+= nodejs>=6<7
+BUILDLINK_PKGSRCDIR.nodejs?=   ../../lang/nodejs6
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.endif
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+pkgbase := nodejs
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.nodejs:Mopenssl)
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+.endif # NODEJS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -nodejs

Index: pkgsrc/lang/nodejs8/buildlink3.mk
diff -u /dev/null pkgsrc/lang/nodejs8/buildlink3.mk:1.1
--- /dev/null   Fri May  4 14:28:32 2018
+++ pkgsrc/lang/nodejs8/buildlink3.mk   Fri May  4 14:28:32 2018
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1 2018/05/04 14:28:32 fhajny Exp $
+
+BUILDLINK_TREE+=       nodejs
+
+.if !defined(NODEJS_BUILDLINK3_MK)
+NODEJS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.nodejs+= nodejs>=8<9
+BUILDLINK_PKGSRCDIR.nodejs?=   ../../lang/nodejs8
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.endif
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+pkgbase := nodejs
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.nodejs:Mopenssl)
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+.endif # NODEJS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -nodejs