From owner-freebsd-x11@FreeBSD.ORG Thu Nov 8 16:22:10 2007 Return-Path: Delivered-To: x11@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7C6D16A421 for ; Thu, 8 Nov 2007 16:22:10 +0000 (UTC) (envelope-from freebsd-questions@slightlystrange.org) Received: from catflap.slightlystrange.org (cpc5-cmbg1-0-0-cust497.cmbg.cable.ntl.com [86.6.1.242]) by mx1.freebsd.org (Postfix) with ESMTP id 9164413C480 for ; Thu, 8 Nov 2007 16:22:10 +0000 (UTC) (envelope-from freebsd-questions@slightlystrange.org) Received: by catflap.slightlystrange.org (Postfix, from userid 106) id D11FF615F; Thu, 8 Nov 2007 16:03:40 +0000 (GMT) Received: from torus.slightlystrange.org (torus.slightlystrange.org [10.1.3.50]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by catflap.slightlystrange.org (Postfix) with ESMTP id EBAAF6132 for ; Thu, 8 Nov 2007 16:03:39 +0000 (GMT) Received: (from danielby@localhost) by torus.slightlystrange.org (8.14.1/8.13.4/Submit) id lA8G3cwQ018628 for x11@FreeBSD.org; Thu, 8 Nov 2007 16:03:38 GMT (envelope-from freebsd-questions@slightlystrange.org) Date: Thu, 8 Nov 2007 16:03:38 +0000 From: Daniel Bye To: x11@FreeBSD.org Message-ID: <20071108160338.GA14868@torus.slightlystrange.org> Mail-Followup-To: x11@FreeBSD.org References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="DocE+STaALJfprDB" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-PGP-Fingerprint: D349 B109 0EB8 2554 4D75 B79A 8B17 F97C 1622 166A Cc: Subject: Re: Error upgrading Xorg 7.2 on FreeBSD 6.2 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Daniel Bye List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2007 16:22:11 -0000 --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--