1 files changed, 20 insertions, 29 deletions
diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild
index e1b0c8b96b..ae3f7134e5 100644
--- a/development/nodejs/nodejs.SlackBuild
+++ b/development/nodejs/nodejs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nodejs
 # Thanks to Audrius Kažukauskas
@@ -24,11 +24,14 @@
 # along with this program (most likely, a file named COPYING). If
 # not, see <https://www.gnu.org/licenses/>.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nodejs
 SRCNAM=node
-VERSION=${VERSION:-12.20.0}
+VERSION=${VERSION:-20.12.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-v$VERSION
-tar xvf $CWD/$SRCNAM-v$VERSION.tar.xz
+tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz
 cd $SRCNAM-v$VERSION
 chown -R root:root .
 find -L . \
@@ -74,17 +81,20 @@ find -L . \
 
 ## Fix man page path.
 sed -i 's|share/||' tools/install.py
-sed -i '/var manRoot/ s/"share",//' deps/npm/lib/{,un}build.js
 
 ## Fix libdir for 64-bit.
 sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py
-sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" lib/module.js
-sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" deps/npm/lib/npm.js
+sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" \
+  lib/module.js \
+  lib/internal/modules/cjs/loader.js \
+  deps/npm/lib/npm.js
 
 sed -i "s|math.h|cmath|" src/node_crypto.cc
 ./configure \
   --prefix=/usr \
-  --shared-zlib
+  --shared-zlib \
+  --shared-openssl \
+  --ninja
 
 make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
 make install DESTDIR=$PKG
@@ -98,31 +108,12 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 ## Add bash completion file for npm.
 install -D -m 644 $CWD/npm.sh $PKG/usr/share/bash-completion/completions/npm
 
-## Remove unneeded files.
-find $PKG/usr \( -name '.git*' \) -exec rm -f {} \;
-
-## Set NODE_PATH to look for globally installed modules.
-mkdir -p $PKG/etc/profile.d
-cat > $PKG/etc/profile.d/${SRCNAM}.csh << EOF
-#!/bin/csh
-setenv NODE_PATH /usr/lib${LIBDIRSUFFIX}/node_modules
-EOF
-cat > $PKG/etc/profile.d/${SRCNAM}.sh << EOF
-#!/bin/sh
-export NODE_PATH=/usr/lib${LIBDIRSUFFIX}/node_modules
-EOF
-chmod 0755 $PKG/etc/profile.d/*
-
-# Fix some files path
-mv $PKG/usr/doc/node  $PKG/usr/share/nodejs
-mv $PKG/usr/systemtap $PKG/usr/share/systemtap
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE