25 files changed, 31 insertions, 34 deletions
diff --git a/Library/Formula/avidemux.rb b/Library/Formula/avidemux.rb
index f1b29b843..128ea1548 100644
--- a/Library/Formula/avidemux.rb
+++ b/Library/Formula/avidemux.rb
@@ -133,7 +133,7 @@ class Avidemux < Formula
     mkdir_p app/"MacOS"
     cp_r "./cmake/osx/Avidemux2.6", app/"MacOS/Avidemux2.6.app"
     chmod 0755, app/"MacOS/Avidemux2.6.app"
-    cp_r Formula['qt'].opt_prefix/"lib/QtGui.framework/Resources/qt_menu.nib", app/"MacOS/" if build.with? 'qt'
+    cp_r "#{Formula['qt'].opt_lib}/QtGui.framework/Resources/qt_menu.nib", app/"MacOS/" if build.with? 'qt'
     cp "./cmake/osx/Info.plist", app
     (app/"Resources").install_symlink bin, lib
     cp Dir["./cmake/osx/*.icns"], app/"Resources/"
diff --git a/Library/Formula/bash-git-prompt.rb b/Library/Formula/bash-git-prompt.rb
index ab9a3bc44..a63ea39d2 100644
--- a/Library/Formula/bash-git-prompt.rb
+++ b/Library/Formula/bash-git-prompt.rb
@@ -16,9 +16,9 @@ class BashGitPrompt < Formula
 
   def caveats; <<-EOS.undent
     You should add the following to your .bashrc (or equivalent):
-      if [ -f "$(brew --prefix)/opt/bash-git-prompt/share/gitprompt.sh" ]; then
+      if [ -f "$(brew --prefix bash-git-prompt)/share/gitprompt.sh" ]; then
         GIT_PROMPT_THEME=Default
-        source "$(brew --prefix)/opt/bash-git-prompt/share/gitprompt.sh"
+        source "$(brew --prefix bash-git-prompt)/share/gitprompt.sh"
       fi
     EOS
   end
diff --git a/Library/Formula/dar.rb b/Library/Formula/dar.rb
index 59b7f277a..775a74eb2 100644
--- a/Library/Formula/dar.rb
+++ b/Library/Formula/dar.rb
@@ -25,8 +25,8 @@ class Dar < Formula
   depends_on "upx" => :build if build.with? "upx"
 
   def install
-    ENV.prepend_path 'PATH', "#{Formula['gnu-sed'].opt_prefix}/libexec/gnubin"
-    ENV.prepend_path 'PATH', "#{Formula['coreutils'].libexec}/gnubin" if build.with? "docs"
+    ENV.prepend_path 'PATH', "#{Formula['gnu-sed'].opt_libexec}/gnubin"
+    ENV.prepend_path 'PATH', "#{Formula['coreutils'].opt_libexec}/gnubin" if build.with? "docs"
     ENV.libstdcxx if ENV.compiler == :clang && MacOS.version >= :mavericks
 
     args = %W[
diff --git a/Library/Formula/easy-tag.rb b/Library/Formula/easy-tag.rb
index 0d461e310..b7d7bcf2e 100644
--- a/Library/Formula/easy-tag.rb
+++ b/Library/Formula/easy-tag.rb
@@ -23,7 +23,7 @@ class EasyTag < Formula
   depends_on "wavpack" => :optional
 
   def install
-    ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].lib}/python2.7/site-packages"
+    ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].opt_lib}/python2.7/site-packages"
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make"
diff --git a/Library/Formula/emscripten.rb b/Library/Formula/emscripten.rb
index 7b49fd818..d0cbb906b 100644
--- a/Library/Formula/emscripten.rb
+++ b/Library/Formula/emscripten.rb
@@ -86,7 +86,8 @@ class Emscripten < Formula
   end
 
   def caveats; <<-EOS.undent
-    Manually set LLVM_ROOT to \"#{opt_prefix}/libexec/llvm/bin\"
+    Manually set LLVM_ROOT to
+      #{opt_libexec}/llvm/bin
     in ~/.emscripten after running `emcc` for the first time.
     EOS
   end
diff --git a/Library/Formula/gcc.rb b/Library/Formula/gcc.rb
index c691849ac..acb4a21ac 100644
--- a/Library/Formula/gcc.rb
+++ b/Library/Formula/gcc.rb
@@ -129,7 +129,7 @@ class Gcc < Formula
     args << "--disable-nls" if build.without? "nls"
 
     if build.with?("java") || build.with?("all-languages")
