mkvtoolnix: use Boost 1.49

1 files changed, 3 insertions, 30 deletions

diff --git a/Library/Formula/mkvtoolnix.rb b/Library/Formula/mkvtoolnix.rb
index b6c5928b8..e99ea5d10 100644
--- a/Library/Formula/mkvtoolnix.rb
+++ b/Library/Formula/mkvtoolnix.rb
@@ -7,7 +7,7 @@ class Mkvtoolnix < Formula
 
   head 'https://github.com/mbunkus/mkvtoolnix.git'
 
-  depends_on 'boost'
+  depends_on 'boost149'
   depends_on 'libvorbis'
   depends_on 'libmatroska'
   depends_on 'flac' => :optional
@@ -18,40 +18,13 @@ class Mkvtoolnix < Formula
     cause "Compilation errors with older clang."
   end
 
-  # Patch to build with #define foreach BOOST_FOREACH
-  # See: https://svn.boost.org/trac/boost/ticket/6131
-  def patches
-    DATA unless build.head?
-  end
-
   def install
+    old_boost = Formula.factory("boost149")
     system "./configure", "--disable-debug",
                           "--prefix=#{prefix}",
-                          "--with-boost-libdir=#{HOMEBREW_PREFIX}/lib", # For non-/usr/local prefix
+                          "--with-boost=#{old_boost.prefix}",
                           "--with-boost-regex=boost_regex-mt" # via macports
     system "./drake", "-j#{ENV.make_jobs}"
     system "./drake install"
   end
 end
-
-__END__
-diff --git a/src/common/common.h b/src/common/common.h
-index 16f7177..8e9e053 100644
---- a/src/common/common.h
-+++ b/src/common/common.h
-@@ -17,7 +17,6 @@
- #undef min
- #undef max
-
--#include <boost/foreach.hpp>
- #include <boost/format.hpp>
- #include <boost/regex.hpp>
- #include <string>
-@@ -83,6 +82,7 @@ extern unsigned int MTX_DLL_API verbose;
-
- #define foreach                  BOOST_FOREACH
- #define reverse_foreach          BOOST_REVERSE_FOREACH
-+#include <boost/foreach.hpp>
- #define mxforeach(it, vec)       for (it = (vec).begin(); it != (vec).end(); it++)
- #define mxfind(value, cont)      std::find(cont.begin(), cont.end(), value)
- #define mxfind2(it, value, cont) ((it = std::find((cont).begin(), (cont).end(), value)) != (cont).end())