spidermonkey: => 1.8.5

5 files changed, 45 insertions, 18 deletions

diff --git a/devel/spidermonkey/BUILD b/devel/spidermonkey/BUILD
index c8f60b45ac..21abbe2161 100755
--- a/devel/spidermonkey/BUILD
+++ b/devel/spidermonkey/BUILD
@@ -1,5 +1,14 @@
-cd src &&
+cd js/src &&
 
-make_single &&
-make -f Makefile.ref BUILD_OPT=1 &&
-make_normal
+CFLAGS="-DJS_C_STRINGS_ARE_UTF8 $CFLAGS" &&
+
+#
+# Only strip if the user wants us to
+#
+if echo $LDFLAGS | grep -q -- '-s'; then
+  OPTS="--enable-strip $OPTS"
+else
+  OPTS="--disable-strip $OPTS"
+fi &&
+
+default_build
diff --git a/devel/spidermonkey/DEPENDS b/devel/spidermonkey/DEPENDS
new file mode 100755
index 0000000000..e210e76971
--- /dev/null
+++ b/devel/spidermonkey/DEPENDS
@@ -0,0 +1,14 @@
+optional_depends nspr \
+                 "--with-system-nspr" \
+                 "--without-system-nspr" \
+                 "to use system NSPR library" &&
+
+optional_depends valgrind \
+                 "--enable-valgrind" \
+                 "--disable-valgrind" \
+                 "to enable Valgrind integration hooks" &&
+
+optional_depends readline \
+                 "--enable-readline" \
+                 "--disable-readline" \
+                 "for linking js shell to system readline library"
diff --git a/devel/spidermonkey/DETAILS b/devel/spidermonkey/DETAILS
index b164d0df87..293163dbc0 100755
--- a/devel/spidermonkey/DETAILS
+++ b/devel/spidermonkey/DETAILS
@@ -1,9 +1,9 @@
            SPELL=spidermonkey
-         VERSION=1.8.0-rc1
-          SOURCE=js-$VERSION.tar.gz
+         VERSION=1.8.5
+          SOURCE=js${VERSION//.}-1.0.0.tar.gz
    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/js/$SOURCE
-     SOURCE_HASH=sha512:b6e851d96cc3b5a10c3fc531922e8ba59c28e587c72365b63c3a0ab65a400cb24a217310dc9891387c02b79eb5f159e9b3d9bab36ce138257815b11d0524d5ba
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/js
+     SOURCE_HASH=sha512:2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/js-$VERSION"
         WEB_SITE=http://www.mozilla.org/js/spidermonkey/
       LICENSE[0]=MPL
          ENTERED=20071027
diff --git a/devel/spidermonkey/HISTORY b/devel/spidermonkey/HISTORY
index 7458f3dca3..3704d951d1 100644
--- a/devel/spidermonkey/HISTORY
+++ b/devel/spidermonkey/HISTORY
@@ -1,3 +1,11 @@
+2011-07-02 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS, BUILD, INSTALL: updated spell to 1.8.5
+	* DEPENDS: added, for missing dependencies
+
+2010-12-07 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* BUILD: added utf-8 support
+
 2010-05-01 Arjan Bouter <abouter@sourcemage.org>
 	* DETAILS: version 1.8.0-rc1
 
diff --git a/devel/spidermonkey/INSTALL b/devel/spidermonkey/INSTALL
index c0bc37d6cb..95f0f60dbb 100755
--- a/devel/spidermonkey/INSTALL
+++ b/devel/spidermonkey/INSTALL
@@ -1,14 +1,10 @@
-local BUILD_DIR=Linux_All_OPT.OBJ &&
+default_install &&
 
-for i in js jscpucfg jskwgen; do
-  install -vm 755 $BUILD_DIR/$i $INSTALL_ROOT/usr/bin
-done &&
+cd "$SOURCE_DIRECTORY/js/src" &&
 
-install -vm 644 $BUILD_DIR/libjs.so $INSTALL_ROOT/usr/lib/libjs.so.${VERSION:0:3} &&
-ln -vsf libjs.so.${VERSION:0:3} $INSTALL_ROOT/usr/lib/libjs.so.${VERSION:0:1} &&
-ln -vsf libjs.so.${VERSION:0:3} $INSTALL_ROOT/usr/lib/libjs.so &&
+install -vm 755 shell/js jscpucfg "$INSTALL_ROOT/usr/bin" &&
 
-install -vm 644 $BUILD_DIR/libjs.a $INSTALL_ROOT/usr/lib &&
+ln -vsf "$TRACK_ROOT/usr/lib/libmozjs${VERSION//.}.so" \
+        "$INSTALL_ROOT/usr/lib/libjs.so" &&
 
-install -vm 755 -d $INSTALL_ROOT/usr/include/js &&
-install -vm 644 *.h *.tbl *.msg $BUILD_DIR/*.h $INSTALL_ROOT/usr/include/js
+ln -vsf "$TRACK_ROOT/usr/lib/libmozjs185-1.0.a" "$INSTALL_ROOT/usr/lib/libjs.a"