-      args << "--with-ecj-jar=#{Formula["ecj"].opt_prefix}/share/java/ecj.jar"
+      args << "--with-ecj-jar=#{Formula["ecj"].opt_share}/java/ecj.jar"
     end
 
     if build.without?("multilib") || !MacOS.prefer_64_bit?
diff --git a/Library/Formula/git-flow-avh.rb b/Library/Formula/git-flow-avh.rb
index 68e735718..114165e4f 100644
--- a/Library/Formula/git-flow-avh.rb
+++ b/Library/Formula/git-flow-avh.rb
@@ -26,7 +26,7 @@ class GitFlowAvh < Formula
     system "make", "prefix=#{libexec}", "install"
     (bin/'git-flow').write <<-EOS.undent
       #!/bin/bash
-      export FLAGS_GETOPT_CMD=#{HOMEBREW_PREFIX}/opt/gnu-getopt/bin/getopt
+      export FLAGS_GETOPT_CMD=#{Formula["gnu-getopt"].opt_bin}/getopt
       exec "#{libexec}/bin/git-flow" "$@"
     EOS
 
diff --git a/Library/Formula/gnome-doc-utils.rb b/Library/Formula/gnome-doc-utils.rb
index 4b78c3834..d7b4617cc 100644
--- a/Library/Formula/gnome-doc-utils.rb
+++ b/Library/Formula/gnome-doc-utils.rb
@@ -26,7 +26,7 @@ class GnomeDocUtils < Formula
   def install
     # Find our docbook catalog
     ENV['XML_CATALOG_FILES'] = "#{etc}/xml/catalog"
-    ENV.append_path 'PYTHONPATH', HOMEBREW_PREFIX/"opt/libxml2/lib/python2.7/site-packages"
+    ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].opt_lib}/python2.7/site-packages"
 
     system "./configure", "--prefix=#{prefix}",
                           "--disable-scrollkeeper",
diff --git a/Library/Formula/gst-libav.rb b/Library/Formula/gst-libav.rb
index a20b6866e..c6a935ee6 100644
--- a/Library/Formula/gst-libav.rb
+++ b/Library/Formula/gst-libav.rb
@@ -43,6 +43,6 @@ class GstLibav < Formula
   end
 
   test do
-    system Formula["gstreamer"].opt_prefix/"bin/gst-inspect-1.0", "libav"
+    system "#{Formula["gstreamer"].opt_bin}/gst-inspect-1.0", "libav"
   end
 end
diff --git a/Library/Formula/ircd-irc2.rb b/Library/Formula/ircd-irc2.rb
index bc6ec7647..086c9f494 100644
--- a/Library/Formula/ircd-irc2.rb
+++ b/Library/Formula/ircd-irc2.rb
@@ -62,7 +62,7 @@ class IrcdIrc2 < Formula
       <string>#{plist_name}</string>
       <key>ProgramArguments</key>
       <array>
-        <string>#{opt_prefix}/sbin/ircd</string>
+        <string>#{opt_sbin}/ircd</string>
         <string>-t</string>
       </array>
       <key>RunAtLoad</key>
diff --git a/Library/Formula/itstool.rb b/Library/Formula/itstool.rb
index bae0f26ee..fe89ea552 100644
--- a/Library/Formula/itstool.rb
+++ b/Library/Formula/itstool.rb
@@ -23,8 +23,7 @@ class Itstool < Formula
   depends_on 'libxml2' => 'with-python'
 
   def install
-    ENV.append_path 'PYTHONPATH', "#{Formula["libxml2"].lib}/python2.7/site-packages"
-
+    ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].opt_lib}/python2.7/site-packages"
     system "./autogen.sh" if build.head?
     system "./configure", "--prefix=#{prefix}"
     system "make install"
diff --git a/Library/Formula/keybase.rb b/Library/Formula/keybase.rb
index 8fab9666d..e354f13a8 100644
--- a/Library/Formula/keybase.rb
+++ b/Library/Formula/keybase.rb
@@ -20,7 +20,7 @@ class Keybase < Formula
     (bin/"keybase").write <<-EOS.undent
       #!/bin/sh
       export KEYBASE_BIN="#{bin}/keybase"
-      exec "#{HOMEBREW_PREFIX}/opt/node/bin/node" "#{libexec}/bin/main.js" "$@"
+      exec "#{Formula["node"].opt_bin}/node" "#{libexec}/bin/main.js" "$@"
     EOS
   end
 
diff --git a/Library/Formula/knot.rb b/Library/Formula/knot.rb
index 03d0e85b7..a0eb00b2e 100644
--- a/Library/Formula/knot.rb
+++ b/Library/Formula/knot.rb
@@ -90,7 +90,7 @@ class Knot < Formula
       <true/>
       <key>ProgramArguments</key>
       <array>
