From owner-freebsd-hackers  Thu Mar 16 15:14:58 1995
Return-Path: hackers-owner
Received: (from majordom@localhost) by freefall.cdrom.com (8.6.10/8.6.6) id PAA02737 for hackers-outgoing; Thu, 16 Mar 1995 15:14:58 -0800
Received: from netcom14.netcom.com (hasty@netcom14.netcom.com [192.100.81.126]) by freefall.cdrom.com (8.6.10/8.6.6) with ESMTP id PAA02729 for <hackers@freebsd.org>; Thu, 16 Mar 1995 15:14:54 -0800
From: hasty@netcom.com
Received: from localhost by netcom14.netcom.com (8.6.10/Netcom)
	id PAA01957; Thu, 16 Mar 1995 15:13:35 -0800
Message-Id: <199503162313.PAA01957@netcom14.netcom.com>
To: hackers@FreeBSD.org
Subject: Re: patches for X11R6?? 
In-reply-to: Your message of Thu, 16 Mar 95 20:03:45 +1000.
             <199503161003.AA29870@physics.su.oz.au> 
Date: Thu, 16 Mar 95 15:13:34 -0800
Sender: hackers-owner@FreeBSD.org
Precedence: bulk

> >Just downloaded X11R6 and it is failing to compile.
> >Wondering if any one got patches for it ...

> What is the problem?

> If it is badly generated Makefiles, then the following patch may help.

> If you have other problems, try the XFree86 3.1.1 patches.

> David
> ---------------
> *** xc/config/imake/imakemdep.h.orig	Thu Mar 16 20:59:24 1995
> --- xc/config/imake/imakemdep.h	Thu Mar 16 21:00:03 1995
> ***************
> *** 254,260 ****
>   	"-D__i386__",
>   # endif
>   # ifdef __GNUC__
> ! 	"-traditional"
>   # endif
>   #endif
>   #ifdef M4330
> --- 254,260 ----
>   	"-D__i386__",
>   # endif
>   # ifdef __GNUC__
> ! 	"-traditional",
>   # endif
>   #endif
>   #ifdef M4330
> ***************
> *** 417,423 ****
>   	"-D__i386__",
>   # endif
>   # ifdef __GNUC__
> ! 	"-traditional"
>   # endif
>   #endif
>   #ifdef Oki
> --- 417,423 ----
>   	"-D__i386__",
>   # endif
>   # ifdef __GNUC__
> ! 	"-traditional",
>   # endif
>   #endif
>   #ifdef Oki

Well, this is what I did to get X11R6 to compile with FreeBSD-2.current:

#!/bin/sh
patch -p -s </bg/usr/freebsd/fix-01
patch -p -s </bg/usr/freebsd/fix-02
patch -p -s </bg/usr/freebsd/fix-03
tar -xf /bg/usr/freebsd/fix3docs.tar
patch -p -s </bg/usr/freebsd/fix-04
patch -p -s </bg/usr/freebsd/fix-05
patch -p -s </bg/usr/freebsd/fix-06
patch -p -s </bg/usr/freebsd/fix-07
patch -p -s </bg/usr/freebsd/fix-08
patch -p -s </bg/usr/freebsd/fix-09
patch -p -s </bg/usr/freebsd/fix-10
patch -p -s </bg/usr/freebsd/fix10fonts.Z
patch -p -s </bg/usr/freebsd/fix-11
tar -xzf /bg/usr/freebsd/XFree86-3.1.1.tar.gz
patch -p -s </bg/usr/freebsd/XFree86-3.1.1.diff

---------------
There was single file not in the distribution just ignore
the patch, if memory does not failed me it was for an hp file
and not an XFree86 file or core file that we need.

And then, I applied the  patch that David Dawes posted which
is included at the top of this message.

Patch XFree86-3.1.1.diff depends on XFree86-3.1.1.tar.gz so
if you get X11R6 pl11 and apply XFree86-3.1.1.diff to the
the tree it will fail.

To build X11R6, in ./xc, I just typed "make World".


	Have fun,
	Amancio