From owner-cvs-all Tue May 11 2:13:56 1999 Delivered-To: cvs-all@freebsd.org Received: from catastrophe.gelemna.ft-wayne.in.us (fw-line-22.fwi.com [209.84.172.27]) by hub.freebsd.org (Postfix) with ESMTP id 8195B15E3B; Tue, 11 May 1999 02:13:31 -0700 (PDT) (envelope-from croyle@gelemna.ft-wayne.in.us) Received: from emerson.gelemna.ft-wayne.in.us (emerson.gelemna.ft-wayne.in.us [10.23.42.2]) by catastrophe.gelemna.ft-wayne.in.us (8.8.8/8.8.8) with ESMTP id EAA11729; Tue, 11 May 1999 04:13:31 -0500 (EST) (envelope-from croyle@gelemna.ft-wayne.in.us) Received: (from croyle@localhost) by emerson.gelemna.ft-wayne.in.us (8.9.3/8.9.2) id EAA91674; Tue, 11 May 1999 04:15:01 -0500 (EST) (envelope-from croyle@gelemna.ft-wayne.in.us) To: "Jonathan M. Bresler" Cc: 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> Mime-Version: 1.0 (generated by tm-edit 7.108) Content-Type: text/plain; charset=US-ASCII From: Don Croyle Date: 11 May 1999 04:15:00 -0500 Organization: Minimal at best In-Reply-To: "Jonathan M. Bresler"'s message of "Mon, 10 May 1999 20:21:05 -0700 (PDT)" Message-ID: <863e14m0h7.fsf@emerson.gelemna.ft-wayne.in.us> Lines: 32 X-Mailer: Gnus v5.5/XEmacs 20.4 - "Emerald" Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk "Jonathan M. Bresler" 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. *** 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