Date: Fri, 12 Feb 1999 13:28:46 -0600 From: Ted Spradley <tsprad@set.spradley.tmi.net> To: shimon@simon-shapiro.org Cc: Doug Rabson <dfr@nlsystems.com>, freebsd-alpha@FreeBSD.ORG Subject: Re: X11 - Again... Message-ID: <199902121928.NAA23899@set.spradley.tmi.net> In-Reply-To: Your message of "Fri, 12 Feb 1999 12:26:53 EST." <XFMail.990212122653.shimon@simon-shapiro.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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. 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?199902121928.NAA23899>