aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--academic/R/R.SlackBuild6
-rw-r--r--academic/R/R.info6
-rw-r--r--academic/R/extern.patch12
-rw-r--r--academic/R/slack-desc8
4 files changed, 9 insertions, 23 deletions
diff --git a/academic/R/R.SlackBuild b/academic/R/R.SlackBuild
index e684e41daecff..754648510d842 100644
--- a/academic/R/R.SlackBuild
+++ b/academic/R/R.SlackBuild
@@ -24,8 +24,8 @@
# <http://www.gnu.org/licenses/>.
PRGNAM=R
-VERSION=${VERSION:-3.2.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.2.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ "${R_SHLIB:-yes}" = "yes" ]; then
@@ -81,8 +81,6 @@ 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 {} \;
-patch -p0 < $CWD/extern.patch
-
CFLAG="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/academic/R/R.info b/academic/R/R.info
index d48113de7d6a1..73cd44090205c 100644
--- a/academic/R/R.info
+++ b/academic/R/R.info
@@ -1,8 +1,8 @@
PRGNAM="R"
-VERSION="3.2.0"
+VERSION="3.2.1"
HOMEPAGE="http://www.r-project.org/"
-DOWNLOAD="http://ftp.osuosl.org/pub/cran/src/base/R-3/R-3.2.0.tar.gz"
-MD5SUM="66fa17ad457d7e618191aa0f52fc402e"
+DOWNLOAD="http://ftp.osuosl.org/pub/cran/src/base/R-3/R-3.2.1.tar.gz"
+MD5SUM="c2aac8b40f84e08e7f8c9068de9239a3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/academic/R/extern.patch b/academic/R/extern.patch
deleted file mode 100644
index e1c67945ad88d..0000000000000
--- a/academic/R/extern.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/include/Rinterface.h (revision 66251)
-+++ src/include/Rinterface.h (working copy)
-@@ -84,7 +84,7 @@
- void fpu_setup(Rboolean);
-
- /* in unix/system.c */
--int R_running_as_main_program;
-+extern int R_running_as_main_program;
-
- #ifdef CSTACK_DEFNS
- /* duplicating Defn.h */
-
diff --git a/academic/R/slack-desc b/academic/R/slack-desc
index 0d2de38c47e4a..72eee37f817fd 100644
--- a/academic/R/slack-desc
+++ b/academic/R/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|