p1 the default patch-level

6 files changed, 14 insertions, 19 deletions

diff --git a/Library/Formula/alpine.rb b/Library/Formula/alpine.rb
index fd4743e24..651a847dc 100644
--- a/Library/Formula/alpine.rb
+++ b/Library/Formula/alpine.rb
@@ -1,17 +1,15 @@
 require 'formula'
 
 class Alpine < Formula
-  url 'ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.gz'
   homepage 'http://www.washington.edu/alpine/'
+  url 'ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.gz'
   md5 '0f4757167baf5c73aa44f2ffa4860093'
 
   # Upstream builds are broken on Snow Leopard due to a hack put in
   # for prior versions of OS X. See:
   # http://trac.macports.org/ticket/20971
   def patches
-    { :p1 =>
-      "https://trac.macports.org/export/89747/trunk/dports/mail/alpine/files/alpine-osx-10.6.patch"
-    }
+    "https://trac.macports.org/export/89747/trunk/dports/mail/alpine/files/alpine-osx-10.6.patch"
   end if MacOS.snow_leopard?
 
   def install
diff --git a/Library/Formula/beanstalk.rb b/Library/Formula/beanstalk.rb
index 921ae75c8..b45916873 100644
--- a/Library/Formula/beanstalk.rb
+++ b/Library/Formula/beanstalk.rb
@@ -9,10 +9,10 @@ class Beanstalk < Formula
   # bug report: https://github.com/kr/beanstalkd/issues/96
   # Will be in next release
   def patches
-    {:p1 => "http://github.com/kr/beanstalkd/commit/80da772efeeaabb12893f52a93da74ca9e69206d.patch"}
+    "http://github.com/kr/beanstalkd/commit/80da772efeeaabb12893f52a93da74ca9e69206d.patch"
   end
 
   def install
-    system "make install PREFIX=#{prefix}"
+    system "make", "install", "PREFIX=#{prefix}"
   end
 end
diff --git a/Library/Formula/dc3dd.rb b/Library/Formula/dc3dd.rb
index 96af8b36e..db028cf53 100644
--- a/Library/Formula/dc3dd.rb
+++ b/Library/Formula/dc3dd.rb
@@ -1,18 +1,19 @@
 require 'formula'
 
 class Dc3dd < Formula
-  url 'http://downloads.sourceforge.net/project/dc3dd/dc3dd/7.1.0/dc3dd-7.1.614.tar.gz'
   homepage 'http://sourceforge.net/projects/dc3dd/'
+  url 'http://downloads.sourceforge.net/project/dc3dd/dc3dd/7.1.0/dc3dd-7.1.614.tar.gz'
   md5 'b6c4ec16e7f539b17224d7f334f8396e'
 
+  # remove explicit dependency on automake 1.10.1
   def patches
-     # remove explicit dependency on automake 1.10.1
-    { :p1 => 'https://raw.github.com/gist/1159050/611c91779ba90edc77b8489e006c96a8e0078462/dc3dd-automake.patch'}
+    'https://raw.github.com/gist/1159050/611c91779ba90edc77b8489e006c96a8e0078462/dc3dd-automake.patch'
   end
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}", "--infodir=#{info}"
+                          "--prefix=#{prefix}",
+                          "--infodir=#{info}"
     system "make"
     system "make install"
     rm (lib+'charset.alias')
diff --git a/Library/Formula/mpfr.rb b/Library/Formula/mpfr.rb
index 77bf8e6e6..b0575be73 100644
--- a/Library/Formula/mpfr.rb
+++ b/Library/Formula/mpfr.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Mpfr < Formula
-  url 'http://www.mpfr.org/mpfr-3.1.0/mpfr-3.1.0.tar.bz2'
   homepage 'http://www.mpfr.org/'
+  url 'http://www.mpfr.org/mpfr-3.1.0/mpfr-3.1.0.tar.bz2'
   md5 '238ae4a15cc3a5049b723daef5d17938'
 
   depends_on 'gmp'
@@ -12,7 +12,7 @@ class Mpfr < Formula
   end
 
   def patches
-    { :p1 => "http://www.mpfr.org/mpfr-3.1.0/allpatches" }
+    "http://www.mpfr.org/mpfr-3.1.0/allpatches"
   end
 
   def install
diff --git a/Library/Formula/rlog.rb b/Library/Formula/rlog.rb
index c07bfb5a5..f6fbe7a51 100644
--- a/Library/Formula/rlog.rb
+++ b/Library/Formula/rlog.rb
@@ -1,13 +1,11 @@
 require 'formula'
 
 class Rlog < Formula
-  url 'http://rlog.googlecode.com/files/rlog-1.4.tar.gz'
   homepage 'http://www.arg0.net/rlog'
+  url 'http://rlog.googlecode.com/files/rlog-1.4.tar.gz'
   md5 'c29f74e0f50d66b20312d049b683ff82'
 
-  def patches
-    return { :p1 => DATA }
-  end
+  def patches; DATA; end
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
diff --git a/Library/Formula/winexe.rb b/Library/Formula/winexe.rb
index 21df28305..dd7b8065e 100644
--- a/Library/Formula/winexe.rb
+++ b/Library/Formula/winexe.rb
@@ -11,9 +11,7 @@ class Winexe < Formula
   # virtually everywhere, but for some reason it only breaks it on OS X.
   # http://miskstuf.tumblr.com/post/6840077505/winexe-1-00-linux-macos-windows-7-finally-working
   # Added by @vspy
-  def patches
-    {:p1 => DATA}
-  end
+  def patches; DATA; end
 
   def install
     cd "source4" do