From 4d964b592ecd8d1756ef559ed7f0f205eaf57b3a Mon Sep 17 00:00:00 2001
From: melikamp <melikamp@melikamp.net>
Date: Thu, 9 Mar 2017 12:20:16 +0000
Subject: academic/R: Updated for version 3.3.3.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 academic/R/R.SlackBuild | 13 +++++++------
 academic/R/R.info       |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'academic/R')

diff --git a/academic/R/R.SlackBuild b/academic/R/R.SlackBuild
index f8028e9e9f07..f7f05cba344d 100644
--- a/academic/R/R.SlackBuild
+++ b/academic/R/R.SlackBuild
@@ -2,8 +2,8 @@
 
 # SlackBuild script for R
 
-# Copyright 2014 melikamp, Andrew Rowland. (Contributors are listed in
-# order of first participation.)
+# Copyright 2014-2017 melikamp, Andrew Rowland. (Contributors are
+# listed in order of first participation.)
 
 # 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,7 +24,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=R
-VERSION=${VERSION:-3.3.1}
+VERSION=${VERSION:-3.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,7 +41,7 @@ fi
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -52,8 +52,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -96,6 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install DESTDIR=$PKG
+make install-tests DESTDIR=$PKG
 
 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
diff --git a/academic/R/R.info b/academic/R/R.info
index 70c36f106df6..fefb376dd358 100644
--- a/academic/R/R.info
+++ b/academic/R/R.info
@@ -1,8 +1,8 @@
 PRGNAM="R"
-VERSION="3.3.1"
+VERSION="3.3.3"
 HOMEPAGE="http://www.r-project.org/"
-DOWNLOAD="http://ftp.osuosl.org/pub/cran/src/base/R-3/R-3.3.1.tar.gz"
-MD5SUM="f50a659738b73036e2f5635adbd229c5"
+DOWNLOAD="http://ftp.osuosl.org/pub/cran/src/base/R-3/R-3.3.3.tar.gz"
+MD5SUM="0ac211ec15e813a24f8f4a5a634029a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3