4 files changed, 28 insertions, 26 deletions
diff --git a/network/js/README b/network/js/README
index 9842a83b18..ace5020d4b 100644
--- a/network/js/README
+++ b/network/js/README
@@ -1,4 +1,4 @@
-js (SpiderMonkey, Mozilla's JavaScript Engine)
+SpiderMonkey, Mozilla's JavaScript Engine
 
 SpiderMonkey is the code-name for the Mozilla's C implementation of
 JavaScript. It can be used by applications such as elinks and others.
@@ -6,4 +6,4 @@ JavaScript. It can be used by applications such as elinks and others.
 This is the standalone version of the engine used by Firefox and other
 Mozilla applications.
 
-See /usr/doc/spidermonkey-1.7.0/README.html for examples.
+See README.html in the package's documentation directory for examples.
diff --git a/network/js/js.SlackBuild b/network/js/js.SlackBuild
index aebc298c0e..a898e1e4f8 100644
--- a/network/js/js.SlackBuild
+++ b/network/js/js.SlackBuild
@@ -10,11 +10,13 @@
 # me if you make any nice improvements.
 
 PRGNAM=js
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.8.0_rc1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRC_VERSION=$(echo $VERSION | tr _ -)
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -22,22 +24,28 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
-set -e # Exit on most errors
+CFLAGS="$SLKCFLAGS" 
+CXXFLAGS="$SLKCFLAGS" 
+XLDFLAGS="-s" 
+OPTIMIZER="$SLKCFLAGS"
 
-SOURCE=$TMP/$PRGNAM # For convenience
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SOURCE
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $SOURCE
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
+cd $PRGNAM
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 find . \
@@ -46,20 +54,16 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Dynamic linking patch
 patch -p1 < $CWD/dynamic-link.patch
 
-# Set some flags
-CFLAGS="$SLKCFLAGS"  ; export CFLAGS
-CXXFLAGS="$SLKCFLAGS"  ; export CXXFLAGS
-XLDFLAGS="-s" ; export XLDFLAGS
-OPTIMIZER="$SLKCFLAGS" ; export OPTIMIZER
-
 cd src
 gmake -f Makefile.ref all export BUILD_OPT=1
+
 mv -v ../../dist $PKG/usr
 
-unset CFLAGS CXXFLAGS XLDFLAGS OPTIMIZER
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp ../README README.html $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -68,12 +72,8 @@ unset CFLAGS CXXFLAGS XLDFLAGS OPTIMIZER
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp ../README README.html $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
 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/network/js/js.info b/network/js/js.info
index b20e94c57a..e9043847ee 100644
--- a/network/js/js.info
+++ b/network/js/js.info
@@ -1,8 +1,10 @@
 PRGNAM="js"
-VERSION="1.7.0"
+VERSION="1.8.0_rc1"
 HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-DOWNLOAD="http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz"
-MD5SUM="5571134c3863686b623ebe4e6b1f6fe6"
+DOWNLOAD="http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz"
+MD5SUM="eaad8815dcc66a717ddb87e9724d964e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"
 EMAIL="dave@unrealize.co.uk"
 APPROVED="rworkman"
diff --git a/network/js/slack-desc b/network/js/slack-desc
index b4c9fd547d..9727f550e2 100644
--- a/network/js/slack-desc
+++ b/network/js/slack-desc
@@ -5,8 +5,8 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-  |-----handy-ruler-------------------------------------------------------|
-js: SpiderMonkey, Mozilla's JavaScript Engine
+  |-----handy-ruler------------------------------------------------------|
+js: SpiderMonkey (Mozilla's JavaScript Engine)
 js:
 js: SpiderMonkey is the code-name for the Mozilla's C implementation of
 js: JavaScript. It can be used by applications such as elinks and others.