From owner-freebsd-current@FreeBSD.ORG  Fri Aug 27 16:20:10 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C1EEC16A4CF
	for <current@freebsd.org>; Fri, 27 Aug 2004 16:20:10 +0000 (GMT)
Received: from mproxy.gmail.com (rproxy.gmail.com [64.233.170.203])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 65F9843D4C
	for <current@freebsd.org>; Fri, 27 Aug 2004 16:20:10 +0000 (GMT)
	(envelope-from swhetzel@gmail.com)
Received: by mproxy.gmail.com with SMTP id 77so227002rnl
        for <current@freebsd.org>; Fri, 27 Aug 2004 09:20:06 -0700 (PDT)
Received: by 10.38.83.11 with SMTP id g11mr2099814rnb;
        Fri, 27 Aug 2004 09:20:06 -0700 (PDT)
Received: by 10.38.75.25 with HTTP; Fri, 27 Aug 2004 09:20:06 -0700 (PDT)
Message-ID: <790a9fff0408270920a9e694@mail.gmail.com>
Date: Fri, 27 Aug 2004 11:20:06 -0500
From: Scot Hetzel <swhetzel@gmail.com>
To: Oliver Eikemeier <eikemeier@fillmore-labs.com>
In-Reply-To: <62D80202-F843-11D8-AC6A-00039312D914@fillmore-labs.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
References: <62D80202-F843-11D8-AC6A-00039312D914@fillmore-labs.com>
cc: dougb@freebsd.org
cc: freebsd-rc@freebsd.org
cc: current@freebsd.org
Subject: Re: Patch for mergemaster [was Re: RFC: Alternate patch to have
	true new-style rc.d scripts in ports (without touching localpkg)]
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Scot Hetzel <swhetzel@gmail.com>
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Aug 2004 16:20:10 -0000

On Fri, 27 Aug 2004 18:08:51 +0200, Oliver Eikemeier
<eikemeier@fillmore-labs.com> wrote:
> Scot Hetzel wrote:
> 
> > Attached is a patch to mergemaster that checks the script files for
> > "$FreeBSD: src" during the STALE_RC_FILES check.  If a script has such
> > a header, it is assumed to be a stale rc file.  The old behavior of
> > checking all scripts is still available when the -s flag is specified
> > to mergemaster.
> 
> An alternate approach is in PR 64476:
>   <http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/64476>
> 
> But probably the "$FreeBSD: src" test is more useful, I'm not sure.
> Anyway, you could post this as a follow-up, so that both approaches
> could be compared.
> 
OK, sent patch as follow-up to this PR.

Scot