From owner-freebsd-x11@FreeBSD.ORG Sun Apr 15 02:01:00 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 2137516A403; Sun, 15 Apr 2007 02:01:00 +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 B52F913C465; Sun, 15 Apr 2007 02:00:59 +0000 (UTC) (envelope-from dejan.lesjak@ijs.si) Received: from localhost (mailman.ijs.si [193.2.4.66]) by mail.ijs.si (Postfix) with ESMTP id 90B26192DBD; Sun, 15 Apr 2007 04:00:58 +0200 (CEST) DKIM-Signature: v=0.5; a=rsa-sha1; c=relaxed/simple; d=ijs.si; s=ja-200610; t=1176602458; bh=ACfWzd5rfSXmOfrQPacaynNh4tY=; h=DomainKey-Signature: X-Virus-Scanned:Received:Received:Received:Received:From: Organization:To:Subject:Date:User-Agent:Cc:References:In-Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding: Content-Disposition:Message-Id; b=T2Dz1E97BnJXGRMWF2xTtvBl76k4QuQl +adsdNZLO6kKyHrX/Jsocobtmje7lnP+YwxE/jvr9+PvfEEPGib2SfM5g1CfL/bRAZV M3xvty3NubKXUMcktuSTN6HgiBqRe DomainKey-Signature: a=rsa-sha1; s=ja-200610; d=ijs.si; c=nofws; q=dns; h=x-virus-scanned:received:from:organization:to:subject:date: user-agent:cc:references:in-reply-to:mime-version:content-type: content-transfer-encoding:content-disposition:message-id; b=eGbYnDay1T8Kh7wZGvoCVuBxLZ0HE++UjrrVCMLk5WlLb8Ho8HSQIIsvGNnLsAEp7 qnl6jtOTFEYVKN2CkDSVMqLLBf73Ojcx3wstREUKINzZNY+QGSxkyA6ICwt2F7Q 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 b9kofI4VnCBD; Sun, 15 Apr 2007 04:00:56 +0200 (CEST) Received: from edina.ijs.si (edina.ijs.si [193.2.4.3]) by mail.ijs.si (Postfix) with ESMTP id 726F4192DAB; Sun, 15 Apr 2007 04:00:56 +0200 (CEST) Received: from radagast.ijs.si (radagast.ijs.si [193.2.4.168]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by edina.ijs.si (Postfix) with ESMTP id D40A4510BD; Sun, 15 Apr 2007 04:00:55 +0200 (CEST) Received: from localhost.ijs.si (localhost.ijs.si [127.0.0.1]) by radagast.ijs.si (8.13.8/8.13.8) with ESMTP id l3F20s0u071896; Sun, 15 Apr 2007 04:00:55 +0200 (CEST) (envelope-from dejan.lesjak@ijs.si) From: Dejan Lesjak Organization: IJS To: Kris Kennaway Date: Sun, 15 Apr 2007 04:00:53 +0200 User-Agent: KMail/1.9.6 References: <20070414194028.GB2313@xor.obsecurity.org> <20070414195441.GA17321@xor.obsecurity.org> <20070415012035.GA32022@xor.obsecurity.org> In-Reply-To: <20070415012035.GA32022@xor.obsecurity.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704150400.54127.dejan.lesjak@ijs.si> Cc: lesi@freebsd.org, x11@freebsd.org Subject: Re: Upgrade script 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, 15 Apr 2007 02:01:00 -0000 On Sunday 15 April 2007 03:20:35 Kris Kennaway wrote: > Actually this script is not doing enough: the problem is that even > after all the portrevisions will be bumped, a portupgrade -a will not > install most of the new xorg packages, and the user will be left with > a non-working hybrid (I guess no-one actually tested the upgrade part > yet :-). Erm, yes it was, a couple of times in vmware - fresh install of xorg, windowmaker, xine (as they both go in X11BASE). All the xorg 7.2 libs ports were installed. > i.e. when xorg-libraries is upgraded from 6.9 to 7.2, most of the > dependency checks for things that now live in sub-packages will pass > (since they look for files also installed by xorg 6.9), so most of the > new ports won't be installed. They shouldn't just pass. xorg-libraries meta-port is looking for .pc files for dependencies, not libraries, for exactly this purpose. Also the dependecies are under RUN_DEPENDS so portupgrade installs them after removing old version of xorg-libraries (ie it does equivalent of (cd portdir && make build && make deinstall && make install)), at least it did so the last time I upgraded. > I confirmed this on an attempted > upgrade of an xorg 6.9 machine. What was missing from 7.2? > What was necessary was the following: > > # Make sure all dependencies are in consistent state > pkgdb -FL > > # This is over-complete, i.e. it removes some things it doesn't have > # to. Should be replaced by pkg_delete -f. > pkg_deinstall -Rf xorg imake libGLU nvidia-driver > > # Install new xorg from scratch. Could be replaced by pkg_add -r xorg > # once packages are available. > portinstall -N xorg > > # Patch up dependencies, i.e. register new dependencies on all the new > # sub-ports of the packages we didn't upgrade yet > pkgdb -FL > > Then portupgrade -a, which was probably not strictly necessary. > > Kris > > P.S. Dunno about non-portupgrade users, they may be SOL. Hand upgrade of eg xorg-libraries should work with (make build && make deinstall && make install). So if portupgrade alternatives work that way as well they should do the right thing. I'll do more tests but of course wiping out ports, installing old xorg and upgrading to new takes a bit of time... Dejan