valgrind: refresh and reorganize Xcode-only patches

Formula/valgrind.rb

@@ -7,19 +7,36 @@ class Valgrind < Formula
     url 'http://valgrind.org/downloads/valgrind-3.9.0.tar.bz2'
     sha1 '9415e28933de9d6687f993c4bb797e6bd49583f1'
 
-    if MacOS.version == :mavericks
-      depends_on :autoconf
-      depends_on :automake
-      depends_on :libtool
+    # Look for headers in the SDK on Xcode-only systems: https://bugs.kde.org/show_bug.cgi?id=295084
+    if MacOS.version >= :mavericks
+      depends_on "autoconf" => :build
+      depends_on "automake" => :build
+      depends_on "libtool" => :build
+
+      patch do
+        url "https://gist.githubusercontent.com/jacknagel/cd26a902d72aabd0b51d/raw/1b3c45a19c04ef096fd793c32ba13c037b1ad700/valgrind-sdk-paths-Makefile-am.diff"
+        sha1 "38eeec10e13487a38d265e411f3066f1df058181"
+      end
+    else
+      patch do
+        url "https://gist.githubusercontent.com/jacknagel/369bedc191e0a0795358/raw/a2ec0cf5f5cbf960b95a643c45506479d6ef17c2/valgrind-sdk-paths-Makefile-in.diff"
+        sha1 "8a1532d0696ce82f3b108fdee8d595015e7608e4"
+      end
     end
   end
 
   head do
     url 'svn://svn.valgrind.org/valgrind/trunk'
 
-    depends_on :autoconf
-    depends_on :automake
-    depends_on :libtool
+    depends_on "autoconf" => :build
+    depends_on "automake" => :build
+    depends_on "libtool" => :build
+
+    # Look for headers in the SDK on Xcode-only systems: https://bugs.kde.org/show_bug.cgi?id=295084
+    patch do
+      url "https://gist.githubusercontent.com/jacknagel/cd26a902d72aabd0b51d/raw/1b3c45a19c04ef096fd793c32ba13c037b1ad700/valgrind-sdk-paths.diff"
+      sha1 "38eeec10e13487a38d265e411f3066f1df058181"
+    end
   end
 
   depends_on :macos => :snow_leopard
@@ -28,13 +45,6 @@ class Valgrind < Formula
   # See #2150 for more information.
   skip_clean 'lib/valgrind'
 
-  # For Xcode-only systems, we have to patch hard-coded paths, use xcrun &
-  # add missing CFLAGS. See: https://bugs.kde.org/show_bug.cgi?id=295084
-  patch do
-    url "https://gist.githubusercontent.com/2bits/3784836/raw/f046191e72445a2fc8491cb6aeeabe84517687d9/patch1.diff"
-    sha1 "a2252d977302a37873b0f2efe8aa4a4fed2eb2c2"
-  end
-
   # Fix for 10.7.4 w/XCode-4.5, duplicate symbols. Reported upstream in
   # https://bugs.kde.org/show_bug.cgi?id=307415
   patch do
@@ -66,7 +76,13 @@ class Valgrind < Formula
       args << "--enable-only32bit"
     end
 
-    system "./autogen.sh" if build.head? || MacOS.version == :mavericks
+    if build.head? || MacOS.version == :mavericks
+      inreplace "coregrind/Makefile.am", "@@HOMEBREW_SDKROOT@@", MacOS.sdk_path.to_s
+      system "./autogen.sh"
+    else
+      inreplace "coregrind/Makefile.in", "@@HOMEBREW_SDKROOT@@", MacOS.sdk_path.to_s
+    end
+
     system "./configure", *args
     system "make"
     system "make", "install"