From owner-freebsd-x11@FreeBSD.ORG  Sun May 27 11:24:29 2007
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
X-Original-To: freebsd-x11@freebsd.org
Delivered-To: freebsd-x11@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6423D16A469
	for <freebsd-x11@freebsd.org>; Sun, 27 May 2007 11:24:29 +0000 (UTC)
	(envelope-from at1webb@san.rr.com)
Received: from ms-smtp-05.socal.rr.com (ms-smtp-05.socal.rr.com
	[66.75.162.137])
	by mx1.freebsd.org (Postfix) with ESMTP id 23A0813C4C2
	for <freebsd-x11@freebsd.org>; Sun, 27 May 2007 11:24:29 +0000 (UTC)
	(envelope-from at1webb@san.rr.com)
Received: from [127.0.0.1] (cpe-70-95-242-67.san.res.rr.com [70.95.242.67])
	by ms-smtp-05.socal.rr.com (8.13.6/8.13.6) with ESMTP id l4R59t4U003126
	for <freebsd-x11@freebsd.org>; Sat, 26 May 2007 22:10:01 -0700 (PDT)
Message-ID: <465912A1.60209@san.rr.com>
Date: Sat, 26 May 2007 22:09:53 -0700
From: Robert Webb <at1webb@san.rr.com>
User-Agent: Thunderbird 2.0.0.0 (Windows/20070326)
MIME-Version: 1.0
To: freebsd-x11@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Subject: Xorg upgrade issues
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 27 May 2007 11:24:29 -0000

I'm running 6.2 STABLE and I have a slight issue with the upgrade, just 
a few quick questions.
Following /usr/ports/UPDATING, every step went without a hitch except

pkg_delete xorg-manpages\*

Which said that that port did not exist. No big problem there.

My real issue is that the mergebase script does not exist, is there a 
howto for going through and manually merging the files? I could send the 
script that shows everything, but it is about 6 Meg...