Update spidermonkey to 1.9.3

* Use a stable tarball on Google Code instead of an hg revision
* Update to 1.9.3 to stop getting compile errors on 64-bit OS X
* autoconf 2.1.3 apparently no longer needed

1 files changed, 14 insertions, 45 deletions

diff --git a/Library/Formula/spidermonkey.rb b/Library/Formula/spidermonkey.rb
index 2d47fe5f1..6f42d1dc3 100644
--- a/Library/Formula/spidermonkey.rb
+++ b/Library/Formula/spidermonkey.rb
@@ -1,16 +1,12 @@
 require 'formula'
 
-class Spidermonkey <Formula  
-  # There are no proper releases of spidermonkey. So pick a specific/constant
-  # revision:  r35345
-  url 'http://hg.mozilla.org/tracemonkey/archive/57a6ad20eae9.tar.gz'
-  md5 '4a143399f69d6509bd980073096af6d4'
-
-  version '1.9.2'
-
+class Spidermonkey <Formula
+  # Use a 3rd party tarball, since Mozilla hasn't made a stable one since version 1.7
+  # Use 1.9.3 for proper x64 support on OS X.
+  url 'http://packaging-spidermonkey.googlecode.com/files/libmozjs-1.9.3-1.5.tar.bz2'
   homepage 'https://developer.mozilla.org/en/SpiderMonkey'
-
-  head 'hg://http://hg.mozilla.org/tracemonkey'
+  sha1 '6ab671497497da12f0a17790b19a1d2d487d3c63'
+  version '1.9.3'
 
   depends_on 'readline'
   depends_on 'nspr'
@@ -23,35 +19,16 @@ class Spidermonkey <Formula
       ENV['CFLAGS'] = ENV['CFLAGS'].gsub(/-msse[^\s]+/, '')
     end
 
-    # For some reason SpiderMonkey requires Autoconf-2.13
-    ac213_prefix = Pathname.pwd.join('ac213').to_s
-    Autoconf213.new.brew do |f|
-      # probably no longer required, see issue #751
-      inreplace 'configure', 'for ac_prog in mawk gawk nawk awk', 'for ac_prog in awk'
-
-      system "./configure", "--disable-debug", 
-                            "--program-suffix=213",
-                            "--prefix=#{ac213_prefix}"
-      system "make install"
-    end
-
-    Dir.chdir "js/src" do
-      # Fixes a bug with linking against CoreFoundation. Tests all pass after
-      # building like this. See: http://openradar.appspot.com/7209349
-      inreplace "configure.in", "LDFLAGS=\"$LDFLAGS -framework Cocoa\"", ""
-      system "#{ac213_prefix}/bin/autoconf213"
-      # Remove the broken *(for anyone but FF) install_name
-      inreplace "config/rules.mk", "-install_name @executable_path/$(SHARED_LIBRARY) ", ""
-    end
-
-    FileUtils.mkdir "brew-build";
+    # Remove the broken *(for anyone but FF) install_name
+    inreplace "config/rules.mk", "-install_name @executable_path/$(SHARED_LIBRARY) ", ""
 
+    mkdir "brew-build"
     Dir.chdir "brew-build" do
-      system "../js/src/configure", "--prefix=#{prefix}",
-                                    "--enable-readline",
-                                    "--enable-threadsafe",
-                                    "--with-system-nspr"
-
+      system "../configure", "--prefix=#{prefix}",
+                             "--enable-readline",
+                             "--enable-threadsafe",
+                             "--with-system-nspr",
+                             "--enable-macos-target=#{MACOS_VERSION}"
       inreplace "js-config", /JS_CONFIG_LIBS=.*?$/, "JS_CONFIG_LIBS=''"
 
       # Can't do `make install` right off the bat sadly
@@ -61,13 +38,5 @@ class Spidermonkey <Formula
       # The `js` binary ins't installed. Lets do that too, eh?
       bin.install "shell/js"
     end
-
   end
 end
-
-
-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