From 2932494da121a33e4bb4b5663307ca255d55ccd4 Mon Sep 17 00:00:00 2001 From: dsainty Date: Fri, 13 Apr 2007 09:11:20 +0000 Subject: The perils of modifying patches by hand... The old patch files applied via NetBSD's patch(1) just fine, but failed on a Debian Linux box. We need to provide three lines of context in the diff or else They complain about patching fuzz, even if 100% of the diff context matches the target. --- archivers/dar/distinfo | 6 +++--- archivers/dar/patches/patch-aa | 7 ++++--- archivers/dar/patches/patch-ab | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'archivers') diff --git a/archivers/dar/distinfo b/archivers/dar/distinfo index de6bf479bc9..2a9153e8f4e 100644 --- a/archivers/dar/distinfo +++ b/archivers/dar/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.18 2007/03/18 04:36:23 dsainty Exp $ +$NetBSD: distinfo,v 1.19 2007/04/13 09:11:20 dsainty Exp $ SHA1 (dar-2.3.3.tar.gz) = ec52d7d75b3414b54f03988874c51b2e655561ab RMD160 (dar-2.3.3.tar.gz) = 7e426a21633205738b1262fb643e1a91c8feb793 Size (dar-2.3.3.tar.gz) = 1179147 bytes -SHA1 (patch-aa) = 21728dd16aaeae50f0e28e60e4360e7a3eb2412b -SHA1 (patch-ab) = f559c5fd99ab1f4b164b26762caadcb909c53aaa +SHA1 (patch-aa) = d9d9cef20573582c2f56aa70ae1b3af98b11725a +SHA1 (patch-ab) = d442f8ec95909bf9a5e72e1ff10042ec263ec8d2 SHA1 (patch-ac) = 34ba67a1ae794c1069824347b67a204455d18f2e SHA1 (patch-ad) = b880e88531a834a69e72b9450b0aee756024fd25 SHA1 (patch-ae) = 54220384bf2031df64c38f5abea038382ca37e8e diff --git a/archivers/dar/patches/patch-aa b/archivers/dar/patches/patch-aa index 7a18f723c7b..295e7e5126f 100644 --- a/archivers/dar/patches/patch-aa +++ b/archivers/dar/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2007/03/18 04:36:23 dsainty Exp $ +$NetBSD: patch-aa,v 1.4 2007/04/13 09:11:20 dsainty Exp $ --- doc/Makefile.in.orig 2003-12-07 05:48:29.000000000 -0600 -+++ doc/Makefile.in -@@ -15,6 +15,6 @@ ++++ doc/Makefile.in 2003-12-07 05:48:29.000000000 -0600 +@@ -15,7 +15,7 @@ @SET_MAKE@ VPATH = @srcdir@ @@ -10,3 +10,4 @@ $NetBSD: patch-aa,v 1.3 2007/03/18 04:36:23 dsainty Exp $ +pkgdatadir = $(datadir)/doc/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd diff --git a/archivers/dar/patches/patch-ab b/archivers/dar/patches/patch-ab index 329d5d327b6..661b3ac4f53 100644 --- a/archivers/dar/patches/patch-ab +++ b/archivers/dar/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2007/03/18 04:36:23 dsainty Exp $ +$NetBSD: patch-ab,v 1.4 2007/04/13 09:11:20 dsainty Exp $ --- doc/mini-howto/Makefile.in.orig 2005-06-09 13:19:08.000000000 +0300 +++ doc/mini-howto/Makefile.in 2005-06-09 13:19:21.000000000 +0300 -@@ -15,6 +15,6 @@ +@@ -15,7 +15,7 @@ @SET_MAKE@ VPATH = @srcdir@ @@ -10,3 +10,4 @@ $NetBSD: patch-ab,v 1.3 2007/03/18 04:36:23 dsainty Exp $ +pkgdatadir = $(datadir)/doc/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -- cgit v1.2.3