Mark scons, cmake & pkg-config as build-time deps

158 files changed, 181 insertions, 180 deletions

diff --git a/Library/Formula/abuse.rb b/Library/Formula/abuse.rb
index ae1d8681f..5be93baeb 100644
--- a/Library/Formula/abuse.rb
+++ b/Library/Formula/abuse.rb
@@ -10,7 +10,7 @@ class Abuse <Formula
   homepage 'http://abuse.zoy.org/'
   version 'trunk'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'sdl'
   depends_on 'libvorbis'
 
diff --git a/Library/Formula/adplug.rb b/Library/Formula/adplug.rb
index 5a091a7f5..416066975 100644
--- a/Library/Formula/adplug.rb
+++ b/Library/Formula/adplug.rb
@@ -5,7 +5,7 @@ class Adplug <Formula
   homepage 'http://adplug.sf.net'
   md5 '8f815fd5d254de0fe5df818df9d1d8af'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libbinio'
 
   def install
diff --git a/Library/Formula/akonadi.rb b/Library/Formula/akonadi.rb
index b64e39c01..cca3528ae 100644
--- a/Library/Formula/akonadi.rb
+++ b/Library/Formula/akonadi.rb
@@ -5,10 +5,10 @@ class Akonadi <Formula
   homepage 'http://pim.kde.org/akonadi/'
   md5 'e6eef3ed5c28d55f4b6530544e379413'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
+  depends_on 'automoc4' => :build
   depends_on 'shared-mime-info'
   depends_on 'mysql'
-  depends_on 'automoc4'
   depends_on 'soprano'
   depends_on 'boost'
   depends_on 'qt'
diff --git a/Library/Formula/allegro.rb b/Library/Formula/allegro.rb
index 80cbfe23f..35425d4b5 100644
--- a/Library/Formula/allegro.rb
+++ b/Library/Formula/allegro.rb
@@ -5,7 +5,7 @@ class Allegro <Formula
   homepage 'http://www.allegro.cc'
   md5 '0f1cfff8f2cf88e5c91a667d9fd386ec'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'libvorbis' => :optional
 
   def install
diff --git a/Library/Formula/atk.rb b/Library/Formula/atk.rb
index a6425a58c..baff8e81e 100644
--- a/Library/Formula/atk.rb
+++ b/Library/Formula/atk.rb
@@ -5,7 +5,7 @@ class Atk <Formula
   homepage 'http://library.gnome.org/devel/atk/'
   sha256 '92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
 
   def install
diff --git a/Library/Formula/attica.rb b/Library/Formula/attica.rb
index 7bc7fcf7b..e40653f98 100644
--- a/Library/Formula/attica.rb
+++ b/Library/Formula/attica.rb
@@ -5,7 +5,7 @@ class Attica <Formula
   homepage 'http://www.kde.org/'
   md5 '8b4207dbc0a826d422632bdb9c50d51a'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     system "cmake . #{std_cmake_parameters}"
diff --git a/Library/Formula/automoc4.rb b/Library/Formula/automoc4.rb
index 7dcfc3b5d..9f0303f9e 100644
--- a/Library/Formula/automoc4.rb
+++ b/Library/Formula/automoc4.rb
@@ -5,7 +5,7 @@ class Automoc4 <Formula
   homepage 'http://techbase.kde.org/Development/Tools/Automoc4'
   md5 '91bf517cb940109180ecd07bc90c69ec'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'qt'
 
   def install
diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb
index 3ffe14ea3..1fc1d514b 100644
--- a/Library/Formula/cairo.rb
+++ b/Library/Formula/cairo.rb
@@ -5,7 +5,7 @@ class Cairo <Formula
   homepage 'http://cairographics.org/'
   md5 'b60a82f405f9400bbfdcf850b1728d25'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libpng'
   depends_on 'pixman'
 
diff --git a/Library/Formula/cairomm.rb b/Library/Formula/cairomm.rb
index 5fe2c67c4..b96693c23 100644
--- a/Library/Formula/cairomm.rb
+++ b/Library/Formula/cairomm.rb
@@ -9,7 +9,7 @@ class Cairomm <Formula
     { :p0 => DATA }
   end
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libsigc++'
   # cairo is available on 10.6 via X11 but not on 10.5
   depends_on 'cairo' if MACOS_VERSION == 10.5
diff --git a/Library/Formula/cclive.rb b/Library/Formula/cclive.rb
index 39f25bf9f..8f47627ce 100644
--- a/Library/Formula/cclive.rb
+++ b/Library/Formula/cclive.rb
@@ -5,7 +5,7 @@ class Cclive <Formula
   homepage 'http://code.google.com/p/cclive/'
   md5 'c3d50c05ca332b01286f9f3b6dd21841'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'quvi'
 
   def install
diff --git a/Library/Formula/center-im.rb b/Library/Formula/center-im.rb
index b483505ab..a7f53dc06 100644
--- a/Library/Formula/center-im.rb
+++ b/Library/Formula/center-im.rb
@@ -5,7 +5,7 @@ class CenterIm <Formula
   homepage 'http://www.centerim.org/index.php/Main_Page'
   md5 'c43911508205e0277529230c8316a298'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'jpeg' => :optional
 
diff --git a/Library/Formula/cgal.rb b/Library/Formula/cgal.rb
index 418853c46..92bd43d20 100644
--- a/Library/Formula/cgal.rb
+++ b/Library/Formula/cgal.rb
@@ -5,7 +5,7 @@ class Cgal <Formula
   md5 '78dbaf85df0a53ca0e87308d9cbf671e'
   homepage 'http://www.cgal.org/'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'boost'
   depends_on 'gmp'
   depends_on 'mpfr'
diff --git a/Library/Formula/chipmunk.rb b/Library/Formula/chipmunk.rb
index 93a39ebff..a522bbc32 100644
--- a/Library/Formula/chipmunk.rb
+++ b/Library/Formula/chipmunk.rb
@@ -4,7 +4,7 @@ class Chipmunk <Formula
   head 'http://chipmunk-physics.googlecode.com/svn/trunk'
   homepage 'http://code.google.com/p/chipmunk-physics/'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     system "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}",
diff --git a/Library/Formula/clutter.rb b/Library/Formula/clutter.rb
index 6e4e7df4b..cb8d517dd 100644
--- a/Library/Formula/clutter.rb
+++ b/Library/Formula/clutter.rb
@@ -5,11 +5,11 @@ class Clutter <Formula
   homepage 'http://www.clutter-project.org/'
   md5 '687f9699ea5590091282034a936c6dc7'
 
-  depends_on 'pango'
+  depends_on 'pkg-config' => :build
+  depends_on 'gettext'
   depends_on 'glib'
-  depends_on 'pkg-config'
   depends_on 'intltool'
-  depends_on 'gettext'
+  depends_on 'pango'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--with-flavour=osx", "--with-imagebackend=quartz"
diff --git a/Library/Formula/confuse.rb b/Library/Formula/confuse.rb
index 6ac5fc938..009b22a1c 100644
--- a/Library/Formula/confuse.rb
+++ b/Library/Formula/confuse.rb
@@ -5,7 +5,7 @@ class Confuse <Formula
   homepage 'http://www.nongnu.org/confuse/'
   md5 '45932fdeeccbb9ef4228f1c1a25e9c8f'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
diff --git a/Library/Formula/cppdom.rb b/Library/Formula/cppdom.rb
index cfc1062ea..3f55e314b 100644
--- a/Library/Formula/cppdom.rb
+++ b/Library/Formula/cppdom.rb
@@ -5,7 +5,7 @@ class Cppdom <Formula
   homepage 'http://sourceforge.net/projects/xml-cppdom/'
   md5 'ab30e45eb8129e14040020edc5b0b130'
 
-  depends_on 'scons'
+  depends_on 'scons' => :build
   depends_on 'boost'
 
   def install
diff --git a/Library/Formula/csstidy.rb b/Library/Formula/csstidy.rb
index 404adeeb8..d50323f3a 100644
--- a/Library/Formula/csstidy.rb
+++ b/Library/Formula/csstidy.rb
@@ -4,7 +4,7 @@ class Csstidy <Formula
   head 'http://csstidy.svn.sourceforge.net/svnroot/csstidy/trunk-cpp/'
   homepage 'http://csstidy.sourceforge.net/'
 
-  depends_on 'scons'
+  depends_on 'scons' => :build
 
   def install
     arch = Hardware.is_64_bit? ? 'x64' : 'ia32'
diff --git a/Library/Formula/despotify.rb b/Library/Formula/despotify.rb
index 42f0287e9..ffb2b5a35 100644
--- a/Library/Formula/despotify.rb
+++ b/Library/Formula/despotify.rb
@@ -4,9 +4,9 @@ class Despotify <Formula
   head 'https://despotify.svn.sourceforge.net/svnroot/despotify/src'
   homepage 'http://despotify.se/'
 
+  depends_on 'pkg-config' => :build
   depends_on 'libao'
   depends_on 'libvorbis'
-  depends_on 'pkg-config'
 
   def install
     system "make Makefile.local.mk"
diff --git a/Library/Formula/dia.rb b/Library/Formula/dia.rb
index 27cea2163..ba1045608 100644
--- a/Library/Formula/dia.rb
+++ b/Library/Formula/dia.rb
@@ -5,7 +5,7 @@ class Dia <Formula
   homepage 'http://live.gnome.org/Dia'
   md5 '3d11f9aaa5a4923f0a5533962c87bdfb'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'intltool'
   depends_on 'gettext'
   depends_on 'pango'
diff --git a/Library/Formula/eigen.rb b/Library/Formula/eigen.rb
index 63498b8ee..d9a83c1c7 100644
--- a/Library/Formula/eigen.rb
+++ b/Library/Formula/eigen.rb
@@ -5,7 +5,7 @@ class Eigen <Formula
   homepage 'http://eigen.tuxfamily.org/'
   md5 'd0195ac20bcd91602db8ca967a21e9ec'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     system "cmake . #{std_cmake_parameters}"
diff --git a/Library/Formula/encfs.rb b/Library/Formula/encfs.rb
index f5e92ce52..fc2a1def6 100644
--- a/Library/Formula/encfs.rb
+++ b/Library/Formula/encfs.rb
@@ -5,7 +5,7 @@ class Encfs <Formula
   homepage 'http://www.arg0.net/encfs'
   md5 '3a3fef640c7c9f020104304392cd1836'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'boost'
   depends_on 'rlog'
diff --git a/Library/Formula/exif.rb b/Library/Formula/exif.rb
index 778415d74..d9fc9ca7a 100644
--- a/Library/Formula/exif.rb
+++ b/Library/Formula/exif.rb
@@ -5,7 +5,7 @@ class Exif <Formula
   homepage 'http://libexif.sourceforge.net/'
   md5 '75f0dd6f9f2d128261721c0896e0b324'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'popt'
   depends_on 'libexif'
   depends_on 'gettext'
diff --git a/Library/Formula/falcon.rb b/Library/Formula/falcon.rb
index 7a9064bec..db7d92ba4 100644
--- a/Library/Formula/falcon.rb
+++ b/Library/Formula/falcon.rb
@@ -7,7 +7,7 @@ class Falcon <Formula
 
   head 'http://git.falconpl.org/falcon.git', :branch => 'master', :using => :git
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'pcre'
 
   def options
@@ -51,4 +51,4 @@ class Falcon <Formula
     system "make"
     system "make install"
   end
-end
\ No newline at end of file
+end
diff --git a/Library/Formula/fluid-synth.rb b/Library/Formula/fluid-synth.rb
index 562a8a6a1..2692d17f5 100644
--- a/Library/Formula/fluid-synth.rb
+++ b/Library/Formula/fluid-synth.rb
@@ -5,7 +5,7 @@ class FluidSynth <Formula
   homepage 'http://fluidsynth.resonance.org/trac'
   md5 '0db3da78028d255026230809c6e21b44'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'libsndfile' => :optional
 
diff --git a/Library/Formula/flusspferd.rb b/Library/Formula/flusspferd.rb
index fa20c1258..3f3594e81 100644
--- a/Library/Formula/flusspferd.rb
+++ b/Library/Formula/flusspferd.rb
@@ -5,7 +5,7 @@ class Flusspferd <Formula
   homepage 'http://flusspferd.org/'
   md5 '7688b2a939777b4b7be82898dea9b3d9'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'arabica'
   depends_on 'gmp'
   depends_on 'boost'
diff --git a/Library/Formula/fontforge.rb b/Library/Formula/fontforge.rb
index 986880c49..0bbda4283 100644
--- a/Library/Formula/fontforge.rb
+++ b/Library/Formula/fontforge.rb
@@ -5,7 +5,7 @@ class Fontforge <Formula
   homepage 'http://fontforge.sourceforge.net'
   md5 '5f3d20d645ec1aa2b7b4876386df8717'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'pango'
   depends_on 'potrace'
diff --git a/Library/Formula/ftgl.rb b/Library/Formula/ftgl.rb
index ca3f75581..770f20742 100644
--- a/Library/Formula/ftgl.rb
+++ b/Library/Formula/ftgl.rb
@@ -5,7 +5,7 @@ class Ftgl <Formula
   homepage 'http://sourceforge.net/projects/ftgl/'
   md5 'fcf4d0567b7de9875d4e99a9f7423633'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     ENV.x11 # Put freetype-config in path
diff --git a/Library/Formula/gccxml.rb b/Library/Formula/gccxml.rb
index 75822c43d..9454139f8 100644
--- a/Library/Formula/gccxml.rb
+++ b/Library/Formula/gccxml.rb
@@ -5,7 +5,7 @@ class Gccxml <Formula
   version 'HEAD'
   homepage 'http://www.gccxml.org/HTML/Index.html'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     mkdir 'gccxml-build'
diff --git a/Library/Formula/geany.rb b/Library/Formula/geany.rb
index 183a92f09..7e61d4803 100644
--- a/Library/Formula/geany.rb
+++ b/Library/Formula/geany.rb
@@ -5,7 +5,7 @@ class Geany <Formula
   homepage 'http://www.geany.org/Main/HomePage'
   md5 '727cec2936846850bb088b476faad5f2'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'intltool'
   depends_on 'gtk+'
diff --git a/Library/Formula/geeqie.rb b/Library/Formula/geeqie.rb
index 3c8a48554..1fb070185 100644
--- a/Library/Formula/geeqie.rb
+++ b/Library/Formula/geeqie.rb
@@ -5,7 +5,7 @@ class Geeqie <Formula
   homepage 'http://geeqie.sourceforge.net/'
   md5 '1d67ef990390224c5052697d93bb49c0'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'intltool'
   depends_on 'gtk+'
diff --git a/Library/Formula/ghostscript.rb b/Library/Formula/ghostscript.rb
index 9dbcfb08e..922a442fc 100644
--- a/Library/Formula/ghostscript.rb
+++ b/Library/Formula/ghostscript.rb
@@ -11,7 +11,7 @@ class Ghostscript <Formula
   homepage 'http://www.ghostscript.com/'
   md5 '177c33b796ed28d3d568e230a6dbdba5'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'jpeg'
   depends_on 'libtiff'
 
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 5b72afee6..32e5c92e5 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -13,7 +13,7 @@ class Glib <Formula
   sha256 '3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c'
   homepage 'http://www.gtk.org'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
 
   def patches
diff --git a/Library/Formula/glibmm.rb b/Library/Formula/glibmm.rb
index 866f072a8..c2c4c3a7e 100644
--- a/Library/Formula/glibmm.rb
+++ b/Library/Formula/glibmm.rb
@@ -5,7 +5,7 @@ class Glibmm <Formula
   homepage 'http://www.gtkmm.org/'
   md5 '90ff0a5bd5987431cf36f0aa0160a753'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libsigc++'
   depends_on 'glib'
 
diff --git a/Library/Formula/gloox.rb b/Library/Formula/gloox.rb
index 80b570d09..981e5aa61 100644
--- a/Library/Formula/gloox.rb
+++ b/Library/Formula/gloox.rb
@@ -5,7 +5,7 @@ class Gloox <Formula
   homepage 'http://camaya.net/glooxdownload'
   md5 'f8eacf1c6476e0a309b453fd04f90e31'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def patches
     # Fix memory leak
diff --git a/Library/Formula/gmediaserver.rb b/Library/Formula/gmediaserver.rb
index d2fcf6cb0..bc42a4b90 100644
--- a/Library/Formula/gmediaserver.rb
+++ b/Library/Formula/gmediaserver.rb
@@ -5,7 +5,7 @@ class Gmediaserver < Formula
   homepage 'http://www.gnu.org/software/gmediaserver/'
   md5 'c422de386331e2a1a859d45f6fa270a3'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libupnp'
   depends_on 'libmagic'
   depends_on 'id3lib' => :optional
diff --git a/Library/Formula/gmtl.rb b/Library/Formula/gmtl.rb
index 33da56bfb..622d63286 100644
--- a/Library/Formula/gmtl.rb
+++ b/Library/Formula/gmtl.rb
@@ -5,7 +5,7 @@ class Gmtl <Formula
   homepage 'http://ggt.sourceforge.net/'
   md5 '018c2cce3c87ad63509481b1eb144387'
 
-  depends_on 'scons'
+  depends_on 'scons' => :build
 
   def install
     system "scons", "install", "prefix=#{prefix}"
diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb
index d52b4c310..ded18d005 100644
--- a/Library/Formula/gnuplot.rb
+++ b/Library/Formula/gnuplot.rb
@@ -5,7 +5,7 @@ class Gnuplot <Formula
   homepage 'http://www.gnuplot.info'
   md5 'e708665bd512153ad5c35252fe499059'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'readline'
   depends_on 'gd' unless ARGV.include? "--nogd"
   depends_on 'pdflib-lite' if ARGV.include? "--pdf"
diff --git a/Library/Formula/gnutls.rb b/Library/Formula/gnutls.rb
index a785cae29..4feee0050 100644
--- a/Library/Formula/gnutls.rb
+++ b/Library/Formula/gnutls.rb
@@ -5,7 +5,7 @@ class Gnutls <Formula
   homepage 'http://www.gnu.org/software/gnutls/gnutls.html'
   sha1 '507ff8ad7c1e042f8ecaa4314f32777e74caf0d3'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libgcrypt'
   depends_on 'libtasn1' => :optional
 
diff --git a/Library/Formula/gource.rb b/Library/Formula/gource.rb
index e7e566734..cbe16985b 100644
--- a/Library/Formula/gource.rb
+++ b/Library/Formula/gource.rb
@@ -6,7 +6,7 @@ class Gource <Formula
   version "0.28"
   head 'git://github.com/acaudwell/Gource.git'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'sdl'
   depends_on 'sdl_image'
   depends_on 'ftgl'
diff --git a/Library/Formula/gphoto2.rb b/Library/Formula/gphoto2.rb
index bb832a598..f3a08d899 100644
--- a/Library/Formula/gphoto2.rb
+++ b/Library/Formula/gphoto2.rb
@@ -5,7 +5,7 @@ class Gphoto2 <Formula
   homepage 'http://gphoto.org/'
   md5 '3c86c9824b9bfc57a52be5f84ad205f7'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'jpeg'
   depends_on 'libgphoto2'
   depends_on 'popt'
diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb
index 1b3de73cd..8d28ebc57 100644
--- a/Library/Formula/graphviz.rb
+++ b/Library/Formula/graphviz.rb
@@ -5,7 +5,7 @@ class Graphviz <Formula
   md5 '6f45946fa622770c45609778c0a982ee'
   homepage 'http://graphviz.org/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     ENV.x11
diff --git a/Library/Formula/gst-plugins-base.rb b/Library/Formula/gst-plugins-base.rb
index 1def93620..54d7d05c8 100644
--- a/Library/Formula/gst-plugins-base.rb
+++ b/Library/Formula/gst-plugins-base.rb
@@ -5,7 +5,7 @@ class GstPluginsBase <Formula
   url 'http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.30.tar.bz2'
   md5 '3ad90152b58563e1314af26c263f3c4c'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'gstreamer'
   depends_on 'liboil'
diff --git a/Library/Formula/gst-plugins-good.rb b/Library/Formula/gst-plugins-good.rb
index a59ae10c9..e1d2c9e61 100644
--- a/Library/Formula/gst-plugins-good.rb
+++ b/Library/Formula/gst-plugins-good.rb
@@ -5,7 +5,7 @@ class GstPluginsGood <Formula
   url 'http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.24.tar.bz2'
   md5 'dc0de606e3e303cf378327b72a4d281f'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'gst-plugins-base'
   depends_on 'aalib' => :optional
diff --git a/Library/Formula/gstreamer.rb b/Library/Formula/gstreamer.rb
index 01e7cac00..013d6f8fb 100644
--- a/Library/Formula/gstreamer.rb
+++ b/Library/Formula/gstreamer.rb
@@ -5,7 +5,7 @@ class Gstreamer <Formula
   url 'http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.30.tar.bz2'
   md5 'de01f73f71d97c5854badd363ca06509'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'glib'
 
diff --git a/Library/Formula/gtk+.rb b/Library/Formula/gtk+.rb
index a369946ea..610455d2a 100644
--- a/Library/Formula/gtk+.rb
+++ b/Library/Formula/gtk+.rb
@@ -5,7 +5,7 @@ class Gtkx <Formula
   homepage 'http://www.gtk.org/'
   sha256 '0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'jpeg'
   depends_on 'libtiff'
diff --git a/Library/Formula/guile.rb b/Library/Formula/guile.rb
index c6299892f..06548775b 100644
--- a/Library/Formula/guile.rb
+++ b/Library/Formula/guile.rb
@@ -11,7 +11,7 @@ class Guile <Formula
     sha1 '24cd2f06439c76d41d982a7384fe8a0fe5313b54'
   end
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libffi'
   depends_on 'libunistring'
   depends_on 'bdw-gc'
diff --git a/Library/Formula/gwenhywfar.rb b/Library/Formula/gwenhywfar.rb
index 2ff17ef3a..7a0b310e8 100644
--- a/Library/Formula/gwenhywfar.rb
+++ b/Library/Formula/gwenhywfar.rb
@@ -5,14 +5,15 @@ class Gwenhywfar <Formula
   homepage 'http://gwenhywfar.sourceforge.net/'
   md5 '513ea7b5b22edf512fa7d825ef544954'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'gnutls'
 
   def options
-    [
-      ['--with-gui=XX,...', "Install gui support XX where XX is the name of the gui toolkit\n\te.g.: --with-gui=gtk\n\tAvailable gui toolkits are: qt, gtk"],
-    ]
+    [[
+      "--with-gui=XX,...",
+      "Install gui support XX where XX is the name of the gui toolkit\n\te.g.: --with-gui=gtk\n\tAvailable gui toolkits are: qt, gtk"
+    ]]
   end
 
 
diff --git a/Library/Formula/hatari.rb b/Library/Formula/hatari.rb
index 7fb22905e..6596ed049 100644
--- a/Library/Formula/hatari.rb
+++ b/Library/Formula/hatari.rb
@@ -5,7 +5,7 @@ class Hatari <Formula
   homepage 'http://hatari.berlios.de/'
   md5 '2f30e5c9e146ee92e3f2f5ae1cef3673'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'sdl'
 
   def install
diff --git a/Library/Formula/ifuse.rb b/Library/Formula/ifuse.rb
index 4a14c51ab..a7710e874 100644
--- a/Library/Formula/ifuse.rb
+++ b/Library/Formula/ifuse.rb
@@ -5,7 +5,7 @@ class Ifuse <Formula
   homepage 'http://www.libimobiledevice.org/'
   md5 '325d58abe182afa95187e6c55f2bba5f'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'libimobiledevice'
 
diff --git a/Library/Formula/io.rb b/Library/Formula/io.rb
index f89f06373..4b710869e 100644
--- a/Library/Formula/io.rb
+++ b/Library/Formula/io.rb
@@ -4,7 +4,7 @@ class Io <Formula
   head 'git://github.com/stevedekorte/io.git'
   homepage 'http://iolanguage.com/'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'libsgml'
 
   def install
diff --git a/Library/Formula/irssi.rb b/Library/Formula/irssi.rb
index c130f3e3a..4c70d2e21 100644
--- a/Library/Formula/irssi.rb
+++ b/Library/Formula/irssi.rb
@@ -5,7 +5,7 @@ class Irssi <Formula
   url 'http://irssi.org/files/irssi-0.8.15.tar.bz2'
   md5 '1dcb3f511b88df94b0c996f36668c7da'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
 
   # Don't strip, to allow dynamic loading of modules
diff --git a/Library/Formula/jack.rb b/Library/Formula/jack.rb
index d5b74feff..8812b365a 100644
--- a/Library/Formula/jack.rb
+++ b/Library/Formula/jack.rb
@@ -5,7 +5,7 @@ class Jack <Formula
   homepage 'http://jackaudio.org'
   md5 'd58e29a55f285d54e75134cec8e02a10'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
diff --git a/Library/Formula/kde-phonon.rb b/Library/Formula/kde-phonon.rb
index 89d1fa3e3..606a7fcea 100644
--- a/Library/Formula/kde-phonon.rb
+++ b/Library/Formula/kde-phonon.rb
@@ -5,9 +5,9 @@ class KdePhonon <Formula
   homepage 'http://phonon.kde.org/'
   md5 '80544b876cf0e0af05f2303b3f534351'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
+  depends_on 'automoc4' => :build
   depends_on 'qt'
-  depends_on 'automoc4'
 
   keg_only "This package is already supplied by Qt and is only needed by KDE packages."
 
diff --git a/Library/Formula/kdebase-runtime.rb b/Library/Formula/kdebase-runtime.rb
index baca2c489..4d58447dc 100644
--- a/Library/Formula/kdebase-runtime.rb
+++ b/Library/Formula/kdebase-runtime.rb
@@ -5,7 +5,7 @@ class KdebaseRuntime <Formula
   homepage ''
   md5 'd46fca58103624c28fcdf3fbd63262eb'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'kde-phonon'
   depends_on 'oxygen-icons'
 
diff --git a/Library/Formula/kdelibs.rb b/Library/Formula/kdelibs.rb
index b707fdde3..621794e78 100644
--- a/Library/Formula/kdelibs.rb
+++ b/Library/Formula/kdelibs.rb
@@ -5,35 +5,35 @@ class Kdelibs <Formula
   homepage 'http://www.kde.org/'
   md5 '44ddba0e31ee3d78da09f0176d3c66db'
 
+  depends_on 'cmake' => :build
+  depends_on 'automoc4' => :build
   depends_on 'gettext'
-  depends_on 'cmake'
-  depends_on 'qt'
-  depends_on 'automoc4'
   depends_on 'pcre'
   depends_on 'jpeg'
   depends_on 'giflib'
+  depends_on 'libpng' unless File.exist? "/usr/X11R6/lib"
   depends_on 'strigi'
   depends_on 'soprano'
   depends_on 'shared-desktop-ontologies'
   depends_on 'shared-mime-info'
   depends_on 'attica'
   depends_on 'd-bus'
-
-  depends_on 'libpng' unless File.exist? "/usr/X11R6/lib"
+  depends_on 'qt'
 
   def patches
     DATA
   end
 
   def install
-    gettext = Formula.factory 'gettext'
-    mkdir('build')
-    cd('build')
-    system "cmake .. #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{gettext.prefix} -DBUNDLE_INSTALL_DIR=#{bin}"
+    gettext_prefix = Formula.factory('gettext').prefix
+    mkdir 'build'
+    cd 'build'
+    system "cmake .. #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{gettext_prefix} -DBUNDLE_INSTALL_DIR=#{bin}"
     system "make install"
   end
 end
 
+
 __END__
 
 Index: kdelibs-4.3.2/kinit/kinit.cpp
diff --git a/Library/Formula/kdepim.rb b/Library/Formula/kdepim.rb
index 87390ceed..12aa0782f 100644
--- a/Library/Formula/kdepim.rb
+++ b/Library/Formula/kdepim.rb
@@ -5,7 +5,7 @@ class Kdepim <Formula
   homepage ''
   md5 'db74243fb2192b64bb613027e1c0cc23'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'kdebase-runtime'
 
   def install
diff --git a/Library/Formula/kdepimlibs.rb b/Library/Formula/kdepimlibs.rb
index ff90180b0..8ba6c63c5 100644
--- a/Library/Formula/kdepimlibs.rb
+++ b/Library/Formula/kdepimlibs.rb
@@ -5,7 +5,7 @@ class Kdepimlibs <Formula
   homepage 'http://www.kde.org/'
   md5 'ebe6e0bbac211ae9cada13cc6efbd161'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'gpgme'
   depends_on 'akonadi'
   depends_on 'libical'
diff --git a/Library/Formula/lasi.rb b/Library/Formula/lasi.rb
index caee0aeaa..ca6ffc2c3 100644
--- a/Library/Formula/lasi.rb
+++ b/Library/Formula/lasi.rb
@@ -4,8 +4,8 @@ class Lasi <Formula
   head 'https://lasi.svn.sourceforge.net/svnroot/lasi/trunk'
   homepage 'http://www.unifont.org/lasi/'
 
-  depends_on 'cmake'
-  depends_on 'pkg-config'
+  depends_on 'cmake' => :build
+  depends_on 'pkg-config' => :build
   depends_on 'pango'
   depends_on 'doxygen'
 
diff --git a/Library/Formula/lastfm_fplib.rb b/Library/Formula/lastfm_fplib.rb
index 53ce9a4f8..65c682b42 100644
--- a/Library/Formula/lastfm_fplib.rb
+++ b/Library/Formula/lastfm_fplib.rb
@@ -4,7 +4,7 @@ class LastfmFplib <Formula
   head 'svn://svn.audioscrobbler.net/recommendation/MusicID/lastfm_fplib'
   homepage 'http://blog.last.fm/2007/08/29/audio-fingerprinting-for-clean-metadata'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'taglib'
   depends_on 'mad'
   depends_on 'libsamplerate'
diff --git a/Library/Formula/lastfmfpclient.rb b/Library/Formula/lastfmfpclient.rb
index 6fab9cac7..039f1e122 100644
--- a/Library/Formula/lastfmfpclient.rb
+++ b/Library/Formula/lastfmfpclient.rb
@@ -6,7 +6,7 @@ class Lastfmfpclient <Formula
   homepage 'http://github.com/lastfm/Fingerprinter'
   md5 'ab909b4d6dcc6182afae616749ce0fdc'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'taglib'
   depends_on 'fftw'
   depends_on 'mad'
diff --git a/Library/Formula/lftp.rb b/Library/Formula/lftp.rb
index 3ddce4711..96933a70f 100644
--- a/Library/Formula/lftp.rb
+++ b/Library/Formula/lftp.rb
@@ -5,8 +5,8 @@ class Lftp <Formula
   homepage 'http://lftp.yar.ru/'
   md5 '028f14ef845403e6f76acb41f51e908c'
 
+  depends_on 'pkg-config' => :build
   depends_on 'readline'
-  depends_on 'pkg-config'
   depends_on 'gnutls'
 
   def install
diff --git a/Library/Formula/libass.rb b/Library/Formula/libass.rb
index 8f5b93ff1..a62918752 100644
--- a/Library/Formula/libass.rb
+++ b/Library/Formula/libass.rb
@@ -5,7 +5,7 @@ class Libass <Formula
   homepage 'http://code.google.com/p/libass/'
   md5 '6f545089d838d524c4f3b12e8ef6ed38'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
diff --git a/Library/Formula/libcddb.rb b/Library/Formula/libcddb.rb
index ffc8546cb..95cfaf4e9 100644
--- a/Library/Formula/libcddb.rb
+++ b/Library/Formula/libcddb.rb
@@ -5,7 +5,7 @@ class Libcddb <Formula
   md5 '8bb4a6f542197e8e9648ae597cd6bc8a'
   homepage 'http://libcddb.sourceforge.net/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libcdio'
 
   def install
diff --git a/Library/Formula/libcroco.rb b/Library/Formula/libcroco.rb
index ec508fafa..5177ea539 100644
--- a/Library/Formula/libcroco.rb
+++ b/Library/Formula/libcroco.rb
@@ -5,7 +5,7 @@ class Libcroco <Formula
   md5 '1429c597aa4b75fc610ab3a542c99209'
   homepage 'http://www.freespiders.org/projects/libcroco/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'intltool'
 
diff --git a/Library/Formula/libdmtx.rb b/Library/Formula/libdmtx.rb
index ac10aeb04..0b676c15a 100644
--- a/Library/Formula/libdmtx.rb
+++ b/Library/Formula/libdmtx.rb
@@ -5,7 +5,7 @@ class Libdmtx <Formula
   homepage 'http://www.libdmtx.org'
   md5 '0684cf3857591e777b57248d652444ae'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'imagemagick'
 
   def install
diff --git a/Library/Formula/libexosip.rb b/Library/Formula/libexosip.rb
index cfd0e375f..a9fb3c01f 100644
--- a/Library/Formula/libexosip.rb
+++ b/Library/Formula/libexosip.rb
@@ -5,7 +5,7 @@ class Libexosip <Formula
   homepage 'http://www.antisip.com/as/'
   md5 'a2739067b51c1e417c5aef9606b285b2'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libosip'
 
   def install
diff --git a/Library/Formula/libfishsound.rb b/Library/Formula/libfishsound.rb
index 3b2f19be7..c5f44a708 100644
--- a/Library/Formula/libfishsound.rb
+++ b/Library/Formula/libfishsound.rb
@@ -5,7 +5,7 @@ class Libfishsound <Formula
   homepage 'http://xiph.org/fishsound/'
   md5 '02c5c7b361a35c9da3cf311d68800dab'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libvorbis'
   depends_on 'speex' => :optional
   depends_on 'flac' => :optional
diff --git a/Library/Formula/libfixbuf.rb b/Library/Formula/libfixbuf.rb
index f9df0c900..bccd0421e 100644
--- a/Library/Formula/libfixbuf.rb
+++ b/Library/Formula/libfixbuf.rb
@@ -5,7 +5,7 @@ class Libfixbuf <Formula
   homepage 'http://tools.netsa.cert.org/fixbuf/'
   md5 '7c22a5b376a3661c7bb79ca2972c0173'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
 
   def install
diff --git a/Library/Formula/libftdi.rb b/Library/Formula/libftdi.rb
index 7c971a436..2111d5382 100644
--- a/Library/Formula/libftdi.rb
+++ b/Library/Formula/libftdi.rb
@@ -5,7 +5,7 @@ class Libftdi <Formula
   homepage 'http://www.intra2net.com/en/developer/libftdi'
   md5 '810c69cfaa078b49795c224ef9b6b851'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'libusb-compat'
 
   def patches
diff --git a/Library/Formula/libgphoto2.rb b/Library/Formula/libgphoto2.rb
index 9945021ce..9aefa1bad 100644
--- a/Library/Formula/libgphoto2.rb
+++ b/Library/Formula/libgphoto2.rb
@@ -4,7 +4,7 @@ class Libgphoto2 <Formula
   url 'http://downloads.sourceforge.net/project/gphoto/libgphoto/2.4.10.1/libgphoto2-2.4.10.1.tar.bz2'
   md5 '362cd914c64b2363f4d0bd5ad07c7209'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libusb-compat'
   depends_on 'libexif' => :optional
 
diff --git a/Library/Formula/libgsf.rb b/Library/Formula/libgsf.rb
index ea53e80d0..daba26aa4 100644
--- a/Library/Formula/libgsf.rb
+++ b/Library/Formula/libgsf.rb
@@ -5,7 +5,7 @@ class Libgsf <Formula
   homepage 'http://directory.fsf.org/project/libgsf/'
   sha256 '10c6b69149e424ac5f325eb247fdf640ddd949952f21b99a890e73f9d4276876'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'intltool'
   depends_on 'glib'
diff --git a/Library/Formula/libgtop.rb b/Library/Formula/libgtop.rb
index 50aeb2bbc..e6802a865 100644
--- a/Library/Formula/libgtop.rb
+++ b/Library/Formula/libgtop.rb
@@ -5,7 +5,7 @@ class Libgtop <Formula
   homepage 'http://library.gnome.org/devel/libgtop/stable/'
   md5 'a035abf8cf7877a9950b6483aa7b96fd'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'glib'
   depends_on 'intltool'
diff --git a/Library/Formula/libidl.rb b/Library/Formula/libidl.rb
index a8638fc80..dc3747ba6 100644
--- a/Library/Formula/libidl.rb
+++ b/Library/Formula/libidl.rb
@@ -5,7 +5,7 @@ class Libidl <Formula
   homepage 'http://ftp.acc.umu.se/pub/gnome/sources/libIDL/0.8/'
   md5 'bb8e10a218fac793a52d404d14adedcb'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'glib'
 
diff --git a/Library/Formula/libimobiledevice.rb b/Library/Formula/libimobiledevice.rb
index e9c9daec7..59fdc4185 100644
--- a/Library/Formula/libimobiledevice.rb
+++ b/Library/Formula/libimobiledevice.rb
@@ -5,7 +5,7 @@ class Libimobiledevice <Formula
   homepage 'http://www.libimobiledevice.org/'
   md5 '684edcf0946f5a8db95bfcced7626dbe'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libtasn1'
   depends_on 'usbmuxd'
   depends_on 'libplist'
diff --git a/Library/Formula/libmms.rb b/Library/Formula/libmms.rb
index f8407f60d..0bfedeeaa 100644
--- a/Library/Formula/libmms.rb
+++ b/Library/Formula/libmms.rb
@@ -5,7 +5,7 @@ class Libmms <Formula
   homepage 'https://launchpad.net/libmms'
   md5 'cf83053ec891f14e73a04c84d9de08ee'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
 
   def install
diff --git a/Library/Formula/liboil.rb b/Library/Formula/liboil.rb
index 798548238..5523389c8 100644
--- a/Library/Formula/liboil.rb
+++ b/Library/Formula/liboil.rb
@@ -5,7 +5,7 @@ class Liboil <Formula
   url 'http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz'
   md5 '47dc734f82faeb2964d97771cfd2e701'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
 
   def install
diff --git a/Library/Formula/libplist.rb b/Library/Formula/libplist.rb
index 17ee21290..5fee20544 100644
--- a/Library/Formula/libplist.rb
+++ b/Library/Formula/libplist.rb
@@ -5,7 +5,7 @@ class Libplist <Formula
   homepage 'http://github.com/JonathanBeck/libplist'
   md5 '0f48f4da8ddba5d7e186307622bf2c62'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'glib'
   depends_on 'libxml2'
 
diff --git a/Library/Formula/libqrencode.rb b/Library/Formula/libqrencode.rb
index 2a94a1f58..ef2f97702 100644
--- a/Library/Formula/libqrencode.rb
+++ b/Library/Formula/libqrencode.rb
@@ -5,7 +5,7 @@ class Libqrencode <Formula
   homepage 'http://megaui.net/fukuchi/works/qrencode/index.en.html'
   md5 'fc300af948b36b2197ede0d131c12e21'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/libquicktime.rb b/Library/Formula/libquicktime.rb
index e8a0117a6..305ef5e57 100644
--- a/Library/Formula/libquicktime.rb
+++ b/Library/Formula/libquicktime.rb
@@ -14,7 +14,7 @@ class Libquicktime <Formula
       DATA
   end
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'jpeg' => :optional
   depends_on 'lame' => :optional
diff --git a/Library/Formula/libshout.rb b/Library/Formula/libshout.rb
index 65b9b654f..15e1612ff 100644
--- a/Library/Formula/libshout.rb
+++ b/Library/Formula/libshout.rb
@@ -5,7 +5,7 @@ class Libshout <Formula
   homepage 'http://www.icecast.org/'
   md5 '4f75fc9901c724b712c371c9a1e782d3'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libogg'
   depends_on 'libvorbis'
 
diff --git a/Library/Formula/libsvg-cairo.rb b/Library/Formula/libsvg-cairo.rb
index b50dbced7..d9f858984 100644
--- a/Library/Formula/libsvg-cairo.rb
+++ b/Library/Formula/libsvg-cairo.rb
@@ -6,7 +6,7 @@ class LibsvgCairo <Formula
   md5 'd79da7b3a60ad8c8e4b902c9b3563047'
   version '0.1.6'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libpng'
   depends_on 'libsvg'
   depends_on 'cairo' if MACOS_VERSION < 10.6
diff --git a/Library/Formula/libtorrent.rb b/Library/Formula/libtorrent.rb
index 6043cc1db..5945fadc2 100644
--- a/Library/Formula/libtorrent.rb
+++ b/Library/Formula/libtorrent.rb
@@ -5,7 +5,7 @@ class Libtorrent <Formula
   homepage 'http://libtorrent.rakshasa.no/'
   md5 '037499ed708aaf72988cee60e5a8d96b'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libsigc++'
 
   def install
diff --git a/Library/Formula/libusb-compat.rb b/Library/Formula/libusb-compat.rb
index 77f3a117a..f14f5b205 100644
--- a/Library/Formula/libusb-compat.rb
+++ b/Library/Formula/libusb-compat.rb
@@ -5,7 +5,7 @@ class LibusbCompat <Formula
   homepage 'http://www.libusb.org/'
   md5 '570ac2ea085b80d1f74ddc7c6a93c0eb'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libusb'
 
   def install
diff --git a/Library/Formula/libvorbis.rb b/Library/Formula/libvorbis.rb
index 708e23a4b..fadcb6ba9 100644
--- a/Library/Formula/libvorbis.rb
+++ b/Library/Formula/libvorbis.rb
@@ -5,7 +5,7 @@ class Libvorbis <Formula
   md5 '90b1eb86e6d57694ffdfc2e4d8c7a64e'
   homepage 'http://vorbis.com'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libogg'
 
   def install
diff --git a/Library/Formula/libwmf.rb b/Library/Formula/libwmf.rb
index 20ebb6a65..72f401e42 100644
--- a/Library/Formula/libwmf.rb
+++ b/Library/Formula/libwmf.rb
@@ -5,7 +5,7 @@ class Libwmf <Formula
   homepage 'http://wvware.sourceforge.net/libwmf.html'
   md5 'd1177739bf1ceb07f57421f0cee191e0'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gd'
 
   def install
diff --git a/Library/Formula/libzzip.rb b/Library/Formula/libzzip.rb
index 173003d1f..fe5725942 100644
--- a/Library/Formula/libzzip.rb
+++ b/Library/Formula/libzzip.rb
@@ -5,7 +5,7 @@ class Libzzip <Formula
   homepage 'http://sourceforge.net/projects/zziplib/'
   md5 '7ebb644bbd880b130435ce6dcbd3cdd3'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
diff --git a/Library/Formula/lighttpd.rb b/Library/Formula/lighttpd.rb
index 006a6004f..6ca392149 100644
--- a/Library/Formula/lighttpd.rb
+++ b/Library/Formula/lighttpd.rb
@@ -5,7 +5,7 @@ class Lighttpd <Formula
   md5 '586eb535d31ac299652495b058dd87c4'
   homepage 'http://www.lighttpd.net/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'pcre'
 
   def install
diff --git a/Library/Formula/lilypond.rb b/Library/Formula/lilypond.rb
index 4add03526..74b140aa2 100644
--- a/Library/Formula/lilypond.rb
+++ b/Library/Formula/lilypond.rb
@@ -5,7 +5,7 @@ class Lilypond <Formula
   homepage 'http://lilypond.org/'
   md5 '741190abdd2217cf9f4ea6abff66accf'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   # The guile version must be < 1.9
   depends_on 'guile'
   depends_on 'gettext'
diff --git a/Library/Formula/loudmouth.rb b/Library/Formula/loudmouth.rb
index 229e281c7..b94b0c58d 100644
--- a/Library/Formula/loudmouth.rb
+++ b/Library/Formula/loudmouth.rb
@@ -8,7 +8,7 @@ class Loudmouth <Formula
 
   head 'git://github.com/engineyard/loudmouth.git'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'gnutls' => :optional
 
diff --git a/Library/Formula/makensis.rb b/Library/Formula/makensis.rb
index 177d5e6d9..335d32397 100644
--- a/Library/Formula/makensis.rb
+++ b/Library/Formula/makensis.rb
@@ -10,7 +10,7 @@ class Makensis <Formula
   homepage 'http://nsis.sourceforge.net/'
   md5 '61c2e81739436b06d7cf7bcce1d533ac'
 
-  depends_on 'scons'
+  depends_on 'scons' => :build
 
   def install
     system "scons makensis"
diff --git a/Library/Formula/mcabber.rb b/Library/Formula/mcabber.rb
index 103a000c2..835ab79a5 100644
--- a/Library/Formula/mcabber.rb
+++ b/Library/Formula/mcabber.rb
@@ -6,7 +6,7 @@ class Mcabber <Formula
   md5 '97faad2154a87da9329d51db957f9024'
   head 'http://mcabber.com/hg/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'loudmouth'
   depends_on 'gpgme'
diff --git a/Library/Formula/mdbtools.rb b/Library/Formula/mdbtools.rb
index 02cb0d9b2..799aad85b 100644
--- a/Library/Formula/mdbtools.rb
+++ b/Library/Formula/mdbtools.rb
@@ -5,7 +5,7 @@ class Mdbtools <Formula
   # Last stable release won't build on OS X, but HEAD from CVS does.
   head "cvs://:pserver:anonymous@mdbtools.cvs.sourceforge.net:/cvsroot/mdbtools:mdbtools"
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'gawk' => :optional # To generate docs
 
diff --git a/Library/Formula/media-info.rb b/Library/Formula/media-info.rb
index 70f894333..448fd28bd 100644
--- a/Library/Formula/media-info.rb
+++ b/Library/Formula/media-info.rb
@@ -6,7 +6,7 @@ class MediaInfo <Formula
   version '0.7.8'
   md5 '9df4cf265802bae929450954f15a46d1'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     root_dir = Dir.pwd
diff --git a/Library/Formula/mednafen.rb b/Library/Formula/mednafen.rb
index 74aebfc77..8099e4dda 100644
--- a/Library/Formula/mednafen.rb
+++ b/Library/Formula/mednafen.rb
@@ -6,7 +6,7 @@ class Mednafen <Formula
   md5 'f50882095931a44df828e1254ed1a461'
   version '0.8.D-rc1'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'sdl'
   depends_on 'sdl_net'
   depends_on 'libcdio'
diff --git a/Library/Formula/midnight-commander.rb b/Library/Formula/midnight-commander.rb
index 5ea01da84..30dffc444 100644
--- a/Library/Formula/midnight-commander.rb
+++ b/Library/Formula/midnight-commander.rb
@@ -6,7 +6,7 @@ class MidnightCommander <Formula
   sha256 '1b8e9650f092d4554eb08f137142bd203b5cef74b5000f3e228f0261fd92a039'
   version '4.7.0.8'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
 
   def install
diff --git a/Library/Formula/monotone.rb b/Library/Formula/monotone.rb
index 55ce56731..f8aa8b5d3 100644
--- a/Library/Formula/monotone.rb
+++ b/Library/Formula/monotone.rb
@@ -5,7 +5,7 @@ class Monotone <Formula
   homepage 'http://www.monotone.ca/'
   md5 '330a1fe1d92c899d1ad539606f85a9f8'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'botan'
   depends_on 'boost'
diff --git a/Library/Formula/moxi.rb b/Library/Formula/moxi.rb
index 51b60a099..e2d57b153 100644
--- a/Library/Formula/moxi.rb
+++ b/Library/Formula/moxi.rb
@@ -5,7 +5,7 @@ class Moxi <Formula
   homepage 'http://labs.northscale.com/moxi/'
   md5 'ec73c7521324321eb4c8b4f51f9d7373'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'check'
   depends_on 'libevent'
 
diff --git a/Library/Formula/mpc.rb b/Library/Formula/mpc.rb
index d45a39ab0..e0b0cd67c 100644
--- a/Library/Formula/mpc.rb
+++ b/Library/Formula/mpc.rb
@@ -5,7 +5,7 @@ class Mpc <Formula
   homepage 'http://mpd.wikia.com/wiki/Client:Mpc'
   md5 '9ab2967d9ec719b06a86f3b4121be654'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libmpdclient'
 
   def install
diff --git a/Library/Formula/mpd.rb b/Library/Formula/mpd.rb
index 7715219cf..a5591b387 100644
--- a/Library/Formula/mpd.rb
+++ b/Library/Formula/mpd.rb
@@ -5,9 +5,9 @@ class Mpd <Formula
   homepage 'http://mpd.wikia.com'
   md5 'b00b289a20ecd9accfd4972d6395135c'
 
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'libid3tag'
-  depends_on 'pkg-config'
   depends_on 'flac'
   depends_on 'libshout'
   depends_on 'mad'
diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb
index af8c850e9..3e6786e7a 100644
--- a/Library/Formula/mplayer.rb
+++ b/Library/Formula/mplayer.rb
@@ -5,7 +5,7 @@ class Mplayer <Formula
   # http://github.com/mxcl/homebrew/issues/issue/87
   head 'svn://svn.mplayerhq.hu/mplayer/trunk', :using => StrictSubversionDownloadStrategy
 
-  depends_on 'pkg-config' => :recommended
+  depends_on 'pkg-config' => :build
   depends_on 'yasm' => :optional
 
   def install
diff --git a/Library/Formula/mscgen.rb b/Library/Formula/mscgen.rb
index db634b6f9..c9967a993 100644
--- a/Library/Formula/mscgen.rb
+++ b/Library/Formula/mscgen.rb
@@ -5,7 +5,7 @@ class Mscgen <Formula
   homepage 'http://www.mcternan.me.uk/mscgen/'
   md5 'b3a084a31070a0db2e0bb40a35825fac'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gd' => :recommended
 
   def install
diff --git a/Library/Formula/mysql-connector-c.rb b/Library/Formula/mysql-connector-c.rb
index a7aa7b554..d6ad899b0 100644
--- a/Library/Formula/mysql-connector-c.rb
+++ b/Library/Formula/mysql-connector-c.rb
@@ -5,7 +5,7 @@ class MysqlConnectorC <Formula
   url 'http://mysql.llarian.net/Downloads/Connector-C/mysql-connector-c-6.0.2.tar.gz'
   md5 'f922b778abdd25f7c1c95a8329144d56'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     fails_with_llvm "error: unsupported inline asm"
diff --git a/Library/Formula/mysql-proxy.rb b/Library/Formula/mysql-proxy.rb
index bb744bae9..e1cd71397 100644
--- a/Library/Formula/mysql-proxy.rb
+++ b/Library/Formula/mysql-proxy.rb
@@ -5,7 +5,7 @@ class MysqlProxy <Formula
   homepage 'https://launchpad.net/mysql-proxy'
   md5 'b6a9748d72e8db7fe3789fbdd60ff451'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'libevent'
   depends_on 'lua'
diff --git a/Library/Formula/ncmpc.rb b/Library/Formula/ncmpc.rb
index 07603befc..0b4889783 100644
--- a/Library/Formula/ncmpc.rb
+++ b/Library/Formula/ncmpc.rb
@@ -5,7 +5,7 @@ class Ncmpc <Formula
   homepage 'http://mpd.wikia.com/wiki/Client:Ncmpc'
   md5 'f3e53a379bd0bc82d315aa111bfdd17a'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'glib'
   depends_on 'libmpdclient'
diff --git a/Library/Formula/neon.rb b/Library/Formula/neon.rb
index bd37b2f3c..cc478b347 100644
--- a/Library/Formula/neon.rb
+++ b/Library/Formula/neon.rb
@@ -5,7 +5,7 @@ class Neon <Formula
   md5 'ba1015b59c112d44d7797b62fe7bee51'
   homepage 'http://www.webdav.org/neon/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   keg_only :provided_by_osx
 
diff --git a/Library/Formula/oggz.rb b/Library/Formula/oggz.rb
index 7d6f6ee60..de5d0cd82 100644
--- a/Library/Formula/oggz.rb
+++ b/Library/Formula/oggz.rb
@@ -5,7 +5,7 @@ class Oggz <Formula
   md5 '57359f6f0824b3e9bad85b49a6418514'
   homepage 'http://www.xiph.org/oggz/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libogg'
 
   def install
diff --git a/Library/Formula/open-mesh.rb b/Library/Formula/open-mesh.rb
index 49d13c796..9b66f3c82 100644
--- a/Library/Formula/open-mesh.rb
+++ b/Library/Formula/open-mesh.rb
@@ -5,7 +5,7 @@ class OpenMesh <Formula
   homepage 'http://www.openmesh.org'
   md5 '9b4f24a7b1a31cfd65aada58672a6c09'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'qt'
   depends_on 'glew'
 
diff --git a/Library/Formula/opencv.rb b/Library/Formula/opencv.rb
index e16d56734..155bbb142 100644
--- a/Library/Formula/opencv.rb
+++ b/Library/Formula/opencv.rb
@@ -10,8 +10,8 @@ class Opencv <Formula
   # NOTE: Head builds past the revision above may break on OS X
   head 'https://code.ros.org/svn/opencv/trunk/opencv', :using => :svn
 
-  depends_on 'cmake'
-  depends_on 'pkg-config'
+  depends_on 'cmake' => :build
+  depends_on 'pkg-config' => :build
 
   depends_on 'libtiff' => :optional
   depends_on 'jasper'  => :optional
diff --git a/Library/Formula/openexr.rb b/Library/Formula/openexr.rb
index e5e5d41e7..8ac5fd714 100644
--- a/Library/Formula/openexr.rb
+++ b/Library/Formula/openexr.rb
@@ -5,7 +5,7 @@ class Openexr <Formula
   homepage 'http://www.openexr.com/'
   md5 '11951f164f9c872b183df75e66de145a'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'ilmbase'
 
   def patches
diff --git a/Library/Formula/openimageio.rb b/Library/Formula/openimageio.rb
index 3164ec0c8..1f6771757 100644
--- a/Library/Formula/openimageio.rb
+++ b/Library/Formula/openimageio.rb
@@ -5,8 +5,8 @@ class Openimageio <Formula
   version "0.8"
   homepage 'http://openimageio.org'
 
-  depends_on 'pkg-config'
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
+  depends_on 'pkg-config' => :build
   depends_on 'ilmbase'
   depends_on 'openexr'
   depends_on 'boost'
diff --git a/Library/Formula/openjpeg.rb b/Library/Formula/openjpeg.rb
index 319ffbbd5..06877f564 100644
--- a/Library/Formula/openjpeg.rb
+++ b/Library/Formula/openjpeg.rb
@@ -4,7 +4,7 @@ class Openjpeg <Formula
   head 'http://openjpeg.googlecode.com/svn/trunk/'
   homepage 'http://www.openjpeg.org/'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'libtiff'
 
   def install
diff --git a/Library/Formula/opensaml.rb b/Library/Formula/opensaml.rb
index ed1476440..472268cf4 100644
--- a/Library/Formula/opensaml.rb
+++ b/Library/Formula/opensaml.rb
@@ -5,7 +5,7 @@ class Opensaml <Formula
   homepage 'https://spaces.internet2.edu/display/OpenSAML/'
   md5 '9695d40cb28519c2cde8211cd1c3dc69'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'log4shib'
   depends_on 'xerces-c'
   depends_on 'xml-security-c'
diff --git a/Library/Formula/orderly.rb b/Library/Formula/orderly.rb
index aff04795f..e8fc3e0bb 100644
--- a/Library/Formula/orderly.rb
+++ b/Library/Formula/orderly.rb
@@ -7,7 +7,7 @@ class Orderly <Formula
   version '0.0.1'
 
   depends_on 'yajl'
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     system "cmake . #{std_cmake_parameters}"
diff --git a/Library/Formula/oxygen-icons.rb b/Library/Formula/oxygen-icons.rb
index 94427b6c1..1aece29e0 100644
--- a/Library/Formula/oxygen-icons.rb
+++ b/Library/Formula/oxygen-icons.rb
@@ -5,7 +5,7 @@ class OxygenIcons <Formula
   homepage 'http://www.oxygen-icons.org/'
   md5 '86e655d909f743cea6a2fc6dd90f0e52'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     system "cmake . #{std_cmake_parameters}"
diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb
index 8b9da174f..0de90dbeb 100644
--- a/Library/Formula/pango.rb
+++ b/Library/Formula/pango.rb
@@ -5,7 +5,7 @@ class Pango <Formula
   homepage 'http://www.pango.org/'
   sha256 '8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
 
   if MACOS_VERSION < 10.6
diff --git a/Library/Formula/pangomm.rb b/Library/Formula/pangomm.rb
index a2b3a5096..c189fb461 100644
--- a/Library/Formula/pangomm.rb
+++ b/Library/Formula/pangomm.rb
@@ -5,7 +5,7 @@ class Pangomm <Formula
   homepage 'http://www.pango.org/'
   md5 '2ccc1a5e271d90d4d1a414e0e234329a'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'pango'
   depends_on 'glibmm'
   depends_on 'cairomm'
diff --git a/Library/Formula/pinentry.rb b/Library/Formula/pinentry.rb
index ba18c1631..f1ec53e7e 100644
--- a/Library/Formula/pinentry.rb
+++ b/Library/Formula/pinentry.rb
@@ -5,7 +5,7 @@ class Pinentry <Formula
   homepage 'http://www.gnupg.org/related_software/pinentry/index.en.html'
   sha1 '381f9ee47b9f198e1be5d3ec4e043067a7e97912'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libgpg-error'
   depends_on 'libgcrypt'
   depends_on 'libksba'
diff --git a/Library/Formula/pixman.rb b/Library/Formula/pixman.rb
index 02b4ae2f5..37ba3e003 100644
--- a/Library/Formula/pixman.rb
+++ b/Library/Formula/pixman.rb
@@ -5,7 +5,7 @@ class Pixman <Formula
   homepage 'http://www.cairographics.org/'
   md5 'a4fb870fc325be258089f1683642e976'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libpng'
 
   def install
diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb
index f87b66f2c..19ad59b99 100644
--- a/Library/Formula/poppler.rb
+++ b/Library/Formula/poppler.rb
@@ -10,7 +10,7 @@ class Poppler <Formula
   homepage 'http://poppler.freedesktop.org/'
   md5 '1d27cb8a09aaa373660fd608b258022a'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on "qt" if ARGV.include? "--with-qt4"
 
   def patches