-        <string>#{opt_prefix}/sbin/knotd</string>
+        <string>#{opt_sbin}/knotd</string>
         <string>-c</string>
         <string>#{etc}/knot.conf</string>
       </array>
diff --git a/Library/Formula/liblwgeom.rb b/Library/Formula/liblwgeom.rb
index 3f0c83795..7576ba5c9 100644
--- a/Library/Formula/liblwgeom.rb
+++ b/Library/Formula/liblwgeom.rb
@@ -59,7 +59,7 @@ class Liblwgeom < Formula
     ]
 
     if build.head?
-      args << "--with-pgconfig=#{Formula["postgresql"].opt_prefix.realpath}/bin/pg_config"
+      args << "--with-pgconfig=#{Formula["postgresql"].opt_bin}/pg_config"
     end
 
     system './autogen.sh'
diff --git a/Library/Formula/mysql-cluster.rb b/Library/Formula/mysql-cluster.rb
index b9ea34059..7b1fe0782 100644
--- a/Library/Formula/mysql-cluster.rb
+++ b/Library/Formula/mysql-cluster.rb
@@ -127,7 +127,7 @@ class MysqlCluster < Formula
 
     Set up databases to run AS YOUR USER ACCOUNT with:
       unset TMPDIR
-      mysql_install_db --verbose --user=`whoami` --basedir="$(brew --prefix mysql-cluster)" --datadir=#{var}/mysql-cluster/mysqld_data --tmpdir=/tmp
+      mysql_install_db --verbose --user=`whoami` --basedir="#{opt_prefix}" --datadir=#{var}/mysql-cluster/mysqld_data --tmpdir=/tmp
 
     For a first cluster, you may start with a single MySQL Server (mysqld),
     a pair of Data Nodes (ndbd) and a single management node (ndb_mgmd):
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index 4bd3b0354..e44beecab 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -124,16 +124,16 @@ class Nginx < Formula
   def passenger_caveats; <<-EOS.undent
 
     To activate Phusion Passenger, add this to #{etc}/nginx/nginx.conf, inside the 'http' context:
-      passenger_root #{HOMEBREW_PREFIX}/opt/passenger/libexec/lib/phusion_passenger/locations.ini;
+      passenger_root #{Formula["passenger"].opt_libexec}/lib/phusion_passenger/locations.ini;
       passenger_ruby /usr/bin/ruby;
     EOS
   end
 
   def caveats
     s = <<-EOS.undent
-    Docroot is: #{HOMEBREW_PREFIX}/var/www
+    Docroot is: #{var}/www
 
-    The default port has been set in #{HOMEBREW_PREFIX}/etc/nginx/nginx.conf to 8080 so that
+    The default port has been set in #{etc}/nginx/nginx.conf to 8080 so that
     nginx can run without sudo.
     EOS
     s << passenger_caveats if build.with? "passenger"
diff --git a/Library/Formula/pgtap.rb b/Library/Formula/pgtap.rb
index a42d605b1..0173b60f7 100644
--- a/Library/Formula/pgtap.rb
+++ b/Library/Formula/pgtap.rb
@@ -41,7 +41,7 @@ class Pgtap < Formula
       system './Build', 'install'
     end
 
-    pg_config = Formula["postgresql"].opt_prefix/'bin/pg_config'
+    pg_config = "#{Formula["postgresql"].opt_bin}/pg_config"
     system "make", "PG_CONFIG=#{pg_config}"
     system "make", "PG_CONFIG=#{pg_config}", "install"
   end
diff --git a/Library/Formula/pow.rb b/Library/Formula/pow.rb
index d7cce9292..8f06dae37 100644
--- a/Library/Formula/pow.rb
+++ b/Library/Formula/pow.rb
@@ -12,7 +12,7 @@ class Pow < Formula
     (bin/"pow").write <<-EOS.undent
       #!/bin/sh
       export POW_BIN="#{bin}/pow"
-      exec "#{HOMEBREW_PREFIX}/opt/node/bin/node" "#{libexec}/lib/command.js" "$@"
+      exec "#{Formula["node"].opt_bin}/node" "#{libexec}/lib/command.js" "$@"
     EOS
   end
 
diff --git a/Library/Formula/pygtkglext.rb b/Library/Formula/pygtkglext.rb
index 4495cfc4a..81768de43 100644
--- a/Library/Formula/pygtkglext.rb
+++ b/Library/Formula/pygtkglext.rb
@@ -11,7 +11,7 @@ class Pygtkglext < Formula
   depends_on 'pygobject'
 
   def install
