r: 4.0.5 -> 4.1.0

3 files changed, 24 insertions, 17 deletions

diff --git a/r/.footprint b/r/.footprint
index 3d9685b5a..d45985b01 100644
--- a/r/.footprint
+++ b/r/.footprint
@@ -276,6 +276,7 @@ drwxr-xr-x	root/root	usr/lib/R/library/Matrix/external/
 -rw-r--r--	root/root	usr/lib/R/library/Matrix/external/KNex_slots.rda
 -rw-r--r--	root/root	usr/lib/R/library/Matrix/external/USCounties_slots.rda
 -rw-r--r--	root/root	usr/lib/R/library/Matrix/external/Z_NA_rnk.rds
+-rw-r--r--	root/root	usr/lib/R/library/Matrix/external/jgl009.mtx
 -rw-r--r--	root/root	usr/lib/R/library/Matrix/external/lund_a.mtx
 -rw-r--r--	root/root	usr/lib/R/library/Matrix/external/lund_a.rsa
 -rw-r--r--	root/root	usr/lib/R/library/Matrix/external/pores_1.mtx
@@ -304,7 +305,9 @@ drwxr-xr-x	root/root	usr/lib/R/library/Matrix/po/
 drwxr-xr-x	root/root	usr/lib/R/library/Matrix/po/de/
 drwxr-xr-x	root/root	usr/lib/R/library/Matrix/po/en@quot/
 drwxr-xr-x	root/root	usr/lib/R/library/Matrix/po/fr/
+drwxr-xr-x	root/root	usr/lib/R/library/Matrix/po/it/
 drwxr-xr-x	root/root	usr/lib/R/library/Matrix/po/ko/
+drwxr-xr-x	root/root	usr/lib/R/library/Matrix/po/lt/
 drwxr-xr-x	root/root	usr/lib/R/library/Matrix/po/pl/
 -rw-r--r--	root/root	usr/lib/R/library/Matrix/test-tools-1.R
 -rw-r--r--	root/root	usr/lib/R/library/Matrix/test-tools-Matrix.R
@@ -450,6 +453,7 @@ drwxr-xr-x	root/root	usr/lib/R/library/cluster/po/en@quot/
 drwxr-xr-x	root/root	usr/lib/R/library/cluster/po/fr/
 drwxr-xr-x	root/root	usr/lib/R/library/cluster/po/it/
 drwxr-xr-x	root/root	usr/lib/R/library/cluster/po/ko/
+drwxr-xr-x	root/root	usr/lib/R/library/cluster/po/lt/
 drwxr-xr-x	root/root	usr/lib/R/library/cluster/po/pl/
 -rw-r--r--	root/root	usr/lib/R/library/cluster/test-tools.R
 drwxr-xr-x	root/root	usr/lib/R/library/codetools/
@@ -836,6 +840,7 @@ drwxr-xr-x	root/root	usr/lib/R/library/lattice/po/
 drwxr-xr-x	root/root	usr/lib/R/library/lattice/po/de/
 drwxr-xr-x	root/root	usr/lib/R/library/lattice/po/en@quot/
 drwxr-xr-x	root/root	usr/lib/R/library/lattice/po/fr/
+drwxr-xr-x	root/root	usr/lib/R/library/lattice/po/it/
 drwxr-xr-x	root/root	usr/lib/R/library/lattice/po/ko/
 drwxr-xr-x	root/root	usr/lib/R/library/lattice/po/pl/
 drwxr-xr-x	root/root	usr/lib/R/library/methods/
@@ -899,6 +904,7 @@ drwxr-xr-x	root/root	usr/lib/R/library/mgcv/po/
 drwxr-xr-x	root/root	usr/lib/R/library/mgcv/po/de/
 drwxr-xr-x	root/root	usr/lib/R/library/mgcv/po/en@quot/
 drwxr-xr-x	root/root	usr/lib/R/library/mgcv/po/fr/
+drwxr-xr-x	root/root	usr/lib/R/library/mgcv/po/it/
 drwxr-xr-x	root/root	usr/lib/R/library/mgcv/po/ko/
 drwxr-xr-x	root/root	usr/lib/R/library/mgcv/po/pl/
 drwxr-xr-x	root/root	usr/lib/R/library/nlme/
@@ -1362,6 +1368,7 @@ drwxr-xr-x	root/root	usr/lib/R/library/translations/fr/
 drwxr-xr-x	root/root	usr/lib/R/library/translations/it/
 drwxr-xr-x	root/root	usr/lib/R/library/translations/ja/
 drwxr-xr-x	root/root	usr/lib/R/library/translations/ko/
+drwxr-xr-x	root/root	usr/lib/R/library/translations/lt/
 drwxr-xr-x	root/root	usr/lib/R/library/translations/nn/
 drwxr-xr-x	root/root	usr/lib/R/library/translations/pl/
 drwxr-xr-x	root/root	usr/lib/R/library/translations/pt_BR/
