summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2007-12-01 10:18:18 -0800
committerEric Sandall2007-12-01 10:22:08 -0800
commitc266ba49cda82e3da90b3c951b9ab3a1ed7bfa3e (patch)
tree9dc13ddd676b2634e263f2f18bcd1e86d2163cb6
parent386a69fe0d904a7a2466f15dbc51508bc327e990 (diff)
r: Updated to 2.6.1
-rwxr-xr-xscience/r/DETAILS4
-rw-r--r--science/r/HISTORY5
-rwxr-xr-xscience/r/INSTALL14
-rw-r--r--science/r/R-2.4.1.tar.gz.sigbin152 -> 0 bytes
-rw-r--r--science/r/R-2.6.1.tar.gz.sigbin0 -> 280 bytes
5 files changed, 19 insertions, 4 deletions
diff --git a/science/r/DETAILS b/science/r/DETAILS
index a398d83fd7..736ec3bcbe 100755
--- a/science/r/DETAILS
+++ b/science/r/DETAILS
@@ -1,13 +1,13 @@
SPELL=r
- VERSION=2.4.1
+ VERSION=2.6.1
SOURCE=R-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/R-$VERSION
SOURCE_URL[0]=http://cran.r-project.org/src/base/R-2/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
WEB_SITE=http://www.r-project.org/
- ENTERED=20020803
KEYWORDS="science"
+ ENTERED=20020803
SHORT='R is "GNU S", a freely available language'
cat << EOF
R is "GNU S" - A language and environment for statistical computing and
diff --git a/science/r/HISTORY b/science/r/HISTORY
index 80d9d38dba..4db675a536 100644
--- a/science/r/HISTORY
+++ b/science/r/HISTORY
@@ -1,3 +1,8 @@
+2007-12-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 2.6.1
+ * INSTALL: x86_64 also needs doc and doc/html created before install
+ Also create doc/manual and doc/html/search
+
2007-01-29 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DETAILS: updated spell to 2.4.1
diff --git a/science/r/INSTALL b/science/r/INSTALL
index 5cc8cea7e8..580e9cda9d 100755
--- a/science/r/INSTALL
+++ b/science/r/INSTALL
@@ -1,3 +1,13 @@
-install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib/R/doc &&
-install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib/R/doc/html &&
+install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib/R/doc &&
+install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib/R/doc/html &&
+install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib/R/doc/html/search &&
+install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib/R/doc/manual &&
+
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib64/R/doc &&
+ install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib64/R/doc/html &&
+ install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib64/R/doc/html/search &&
+ install -d -m 0755 -o root -g root $INSTALL_ROOT/usr/lib64/R/doc/manual
+fi &&
+
default_install
diff --git a/science/r/R-2.4.1.tar.gz.sig b/science/r/R-2.4.1.tar.gz.sig
deleted file mode 100644
index 9d4d87084e..0000000000
--- a/science/r/R-2.4.1.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/science/r/R-2.6.1.tar.gz.sig b/science/r/R-2.6.1.tar.gz.sig
new file mode 100644
index 0000000000..ab8106a54e
--- /dev/null
+++ b/science/r/R-2.6.1.tar.gz.sig
Binary files differ