From owner-freebsd-x11@FreeBSD.ORG Thu Jun 7 16:35:07 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 43D4B16A468 for ; Thu, 7 Jun 2007 16:35:07 +0000 (UTC) (envelope-from ericx@vineyard.net) Received: from smtp1.vineyard.net (a1.vineyard.net [204.17.195.95]) by mx1.freebsd.org (Postfix) with ESMTP id DD02A13C465 for ; Thu, 7 Jun 2007 16:35:06 +0000 (UTC) (envelope-from ericx@vineyard.net) Received: from localhost (loopback [127.0.0.1]) by smtp1.vineyard.net (Postfix) with ESMTP id A6F261581836; Thu, 7 Jun 2007 12:17:51 -0400 (EDT) Received: from smtp1.vineyard.net ([127.0.0.1]) by localhost (ace1.vineyard.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 53723-01; Thu, 7 Jun 2007 12:17:51 -0400 (EDT) Received: from [204.17.195.104] (fortiva.vineyard.net [204.17.195.104]) by smtp1.vineyard.net (Postfix) with ESMTP id 48A9C1581808; Thu, 7 Jun 2007 12:17:51 -0400 (EDT) Message-ID: <46682FAA.8050807@vineyard.net> Date: Thu, 07 Jun 2007 12:17:46 -0400 From: "Eric W. Bates" User-Agent: Thunderbird 1.5.0.12 (Windows/20070509) MIME-Version: 1.0 To: Mark Lubratt References: In-Reply-To: X-Enigmail-Version: 0.94.1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: by AMaViS-ace1 at Vineyard.NET Cc: freebsd-x11@freebsd.org Subject: Re: Xorg portupgrade problem 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: Thu, 07 Jun 2007 16:35:07 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mark Lubratt wrote: > Hello! > > I'm currently running FreeBSD 6.2 (and also somewhat of a X novice). > Last week I began a port upgrade of all of my installed ports. I tried > following the upgrade instructions in the /usr/ports/UPDATING file > regarding the xorg upgrade to 7.2. I completed the steps the best that > I could (I'm still having some gstreamer upgrade problems). I finally > made it to the part where mergebase.sh is run. Mergebase.sh cited a > list of files that it claims are duplicated. At the suggestions of the > UPDATING file, I'm checking here to see what my next step should be. > > mergebase.sh output: > > http://www.indeq.com/mergebase.zMry6rN3 > > Could anyone please point me in the right direction? well... You have to use a little judgment; but I have been opening up emacs and comparing the old files with the new files. Typically something has gotten screwed up while the various ports have been replaced and not all of the older files were deleted. So if the files really look like duplicates (e.g. the /usr/local version and the /usr/X11R6 version have the same relative path and the X11R6 one is older), I just delete them. After which running the script again eventually finishes. I believe the script is basically intelligently written with the assumption that you know best. If you have some custom configs or tweaks of some sort in the old tree that you do not want to lose, you will recognize them from the list and move them over to the new tree. But I have never really done much of that with X; so I have ended up deleting all the old duplicates after looking them over. My personal rule of thumb: "If I don't recognize what the file is; then the newer one must be preferable." A much more rigorous approach is to use pkg_which to attempt to discover which port each of the questionable files comes from and read ALL the docs therein (I'm not that rigorous). ymmv > Thanks! > Mark > > _______________________________________________ > freebsd-x11@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-x11 > To unsubscribe, send any mail to "freebsd-x11-unsubscribe@freebsd.org" > > - -- Eric W. Bates ericx@vineyard.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGaC+qD1roJTQ4LlERAmVFAJ4yqf/zwfyJyDeh1G8gB/g6O3ZCiwCgnZ+d 4jFi8+wrlwoAMXUzvNPrHQM= =W4Uo -----END PGP SIGNATURE-----