From owner-cvs-all  Tue May 11  7:50:22 1999
Delivered-To: cvs-all@freebsd.org
Received: from dt057n14.san.rr.com (dt051nc7.san.rr.com [204.210.32.199])
	by hub.freebsd.org (Postfix) with ESMTP
	id 895E315992; Tue, 11 May 1999 07:50:17 -0700 (PDT)
	(envelope-from Studded@gorean.org)
Received: from gorean.org (master [10.0.0.2])
	by dt057n14.san.rr.com (8.8.8/8.8.8) with ESMTP id HAA21947;
	Tue, 11 May 1999 07:50:13 -0700 (PDT)
	(envelope-from Studded@gorean.org)
Message-ID: <373843A4.51DE5B9D@gorean.org>
Date: Tue, 11 May 1999 07:50:12 -0700
From: Studded <Studded@gorean.org>
Organization: Triborough Bridge & Tunnel Authority
X-Mailer: Mozilla 4.51 [en] (X11; I; FreeBSD 3.2-BETA-0509 i386)
X-Accept-Language: en
MIME-Version: 1.0
To: Don Croyle <croyle@gelemna.ft-wayne.in.us>
Cc: "Jonathan M. Bresler" <jmb@FreeBSD.ORG>, cvs-all@FreeBSD.ORG
Subject: Re: cvs commit: src/etc/mail Makefile README 
 sendmail.cf.additions          src/etc/sendmail freefall.mc
References: <199905110321.UAA13701@freefall.freebsd.org> <863e14m0h7.fsf@emerson.gelemna.ft-wayne.in.us>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

Don Croyle wrote:
> 
> "Jonathan M. Bresler" <jmb@FreeBSD.ORG> writes:
> 
> > jmb         1999/05/10 20:21:05 PDT
> 
> >   Removed files:         (Branch: RELENG_3)
> >     etc/mail             sendmail.cf.additions
> 
> This causes mergemaster (and probably make release) to choke.

	Can you provide some details on how it chokes? I just cvsup'ed and ran
mergemaster and didn't have any problems. 

Thanks,

Doug

> *** etc/Makefile.orig   Thu May  6 18:41:06 1999
> --- etc/Makefile        Tue May 11 04:08:21 1999
> ***************
> *** 24,30 ****
>         BSD.var.dist BSD.x11.dist
>   NAMEDB= PROTO.localhost.rev named.conf named.root make-localhost
>   PPPCNF= ppp.deny ppp.shells.sample
> ! NOSPAM=       Makefile README sendmail.cf.additions
> 
> 
>   # Special top level files for FreeBSD
> --- 24,30 ----
>         BSD.var.dist BSD.x11.dist
>   NAMEDB= PROTO.localhost.rev named.conf named.root make-localhost
>   PPPCNF= ppp.deny ppp.shells.sample
> ! NOSPAM=       Makefile README
> 
> 
>   # Special top level files for FreeBSD
> .
> --
> I've always wanted to be a dilettante, but I've never quite been ready
> to make the commitment.
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe cvs-all" in the body of the message


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message