Spidermonkey: use official versioned tarball

1 files changed, 17 insertions, 18 deletions

diff --git a/Library/Formula/spidermonkey.rb b/Library/Formula/spidermonkey.rb
index 7ef6b9dbc..dd52827ea 100644
--- a/Library/Formula/spidermonkey.rb
+++ b/Library/Formula/spidermonkey.rb
@@ -1,22 +1,21 @@
 require 'formula'
 
+# Private older version of autoconf required to compile Spidermonkey
+class Autoconf213 < Formula
+  url 'http://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.13.tar.gz'
+  md5 '9de56d4a161a723228220b0f425dc711'
+  homepage 'http://www.gnu.org/software/autoconf/'
+end
+
 class Spidermonkey < Formula
-  # There are no proper releases of spidermonkey, so pick a version that's known
-  # to work (especially with CouchDB), revision r35345.
-  url 'http://hg.mozilla.org/tracemonkey/archive/57a6ad20eae9.tar.gz'
   homepage 'https://developer.mozilla.org/en/SpiderMonkey'
-  md5 '2d8cf22da82b30c36f47675a8486a3f3'
+  url 'http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz'
+  md5 'a4574365938222adca0a6bd33329cb32'
   version '1.8.5'
 
   depends_on 'readline'
   depends_on 'nspr'
 
-  def patches
-    # Export date functions needed by manually-compiled MongoDB.
-    # Is it just me or is the version-to-version stable API of SpiderMonkey kind of a mess?
-    "https://gist.github.com/raw/426476/a98a15a94ca4efd3aeafb3b5cd943491b53cbf81/001-Properly-export-js_DateClass-and-js_RegExpClass.patch"
-  end
-
   def install
     # aparently this flag causes the build to fail for ivanvc on 10.5 with a
     # penryn (core 2 duo) CPU. So lets be cautious here and remove it.
@@ -25,7 +24,7 @@ class Spidermonkey < Formula
     # For some reason SpiderMonkey requires Autoconf-2.13
     ac213_prefix = Pathname.pwd.join('ac213')
     Autoconf213.new.brew do |f|
-      # probably no longer required, see issue #751
+      # Force use of plain "awk"
       inreplace 'configure', 'for ac_prog in mawk gawk nawk awk', 'for ac_prog in awk'
 
       system "./configure", "--disable-debug",
@@ -55,19 +54,19 @@ class Spidermonkey < Formula
                                     "--with-system-nspr"
 
       inreplace "js-config", /JS_CONFIG_LIBS=.*?$/, "JS_CONFIG_LIBS=''"
-      # Can't do `make install` right off the bat sadly
+      # These need to be in separate steps.
       system "make"
       system "make install"
 
-      # The `js` binary ins't installed. Lets do that too, eh?
+      # Also install js REPL.
       bin.install "shell/js"
     end
   end
-end
 
+  def caveats; <<-EOS.undent
+    This formula installs Spidermonkey 1.8.5.
 
-class Autoconf213 < Formula
-  url 'http://ftp.gnu.org/pub/gnu/autoconf/autoconf-2.13.tar.gz'
-  md5 '9de56d4a161a723228220b0f425dc711'
-  homepage 'http://www.gnu.org/software/autoconf/'
+    If you are trying to compile MongoDB from scratch, you will need 1.7.x instead.
+    EOS
+  end
 end