5 files changed, 47 insertions, 45 deletions
diff --git a/perl/rakudo/README b/perl/rakudo/README
index d4f9d1e00f..ca976c2f63 100644
--- a/perl/rakudo/README
+++ b/perl/rakudo/README
@@ -1,18 +1,16 @@
-Rakudo Perl 6 is a production-ready, stable implementation of the Perl
-6 programming language.
+Rakudo is an implementation of the Raku programming language.
 
-Information on Perl 6 can be found at https://www.perl6.org/.
+Information on Raku can be found at https://raku.org/.
 
-Install the perl6-Readline package or rlwrap to enable command line
-editing in the perl6 interpreter.
+Optional dependencies:
 
+Install the raku-Readline package or rlwrap to enable command line
+editing in the Rakudo interpreter.
 
-Optional Dependencies
-
-Install the zef package manager to manage your Perl 6 modules.
+Install the zef package manager to manage your Raku modules.
 
 By default, Rakudo is built with support for MoarVM. The JVM backend is
-experimental and requires JDK 8.
+experimental and requires a recent JDK.
 
    BACKENDS=moar,jvm ./rakudo.SlackBuild
 
diff --git a/perl/rakudo/doinst.sh b/perl/rakudo/doinst.sh
deleted file mode 100644
index eed6e276bc..0000000000
--- a/perl/rakudo/doinst.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/profile.d/rakudo.csh.new
-config etc/profile.d/rakudo.sh.new
diff --git a/perl/rakudo/rakudo.SlackBuild b/perl/rakudo/rakudo.SlackBuild
index 8ccaec44db..5fdff142a9 100644
--- a/perl/rakudo/rakudo.SlackBuild
+++ b/perl/rakudo/rakudo.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for rakudo
 
-# Copyright 2018 Andreas Voegele <andreas@andreasvoegele.com>
+# Copyright 2020- Michel Begue <mab974@gmail.com>
+# Copyright 2018-2020 Andreas Voegele <andreas@andreasvoegele.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +18,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=rakudo
-VERSION=${VERSION:-2018.12}
+VERSION=${VERSION:-2021.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,46 +66,64 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# The package manager will remove old files.
+sed -i 's/\$cfg->clean_old_p6_libs;//' Configure.pl
+
 perl Configure.pl \
   --prefix=/usr \
   --backends=$BACKENDS
 
 make
 if [ "${MAKETEST:-no}" = "yes" ]; then
-  make test
+  env -u LD_PRELOAD make test
+fi
+env -u LD_PRELOAD make install DESTDIR=$PKG
+
+if [ -e $PKG/usr/bin/rakudo ]; then
+  ln -sf rakudo $PKG/usr/bin/raku
 fi
-make install DESTDIR=$PKG
+
+if [ -e $PKG/usr/bin/rakudo-debug ]; then
+  ln -sf rakudo-debug $PKG/usr/bin/raku-debug
+fi
+
+for i in $PKG/usr/bin/perl6*; do
+  j=$(basename $i | sed 's/perl6/rakudo/')
+  if [ -e $PKG/usr/bin/$j ]; then
+    ln -sf $j $i
+  fi
+done
 
 # Arch Linux uses the name perl6-install-dist.
-cp tools/install-dist.p? $PKG/usr/bin/perl6-install-dist
-chmod 755 $PKG/usr/bin/perl6-install-dist
+cp tools/install-dist.p? $PKG/usr/bin/raku-install-dist
+chmod 755 $PKG/usr/bin/raku-install-dist
+ln -s raku-install-dist $PKG/usr/bin/perl6-install-dist
 
 # Create rakudo.csh and rakudo.sh in /etc/profile.d.
-BINDIRS='$HOME/.perl6/bin:/usr/share/perl6/site/bin:/usr/share/perl6/vendor/bin'
+BINDIRS='$HOME/.raku/bin:/usr/share/perl6/site/bin:/usr/share/perl6/vendor/bin'
 mkdir -p $PKG/etc/profile.d
-cat << EOF > $PKG/etc/profile.d/rakudo.csh.new
+cat << EOF > $PKG/etc/profile.d/rakudo.csh
 #!/bin/csh
 setenv PATH \${PATH}:$BINDIRS
 EOF
-chmod 755 $PKG/etc/profile.d/rakudo.csh.new
-cat << EOF > $PKG/etc/profile.d/rakudo.sh.new
+chmod 755 $PKG/etc/profile.d/rakudo.csh
+cat << EOF > $PKG/etc/profile.d/rakudo.sh
 #!/bin/sh
 export PATH=\$PATH:$BINDIRS
 EOF
-chmod 755 $PKG/etc/profile.d/rakudo.sh.new
+chmod 755 $PKG/etc/profile.d/rakudo.sh
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CREDITS LICENSE README.md \
+  CREDITS LICENSE README.md docs/ChangeLog \
   $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/rakudo/rakudo.info b/perl/rakudo/rakudo.info
index d7ed6fb044..5830a8a4d9 100644
--- a/perl/rakudo/rakudo.info
+++ b/perl/rakudo/rakudo.info
@@ -1,10 +1,10 @@
 PRGNAM="rakudo"
-VERSION="2018.12"
+VERSION="2021.03"
 HOMEPAGE="https://rakudo.org/"
-DOWNLOAD="https://rakudo.org/dl/rakudo/rakudo-2018.12.tar.gz"
-MD5SUM="ebe269dcc8ef3464e9f809bc0f669b29"
+DOWNLOAD="https://github.com/rakudo/rakudo/releases/download/2021.03/rakudo-2021.03.tar.gz"
+MD5SUM="8c7841bcb8e1fc35709458cc99433d9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nqp"
-MAINTAINER="Andreas Voegele"
-EMAIL="andreas@andreasvoegele.com"
+MAINTAINER="Michel Begue"
+EMAIL="mab974@gmail.com"
diff --git a/perl/rakudo/slack-desc b/perl/rakudo/slack-desc
index cf1404e960..2302e01eba 100644
--- a/perl/rakudo/slack-desc
+++ b/perl/rakudo/slack-desc
@@ -6,10 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-rakudo: rakudo (compiler for the Perl 6 programming language)
+rakudo: rakudo (compiler for the Raku programming language)
 rakudo:
-rakudo: Rakudo Perl 6 is a production-ready, stable implementation of the Perl
-rakudo: 6 programming language.
+rakudo: Rakudo is an implementation of the Raku programming language.
 rakudo:
 rakudo: Homepage: https://rakudo.org/
 rakudo:
@@ -17,3 +16,4 @@ rakudo:
 rakudo:
 rakudo:
 rakudo:
+rakudo: