From 2c753545335706ad5b2d7e31ea5a1dab92e6b0da Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Sat, 7 Aug 2010 20:53:10 -0700
Subject: Use is_32_bit? and remove negatives.

---
 Library/Formula/ffmpeg.rb | 2 +-
 Library/Formula/p7zip.rb  | 2 +-
 Library/Formula/pbrt.rb   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index 41d0d46b2..2e0089e7f 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -38,7 +38,7 @@ class Ffmpeg <Formula
 
     # For 32-bit compilation under gcc 4.2, see:
     # http://trac.macports.org/ticket/20938#comment:22
-    if MACOS_VERSION >= 10.6 and not Hardware.is_64_bit?
+    if MACOS_VERSION >= 10.6 and Hardware.is_32_bit?
       ENV.append_to_cflags "-mdynamic-no-pic"
     end
 
diff --git a/Library/Formula/p7zip.rb b/Library/Formula/p7zip.rb
index 1613b0327..8f7874521 100644
--- a/Library/Formula/p7zip.rb
+++ b/Library/Formula/p7zip.rb
@@ -10,7 +10,7 @@ class P7zip <Formula
   end
 
   def build_32bit?
-    ARGV.include? '--32-bit' or !Hardware.is_64_bit?
+    ARGV.include? '--32-bit' or Hardware.is_32_bit?
   end
 
   def install
diff --git a/Library/Formula/pbrt.rb b/Library/Formula/pbrt.rb
index 115d013c0..f84a5123c 100644
--- a/Library/Formula/pbrt.rb
+++ b/Library/Formula/pbrt.rb
@@ -27,7 +27,7 @@ class Pbrt <Formula
       contents.change_make_var! "EXR_LIBDIR", "-L#{openexr.lib} -L#{ilmbase.lib}"
 
       # Change settings if we are using a 32bit system
-      if MACOS_VERSION <= 10.5 or not Hardware.is_64_bit?
+      if MACOS_VERSION <= 10.5 or Hardware.is_32_bit?
         contents.change_make_var! "MARCH", "-m32 -msse2 -mfpmath=sse"
       end
     end
-- 
cgit v1.2.3