Date: Thu, 8 Nov 2007 16:03:38 +0000 From: Daniel Bye <freebsd-questions@slightlystrange.org> To: x11@FreeBSD.org Subject: Re: Error upgrading Xorg 7.2 on FreeBSD 6.2 Message-ID: <20071108160338.GA14868@torus.slightlystrange.org> In-Reply-To: <DFDDC543-91F1-44EB-BCF6-00E7AA1DB43D@ingv.it> References: <DFDDC543-91F1-44EB-BCF6-00E7AA1DB43D@ingv.it>
next in thread | previous in thread | raw e-mail | index | archive | help
--DocE+STaALJfprDB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 08, 2007 at 01:57:35PM +0100, Valentino Lauciani wrote: > Enter 'yes' to continue, anything else will exit script: yes > CONFLICTING FILES: > ./man/whatis >=20 > Files that exist both in /usr/local and /usr/X11R6 have been found as =20 > shown above. Merging will not continue. > While some such files are safe to remove as they will be regenerated =20 > (like /usr/X11R6/man/whatis), some you might want to move away =20 > somewhere safe, and some might point to conflicts in ports. > For this script to continue, you need to either move these files away =20 > from /usr/X11R6 or delete them. If you don't know what to do about a =20 > particular file, ask on x11@FreeBSD.org mailing list. > The list is saved in /tmp/mergebase.qo7TBWmH. > anderson# >=20 > What does it mean? > What I've to do now? You can safely remove the file /usr/X11R6/man/whatis and run mergebase.sh again. It will be generated again for you next time the weekly periodic(8)= =20 script runs (probably next Saturday morning), or you can run it manually after mergebase.sh has finished: # /etc/periodic/weekly/320.whatis All should be fine after that. HTH Dan --=20 Daniel Bye _ ASCII ribbon campaign ( ) - against HTML, vCards and X - proprietary attachments in e-mail / \ --DocE+STaALJfprDB Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFHMzNaixf5fBYiFmoRAjmmAKCBML03zUbq5dNZL2RSpz/8lAS0xwCg3uAv S+3cbhIxd6zjajnvZhqxGig= =LJ5k -----END PGP SIGNATURE----- --DocE+STaALJfprDB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071108160338.GA14868>