From owner-freebsd-x11@FreeBSD.ORG  Mon May 28 10:20:35 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 1243316A4E1
	for <freebsd-x11@freebsd.org>; Mon, 28 May 2007 10:20:35 +0000 (UTC)
	(envelope-from dejan.lesjak@ijs.si)
Received: from mail.ijs.si (mail.ijs.si [193.2.4.66])
	by mx1.freebsd.org (Postfix) with ESMTP id BF7B613C4D3
	for <freebsd-x11@freebsd.org>; Mon, 28 May 2007 10:20:34 +0000 (UTC)
	(envelope-from dejan.lesjak@ijs.si)
Received: from localhost (localhost.ijs.si [127.0.0.1])
	by mail.ijs.si (Postfix) with ESMTP id EAFA8192865;
	Mon, 28 May 2007 12:20:33 +0200 (CEST)
DKIM-Signature: v=0.5; a=rsa-sha1; c=relaxed/simple; d=ijs.si; s=ja-200610;
	t=1180347633; bh=k5XJr0ArRF6GDqOgk9GrQbGeHCU=; h=X-Virus-Scanned:
	Received:Received:Received:From:To:Subject:Date:User-Agent:Cc:
	References:In-Reply-To:MIME-Version:Content-Type:
	Content-Transfer-Encoding:Content-Disposition:Message-Id; b=nS4/zK
	+xMcYzdepxcLlqCagZi+4mbSSBE52/6GuY75ro453kfn3Fu1TSF3S+t+nlMWfR+k0Pj
	Mnro3NR7ilHjFlZprkZ5++2CVa/3sHoZ3JfyOUf/+JJkxtka4UEm4T9
X-Virus-Scanned: amavisd-new at ijs.si
Received: from mail.ijs.si ([193.2.4.66])
	by localhost (mail.ijs.si [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id f7sMOhgbAQ1k; Mon, 28 May 2007 12:20:31 +0200 (CEST)
Received: from edina.ijs.si (edina.ijs.si [193.2.4.3])
	by mail.ijs.si (Postfix) with ESMTP id 73D79192884;
	Mon, 28 May 2007 12:20:31 +0200 (CEST)
Received: from f9pc04.ijs.si (f9pc04.ijs.si [194.249.156.4])
	by edina.ijs.si (Postfix) with ESMTP id 6AA23511A4;
	Mon, 28 May 2007 12:20:31 +0200 (CEST)
From: Dejan Lesjak <dejan.lesjak@ijs.si>
To: freebsd-x11@freebsd.org
Date: Mon, 28 May 2007 12:20:30 +0200
User-Agent: KMail/1.9.6
References: <465912A1.60209@san.rr.com>
In-Reply-To: <465912A1.60209@san.rr.com>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200705281220.30807.dejan.lesjak@ijs.si>
Cc: Robert Webb <at1webb@san.rr.com>
Subject: Re: 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: Mon, 28 May 2007 10:20:35 -0000

On Sunday 27 of May 2007, Robert Webb wrote:
> 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...

It should be in /usr/ports/Tools/scripts. If it's not there you either don't 
have complete ports tree or it is outdated.

Dejan