From owner-freebsd-x11@FreeBSD.ORG Sun May 27 22:50:04 2007 Return-Path: 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 7074816A400 for ; Sun, 27 May 2007 22:50:04 +0000 (UTC) (envelope-from illoai@gmail.com) Received: from mu-out-0910.google.com (mu-out-0910.google.com [209.85.134.190]) by mx1.freebsd.org (Postfix) with ESMTP id 0216913C458 for ; Sun, 27 May 2007 22:50:03 +0000 (UTC) (envelope-from illoai@gmail.com) Received: by mu-out-0910.google.com with SMTP id w9so1052205mue for ; Sun, 27 May 2007 15:50:02 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=HxkucA97lT1gtXaV1A4fQyMxAwboNX9mjp6FzGox6X36MhVDxvRFvs+MYUlXDqv21P22iTW2xrNryf/2mir7OtLnidtZJtEFF4zMC4nRNutjELEtcWUC4x7jdDskL5qY5gyhiTjqMFCP3RHyfAkPI/UgUYAFRGhW7RTAtne4uJQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=MD+LtNBBOqXac1tDqWLPbJ+Ieele5fQpMqagZE2BFv3x61Q9mw+2TVEsC2o3K+2+Jwz8Z/xWhJtyDfGGZonmEQvHL2gplvIQYvz2hYK3TmbeD1IPpBwJ/3a/vAgktNuyFH+tJm5b3AsfJbWa22UP4jv6j6/j05nV1GiJzJ6Fj8M= Received: by 10.82.138.6 with SMTP id l6mr9689834bud.1180304743618; Sun, 27 May 2007 15:25:43 -0700 (PDT) Received: by 10.82.185.16 with HTTP; Sun, 27 May 2007 15:25:43 -0700 (PDT) Message-ID: Date: Sun, 27 May 2007 17:25:43 -0500 From: "illoai@gmail.com" To: "Christopher Prance" In-Reply-To: <465959ae.5cdf8f0a.1be3.fffff774@mx.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <465959ae.5cdf8f0a.1be3.fffff774@mx.google.com> Cc: freebsd-x11@freebsd.org, freebsd-questions@freebsd.org Subject: Re: Upgrade Xorg 7.2.0 - mergebase.sh problems X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 May 2007 22:50:04 -0000 On 27/05/07, Christopher Prance wrote: > I thought I was so close, nope not yet. I finally got my server upgraded > with no problem. Well a few minor setbacks, but I got it done. Of course > it won't run on my Sony 19" monitor which I have yet to figure out, but will > in due time, but my server is not of importance, because I don't run X on > it, it is just a webserver for now. My Thinkpad is a different story, I am > trying to move away from my Windows laptop and rely on only FreeBSD so I > would really like to get X up and running again. The file I'm attaching is > a script of the mergebase.sh tool. It listed several files that exist in > both /usr/local and /usr/X11R6 and it will not continue until I move or > remove them. I don't know which ones to remove and which ones to just move. > Not too mention I did it by hand on my server, because there was not that > many. So any help here would be appreciated. Is there are way I could make > a script to move all these files for me? Which I'm sure there is but my > scripting skills are beginners at best. :( Sorry for the long post, just > had to get it out. Thanks again ahead of time! > > Christopher Prance > >From your attachment, in part: . . . CONFLICTING FILES: ./bin/appres ./bin/assistant ./bin/atobm ./bin/bdftopcf ./bin/bdftruncate ./bin/beforelight ./bin/bitmap ./bin/bmtoa ./bin/cxpm ./bin/designer ./bin/dga . . . % wc -l xorg-update 3421 xorg-update It looks like most, if not all, of your old xorg install is still under /etc/X11R6, which should not be if you followed /usr/ports/UPDATING. It may be safe to delete if xorg 7.2 was otherwise properly installed in /usr/local, though I suspect some (perhaps very long list of) things might have to be recompiled (again!). -- --