1 files changed, 10 insertions, 17 deletions
diff --git a/Library/Formula/opencv.rb b/Library/Formula/opencv.rb
index 5277d3d8a..1a11495a5 100644
--- a/Library/Formula/opencv.rb
+++ b/Library/Formula/opencv.rb
@@ -10,18 +10,13 @@ class Opencv <Formula
   depends_on 'cmake'
   depends_on 'pkg-config'
 
-  # Optional.
-  depends_on 'libtiff'
-  depends_on 'jasper'
-  depends_on 'tbb'
+  depends_on 'libtiff' => :optional
+  depends_on 'jasper'  => :optional
+  depends_on 'tbb'     => :optional
 
-  # Very Optional? Pulls in lots of dependencies but maybe not needed unless you're doing video analysis
-  # Video analysis requires a bunch more things which we don't have: libgstreamer, libxine, unicap, libdc1394 2.x (or libdc1394 1.x + libraw1394).
-  # We can leave this disabled for now.
-  # Maybe we could add a flag?
-  #depends_on 'ffmpeg'
-
-  # There are other optional dependencies but they don't currently exist in Homebrew.
+  # Can also depend on ffmpeg, but this pulls in a lot of extra stuff that you don't
+  # need unless you're doing video analysis, and some of it isn't in Homebrew anyway.
+  # depends_on 'ffmpeg'
 
   def install
     system "cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX:PATH=#{prefix} ."
@@ -29,13 +24,11 @@ class Opencv <Formula
     system "make install"
   end
 
-    def caveats
-      return <<-EOS
-  The OpenCV Python module will not work until you edit your PYTHONPATH like so:
-
-    export PYTHONPATH="#{HOMEBREW_PREFIX}/lib/python2.6/site-packages/:$PYTHONPATH"
+  def caveats; <<-EOS.undent
+    The OpenCV Python module will not work until you edit your PYTHONPATH like so:
+      export PYTHONPATH="#{HOMEBREW_PREFIX}/lib/python2.6/site-packages/:$PYTHONPATH"
 
-  To make this permanent, put it in your shell's profile (e.g. ~/.profile).
+    To make this permanent, put it in your shell's profile (e.g. ~/.profile).
     EOS
   end
 end