updating xorg-libraries 7.2 to 7.2.1

Shaun Branden shaun at pcuse.com
Sun May 27 14:18:57 UTC 2007 

On Sun, May 27, 2007 at 03:01:18PM +0100, Matthew Seaman wrote:
> Josh Paetzel wrote:
> > Shaun Branden wrote:
> 
> >> xorg 7.2 was installed on this system from scratch, ie no ports to start
> >> with.
> 
> > For right now if you want portupgrade to do anything with xorg you
> > need to export XORG_UPGRADE
> 
> 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.  
> 
> 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 
> running mergebase.sh.  On a completely virgin newly instaleld system,
> with /usr/ports populated, but no ports yet installed you may need
> to:
> 
>     mkdir /usr/X11R6
> 
> to give that script something to chew on, and then just:
> 
>     sh /usr/ports/Tools/scripts/mergebase.sh
> 
> before proceeding to install whatever ports you want.

Yeah, I have already run that script but no symlink is created:
root at 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 at 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:
./etc/gconf/gconf.xml.defaults/%gconf-tree-af.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ar.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-az.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-be.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-bg.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-bn.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-bn_IN.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-br.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-bs.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ca.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-cs.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-cy.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-da.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-de.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-dz.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-el.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-en_CA.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-eo.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-es.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-et.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-eu.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-fa.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-fi.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-fr.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ga.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-gl.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-gu.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-he.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-hi.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-hr.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-hu.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-hy.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-id.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-is.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-it.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ja.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ka.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-km.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ko.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ky.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-li.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-lt.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-lv.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-mg.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-mk.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ml.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-mn.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-mr.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ms.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-nb.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ne.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-nl.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-nn.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-no.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-nso.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-or.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-pa.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-pl.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-pt.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-pt_BR.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ro.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sk.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sl.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sq.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sr.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sr at Latn.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sr at ije.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sv.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ta.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-te.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-th.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-tk.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-tr.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-tt.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-uk.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-wa.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-xh.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-yi.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-zh_CN.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-zh_HK.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-zh_TW.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-zu.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree.xml
./etc/settings/.qt_plugins_3.3rc.lock
./etc/settings/qt_plugins_3.3rc
./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 at FreeBSD.org mailing list.
The list is saved in /tmp/mergebase.gVVGMngT.
root at 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 at 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 at 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

-- 
Shaun Branden: Alchemist and Bit Bender
PGP and contact details in the headers.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20070527/1f1443fa/attachment.pgp

More information about the freebsd-stable mailing list