Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 05 Jul 2002 13:12:16 +0200
From:      Jan Lentfer <Jan.Lentfer@web.de>
To:        Terry Lambert <tlambert2@mindspring.com>
Cc:        freebsd-alpha@freebsd.org
Subject:   Re: [PATCH] Re: List of ports that can be compiled with compaq-cc
Message-ID:  <3D257F10.2060605@web.de>
References:  <3D21F1C8.2010708@web.de>		<15650.6127.427432.57976@grasshopper.cs.duke.edu> <3D22188C.2000603@web.de>		<3D222E25.62D5E4D0@mindspring.com> <3D222EF3.8070700@web.de>		<3D223E91.A71CC743@mindspring.com> <3D224716.901@web.de>		<3D2256E7.596D91F9@mindspring.com> <3D225B13.7000004@web.de> 		<3D22635F.A01A6ED8@mindspring.com> <1025781382.2848.25.camel@jan-linnb.lan> <3D24E191.7E4864B1@mindspring.com>

next in thread | previous in thread | raw e-mail | index | archive | help
>
>
>
>Let me know if you have any problems with the patch working as advertised.
>
>-- Terry
>

Hi,

I am not very firm with the "patch" tool. I tried to apply the patch and 
I got this (see below). Is that ok?

Jan

------------------------------------------------------


jan-alpha# pwd
/usr/ports/Mk

jan-alpha# patch bsd.port.mk compaq.diff
Hmm...  Looks like a context diff to me...
The text leading up to this was:
--------------------------
|Index: bsd.port.mk
|===================================================================
|RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v
|retrieving revision 1.397
|diff -c -r1.397 bsd.port.mk
|*** bsd.port.mk        24 Jan 2002 01:15:03 -0000      1.397
|--- bsd.port.mk        4 Jul 2002 23:56:01 -0000
--------------------------
Patching file bsd.port.mk using Plan A...
(Fascinating--this is really a new-style context diff but without
the telltale extra asterisks on the *** line that usually indicate
the new style...)
Hunk #1 failed at 140.
Hunk #2 failed at 919.
2 out of 2 hunks failed--saving rejects to bsd.port.mk.rej
done


jan-alpha# uname -a
FreeBSD jan-alpha.lan 4.6-RELEASE-p1 FreeBSD 4.6-RELEASE-p1 #0: Thu Jul  
4 01:58
:36 CEST 2002     jan@jan-alpha.lan:/usr/src/sys/compile/EV56  alpha


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-alpha" in the body of the message




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