diff --git a/Library/Formula/portmidi.rb b/Library/Formula/portmidi.rb
index f6f94d8c8..d3ffa04bb 100644
--- a/Library/Formula/portmidi.rb
+++ b/Library/Formula/portmidi.rb
@@ -5,7 +5,7 @@ class Portmidi <Formula
   homepage 'http://sourceforge.net/apps/trac/portmedia/wiki/portmidi'
   md5 '26053a105d938395227bb6ae1d78643b'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def caveats
     <<-EOS.undent
diff --git a/Library/Formula/qimageblitz.rb b/Library/Formula/qimageblitz.rb
index cbb8adc1e..e859e86e6 100644
--- a/Library/Formula/qimageblitz.rb
+++ b/Library/Formula/qimageblitz.rb
@@ -5,7 +5,7 @@ class Qimageblitz <Formula
   version '0.0.6'
   homepage 'http://www.kde.org'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'qt'
 
   def install
diff --git a/Library/Formula/qjson.rb b/Library/Formula/qjson.rb
index 31829e5b5..3a1232a4d 100644
--- a/Library/Formula/qjson.rb
+++ b/Library/Formula/qjson.rb
@@ -5,7 +5,7 @@ class Qjson <Formula
   homepage 'http://qjson.sourceforge.net'
   md5 '5a833ad606c164ed8aa69f0873366ace'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'qt'
 
   def install
diff --git a/Library/Formula/qrencode.rb b/Library/Formula/qrencode.rb
index e797a3cde..d053caed6 100644
--- a/Library/Formula/qrencode.rb
+++ b/Library/Formula/qrencode.rb
@@ -5,7 +5,7 @@ class Qrencode <Formula
   homepage 'http://megaui.net/fukuchi/works/qrencode/index.en.html'
   md5 'd97f67cbefaf577e6c15923f3cc57b6a'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libpng'
 
   def install
diff --git a/Library/Formula/quassel.rb b/Library/Formula/quassel.rb
index 32384719a..bf275b69c 100644
--- a/Library/Formula/quassel.rb
+++ b/Library/Formula/quassel.rb
@@ -4,7 +4,7 @@ class Quassel <Formula
   head 'git://git.quassel-irc.org/quassel.git'
   homepage 'http://www.quassel-irc.org/'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'qt'
 
   def patches
diff --git a/Library/Formula/quvi.rb b/Library/Formula/quvi.rb
index bcac196a9..72b1cc002 100644
--- a/Library/Formula/quvi.rb
+++ b/Library/Formula/quvi.rb
@@ -5,7 +5,7 @@ class Quvi <Formula
   sha1 'cfeacf4c0a9958ba42ecab65098d71ecdcdd02f4'
   homepage 'http://code.google.com/p/quvi/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'pcre'
   depends_on 'lua'
 
diff --git a/Library/Formula/redland.rb b/Library/Formula/redland.rb
index f2aef3109..70d6cb7e8 100644
--- a/Library/Formula/redland.rb
+++ b/Library/Formula/redland.rb
@@ -5,9 +5,9 @@ class Redland <Formula
   homepage 'http://librdf.org/'
   md5 'bdbb9b8dc614fc09a14cd646079619e1'
 
+  depends_on 'pkg-config' => :build
   depends_on 'raptor'
   depends_on 'rasqal'
-  depends_on 'pkg-config'
   depends_on 'berkeley-db' => :optional
 
   def install
diff --git a/Library/Formula/rrdtool.rb b/Library/Formula/rrdtool.rb
index 4be02d981..8f9f754d5 100644
--- a/Library/Formula/rrdtool.rb
+++ b/Library/Formula/rrdtool.rb
@@ -5,7 +5,7 @@ class Rrdtool <Formula
   homepage 'http://oss.oetiker.ch/rrdtool/index.en.html'
   md5 '93ad2fc2e9ddcd7d99c611fe30284a54'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'glib'
   depends_on 'libxml2'
diff --git a/Library/Formula/rtorrent.rb b/Library/Formula/rtorrent.rb
index f4214f6a7..194e0b31b 100644
--- a/Library/Formula/rtorrent.rb
+++ b/Library/Formula/rtorrent.rb
@@ -5,7 +5,7 @@ class Rtorrent <Formula
   homepage 'http://libtorrent.rakshasa.no/'
   md5 'b804c45c01c40312926bcea6b55bb084'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libsigc++'
   depends_on 'libtorrent'
   depends_on 'xmlrpc-c' => :optional
diff --git a/Library/Formula/s3-backer.rb b/Library/Formula/s3-backer.rb
index a37a5e22f..1248d326d 100644
--- a/Library/Formula/s3-backer.rb
+++ b/Library/Formula/s3-backer.rb
@@ -5,7 +5,7 @@ class S3Backer <Formula
   homepage 'http://code.google.com/p/s3backer/'
   md5 '98907b98424c867a6e52ffdfbbdafce4'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/schroedinger.rb b/Library/Formula/schroedinger.rb
index 05818dc91..a3076a5c5 100644
--- a/Library/Formula/schroedinger.rb
+++ b/Library/Formula/schroedinger.rb
@@ -6,7 +6,7 @@ class Schroedinger <Formula
   md5	'd67ec48b7c506db8c8b49156bf409e60'
   homepage 'http://diracvideo.org/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'orc'
 
   def install
diff --git a/Library/Formula/sdl_sound.rb b/Library/Formula/sdl_sound.rb
index 09c61ea45..86fc7e9f6 100644
--- a/Library/Formula/sdl_sound.rb
+++ b/Library/Formula/sdl_sound.rb
@@ -5,7 +5,7 @@ class SdlSound <Formula
   homepage 'http://icculus.org/SDL_sound/'
   md5 'aa09cd52df85d29bee87a664424c94b5'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'sdl'
   depends_on 'flac' => :optional
   depends_on 'libmikmod' => :optional
diff --git a/Library/Formula/shared-desktop-ontologies.rb b/Library/Formula/shared-desktop-ontologies.rb
index e094c009b..6ca43c5c3 100644
--- a/Library/Formula/shared-desktop-ontologies.rb
+++ b/Library/Formula/shared-desktop-ontologies.rb
@@ -5,7 +5,7 @@ class SharedDesktopOntologies <Formula
   homepage 'http://sourceforge.net/apps/trac/oscaf/'
   md5 '6c004e1c377f768cae5b321bc111876b'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     system "cmake . #{std_cmake_parameters}"
diff --git a/Library/Formula/shared-mime-info.rb b/Library/Formula/shared-mime-info.rb
index 8b90206a5..292d5a9db 100644
--- a/Library/Formula/shared-mime-info.rb
+++ b/Library/Formula/shared-mime-info.rb
@@ -5,7 +5,7 @@ class SharedMimeInfo <Formula
   homepage 'http://www.freedesktop.org/wiki/Software/shared-mime-info'
   md5 '9032d98f14b8e13e0fea4bf45ca23401'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'intltool'
   depends_on 'glib'
diff --git a/Library/Formula/shell.fm.rb b/Library/Formula/shell.fm.rb
index 662e0b16b..67104ee84 100644
--- a/Library/Formula/shell.fm.rb
+++ b/Library/Formula/shell.fm.rb
@@ -6,8 +6,8 @@ class ShellFm <Formula
   md5 '3f83866622a892ee89685f1ed079eefd'
 
   # homepage says that libao is optional, but it doesn't seem
-  # to build without it…
-  depends_on 'pkg-config'
+  # to build without it
+  depends_on 'pkg-config' => :build
   depends_on 'libao'
   depends_on 'mad'
 
diff --git a/Library/Formula/soprano.rb b/Library/Formula/soprano.rb
index 981922528..3cd23158b 100644
--- a/Library/Formula/soprano.rb
+++ b/Library/Formula/soprano.rb
@@ -5,7 +5,7 @@ class Soprano <Formula
   homepage 'http://soprano.sourceforge.net/'
   md5 '4892c800853cc340b63d0ab6fcf405af'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'qt'
   depends_on 'clucene' => :optional
   depends_on 'raptor' => :optional
diff --git a/Library/Formula/sox.rb b/Library/Formula/sox.rb
index fe610b61f..34d255274 100644
--- a/Library/Formula/sox.rb
+++ b/Library/Formula/sox.rb
@@ -5,7 +5,7 @@ class Sox <Formula
   homepage 'http://sox.sourceforge.net/'
   md5 'b99871c7bbae84feac9d0d1f010331ba'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libvorbis' => :optional
   depends_on 'flac' => :optional
   depends_on 'libao' => :optional
diff --git a/Library/Formula/strigi.rb b/Library/Formula/strigi.rb
index 44212a662..c98f574a3 100644
--- a/Library/Formula/strigi.rb
+++ b/Library/Formula/strigi.rb
@@ -5,7 +5,7 @@ class Strigi <Formula
   homepage 'http://strigi.sourceforge.net/'
   md5 'ca09ba176cf3ffe9afce4d92f38f9a85'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'clucene'
   depends_on 'exiv2' => :optional
 
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index c5b0f7f61..9a0427228 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -19,7 +19,7 @@ class Subversion <Formula
   md5 '7ae1c827689f21cf975804005be30aeb'
   homepage 'http://subversion.apache.org/'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   # On Snow Leopard, build a new neon. For Leopard, the deps above include this.
   depends_on 'neon' if MACOS_VERSION >= 10.6
 
diff --git a/Library/Formula/svg2pdf.rb b/Library/Formula/svg2pdf.rb
index d02591de4..ccb1f429e 100644
--- a/Library/Formula/svg2pdf.rb
+++ b/Library/Formula/svg2pdf.rb
@@ -5,7 +5,7 @@ class Svg2pdf <Formula
   homepage 'http://cairographics.org/'
   md5 '0059ba059ff89931cf37720fcd102d8f'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libsvg-cairo'
 
   def install
