Use `env`.

12 files changed, 28 insertions, 10 deletions

diff --git a/Library/Formula/auctex.rb b/Library/Formula/auctex.rb
index 38fdf4d9f..4fb7553d2 100644
--- a/Library/Formula/auctex.rb
+++ b/Library/Formula/auctex.rb
@@ -21,6 +21,8 @@ class Auctex < Formula
   mirror 'http://ftp.gnu.org/gnu/auctex/auctex-11.86.tar.gz'
   sha1 'af3dd156f8b2db7764c86d9f7de8abd5811d888a'
 
+  env :userpaths
+
   depends_on TexInstalled.new
 
   def options
diff --git a/Library/Formula/fontforge.rb b/Library/Formula/fontforge.rb
index 9cc5f093c..126f7d612 100644
--- a/Library/Formula/fontforge.rb
+++ b/Library/Formula/fontforge.rb
@@ -7,6 +7,8 @@ class Fontforge < Formula
 
   head 'https://github.com/fontforge/fontforge.git'
 
+  env :std
+
   option 'without-python', 'Build without Python'
   option 'with-x', 'Build with X'
   option 'with-cairo', 'Build with Cairo'
diff --git a/Library/Formula/ghc.rb b/Library/Formula/ghc.rb
index 04bbb02ef..df9f5154f 100644
--- a/Library/Formula/ghc.rb
+++ b/Library/Formula/ghc.rb
@@ -24,14 +24,12 @@ class Ghc < Formula
     sha1 '60f749893332d7c22bb4905004a67510992d8ef6'
   end
 
+  env :std
+
   depends_on NeedsSnowLeopard.new
 
   option '32-bit'
 
-  # Avoid stripping the Haskell binaries & libraries.
-  # See: http://hackage.haskell.org/trac/ghc/ticket/2458
-  skip_clean ['bin', 'lib']
-
   fails_with :clang do
     build 421
     cause <<-EOS.undent
diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb
index 6b5ac6b5d..c085ce56f 100644
--- a/Library/Formula/graphviz.rb
+++ b/Library/Formula/graphviz.rb
@@ -5,6 +5,8 @@ class Graphviz < Formula
   url 'http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz'
   sha1 '4725d88a13e071ee22e632de551d4a55ca08ee7d'
 
+  env :std
+
   option :universal
   option 'with-bindings', 'Build Perl/Python/Ruby/etc. bindings'
   option 'with-pangocairo', 'Build with Pango/Cairo for alternate PDF output'
diff --git a/Library/Formula/jruby.rb b/Library/Formula/jruby.rb
index f8881b42d..53d68cd24 100644
--- a/Library/Formula/jruby.rb
+++ b/Library/Formula/jruby.rb
@@ -5,6 +5,8 @@ class Jruby < Formula
   url 'http://jruby.org.s3.amazonaws.com/downloads/1.6.7.2/jruby-bin-1.6.7.2.tar.gz'
   sha1 '717db67a08bf22a838a7debcca7eed9a010ff840'
 
+  env :std
+
   def install
     # Remove Windows files
     rm Dir['bin/*.{bat,dll,exe}']
diff --git a/Library/Formula/lilypond.rb b/Library/Formula/lilypond.rb
index 7a5506935..6d12185d7 100644
--- a/Library/Formula/lilypond.rb
+++ b/Library/Formula/lilypond.rb
@@ -24,6 +24,8 @@ class Lilypond < Formula
   url 'http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.0.tar.gz'
   sha1 'b5edfdd1332a5cee94bd31c7b1e8b08909c0a068'
 
+  env :userpaths
+
   depends_on TexInstalled.new
   depends_on 'pkg-config' => :build
   depends_on 'gettext'
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index 5dd5eb7d6..7fb43c4ee 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -10,6 +10,8 @@ class Nginx < Formula
     sha1 '8f1f1bd9a98a2d72a5b6fce24d67e9d5f48b5224'
   end
 
+  env :userpaths
+
   depends_on 'pcre'
 
   option 'with-passenger', 'Compile with support for Phusion Passenger module'
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 9f2dd3a5f..d02a36f5a 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -30,6 +30,8 @@ class Python < Formula
   url 'http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2'
   sha1 '842c4e2aff3f016feea3c6e992c7fa96e49c9aa0'
 
+  env :std
+
   depends_on TkCheck.new
   depends_on 'pkg-config' => :build
   depends_on 'readline' => :recommended
diff --git a/Library/Formula/python3.rb b/Library/Formula/python3.rb
index 43518dd54..3a19995c7 100644
--- a/Library/Formula/python3.rb
+++ b/Library/Formula/python3.rb
@@ -22,6 +22,8 @@ class Python3 < Formula
   url 'http://python.org/ftp/python/3.2.3/Python-3.2.3.tar.bz2'
   sha1 '4c2d562a0681ba27bc920500050e2f08de224311'
 
+  env :std
+
   depends_on TkCheck.new
   depends_on 'pkg-config' => :build
   depends_on 'readline' => :recommended
diff --git a/Library/Formula/ruby-enterprise-edition.rb b/Library/Formula/ruby-enterprise-edition.rb
index 777f9c25e..ed1e9b2fa 100644
--- a/Library/Formula/ruby-enterprise-edition.rb
+++ b/Library/Formula/ruby-enterprise-edition.rb
@@ -5,7 +5,7 @@ class RubyEnterpriseEdition < Formula
   url 'http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-1.8.7-2011.03.tar.gz'
   sha1 '662f37afbe04f3a55ac3b119227a2cd4e53745bf'
 
-  skip_clean 'bin/ruby'
+  env :std
 
   option 'enable-shared', "Compile shared, but see caveats"
 
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index e20617e5e..b7ca89a31 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -7,6 +7,13 @@ class Ruby < Formula
 
   head 'http://svn.ruby-lang.org/repos/ruby/trunk/'
 
+  env :std
+
+  option :universal
+  option 'with-suffix', 'Suffix commands with "19"'
+  option 'with-doc', 'Install documentation'
+  option 'with-tcltk' 'Install with Tcl/Tk support'
+
   depends_on :autoconf if build.head?
   depends_on 'pkg-config' => :build
   depends_on 'readline'
@@ -14,11 +21,6 @@ class Ruby < Formula
   depends_on 'libyaml'
   depends_on :x11 if build.include? 'with-tcltk'
 
-  option :universal
-  option 'with-suffix', 'Suffix commands with "19"'
-  option 'with-doc', 'Install documentation'
-  option 'with-tcltk' 'Install with Tcl/Tk support'
-
   fails_with :llvm do
     build 2326
   end
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 43ce8a8d4..5cb7606d5 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -21,6 +21,8 @@ class Wine < Formula
     sha256 'ba987a0e3b1d5c0ba2d42fecdcff1c4e910d7c9949d9baca796b8b5c1318662c'
   end
 
+  env :std
+
   depends_on :x11
   depends_on 'jpeg'
   depends_on 'libicns'