Default to patch level 1

Having gone through our patches it's clear that p1 is more standard.

Also fixed a bug where returning DATA outside of an array would fail to patch.

11 files changed, 24 insertions, 25 deletions

diff --git a/Library/Formula/atomicparsley.rb b/Library/Formula/atomicparsley.rb
index 9cdd679cd..adb350624 100644
--- a/Library/Formula/atomicparsley.rb
+++ b/Library/Formula/atomicparsley.rb
@@ -6,7 +6,7 @@ class Atomicparsley <Formula
   @md5='681e6ecec2921c98e07a9262bdcd6cf2'
 
   def patches
-    { :p0 => DATA }
+    DATA
   end
 
   def install
@@ -18,9 +18,9 @@ end
 
 
 __END__
-diff -Naur AtomicParsley-source-0.9.0/AP_NSImage.mm AtomicParsley-source-0.9.0/AP_NSImage.mm
---- AtomicParsley-source-0.9.0/AP_NSImage.mm	2006-09-02 05:25:32.000000000 -0600
-+++ AtomicParsley-source-0.9.0/AP_NSImage.mm	2009-09-07 16:44:05.000000000 -0600
+diff -Naur a/AtomicParsley-source-0.9.0/AP_NSImage.mm b/AtomicParsley-source-0.9.0/AP_NSImage.mm
+--- a/AtomicParsley-source-0.9.0/AP_NSImage.mm	2006-09-02 05:25:32.000000000 -0600
++++ b/AtomicParsley-source-0.9.0/AP_NSImage.mm	2009-09-07 16:44:05.000000000 -0600
 @@ -26,8 +26,8 @@
  #include <sys/time.h>
  #include <string.h>
diff --git a/Library/Formula/gettext.rb b/Library/Formula/gettext.rb
index b518ae381..9f5a9bfe1 100644
--- a/Library/Formula/gettext.rb
+++ b/Library/Formula/gettext.rb
@@ -6,9 +6,7 @@ class Gettext <Formula
   @homepage='http://www.gnu.org/software/gettext/'
   
   def patches
-    {
-      :p1 => ['http://gist.github.com/raw/186336/2fe65fab894f94a03aab2f03349ae7f1febcd301/mac-osx-105-environ.patch']
-    }
+    'http://gist.github.com/raw/186336/2fe65fab894f94a03aab2f03349ae7f1febcd301/mac-osx-105-environ.patch'
   end
 
   def install
diff --git a/Library/Formula/icu4c.rb b/Library/Formula/icu4c.rb
index 45e86b80e..d8f9fcd72 100644
--- a/Library/Formula/icu4c.rb
+++ b/Library/Formula/icu4c.rb
@@ -27,8 +27,8 @@ end
 
 
 __END__
---- ./source/configure	2009-07-02 03:51:26.000000000 +0900
-+++ ./source/configure	2009-08-16 16:15:49.000000000 +0900
+--- a/source/configure	2009-07-02 03:51:26.000000000 +0900
++++ b/source/configure	2009-08-16 16:15:49.000000000 +0900
 @@ -7058,11 +7058,8 @@
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
diff --git a/Library/Formula/libffi.rb b/Library/Formula/libffi.rb
index 8f37656e5..0691610a2 100644
--- a/Library/Formula/libffi.rb
+++ b/Library/Formula/libffi.rb
@@ -8,7 +8,7 @@ class Libffi <Formula
   def patches
     host = "http://trac.macports.org"
     base = "export/57218/trunk/dports/devel/libffi/files"
-    ["#{host}/#{base}/patch-includedir.diff"]
+    { :p0 => "#{host}/#{base}/patch-includedir.diff" }
   end
 
   def install
diff --git a/Library/Formula/logrotate.rb b/Library/Formula/logrotate.rb
index cbd93be2c..fd5f6bff4 100644
--- a/Library/Formula/logrotate.rb
+++ b/Library/Formula/logrotate.rb
@@ -25,11 +25,12 @@ class Logrotate <Formula
                     'create-388608.patch',
                     'nofollow.patch',
                     'security-388608.patch'].collect {|p| "debian/patches/#{p}"}
