4 files changed, 49 insertions, 41 deletions
diff --git a/academic/R/R.SlackBuild b/academic/R/R.SlackBuild
index b0f8b51812f1..f61baede14a6 100644
--- a/academic/R/R.SlackBuild
+++ b/academic/R/R.SlackBuild
@@ -17,66 +17,68 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
- elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG 
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP || exit 1
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# adjust the path variable; you need pdflatex to build the LaTeX
-# documentation
-PATH=/usr/share/texmf/bin:$PATH
+# Adjust the path variable; you need pdflatex to build the LaTeX documentation
+PATH="$PATH:/usr/share/texmf/bin"
 
-# Set configure options
-# If your app is written in C++, you'll also need to add a line for CXXFLAGS
 CFLAGS="$SLKCFLAGS" \
-  ./configure \
+./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
   --with-perl=/usr/bin/perl \
   --enable-R-shlib \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux 
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
 
 ( cd $PKG
-   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
-mv $PKG/usr/share/man $PKG/usr
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 ) 
 
-mv $PKG/usr/share/info $PKG/usr
-rm -f $PKG/usr/info/dir*
-gzip -9 $PKG/usr/info/*.info*
-rmdir $PKG/usr/share
-
 mkdir -p $PKG/usr/doc
-mv $PKG/usr/lib/R/doc $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/lib${LIBDIRSUFFIX}/R/doc $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL README $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 chown -R root:root $PKG/usr/doc
-( cd $PKG/usr/lib/R ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/R ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
 
 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/R/R.info b/academic/R/R.info
index be724eccf307..0a1e0b316b85 100644
--- a/academic/R/R.info
+++ b/academic/R/R.info
@@ -3,6 +3,8 @@ VERSION="2.9.0"
 HOMEPAGE="http://www.r-project.org"
 DOWNLOAD="http://mirrors.ibiblio.org/pub/mirrors/CRAN/src/base/R-2/R-2.9.0.tar.gz"
 MD5SUM="a5b79a2bc1372136cda4674b5f46d146"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Joel J. Adamson"
 EMAIL="adamsonj@email.unc.edu"
 APPROVED="dsomero"
diff --git a/academic/R/README b/academic/R/README
index 394f8a7c8e58..fa37fc6c1a37 100644
--- a/academic/R/README
+++ b/academic/R/README
@@ -1,12 +1,8 @@
 R Statistical Programming Language <www.r-project.org>
 
-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.
-
-Package built by Joel J. Adamson <sparrow1240@gmail.com>
-on Slackware 12.0
+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.
diff --git a/academic/R/slack-desc b/academic/R/slack-desc
index 47f1ed150315..91511ffa6c2e 100644
--- a/academic/R/slack-desc
+++ b/academic/R/slack-desc
@@ -1,5 +1,13 @@
+# 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
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
 R: R Statistical Programming Language <www.r-project.org>
-R: 
+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 (formerly
@@ -7,5 +15,5 @@ R: AT&T, now Lucent Technologies) by John Chambers and colleagues. R
 R: can be considered as a different implementation of S. There are
 R: some important differences, but much code written for S runs
 R: unaltered under R.
-R: 
-R: Package built by Joel J. Adamson <sparrow1240@gmail.com>
+R:
+R: