From eb2ff6087e2fbf28690c5f3c8d8de27db04cf173 Mon Sep 17 00:00:00 2001
From: Stuart Carnie <stuart.carnie@gmail.com>
Date: Fri, 16 Jul 2010 11:05:35 -0700
Subject: [PATCH] Updated to 9.13. Default to 64/32-bit compile appropriately,
 with --32-bit override

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Formula/p7zip.rb | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/Formula/p7zip.rb b/Formula/p7zip.rb
index e444f22d3c..1613b0327d 100644
--- a/Formula/p7zip.rb
+++ b/Formula/p7zip.rb
@@ -1,16 +1,29 @@
 require 'formula'
 
 class P7zip <Formula
-  @url='http://downloads.sourceforge.net/sourceforge/p7zip/p7zip_9.04_src_all.tar.bz2'
-  @homepage='http://p7zip.sourceforge.net/'
-  @md5='9194ebf9a2b3735d236aed001de5f6f8'
+  url 'http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2'
+  homepage 'http://p7zip.sourceforge.net/'
+  md5 '8ddb5053db3b1f2696407d01be145779'
+
+  def options
+    [["--32-bit", "Force 32-bit."]]
+  end
+
+  def build_32bit?
+    ARGV.include? '--32-bit' or !Hardware.is_64_bit?
+  end
 
   def install
-    FileUtils.mv 'makefile.macosx_32bits', 'makefile.machine'
-    FileUtils.mv 'DOCS/copying.txt', 'COPYING'
+    if build_32bit?
+      mv 'makefile.macosx_32bits', 'makefile.machine'
+    else
+      mv 'makefile.macosx_64bits', 'makefile.machine'
+    end
+
+    mv 'DOCS/copying.txt', 'COPYING'
     system "make"
     # we do our own install because theirs sucks
     bin.install 'bin/7za'
     man.install 'man1'
   end
-end
\ No newline at end of file
+end