From owner-freebsd-alpha Fri Jul 5 5:34:45 2002 Delivered-To: freebsd-alpha@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8DA837B400 for ; Fri, 5 Jul 2002 05:34:42 -0700 (PDT) Received: from flamingo.mail.pas.earthlink.net (flamingo.mail.pas.earthlink.net [207.217.120.232]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AAA343E31 for ; Fri, 5 Jul 2002 05:34:42 -0700 (PDT) (envelope-from tlambert2@mindspring.com) Received: from pool0029.cvx22-bradley.dialup.earthlink.net ([209.179.198.29] helo=mindspring.com) by flamingo.mail.pas.earthlink.net with esmtp (Exim 3.33 #1) id 17QSIH-0002Ra-00; Fri, 05 Jul 2002 08:34:38 -0400 Message-ID: <3D259234.46BDAF42@mindspring.com> Date: Fri, 05 Jul 2002 05:33:56 -0700 From: Terry Lambert X-Mailer: Mozilla 4.7 [en]C-CCK-MCD {Sony} (Win98; U) X-Accept-Language: en MIME-Version: 1.0 To: Jan Lentfer Cc: freebsd-alpha@freebsd.org Subject: Re: [PATCH] Re: List of ports that can be compiled with compaq-cc 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> <3D257F10.2060605@web.de> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-alpha@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org Jan Lentfer wrote: > >Let me know if you have any problems with the patch working as advertised. > > 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-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 No, this is not happy. This is why I asked you what the version you were running was. My patch was against RELEASE_4_5_0. The changes are obvious enough that you should be able to do them by hand -- it's one block of a small number of lines, if you ignore the comments patch at the front of the file. If you need help, then send me the /usr/ports/Mk/bsd.port.mk *off the list*, and I will hack it for you, and send it back. Then the version you are using won't matter. -- Terry To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-alpha" in the body of the message