Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Sep 1995 01:14:57 -0700
From:      asami@cs.berkeley.edu (Satoshi Asami)
To:        ache@freebsd.org
Cc:        ports@freebsd.org
Subject:   lynx patch failure
Message-ID:  <199509200814.BAA04242@silvia.HIP.Berkeley.EDU>

next in thread | raw e-mail | index | archive | help
After "make makesum" to correct the checksum failure (I know, that's
what checksums are for), it still fails with the following:

=======
Checksums OK.
===>  Extracting for lynx-2.4.2
===>  Patching for lynx-2.4.2
===>  Applying FreeBSD patches for lynx-2.4.2
===>   Applying FreeBSD patch /a/ports/net/lynx/patches/patch-aa
Hmm...  Looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./WWW/Library/Implementation/HTTCP.c.orig	Mon May 29 21:05:50 1995
|--- ./WWW/Library/Implementation/HTTCP.c	Sat Jun 17 02:29:35 1995
--------------------------
Patching file ./WWW/Library/Implementation/HTTCP.c using Plan A...
Hunk #1 failed at 95.
Hunk #2 succeeded at 210 (offset 3 lines).
1 out of 2 hunks failed--saving rejects to ./WWW/Library/Implementation/HTTCP.c.rej
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./WWW/Library/Implementation/HTFile.c.orig	Sat Apr  1 01:34:48 1995
|--- ./WWW/Library/Implementation/HTFile.c	Sat Jun 17 02:04:19 1995
--------------------------
Patching file ./WWW/Library/Implementation/HTFile.c using Plan A...
Hunk #1 succeeded at 585.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./WWW/Library/freebsd/Makefile.orig	Tue Jan 17 16:05:20 1995
|--- ./WWW/Library/freebsd/Makefile	Sat Jun 17 02:26:28 1995
--------------------------
Patching file ./WWW/Library/freebsd/Makefile using Plan A...
Hunk #1 succeeded at 8.
Hunk #2 succeeded at 24.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./src/LYJump.c.orig	Sun Feb 12 04:42:24 1995
|--- ./src/LYJump.c	Sat Jun 17 02:04:23 1995
--------------------------
Patching file ./src/LYJump.c using Plan A...
Hunk #1 succeeded at 8.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./src/LYShowInfo.c.orig	Sat Apr  8 17:13:02 1995
|--- ./src/LYShowInfo.c	Sat Jun 17 02:04:24 1995
--------------------------
Patching file ./src/LYShowInfo.c using Plan A...
Hunk #1 succeeded at 135.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./Makefile.orig	Thu Jun  8 16:47:06 1995
|--- ./Makefile	Sat Jun 17 02:22:01 1995
--------------------------
Patching file ./Makefile using Plan A...
Hunk #1 succeeded at 15 (offset 5 lines).
Hunk #2 succeeded at 103 (offset 2 lines).
Hunk #3 succeeded at 237 (offset 14 lines).
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** ./userdefs.h.orig	Thu Jun 15 20:21:02 1995
|--- ./userdefs.h	Sat Jun 17 02:07:39 1995
--------------------------
Patching file ./userdefs.h using Plan A...
Hunk #1 succeeded at 228.
Hunk #2 succeeded at 694 with fuzz 2 (offset 22 lines).
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** src/LYMain.c.bak	Mon Jun  5 06:13:14 1995
|--- src/LYMain.c	Sat Jun 17 03:05:17 1995
--------------------------
Patching file src/LYMain.c using Plan A...
Hunk #1 succeeded at 25 (offset 1 line).
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** src/LYStrings.c.bak	Sat Apr  1 01:51:18 1995
|--- src/LYStrings.c	Sat Jun 17 03:29:19 1995
--------------------------
Patching file src/LYStrings.c using Plan A...
Hunk #1 succeeded at 35.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** src/LYStrings.h.bak	Thu Jun  9 16:02:14 1994
|--- src/LYStrings.h	Sat Jul  8 09:39:28 1995
--------------------------
Patching file src/LYStrings.h using Plan A...
Hunk #1 succeeded at 23.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** src/LYDownload.c.bak	Mon Jun  5 06:12:52 1995
|--- src/LYDownload.c	Sat Jul  8 09:46:22 1995
--------------------------
Patching file src/LYDownload.c using Plan A...
Hunk #1 succeeded at 35.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** src/LYForms.c.bak	Sat Apr  1 01:49:12 1995
|--- src/LYForms.c	Sat Jul  8 09:46:22 1995
--------------------------
Patching file src/LYForms.c using Plan A...
Hunk #1 succeeded at 312.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** src/LYUpload.c.bak	Tue Mar  7 23:38:02 1995
|--- src/LYUpload.c	Sat Jul  8 09:46:22 1995
--------------------------
Patching file src/LYUpload.c using Plan A...
Hunk #1 succeeded at 36.
Hmm...  The next patch looks like a new-style context diff to me...
The text leading up to this was:
--------------------------
|*** src/LYKeymap.c.bak	Tue Mar  7 23:36:26 1995
|--- src/LYKeymap.c	Sat Jul  8 10:11:26 1995
--------------------------
Patching file src/LYKeymap.c using Plan A...
Hunk #1 succeeded at 156.
done
*** Error code 1

Stop.
*** Error code 1

Stop.
=======

(Cf. "make patch PATCH_DEBUG=yes")

Satoshi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199509200814.BAA04242>