From owner-freebsd-x11@FreeBSD.ORG Thu Apr 19 16:55:45 2007 Return-Path: X-Original-To: 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 9707C16A400 for ; Thu, 19 Apr 2007 16:55:45 +0000 (UTC) (envelope-from marcus@freebsd.org) Received: from av-tac-rtp.cisco.com (hen.cisco.com [64.102.19.198]) by mx1.freebsd.org (Postfix) with ESMTP id 427C013C45A for ; Thu, 19 Apr 2007 16:55:45 +0000 (UTC) (envelope-from marcus@freebsd.org) X-TACSUNS: Virus Scanned Received: from rooster.cisco.com (localhost [127.0.0.1]) by av-tac-rtp.cisco.com (8.11.7p3+Sun/8.11.7) with ESMTP id l3JGX6C17445 for ; Thu, 19 Apr 2007 12:33:06 -0400 (EDT) Received: from [64.102.202.122] (dhcp-64-102-202-122.cisco.com [64.102.202.122]) by rooster.cisco.com (8.11.7p3+Sun/8.11.7) with ESMTP id l3JGX5q22188 for ; Thu, 19 Apr 2007 12:33:05 -0400 (EDT) Message-ID: <462799C1.4080404@freebsd.org> Date: Thu, 19 Apr 2007 12:33:05 -0400 From: Joe Marcus Clarke Organization: FreeBSD, Inc. User-Agent: Thunderbird 2.0.0.0 (Macintosh/20070326) MIME-Version: 1.0 To: x11@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Subject: Upgrade from 6.9 to 7.2 (my summary) 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, 19 Apr 2007 16:55:45 -0000 I did the upgrade from 6.9 to 7.2 on one of my test machines in a concerted portmgr effort to drink sugary red stuff. Here's what I had to do to have a successful upgrade: * make index (I have a patch to fix INDEX_PRISTINE) * portupgrade -aW FAIL due to .la problems with fontconfig * sh mergebase.sh to "fix" the .la problem FAIL due to the fact that /usr/X11R6 is a file system * Unmount /usr/X11R6 and manually do the symlink /usr/X11R6 --> /usr/local (remind me to try and growfs later) * portupgrade -aW * pkgdb -L * Patch qt33 with patch from lofi * pkgdb -fF (installs qt33 correctly now that it has been patched) * Reboot to restart port services The fontconfig .la failures have to do with some ports (e.g. gtk20) still reference fontconfig in /usr/X11R6 in their .la files. So, when you rebuild a port that depends on this, you will get a failure to link. I suggested to portmgr that instead of bumping PORTREVISION on all X11BASE ports, we bump it on ALL ports that depend on X. As you can see, my /usr/X11R6 was not a simple directory, but a file system. This caused lesi's script to create /usr/X11R6/local --> /usr/local. I had to manually fix this myself. In order to get X to actually start after this, I had to modify xorg.conf, and correct the ModulePath (/usr/X11R6/lib/modules --> /usr/local/lib/xorg/modules). This was the only changed that was required. Finally, to avoid having multiple copies of hald start at boot time, I added the following to /etc/rc.conf: local_startup="/usr/local/etc/rc.d" Whew! I'm not sure how much of this can actually be handled by a script, but as you can see, there are still some rough edges. Joe -- Joe Marcus Clarke FreeBSD GNOME Team :: gnome@FreeBSD.org FreeNode / #freebsd-gnome http://www.FreeBSD.org/gnome