CVS commit: pkgsrc/lang

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Nov 23 16:57:37 UTC 2023

Modified Files:
        pkgsrc/lang/nodejs: Makefile Makefile.common
        pkgsrc/lang/nodejs16: Makefile
        pkgsrc/lang/nodejs18: Makefile
        pkgsrc/lang/nodejs20: Makefile

Log Message:
nodejs*: Consolidate and fix python includes.

Ensures that PYTHON_FOR_BUILD_ONLY is set prior to including pyversion.mk,
and ensures python and its dependencies are not buildlinked.


To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/lang/nodejs/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/nodejs16/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/nodejs18/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/nodejs20/Makefile

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.280 pkgsrc/lang/nodejs/Makefile:1.281
--- pkgsrc/lang/nodejs/Makefile:1.280   Wed Nov 15 18:13:05 2023
+++ pkgsrc/lang/nodejs/Makefile Thu Nov 23 16:57:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.280 2023/11/15 18:13:05 adam Exp $
+# $NetBSD: Makefile,v 1.281 2023/11/23 16:57:37 jperkin Exp $
 
 DISTNAME=      node-v21.2.0
 EXTRACT_SUFX=  .tar.xz
@@ -43,9 +43,8 @@ minusx:
 .endif
 
 .include "../../lang/nodejs/Makefile.common"
+
 .include "../../net/ngtcp2/buildlink3.mk"
 .include "../../www/nghttp3/buildlink3.mk"
-.include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/tool.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/nodejs/Makefile.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.54 pkgsrc/lang/nodejs/Makefile.common:1.55
--- pkgsrc/lang/nodejs/Makefile.common:1.54     Wed Nov 22 16:30:23 2023
+++ pkgsrc/lang/nodejs/Makefile.common  Thu Nov 23 16:57:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2023/11/22 16:30:23 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.55 2023/11/23 16:57:37 jperkin Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs14/Makefile
 # used by lang/nodejs16/Makefile
@@ -101,6 +101,7 @@ BUILDLINK_API_DEPENDS.libuv+=       libuv>=1.4
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/nodejs/application.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/tool.mk"
 .include "../../net/libcares/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"

Index: pkgsrc/lang/nodejs16/Makefile
diff -u pkgsrc/lang/nodejs16/Makefile:1.22 pkgsrc/lang/nodejs16/Makefile:1.23
--- pkgsrc/lang/nodejs16/Makefile:1.22  Wed Nov  8 13:19:50 2023
+++ pkgsrc/lang/nodejs16/Makefile       Thu Nov 23 16:57:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2023/11/08 13:19:50 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2023/11/23 16:57:37 jperkin Exp $
 
 DISTNAME=      node-v16.20.2
 EXTRACT_SUFX=  .tar.xz
@@ -41,9 +41,8 @@ minusx:
 .include "../../devel/libatomic/buildlink3.mk"
 .endif
 
-.include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/tool.mk"
 .include "../../lang/nodejs/Makefile.common"
+
 .include "../../net/ngtcp2/buildlink3.mk"
 .include "../../www/nghttp3/buildlink3.mk"
 .include "../../mk/atomic64.mk"

Index: pkgsrc/lang/nodejs18/Makefile
diff -u pkgsrc/lang/nodejs18/Makefile:1.24 pkgsrc/lang/nodejs18/Makefile:1.25
--- pkgsrc/lang/nodejs18/Makefile:1.24  Wed Nov  8 13:19:50 2023
+++ pkgsrc/lang/nodejs18/Makefile       Thu Nov 23 16:57:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/11/08 13:19:50 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2023/11/23 16:57:37 jperkin Exp $
 
 DISTNAME=      node-v18.18.2
 PKGREVISION=   3
@@ -44,9 +44,8 @@ minusx:
 .include "../../devel/libatomic/buildlink3.mk"
 .endif
 
-.include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/tool.mk"
 .include "../../lang/nodejs/Makefile.common"
+
 .include "../../net/ngtcp2/buildlink3.mk"
 .include "../../www/nghttp3/buildlink3.mk"
 .include "../../mk/atomic64.mk"

Index: pkgsrc/lang/nodejs20/Makefile
diff -u pkgsrc/lang/nodejs20/Makefile:1.2 pkgsrc/lang/nodejs20/Makefile:1.3
--- pkgsrc/lang/nodejs20/Makefile:1.2   Wed Nov  8 13:19:50 2023
+++ pkgsrc/lang/nodejs20/Makefile       Thu Nov 23 16:57:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/11/08 13:19:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2023/11/23 16:57:37 jperkin Exp $
 
 DISTNAME=      node-v20.9.0
 EXTRACT_SUFX=  .tar.xz
@@ -44,9 +44,8 @@ minusx:
 .endif
 
 .include "../../lang/nodejs/Makefile.common"
+
 .include "../../net/ngtcp2/buildlink3.mk"
 .include "../../www/nghttp3/buildlink3.mk"
-.include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/tool.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"