CVS commit: pkgsrc/lang/nodejs

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jul 27 08:43:16 UTC 2023

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

Log Message:
nodejs: Add missing CONFLICTS/SUPERSEDES for npm.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 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.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.50 pkgsrc/lang/nodejs/Makefile.common:1.51
--- pkgsrc/lang/nodejs/Makefile.common:1.50     Tue Jun  6 12:41:44 2023
+++ pkgsrc/lang/nodejs/Makefile.common  Thu Jul 27 08:43:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.50 2023/06/06 12:41:44 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.51 2023/07/27 08:43:16 jperkin Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs14/Makefile
 # used by lang/nodejs16/Makefile
@@ -18,6 +18,9 @@ USE_TOOLS+=   bash gmake pkg-config
 
 PYTHON_FOR_BUILD_ONLY=         yes
 
+CONFLICTS+=    npm-[0-9]*
+SUPERSEDES+=   npm-[0-9]*
+
 GCC_REQD+=             4.9.4
 
 CONFIG_SHELL=          ${PYTHONBIN}