Date: Sun, 20 May 2007 01:00:08 -0400 From: Kris Kennaway <kris@obsecurity.org> To: Joe Marcus Clarke <marcus@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports UPDATING Message-ID: <20070520050008.GA11759@xor.obsecurity.org> In-Reply-To: <200705200439.l4K4dKFR043242@repoman.freebsd.org> References: <200705200439.l4K4dKFR043242@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Thanks! On Sun, May 20, 2007 at 04:39:19AM +0000, Joe Marcus Clarke wrote: > marcus 2007-05-20 04:39:19 UTC > > FreeBSD ports repository > > Modified files: > . UPDATING > Log: > Update the X.Org updating instructions with some last-minute caveats and > gotchas. > > Reviewed by: portmgr > x11 > Approved by: portmgr (implicit) > > Revision Changes Path > 1.504 +30 -11 ports/UPDATING > http://cvsweb.FreeBSD.org/ports/UPDATING.diff?r1=1.503&r2=1.504 > | --- ports/UPDATING 2007/05/20 04:31:28 1.503 > | +++ ports/UPDATING 2007/05/20 04:39:19 1.504 > | @@ -36,15 +36,7 @@ upgrades. > | # portupgrade -f -o ports-mgmt/portupgrade-devel portupgrade > | # rm -f /usr/ports/INDEX*.db /var/db/pkg/pkgdb.db > | # pkgdb -fu > | - # portsdb -fu > | - > | - If you are an upgrade-test user (big wave!) you were instructed > | - to created a separate tree for the test. You shouldn't forgot > | - to set your PORTSDIR variable to it, and to create INDEXes: > | - > | - # setenv PORTSDIR `realpath .` <- csh-like users > | - # export PORTSDIR=`realpath .` <- sh-like users > | - # portsdb -u > | + # cd /usr/ports && make index > | > | It is necessary to set the XORG_UPGRADE environment variable while > | updating from xorg 6.9 to 7.2. Once the upgrade is complete this > | @@ -60,10 +52,20 @@ upgrades. > | the rigors of the xorg upgrade without a small bit of help: > | > | # portupgrade -Rf libXft > | - Now you are ready to upgrade everything: > | + > | + If your machine does NOT have any gstreamer ports installed, you can then > | + run: > | > | # portupgrade -a > | > | + However, if you DO have gstreamer ports installed, you must run: > | + > | + # portupgrade -a -x 'gstreamer*' > | + > | + Followed by: > | + > | + # portupgrade -Rr 'gstreamer*' > | + > | When packages are available (wait for the announcement on ports@), you > | may prefer to use precompiled packages to speed up the process: > | > | @@ -87,6 +89,10 @@ upgrades. > | help on freebsd-x11@FreeBSD.org). You may also need to edit the > | script if the default locations are not correct on your system. > | > | + If your /usr/X11R6 is a file system, you will also need to modify the > | + script to pause after /usr/X11R6 is backed up, but before the symlink is > | + created. > | + > | # sh /usr/ports/Tools/scripts/mergebase.sh > | > | When the merge operation completes successfully, the /usr/X11R6 > | @@ -98,6 +104,19 @@ upgrades. > | > | # exit > | > | + CAVEATS > | + > | + Make sure you have the x11/xorg meta-port installed. If you do not have > | + this meta-port installed with X.Org 6.9, you will miss out on a lot of > | + the new X.Org 7.2 sub-ports. > | + > | + If you plan on keeping your current /etc/X11/xorg.conf, make sure you > | + change ModulePath to /usr/local/lib/xorg/modules prior to running X. > | + > | + If you run into problems running the new X server, try moving aside > | + your /etc/X11/xorg.conf and allow X to auto-create it (this will > | + happen automatically when launching the X server). > | + > | IF YOU RUN INTO PROBLEMS: > | > | # uname -a > | @@ -5221,4 +5240,4 @@ Option "XkbRules" "xfree86" > | 2) Update all p5-* modules. > | portupgrade -f p5-\* > | > | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/UPDATING,v 1.503 2007/05/20 04:31:28 marcus Exp $ > | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/UPDATING,v 1.504 2007/05/20 04:39:19 marcus Exp $ >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070520050008.GA11759>