3 files changed, 10 insertions, 8 deletions
diff --git a/libraries/rhino/README b/libraries/rhino/README
index 9d2a0a93f5ab6..9c52471b9e8ea 100644
--- a/libraries/rhino/README
+++ b/libraries/rhino/README
@@ -2,4 +2,4 @@ Rhino is an open-source implementation of JavaScript written entirely in
 Java. It is typically embedded into Java applications to provide scripting
 to end users.
 
-This package includes javadoc and example.zip in /usr/doc/rhino-$VERSION
+This package includes javadoc and example.zip in /usr/doc/rhino-1_R2
diff --git a/libraries/rhino/rhino.SlackBuild b/libraries/rhino/rhino.SlackBuild
index 37cf5f432d50c..6d5f67f9f1952 100644
--- a/libraries/rhino/rhino.SlackBuild
+++ b/libraries/rhino/rhino.SlackBuild
@@ -3,8 +3,6 @@
 # Slackware build script for rhino
 # Written by Vincent Batts, vbatts@hashbangbash.com
 
-set -e
-
 PRGNAM=rhino
 VERSION=1_7R2
 ARCH=${ARCH:-i486}
@@ -16,7 +14,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-ANT_HOME=${ANT_HOME:-/usr/share/ant}
+ANTHOME="/usr/share/ant"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -29,6 +27,8 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -37,11 +37,11 @@ unzip $CWD/${PRGNAM}${VERSION}.zip
 cd ${PRGNAM}${VERSION}
 chown -R root:root .
 
-mkdir -p $PKG/$ANT_HOME/lib/ $PKG/usr/share/java
-cp js.jar $PKG/$ANT_HOME/lib/$PRGNAM.jar
+mkdir -p $PKG/$ANTHOME/lib/ $PKG/usr/share/java
+cp js.jar $PKG/$ANTHOME/lib/$PRGNAM.jar
 
 cd $PKG/usr/share/java
-  ln -s ../../../$ANT_HOME/lib/$PRGNAM.jar
+  ln -s ../../../$ANTHOME/lib/$PRGNAM.jar
 cd -
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -53,4 +53,4 @@ 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/libraries/rhino/rhino.info b/libraries/rhino/rhino.info
index f696666ed708b..6bb3b0f0b576a 100644
--- a/libraries/rhino/rhino.info
+++ b/libraries/rhino/rhino.info
@@ -2,7 +2,9 @@ PRGNAM="rhino"
 VERSION="1_R2"
 HOMEPAGE="http://www.mozilla.org/rhino/"
 DOWNLOAD="ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip"
+DOWNLOAD_x86_64=""
 MD5SUM="40d0a9abec8169e42920214b37fa8e0e"
+MD5SUM_x86_64=""
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
 APPROVED="dsomero"