From owner-freebsd-x11@FreeBSD.ORG  Mon Feb 28 14:21:35 2005
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: freebsd-x11@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C4F8316A4CE
	for <freebsd-x11@freebsd.org>; Mon, 28 Feb 2005 14:21:35 +0000 (GMT)
Received: from fed1rmmtao07.cox.net (fed1rmmtao07.cox.net [68.230.241.32])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 70A0043D53
	for <freebsd-x11@freebsd.org>; Mon, 28 Feb 2005 14:21:35 +0000 (GMT)
	(envelope-from xcas@cox.net)
Received: from [192.168.1.104] (really [68.2.128.106])
          by fed1rmmtao07.cox.net
          (InterMail vM.6.01.04.00 201-2131-118-20041027) with ESMTP
          id <20050228142129.RGUS13104.fed1rmmtao07.cox.net@[192.168.1.104]>;
          Mon, 28 Feb 2005 09:21:29 -0500
Message-ID: <42232900.9050909@cox.net>
Date: Mon, 28 Feb 2005 07:21:52 -0700
From: "Greg J." <xcas@cox.net>
User-Agent: Mozilla Thunderbird 1.0 (X11/20050227)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Jean-Pierre Charlier <jpcharlier@ntlworld.com>,
	freebsd-x11@freebsd.org
References: <20050227201512.PHMD769.aamta05-winn.mailhost.ntl.com@[62.253.162.69]>
In-Reply-To: <20050227201512.PHMD769.aamta05-winn.mailhost.ntl.com@[62.253.162.69]>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: X.Org 6.8.2 - (most probably) final patch
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Feb 2005 14:21:35 -0000

Jean-Pierre Charlier wrote:
> Hi,
> 
> I'm very new to FreeBSD, so please bear with me. Sorry to ask a simple question, but how does one apply the .diff file and then update Xorg 6.7.0 to Xorg 6.8.2? I have already tried to patch /usr/ports/devel/imake-6/Makefile, but I get some errors (Hunk #1 failed at 511, Hunk #2 failed at 754). What do you run once this is done?
> 
> Any help would be really appreciated...
> 
> Thanks in Advance.
> 

The patch updates the 6.8.1 port Makefiles, pkg-plists, etc.. to 6.8.2.. 
so you must update your ports tree first.

Please read 
http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html

Once you have that down.. you can apply the patch by doing the following:
cd /usr/ports && patch < /path/to/xorg-682.diff

Then you should be able to portupgrade xorg.