diff --git a/Library/Formula/svg2png.rb b/Library/Formula/svg2png.rb
index 6536d72c0..b50250b2d 100644
--- a/Library/Formula/svg2png.rb
+++ b/Library/Formula/svg2png.rb
@@ -5,7 +5,7 @@ class Svg2png <Formula
   homepage 'http://cairographics.org/'
   md5 'ba266c00486ffd93b8a46d59028aaef9'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libsvg-cairo'
 
   def install
diff --git a/Library/Formula/swfmill.rb b/Library/Formula/swfmill.rb
index fda68ef00..cdc3baa9e 100644
--- a/Library/Formula/swfmill.rb
+++ b/Library/Formula/swfmill.rb
@@ -5,7 +5,7 @@ class Swfmill <Formula
   homepage 'http://swfmill.org'
   md5 '88a634cad4d8d025c84c6e8916a8b1c4'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/syslog-ng.rb b/Library/Formula/syslog-ng.rb
index a03afedcf..b81aad0bd 100644
--- a/Library/Formula/syslog-ng.rb
+++ b/Library/Formula/syslog-ng.rb
@@ -5,7 +5,7 @@ class SyslogNg <Formula
   homepage 'http://www.balabit.com/network-security/syslog-ng/'
   md5 '7107f5758dec4b774136f0f827b35258'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'pcre'
   depends_on 'eventlog'
 
diff --git a/Library/Formula/timbl.rb b/Library/Formula/timbl.rb
index 7f74f87cc..be91ade1a 100644
--- a/Library/Formula/timbl.rb
+++ b/Library/Formula/timbl.rb
@@ -5,7 +5,7 @@ class Timbl <Formula
   homepage 'http://ilk.uvt.nl/timbl/'
   md5 '039febcd556cdd53da874e9d365224ca'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libxml2'
 
   def install
diff --git a/Library/Formula/ufraw.rb b/Library/Formula/ufraw.rb
index c4f921e8a..921052f01 100644
--- a/Library/Formula/ufraw.rb
+++ b/Library/Formula/ufraw.rb
@@ -5,7 +5,7 @@ class Ufraw <Formula
   homepage 'http://ufraw.sourceforge.net'
   md5 '61e100e42f17e3a7fcfae64506eebd14'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'libtiff'
   depends_on 'jpeg'
diff --git a/Library/Formula/usbmuxd.rb b/Library/Formula/usbmuxd.rb
index 13fd2e7da..54a7ed1c9 100644
--- a/Library/Formula/usbmuxd.rb
+++ b/Library/Formula/usbmuxd.rb
@@ -6,7 +6,7 @@ class Usbmuxd <Formula
   md5 '484970632a739206afe86802c6169300'
 
   depends_on 'libusb'
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     inreplace 'Modules/VersionTag.cmake', '"sh"', '"bash"'
diff --git a/Library/Formula/v8.rb b/Library/Formula/v8.rb
index 80fbe7642..5529d240e 100644
--- a/Library/Formula/v8.rb
+++ b/Library/Formula/v8.rb
@@ -4,7 +4,7 @@ class V8 <Formula
   head 'http://v8.googlecode.com/svn/trunk/'
   homepage 'http://code.google.com/p/v8/'
 
-  depends_on 'scons'
+  depends_on 'scons' => :build
 
   def install
     arch = Hardware.is_64_bit? ? 'x64' : 'ia32'
diff --git a/Library/Formula/vala.rb b/Library/Formula/vala.rb
index ad9cad0b4..c4e0ec826 100644
--- a/Library/Formula/vala.rb
+++ b/Library/Formula/vala.rb
@@ -6,7 +6,7 @@ class Vala <Formula
   homepage 'http://live.gnome.org/Vala'
   md5 '1e38cdc951d2b43e49084a6d5ad19e9d'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'glib'
 
diff --git a/Library/Formula/valgrind.rb b/Library/Formula/valgrind.rb
index 6160fe947..825667624 100644
--- a/Library/Formula/valgrind.rb
+++ b/Library/Formula/valgrind.rb
@@ -14,7 +14,7 @@ class Valgrind <Formula
 
   head "svn://svn.valgrind.org/valgrind/trunk"
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'boost'
 
   def install
diff --git a/Library/Formula/varnish.rb b/Library/Formula/varnish.rb
index 9aec71ff7..86b5ed64a 100644
--- a/Library/Formula/varnish.rb
+++ b/Library/Formula/varnish.rb
@@ -5,7 +5,7 @@ class Varnish <Formula
   homepage 'http://varnish.projects.linpro.no/'
   md5 '357d99a760de173d841ac37bf2052be8'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'pcre'
 
   # Do not strip varnish binaries: Otherwise, the magic string end pointer isn't found.
diff --git a/Library/Formula/vcdimager.rb b/Library/Formula/vcdimager.rb
index 0bb1d7e03..ae8e9a9fd 100644
--- a/Library/Formula/vcdimager.rb
+++ b/Library/Formula/vcdimager.rb
@@ -5,7 +5,7 @@ class Vcdimager <Formula
   homepage 'http://www.gnu.org/software/vcdimager/'
   md5 '5e7d80fdbf0037ad20e438f2a9573253'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libcdio'
   depends_on 'popt'
 
diff --git a/Library/Formula/vips.rb b/Library/Formula/vips.rb
index 5af12915f..fde7cf1a5 100644
--- a/Library/Formula/vips.rb
+++ b/Library/Formula/vips.rb
@@ -11,19 +11,19 @@ class Vips <Formula
     md5 '6323a1311a0e7b544cea407d88b82e93'
   end
 
+  depends_on 'pkg-config' => :build
+  depends_on 'gettext'
+  depends_on 'glib'
   depends_on 'jpeg' => :optional
   depends_on 'libtiff' => :optional
   depends_on 'libpng' => :optional
   depends_on 'imagemagick' => :optional
-  depends_on 'glib'
   depends_on 'fftw' => :optional
   depends_on 'little-cms' => :optional
   depends_on 'pango' => :optional
-  depends_on 'pkg-config'
   depends_on 'libexif' => :optional
   depends_on 'liboil' => :optional
   depends_on 'openexr' => :optional
-  depends_on 'gettext'
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/visualboyadvance.rb b/Library/Formula/visualboyadvance.rb
index 620d86247..5cb27b48f 100644
--- a/Library/Formula/visualboyadvance.rb
+++ b/Library/Formula/visualboyadvance.rb
@@ -5,7 +5,7 @@ class Visualboyadvance <Formula
   homepage 'http://vba.ngemu.com/' # This homepage is sketchy
   md5 'cc02339e3fd8efd9f23121b0a2f81fd8'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'libpng'
   depends_on 'sdl'
 
diff --git a/Library/Formula/weechat.rb b/Library/Formula/weechat.rb
index 8c8e30f78..75bed257b 100644
--- a/Library/Formula/weechat.rb
+++ b/Library/Formula/weechat.rb
@@ -6,7 +6,7 @@ class Weechat <Formula
   homepage 'http://www.weechat.org'
   md5 '01648f8717ab1ea5233f9818d45a7c24'
 
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
   depends_on 'gnutls'
 
   def install
diff --git a/Library/Formula/xchat.rb b/Library/Formula/xchat.rb
index b3dd184c5..afc1062aa 100644
--- a/Library/Formula/xchat.rb
+++ b/Library/Formula/xchat.rb
@@ -5,7 +5,7 @@ class Xchat <Formula
   homepage 'http://xchat.org'
   md5 '6775c44f38e84d06c06c336b32c4a452'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'gtk+'
 
diff --git a/Library/Formula/xml-tooling-c.rb b/Library/Formula/xml-tooling-c.rb
index 356e74714..989a45de2 100644
--- a/Library/Formula/xml-tooling-c.rb
+++ b/Library/Formula/xml-tooling-c.rb
@@ -5,7 +5,7 @@ class XmlToolingC <Formula
   homepage 'https://spaces.internet2.edu/display/OpenSAML/XMLTooling-C'
   md5 '3074edc8a00bba1d26c02e798ea8039c'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'log4shib'
   depends_on 'xerces-c'
   depends_on 'xml-security-c'
diff --git a/Library/Formula/yajl.rb b/Library/Formula/yajl.rb
index b222b1eed..85653b9bd 100644
--- a/Library/Formula/yajl.rb
+++ b/Library/Formula/yajl.rb
@@ -7,7 +7,7 @@ class Yajl <Formula
 
   # Configure uses cmake, even though it looks like we're
   # just using autotools below.
-  depends_on 'cmake'
+  depends_on 'cmake' => :build
 
   def install
     ENV.deparallelize
diff --git a/Library/Formula/zbar.rb b/Library/Formula/zbar.rb
index af7b7916e..76fb709da 100644
--- a/Library/Formula/zbar.rb
+++ b/Library/Formula/zbar.rb
@@ -5,7 +5,7 @@ class Zbar <Formula
   homepage 'http://zbar.sourceforge.net'
   md5 '0fd61eb590ac1bab62a77913c8b086a5'
 
-  depends_on 'pkg-config'
+  depends_on 'pkg-config' => :build
   depends_on 'jpeg'
   depends_on 'imagemagick'
   depends_on 'ufraw'
diff --git a/Library/Formula/znc.rb b/Library/Formula/znc.rb
index 7cae42ce2..78482d9ca 100644
--- a/Library/Formula/znc.rb
+++ b/Library/Formula/znc.rb
@@ -5,8 +5,8 @@ class Znc <Formula
   md5 'e800a70c932dd13bc09b63569b49db3a'
   homepage 'http://en.znc.in/wiki/ZNC'
 
+  depends_on 'pkg-config' => :build
   depends_on 'c-ares'
-  depends_on 'pkg-config' => :optional
 
   skip_clean 'bin/znc'
   skip_clean 'bin/znc-config'