From owner-freebsd-alpha  Fri Feb 12 13:38:02 1999
Return-Path: <owner-freebsd-alpha@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id NAA10440
          for freebsd-alpha-outgoing; Fri, 12 Feb 1999 13:38:02 -0800 (PST)
          (envelope-from owner-freebsd-alpha@FreeBSD.ORG)
Received: from nomis.simon-shapiro.org (nomis.simon-shapiro.org [209.86.126.163] (may be forged))
          by hub.freebsd.org (8.8.8/8.8.8) with SMTP id NAA10385
          for <freebsd-alpha@FreeBSD.ORG>; Fri, 12 Feb 1999 13:37:38 -0800 (PST)
          (envelope-from shimon@simon-shapiro.org)
Received: (qmail 5684 invoked by uid 1000); 12 Feb 1999 22:43:49 -0000
Message-ID: <XFMail.990212174349.shimon@simon-shapiro.org>
X-Mailer: XFMail 1.3 [p0] on FreeBSD
X-Priority: 3 (Normal)
Content-Type: text/plain; charset=iso-8859-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
In-Reply-To: <199902121928.NAA23899@set.spradley.tmi.net>
Date: Fri, 12 Feb 1999 17:43:49 -0500 (EST)
X-Face: (&r=uR0&yvh>h^ZL4"-T<Ako6fc!xyO!<qETO3]"NFbiV!}=/kj5G1L>H61PD}/|Y'~58Z#
 Gz&BK'&uLAf:2wLb~L7YcWfau{;N(#LR2)\i.l8'ZqVhv~$rNx$]Om6Sv36S'<b{Ioa^9\-Z$3!Z7-
 ;\X0`\'JZI~c>\~5m/U'"i/L)&t$R0&?,)tm0l5xZ!\hZU^yMyCdt!KTcQ376cCkQ^Q_n.GH;Dd-q+
 O51^+.K-1Kq?WsP9;cw-Ki+b.iY-5@3!YB5{I$h;E][Xlg*sPO61^5=:5k)JdGet,M|$"lq!1!j_>? $0Yc?
Reply-To: shimon@simon-shapiro.org
Organization: The Simon Shapiro Foundation
From: Simon Shapiro <shimon@simon-shapiro.org>
To: Ted Spradley <tsprad@set.spradley.tmi.net>
Subject: Re: X11 - Again...
Cc: freebsd-alpha@FreeBSD.ORG, Doug Rabson <dfr@nlsystems.com>
Sender: owner-freebsd-alpha@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


Ted Spradley, On 12-Feb-99 you wrote:
>  Simon says (sorry, couldn't help it):
>  
> > I wiped out the XFree86 directiry, applied the patches to clean
> > checkout
> > form CVS, moved the patched files back where they belong and it built
> > cleanly.
>  
>  I'm obviously doing something wrong.  I don't think I'm applying the 
>  right patch to the right tree.  I got the patch from 
>  http://www.freebsd.org/%7edfr/XFree86.diff and I thought it should apply
>  to /usr/ports/x11/XFree86.
>  
>  I do 'cvs checkout ports/x11/XFree86' and then 'patch --index-first  < 
>  ~/FreeBSD-Alpha/XFree86.diff' and I get this:
>  
>  
>  [...]
> |===================================================================
> |RCS file: /home/ncvs/ports/x11/XFree86/scripts/configure,v
> |retrieving revision 1.39
> |diff -u -u -r1.39 configure
> |--- configure  1998/12/18 23:56:02     1.39
> |+++ configure  1998/12/25 10:35:15
>  --------------------------
>  Patching file scripts/configure using Plan A...
>  Hunk #1 failed at 100.
>  Hunk #2 failed at 150.
>  Hunk #3 failed at 181.
>  Hunk #4 succeeded at 176 with fuzz 1 (offset -48 lines).
>  3 out of 4 hunks failed--saving rejects to scripts/configure.rej
>  done
>  
>  The diffs against /dev/null patch OK, of course.
>  
>  If I run make anyway I get this
>  
>  [...]
>  ===>  Patching for XFree86-3.3.2
>  ===>  Applying distribution patches for XFree86-3.3.2
>  ===>  Applying FreeBSD patches for XFree86-3.3.2
>  1 out of 3 hunks failed--saving rejects to config/cf/FreeBSD.cf.rej
>  1 out of 1 hunks failed--saving rejects to
>  programs/Xserver/hw/xfree86/com
>  mon/compiler.h.rej
>  *** Error code 2
>  
>  Stop.
>  
>  This should be XFree86-3.3.3, shouldn't it?
>  
>  This is on an AS200-4/233.  I installed 4.0-19990209-SNAP, then checked 
>  out current sources and built and installed the world and a new kernel, 
>  and that all went as perfectly as it always has on i386 PeeCees.

I use patch -p0 from /usr/ports/x11/XFree86, then move the patched patch-xx
files to ./patches/.

I think there is something non-kosher in the patches as I stumbled about
that too.

Simon


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