From owner-freebsd-stable@FreeBSD.ORG Sun May 27 19:02:01 2007 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8A6C916A4CD for ; Sun, 27 May 2007 19:02:01 +0000 (UTC) (envelope-from stephen@math.missouri.edu) Received: from math.missouri.edu (math.missouri.edu [128.206.184.200]) by mx1.freebsd.org (Postfix) with ESMTP id 2A6D713C465 for ; Sun, 27 May 2007 19:02:01 +0000 (UTC) (envelope-from stephen@math.missouri.edu) Received: from math.missouri.edu (localhost [127.0.0.1]) by math.missouri.edu (8.13.1/8.13.1) with ESMTP id l4RIMavw098463; Sun, 27 May 2007 13:22:36 -0500 (CDT) (envelope-from stephen@math.missouri.edu) Received: from localhost (stephen@localhost) by math.missouri.edu (8.13.1/8.13.1/Submit) with ESMTP id l4RIMaHX098458; Sun, 27 May 2007 13:22:36 -0500 (CDT) (envelope-from stephen@math.missouri.edu) Date: Sun, 27 May 2007 13:22:36 -0500 (CDT) From: Stephen Montgomery-Smith To: Matthew Seaman In-Reply-To: <4659BAE2.6040107@infracaninophile.co.uk> Message-ID: <20070527131707.F97044@math.missouri.edu> References: <20070527125334.GA81644@pcuse.com> <20070527132131.GW47537@tcbug.org> <46598F2E.50004@infracaninophile.co.uk> <4659AF0B.3030307@math.missouri.edu> <4659BAE2.6040107@infracaninophile.co.uk> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Josh Paetzel , freebsd-stable@freebsd.org, Shaun Branden Subject: Re: updating xorg-libraries 7.2 to 7.2.1 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 May 2007 19:02:01 -0000 On Sun, 27 May 2007, Matthew Seaman wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > Stephen Montgomery-Smith wrote: >> 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. >>> sh /usr/ports/Tools/scripts/mergebase.sh >>> >>> before proceeding to install whatever ports you want. > >> My experience is that simply having the symlink /usr/X11R6->/usr/local >> is totally sufficient. >> >> However it seems to me that what the port building procedure should now >> do is the following: >> >> * if /usr/X11R6 exists as a directory, it should issue an error message >> like it does now. >> >> * if /usr/X11R6 doesn't yet exist, silently create the symlink. >> >> This will mirror how it used to behave, in that if /usr/local or >> /usr/X11R6 did not exist, they would be created as needed. > > Oh, agreed to that. However, there are still more changes needed > beyond that: > > Stopping the system running periodic jobs from /usr/X11R6/etc/periodic > > Stopping the system running startup scripts from /usr/X11R6/etc/rc.d > > Stopping the system searching for manpages from /usr/X11R6/man > > The last is fairly trivial, but realise that the first two mean that > with the /usr/X11R6 -> /usr/local link in place all > /usr/local/etc/periodic jobs would get run twice, and even more > importantly all /usr/local/etc/rc.d/ startup scripts would also run > twice. > > Until there are new system releases incorporating the necessary changes > in /etc/defaults/rc.conf and /etc/defaults/periodic.conf it will be > necessary to override some of the default settings. In /etc/rc.conf: > > local_startup="/usr/local/etc/rc.d" > > In /etc/periodic.conf: > > local_periodic="/usr/local/etc/periodic" > > and for completeness sake, comment out the 'X11R6' lines in > /etc/manpath.conf I think that the easiest way (i.e. least disruption) is to add to each of the X11R6 scripts a test at their beginning to see if X11R6 is a symlink to /usr/local, and have the scripts do nothing if this is the case. This way people who haven't yet switched to xorg-7.2 will not be disadvantaged in any way. (I don't think simply testing to see if X11R6 is a symlink by itself will be sufficient because I bet that some people already have symlinks like X11R6->X11 or such like.) Also, the last change you propose vis a vis man pages, is that actually necessary - I would have thought that the overhead in searching both local and X11R6 would be fairly negligable. Stephen