diff --git a/r/.signature b/r/.signature
index 1f3662796..17e65ff11 100644
--- a/r/.signature
+++ b/r/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31Rl6llivc6pixk3CwMpKVlm6GFlmrTmya+AASJHhuMLCUa9bpqwBhcXMsq7BKEOBuo0OrPHEibao06ElQcpug4=
-SHA256 (Pkgfile) = 2ee194d5580421a05d8d8d47f28bedaa6c52b148ecad615556135d5c098e5dd5
-SHA256 (.footprint) = 622a98e00876cad4776c1e305877c31a013ee2f9e040e155faae2a3b5eb78561
-SHA256 (R-4.0.5.tar.gz) = 0a3ee079aa772e131fe5435311ab627fcbccb5a50cabc54292e6f62046f1ffef
+RWSagIOpLGJF3+612x3Ok9IodpVaKTUBg24pcSQmRbmc8qZlOYgZ6SSXW1c6aWq9sDxiM9RE7pz9jir0Sb9jW1RvJ3JHhxIDQgc=
+SHA256 (Pkgfile) = f73d8f07b7672ac415b3b1b93f2d33ba68feb90f83c696da64d0732ee64fee9a
+SHA256 (.footprint) = dfe89ecde07aa855511ee4ccf6604aa98475e116196ac79d7a9139f4030d2a4c
+SHA256 (R-4.1.0.tar.gz) = e8e68959d7282ca147360fc9644ada9bd161bab781bab14d33b8999a95182781
 SHA256 (r.desktop) = 25b01ea93fa704884b65ba002d44d4e99725bd826997e8c73b6467df9f23c798
 SHA256 (r.png) = 465b623f15d8144fb30b52791047a22302c275d51f749d8732454e4496c1a989
 SHA256 (R.conf) = 01057f4dd3d0eca3e31090b2793ab17ed6648501513f6cfea36a0c609a55ac5e
diff --git a/r/Pkgfile b/r/Pkgfile
index 686e4b679..7a090640b 100644
--- a/r/Pkgfile
+++ b/r/Pkgfile
@@ -5,9 +5,9 @@
 # Optional: lapack openjdk8 texlive tk
 
 name=r
-version=4.0.5
+version=4.1.0
 release=1
-source=(https://cran.r-project.org/src/base/R-4/R-$version.tar.gz
+source=(https://cran.r-project.org/src/base/R-${version::1}/R-$version.tar.gz
   r.desktop r.png R.conf
   R-3.4.1-parallel.patch R-3.4.1-rmath-shared.patch
   R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch)
@@ -21,8 +21,8 @@ build() {
   patch -Np1 -i $SRC/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
 
   # configuring R
-  [[ -e /usr/lib/pkgconfig/tk.pc ]] && PKGMK_R+=" --with-x=yes" || PKGMK_R+=" --with-x=no"
-  [[ -e /usr/lib/pkgconfig/lapack.pc ]] && PKGMK_R+=" --with-lapack LAPACK_LIBS=$(pkg-config --libs lapack)"
+  prt-get isinst tk && PKGMK_R+=" --with-x=yes" || PKGMK_R+=" --with-x=no"
+  prt-get isinst lapack && PKGMK_R+=" --with-lapack LAPACK_LIBS=$(pkg-config --libs lapack)"
   # this needs a properly working java environment!
   [[ -e $(whereis javac) ]] && PKGMK_R+=" --enable-java" || PKGMK_R+=" --disable-java"
 
@@ -66,21 +66,21 @@ build() {
   #popd
 
   sed -i "s|$PKG ||" "$PKG/usr/bin/R"
-  rm "$PKG/usr/lib/R/bin/R"
-  cd "$PKG/usr/lib/R/bin"
+  rm $PKG/usr/lib/R/bin/R
+  cd $PKG/usr/lib/R/bin
   ln -s ../../../bin/R
 
-  install -Dm644 "$SRC/r.desktop" \
-    "$PKG/usr/share/applications/r.desktop"
-  install -Dm644 "$SRC/r.png" \
-    "$PKG/usr/share/pixmaps/r.png"
-  install -Dm644 "$SRC/R.conf" \
-    "$PKG/etc/ld.so.conf.d/R.conf"
+  install -Dm644 $SRC/r.desktop \
+    $PKG/usr/share/applications/r.desktop
+  install -Dm644 $SRC/r.png \
+    $PKG/usr/share/pixmaps/r.png
+  install -Dm644 $SRC/R.conf \
+    $PKG/etc/ld.so.conf.d/R.conf
 
   install -d $PKG/etc/R
   cd $PKG/usr/lib/R/etc
   for i in *; do
-    mv -f ${i} $PKG/etc/R
+    mv -f $i $PKG/etc/R
     ln -s /etc/R/$i $i
   done