-    ENV['PYGTK_CODEGEN'] = Formula["pygobject"].opt_prefix/'bin/pygobject-codegen-2.0'
+    ENV['PYGTK_CODEGEN'] = "#{Formula["pygobject"].opt_bin}/pygobject-codegen-2.0"
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
diff --git a/Library/Formula/pyqt.rb b/Library/Formula/pyqt.rb
index 01d7c50f2..0f2e7cfdd 100644
--- a/Library/Formula/pyqt.rb
+++ b/Library/Formula/pyqt.rb
@@ -34,7 +34,7 @@ class Pyqt < Formula
     end
 
     Language::Python.each_python(build) do |python, version|
-      ENV.append_path "PYTHONPATH", HOMEBREW_PREFIX/"opt/sip/lib/python#{version}/site-packages"
+      ENV.append_path "PYTHONPATH", "#{Formula["sip"].opt_lib}/python#{version}/site-packages"
 
       args = ["--confirm-license",
               "--bindir=#{bin}",
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 2eab4f1f5..d222e15eb 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -234,7 +234,7 @@ class Python < Formula
     # superenv handles that cc finds includes/libs!
     inreplace "setup.py",
               "do_readline = self.compiler.find_library_file(lib_dirs, 'readline')",
-              "do_readline = '#{HOMEBREW_PREFIX}/opt/readline/lib/libhistory.dylib'"
+              "do_readline = '#{Formula["readline"].opt_lib}/libhistory.dylib'"
   end
 
   def distutils_fix_stdenv
diff --git a/Library/Formula/python3.rb b/Library/Formula/python3.rb
index 354bba5b3..f3978ae9a 100644
--- a/Library/Formula/python3.rb
+++ b/Library/Formula/python3.rb
@@ -192,7 +192,7 @@ class Python3 < Formula
     # superenv makes cc always find includes/libs!
     inreplace "setup.py",
               "do_readline = self.compiler.find_library_file(lib_dirs, 'readline')",
-              "do_readline = '#{HOMEBREW_PREFIX}/opt/readline/lib/libhistory.dylib'"
+              "do_readline = '#{Formula["readline"].opt_lib}/libhistory.dylib'"
   end
 
   def distutils_fix_stdenv
diff --git a/Library/Formula/shrewsoft-vpn-client.rb b/Library/Formula/shrewsoft-vpn-client.rb
index 5235f0c2e..5b93d46da 100644
--- a/Library/Formula/shrewsoft-vpn-client.rb
+++ b/Library/Formula/shrewsoft-vpn-client.rb
@@ -79,7 +79,7 @@ class ShrewsoftVpnClient < Formula
         <string>net.shrew.iked</string>
         <key>ProgramArguments</key>
         <array>
-          <string>#{opt_prefix}/sbin/iked</string>
+          <string>#{opt_sbin}/iked</string>
           <string>-F</string>
         </array>
         <key>RunAtLoad</key>
diff --git a/Library/Formula/xplanetfx.rb b/Library/Formula/xplanetfx.rb
index 5712f2895..b7782bb24 100644
--- a/Library/Formula/xplanetfx.rb
+++ b/Library/Formula/xplanetfx.rb
@@ -37,8 +37,8 @@ class Xplanetfx < Formula
 
     prefix.install "bin", "share"
 
-    path = "#{Formula["coreutils"].opt_prefix}/libexec/gnubin"
-    path += ":#{Formula["gnu-sed"].opt_prefix}/libexec/gnubin" if build.with?("gnu-sed")
+    path = "#{Formula["coreutils"].opt_libexec}/gnubin"
+    path += ":#{Formula["gnu-sed"].opt_libexec}/gnubin" if build.with?("gnu-sed")
     if build.with?("perlmagick")
       perl_version = `/usr/bin/perl -e 'printf "%vd", $^V;'`
       ENV.prepend_create_path "PERL5LIB", "#{HOMEBREW_PREFIX}/lib/perl5/site_perl/#{perl_version}"
diff --git a/Library/Formula/zenity.rb b/Library/Formula/zenity.rb
index 5f1d6ca51..86a674d4f 100644
--- a/Library/Formula/zenity.rb
+++ b/Library/Formula/zenity.rb
@@ -13,12 +13,9 @@ class Zenity < Formula
   depends_on 'scrollkeeper'
 
   def install
-    ENV.append_path 'PYTHONPATH', HOMEBREW_PREFIX/"opt/libxml2/lib/python2.7/site-packages"
-
+    ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].opt_lib}/python2.7/site-packages"
     system "./configure", "--prefix=#{prefix}"
-
     system "make"
     system "make install"
   end
-
 end