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.
This commit is contained in:
Max Howell 2009-09-16 17:08:32 +01:00
parent 96fdab2e79
commit 3b4dac6ddd
11 changed files with 24 additions and 25 deletions

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -7,7 +7,7 @@ class Mawk <Formula
@version='1.3.3'
def patches
{ :p1 => DATA }
DATA
end
def install

View file

@ -19,7 +19,7 @@ class Mysql <Formula
end
def patches
{:p1 => DATA}
DATA
end
def install

View file

@ -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

View file

@ -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

View file

@ -6,7 +6,7 @@ class Xar <Formula
@md5='8eabb055d3387b8edc30ecfb08d2e80d'
def patches
{ :p1 => DATA }
DATA
end
def install