From owner-cvs-all@FreeBSD.ORG  Tue May 29 12:11:21 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2068816A46C;
	Tue, 29 May 2007 12:11:21 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (tim.des.no [194.63.250.121])
	by mx1.freebsd.org (Postfix) with ESMTP id C4FA313C4BD;
	Tue, 29 May 2007 12:11:20 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (localhost [127.0.0.1])
	by spam.des.no (Postfix) with ESMTP id 0802F20CB;
	Tue, 29 May 2007 14:11:16 +0200 (CEST)
X-Spam-Tests: AWL
X-Spam-Learn: disabled
X-Spam-Score: 0.0/3.0
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on tim.des.no
Received: from dwp.des.no (des.no [80.203.243.180])
	by smtp.des.no (Postfix) with ESMTP id A7DA820C8;
	Tue, 29 May 2007 14:11:15 +0200 (CEST)
Received: by dwp.des.no (Postfix, from userid 1001)
	id 5E3C45245; Tue, 29 May 2007 11:06:20 +0200 (CEST)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: Mike Makonnen <mtm@FreeBSD.Org>
References: <200705290622.l4T6MEbp094483@repoman.freebsd.org>
	<20070529074745.GA2078@rogue.navcom.lan>
Date: Tue, 29 May 2007 11:06:20 +0200
In-Reply-To: <20070529074745.GA2078@rogue.navcom.lan> (Mike Makonnen's message
	of "Tue\, 29 May 2007 10\:47\:45 +0300")
Message-ID: <864plw80dv.fsf@dwp.des.no>
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: cvs-src@FreeBSD.org, Doug Barton <dougb@FreeBSD.org>, cvs-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: cvs commit: src/etc/defaults periodic.conf rc.conf
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 May 2007 12:11:21 -0000

Mike Makonnen <mtm@FreeBSD.Org> writes:
> On Tue, May 29, 2007 at 06:22:14AM +0000, Doug Barton wrote:
> >   Log:
> >   Now that a separate /usr/X11R6 directory is no longer in fashion,
> >   stop looking there for things like rc.d and periodic. This avoids
> >   duplicating effort when /usr/X11R6 is a symlink to /usr/local,
> >   which it is by default now.
> I dunno, it seems a bit much to force someone (even if it *is* -CURRENT)
> to either upgrade to xorg 7.2 or maintain a local patch to revert this
> commit. Not all of us have the bandwidth to upgrade immediately :-(

if [ -d /usr/X11R6/etc/rc.d/ -a \
    ! /usr/local/etc/rc.d/ -ef /usr/X11R6/etc/rc.d/ ] ; then
        local_startup=3D"$local_startup /usr/X11R6/etc/rc.d"
fi

DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no