-    {
-      :p1 => [DATA,
-              "http://ftp.de.debian.org/debian/pool/main/l/logrotate/logrotate_3.7.8-4.diff.gz",
-              *debian_patches]
-    }
+
+    [
+      DATA,
+      "http://ftp.de.debian.org/debian/pool/main/l/logrotate/logrotate_3.7.8-4.diff.gz",
+      *debian_patches
+    ]
   end
 
   def install
diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb
index 5cbc50424..c3ef715af 100644
--- a/Library/Formula/lua.rb
+++ b/Library/Formula/lua.rb
@@ -6,7 +6,7 @@ class Lua <Formula
   @md5='d0870f2de55d59c1c8419f36e8fac150'
   
   def patches
-    { :p1 => DATA }
+    DATA
   end
 
   def install
@@ -25,6 +25,8 @@ class Lua <Formula
 end
 
 
+# TODO honestly maybe this is better as it was before, ie. a gist. It's long
+# and potentially more useful to other people as a gist.
 __END__
 diff -Naur lua-5.1.4/Makefile lua-5.1.4-2/Makefile
 --- lua-5.1.4/Makefile	2008-08-11 18:40:48.000000000 -0600
diff --git a/Library/Formula/mawk.rb b/Library/Formula/mawk.rb
index a2079249d..13d2a4952 100644
--- a/Library/Formula/mawk.rb
+++ b/Library/Formula/mawk.rb
@@ -7,7 +7,7 @@ class Mawk <Formula
   @version='1.3.3'
 
   def patches
-    { :p1 => DATA }
+    DATA
   end
 
   def install
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index 33793e43f..1d5aa8c27 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -19,7 +19,7 @@ class Mysql <Formula
   end
 
   def patches
-    {:p1 => DATA}
+    DATA
   end
 
   def install
diff --git a/Library/Formula/spidermonkey.rb b/Library/Formula/spidermonkey.rb
index 354166695..39efcace3 100644
--- a/Library/Formula/spidermonkey.rb
+++ b/Library/Formula/spidermonkey.rb
@@ -12,7 +12,7 @@ class Spidermonkey <Formula
   end
 
   def patches
-    [DATA]
+    DATA
   end
 
   def install
@@ -27,8 +27,8 @@ end
 
 
 __END__
---- src/jsprf.c	2009-07-26 12:32:01.000000000 -0700
-+++ src/jsprf.c	2009-07-26 12:33:12.000000000 -0700
+--- a/src/jsprf.c	2009-07-26 12:32:01.000000000 -0700
++++ b/src/jsprf.c	2009-07-26 12:33:12.000000000 -0700
 @@ -58,6 +58,8 @@
  */
  #ifdef HAVE_VA_COPY
diff --git a/Library/Formula/sshfs.rb b/Library/Formula/sshfs.rb
index 67d94fae4..adcde3167 100644
--- a/Library/Formula/sshfs.rb
+++ b/Library/Formula/sshfs.rb
@@ -8,9 +8,7 @@ class Sshfs <Formula
   @md5='26e9206eb5169e87e6f95f54bc005a4f'
 
   def patches
-    {
-      :p1 => ["http://macfuse.googlecode.com/svn/tags/macfuse-2.0.3|2/filesystems/sshfs/sshfs-fuse-2.2-macosx.patch"]
-    }
+    "http://macfuse.googlecode.com/svn/tags/macfuse-2.0.3|2/filesystems/sshfs/sshfs-fuse-2.2-macosx.patch"
   end
 
   def deps
diff --git a/Library/Formula/xar.rb b/Library/Formula/xar.rb
index 439e2e843..1e3f8a543 100644
--- a/Library/Formula/xar.rb
+++ b/Library/Formula/xar.rb
@@ -6,7 +6,7 @@ class Xar <Formula
   @md5='8eabb055d3387b8edc30ecfb08d2e80d'
 
   def patches
-    { :p1 => DATA }
+    DATA
   end
 
   def install