Date: Sun, 27 May 2007 23:49:08 +0930 From: Shaun Branden <shaun@pcuse.com> To: Matthew Seaman <m.seaman@infracaninophile.co.uk> Cc: Josh Paetzel <josh@tcbug.org>, freebsd-stable@freebsd.org Subject: Re: updating xorg-libraries 7.2 to 7.2.1 Message-ID: <20070527141908.GB81644@pcuse.com> In-Reply-To: <46598F2E.50004@infracaninophile.co.uk> References: <20070527125334.GA81644@pcuse.com> <20070527132131.GW47537@tcbug.org> <46598F2E.50004@infracaninophile.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
--NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, May 27, 2007 at 03:01:18PM +0100, Matthew Seaman wrote: > Josh Paetzel wrote: > > Shaun Branden wrote: >=20 > >> xorg 7.2 was installed on this system from scratch, ie no ports to sta= rt > >> with. >=20 > > For right now if you want portupgrade to do anything with xorg you > > need to export XORG_UPGRADE >=20 > Creating the /usr/X11R6 -> /usr/local symlink is necessary, even on a > system with xorg 7.2 installed from scratch. The presence of that > symlink will stop the xorg-libraries port whinging at you. =20 >=20 > There are a couple of other bits that need twiddling in the default > system, and a very handy way of getting them all to happen is by=20 > running mergebase.sh. On a completely virgin newly instaleld system, > with /usr/ports populated, but no ports yet installed you may need > to: >=20 > mkdir /usr/X11R6 >=20 > to give that script something to chew on, and then just: >=20 > sh /usr/ports/Tools/scripts/mergebase.sh >=20 > before proceeding to install whatever ports you want. Yeah, I have already run that script but no symlink is created: root@sagan:ports$ ls -l /usr/ total 108 drwxrwxr-x 2 root operator 512 May 9 16:17 .snap drwxr-xr-x 11 root wheel 512 May 20 19:03 X11R6 drwxr-xr-x 2 root wheel 7168 May 25 20:55 bin drwxr-xr-x 3 root wheel 512 Apr 29 2006 compat drwxr-xr-x 2 root wheel 512 May 25 20:53 games drwxr-xr-x 13 root wheel 512 May 11 17:52 home drwxr-xr-x 47 root wheel 4608 May 25 20:53 include drwxr-xr-x 4 root wheel 9728 May 25 20:55 lib drwxr-xr-x 5 root wheel 512 Apr 29 2006 libdata drwxr-xr-x 5 root wheel 1536 May 25 20:55 libexec drwxr-xr-x 26 root wheel 512 May 26 19:14 local drwxr-xr-x 3 root wheel 512 May 25 19:53 obj drwxr-xr-x 70 root wheel 1536 May 27 23:36 ports drwxr-xr-x 2 root wheel 5120 May 25 20:55 sbin drwxr-xr-x 27 root wheel 512 Apr 29 2006 share drwxr-xr-x 21 root wheel 512 May 19 18:53 src root@sagan:ports$ sh /usr/ports/Tools/scripts/mergebase.sh This script will attempt to backup /usr/X11R6 into /usr/tmp/mergebase/oldx11base.20070527.233644.tar and then move the contents onto /usr/local. It will then replace /usr/X11R6 with a symbolic link, pointing to /usr/local. After that, the script will attempt to change some settings in /etc that by default point to both /usr/X11R6 and /usr/local to remove references to /usr/X11R6; specifically, the files that could get altered are /etc/periodic.conf /etc/manpath.config /etc/rc.conf. Be advised that this script expects default environment, notably it assumes that you have not changed $X11BASE and $LOCALBASE variables from their default values and that /usr/X11R6 is regular directory and not separate mount. If these assumptions are not correct, either edit this script to change $X11BASE $LOCALBASE and/or $BACKUPDIR values or do the merge by hand (perhaps using this script as a rough guide). Enter 'yes' to continue, anything else will exit script: yes CONFLICTING FILES: =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-af.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ar.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-az.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-be.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-bg.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-bn.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-bn_IN.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-br.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-bs.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ca.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-cs.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-cy.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-da.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-de.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-dz.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-el.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-en_CA.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-eo.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-es.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-et.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-eu.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-fa.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-fi.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-fr.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ga.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-gl.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-gu.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-he.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-hi.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-hr.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-hu.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-hy.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-id.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-is.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-it.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ja.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ka.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-km.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ko.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ky.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-li.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-lt.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-lv.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-mg.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-mk.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ml.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-mn.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-mr.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ms.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-nb.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ne.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-nl.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-nn.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-no.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-nso.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-or.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-pa.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-pl.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-pt.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-pt_BR.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ro.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ru.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-sk.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-sl.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-sq.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-sr.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-sr@Latn.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-sr@ije.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-sv.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-ta.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-te.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-th.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-tk.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-tr.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-tt.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-uk.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-vi.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-wa.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-xh.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-yi.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-zh_CN.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-zh_HK.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-zh_TW.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree-zu.xml =2E/etc/gconf/gconf.xml.defaults/%gconf-tree.xml =2E/etc/settings/.qt_plugins_3.3rc.lock =2E/etc/settings/qt_plugins_3.3rc =2E/man/whatis Files that exist both in /usr/local and /usr/X11R6 have been found as shown above. Merging will not continue. While some such files are safe to remove as they will be regenerated (like /usr/X11R6/man/whatis), some you might want to move away somewhere safe, and some might point to conflicts in ports. For this script to continue, you need to either move these files away from /usr/X11R6 or delete them. If you don't know what to do about a particular file, ask on x11@FreeBSD.org mailing list. The list is saved in /tmp/mergebase.gVVGMngT. root@sagan:ports$ ls -l /usr/ total 108 drwxrwxr-x 2 root operator 512 May 9 16:17 .snap drwxr-xr-x 11 root wheel 512 May 20 19:03 X11R6 drwxr-xr-x 2 root wheel 7168 May 25 20:55 bin drwxr-xr-x 3 root wheel 512 Apr 29 2006 compat drwxr-xr-x 2 root wheel 512 May 25 20:53 games drwxr-xr-x 13 root wheel 512 May 11 17:52 home drwxr-xr-x 47 root wheel 4608 May 25 20:53 include drwxr-xr-x 4 root wheel 9728 May 25 20:55 lib drwxr-xr-x 5 root wheel 512 Apr 29 2006 libdata drwxr-xr-x 5 root wheel 1536 May 25 20:55 libexec drwxr-xr-x 26 root wheel 512 May 26 19:14 local drwxr-xr-x 3 root wheel 512 May 25 19:53 obj drwxr-xr-x 70 root wheel 1536 May 27 23:36 ports drwxr-xr-x 2 root wheel 5120 May 25 20:55 sbin drwxr-xr-x 27 root wheel 512 Apr 29 2006 share drwxr-xr-x 21 root wheel 512 May 19 18:53 src root@sagan:ports$ ls -la /usr/X11R6/ total 96 drwxr-xr-x 11 root wheel 512 May 20 19:03 . drwxr-xr-x 18 root wheel 512 Apr 30 2006 .. drwxr-xr-x 2 root wheel 7680 May 20 19:08 bin drwxr-xr-x 10 root wheel 512 May 20 19:05 etc drwxr-xr-x 8 root wheel 8704 May 20 19:08 include drwxr-xr-x 2 root wheel 512 May 20 18:59 info drwxr-xr-x 15 root wheel 12800 May 20 19:08 lib drwxr-xr-x 6 root wheel 512 Apr 29 2006 libdata drwxr-xr-x 2 root wheel 512 Jan 20 01:59 libexec drwxr-xr-x 25 root wheel 512 May 26 04:20 man drwxr-xr-x 10 root wheel 512 May 22 06:53 share root@sagan:ports$ ls -la /usr/local/ total 392 drwxr-xr-x 26 root wheel 512 May 26 19:14 . drwxr-xr-x 18 root wheel 512 Apr 30 2006 .. drwxr-xr-x 3 root wheel 512 May 21 09:23 Adobe drwxr-xr-x 3 root wheel 512 May 20 18:59 GNUstep drwxr-xr-x 3 root wheel 40960 May 27 23:08 bin drwxr-xr-x 2 root wheel 512 May 21 06:55 build-1 drwxr-xr-x 3 root wheel 1024 May 26 19:14 childsplay drwxr-xr-x 2 root wheel 512 May 21 06:39 env drwxr-xr-x 35 root wheel 2048 May 27 23:08 etc drwxr-xr-x 3 root wheel 512 May 23 21:30 gcc-ooo drwxr-xr-x 6 root wheel 512 May 21 06:42 gnu-autotools drwxr-xr-x 211 root wheel 34304 May 27 23:08 include drwxr-xr-x 2 root wheel 2048 May 26 20:30 info drwxr-xr-x 8 root wheel 512 May 23 21:40 jdk1.4.2 drwxr-xr-x 74 root wheel 74752 May 27 23:08 lib drwxr-xr-x 8 root wheel 512 May 21 07:54 libdata drwxr-xr-x 16 root wheel 1536 May 27 06:49 libexec drwxr-xr-x 8 root wheel 512 May 23 20:08 linux-sun-jdk1.4.2 drwxr-xr-x 42 root wheel 1024 May 26 04:20 man drwxr-xr-x 8 root wheel 512 May 24 03:41 openoffice.org-2.2.0 drwxr-xr-x 2 root wheel 1536 May 26 08:12 sbin drwxr-xr-x 135 root wheel 2560 May 27 23:08 share drwxr-xr-x 4 root wheel 512 May 1 2006 squid drwxr-xr-x 3 root wheel 512 May 21 08:58 src drwxr-xr-x 2 root wheel 512 May 21 10:14 translations drwxr-xr-x 4 root wheel 512 Jul 8 2006 www I am not sure which files are safe to delete, so will try sending this to x11@ as mentioned in the note above. thanks though shaun --=20 Shaun Branden: Alchemist and Bit Bender PGP and contact details in the headers. --NzB8fVQJ5HfG6fxh Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (FreeBSD) iD8DBQFGWZNbyiB/GaqSGUkRAivnAJ41GfvJVaHGjOaG5ngBSFgmLggERQCgyYNl YuX8KXEueV4ItejaqgT9p/U= =bRQ4 -----END PGP SIGNATURE----- --NzB8fVQJ5HfG6fxh--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070527141908.GB81644>