4 files changed, 35 insertions, 34 deletions
diff --git a/academic/R/R.SlackBuild b/academic/R/R.SlackBuild
index 6fb687f83a..97b5d3a22b 100644
--- a/academic/R/R.SlackBuild
+++ b/academic/R/R.SlackBuild
@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild script for R
 
-# Copyright 2019 Andrew Payne, Boston, MA <phalange@komputermatrix.com>
-# Copyright 2014-2017 melikamp, Andrew Rowland. (Contributors are
-# listed in order of first participation.)
+# Copyright 2019-2022 Andrew Payne <phalange@komputermatrix.com>
+# Copyright 2014-2017 melikamp, Andrew Rowland
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,10 +23,13 @@
 # with this program (most likely, a file named COPYING).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=R
-VERSION=${VERSION:-3.6.2}
+VERSION=${VERSION:-4.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ "${R_SHLIB:-yes}" = "yes" ]; then
   r_shlib="--enable-R-shlib"
@@ -48,7 +50,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+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}
@@ -73,7 +82,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -106,10 +115,12 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a {COPYING,INSTALL,README,SVN-REVISION,VERSION,VERSION-NICK} \
+  $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
diff --git a/academic/R/R.info b/academic/R/R.info
index 9ce4d10cd4..6c12168093 100644
--- a/academic/R/R.info
+++ b/academic/R/R.info
@@ -1,8 +1,8 @@
 PRGNAM="R"
-VERSION="3.6.2"
-HOMEPAGE="http://www.r-project.org/"
-DOWNLOAD="https://cran.r-project.org/src/base/R-3/R-3.6.2.tar.gz"
-MD5SUM="90d23d138cee26d275da14b58296e521"
+VERSION="4.4.0"
+HOMEPAGE="https://www.r-project.org/"
+DOWNLOAD="https://cran.r-project.org/src/base/R-4/R-4.4.0.tar.xz"
+MD5SUM="647ef3e012e9cf36a187db64a6082217"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/R/README b/academic/R/README
index cdd9f7dbd6..0ebd1faa48 100644
--- a/academic/R/README
+++ b/academic/R/README
@@ -1,20 +1,10 @@
-R is an integrated suite of software facilities for data manipulation,
-calculation and graphical display. It includes
-
-* an effective data handling and storage facility,
-
-* a suite of operators for calculations on arrays, in particular
-matrices,
-
-* a large, coherent, integrated collection of intermediate tools for
-data analysis,
-
-* graphical facilities for data analysis and display either on-screen
-or on hardcopy, and
-
-* a well-developed, simple and effective programming language which
-includes conditionals, loops, user-defined recursive functions and
-input and output facilities.
+R is a language and environment for statistical computing and
+graphics. It is a GNU project which is similar to the S language and
+environment which was developed at Bell Laboratories (formerly AT&T,
+now Lucent Technologies) by John Chambers and colleagues. R can be
+considered as a different implementation of S. There are some
+important differences, but much code written for S runs unaltered
+under R.
 
 Notes:
 
diff --git a/academic/R/slack-desc b/academic/R/slack-desc
index f6e2acfb82..bbc419bba3 100644
--- a/academic/R/slack-desc
+++ b/academic/R/slack-desc
@@ -9,11 +9,11 @@
 R: R (language and environment for statistical computing)
 R:
 R: R is a language and environment for statistical computing and
-R: graphics. It is a GNU project which is similar to the S language
-R: and environment which was developed at Bell Laboratories
-R: by John Chambers and colleagues. R can be considered as a
-R: different implementation of S. There are some important
-R: differences, but much code written for S runs unaltered under R.
+R: graphics. It is a GNU project which is similar to the S language and
+R: environment which was developed at Bell Laboratories (formerly AT&T,
+R: now Lucent Technologies) by John Chambers and colleagues.
+R:
+R:
 R:
 R: Homepage: https://www.r-project.org/
 R: