From owner-freebsd-commit  Sat Dec  2 10:19:36 1995
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id KAA21964
          for freebsd-commit-outgoing; Sat, 2 Dec 1995 10:19:36 -0800
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id KAA21608
          for cvs-all-outgoing; Sat, 2 Dec 1995 10:18:05 -0800
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id KAA21590
          for cvs-usrsbin-outgoing; Sat, 2 Dec 1995 10:18:01 -0800
Received: (from peter@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id KAA21549
          ; Sat, 2 Dec 1995 10:17:50 -0800
Date: Sat, 2 Dec 1995 10:17:50 -0800
From: Peter Wemm <peter>
Message-Id: <199512021817.KAA21549@freefall.freebsd.org>
To: CVS-committers, cvs-usrsbin
Subject: cvs commit: src/usr.sbin/sendmail/src Makefile collect.c conf.c conf.h daemon.c deliver.c domain.c headers.c main.c parseaddr.c readcf.c recipient.c savemail.c sendmail.8 sendmail.h srvrsmtp.c udb.c usersmtp.c util.c Makefile.386BSD Makefile.AIX Makefile.AUX Makefile.BSD43 Makefile.BSDI Makefile.CLIX Makefile.ConvexOS Makefile.DGUX Makefile.Dell Makefile.DomainOS Makefile.Dynix Makefile.FreeBSD Makefile.HP-UX Makefile.IRIX Makefile.Linux Makefile.Mach386 Makefile.NCR3000 Makefile.NeXT Makefile.NetBSD Makefile.OSF1 Makefile.PTX Makefile.RISCos Makefile.SCO Makefile.SVR4 Makefile.Solaris Makefile.SunOS Makefile.SunOS.4.0.3 Makefile.SunOS.5.1 Makefile.SunOS.5.2 Makefile.SunOS.5.x Makefile.Titan Makefile.ULTRIX Makefile.UMAX Makefile.Utah Makefile.dist sysexits.h
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

peter       95/12/02 10:17:47

  Modified:    usr.sbin/sendmail/cf/cf  Makefile
               usr.sbin/sendmail/contrib  bitdomain.c
               usr.sbin/sendmail/makemap  makemap.c
               usr.sbin/sendmail/src  Makefile collect.c conf.c conf.h
                        daemon.c deliver.c domain.c  headers.c main.c
                        parseaddr.c readcf.c recipient.c savemail.c 
                        sendmail.8 sendmail.h srvrsmtp.c udb.c usersmtp.c
                        util.c
  Removed:     usr.sbin/sendmail/src  Makefile.386BSD Makefile.AIX
                        Makefile.AUX Makefile.BSD43  Makefile.BSDI
                        Makefile.CLIX Makefile.ConvexOS Makefile.DGUX 
                        Makefile.Dell Makefile.DomainOS Makefile.Dynix 
                        Makefile.FreeBSD Makefile.HP-UX Makefile.IRIX
                        Makefile.Linux  Makefile.Mach386 Makefile.NCR3000
                        Makefile.NeXT  Makefile.NetBSD Makefile.OSF1
                        Makefile.PTX Makefile.RISCos  Makefile.SCO
                        Makefile.SVR4 Makefile.Solaris Makefile.SunOS 
                        Makefile.SunOS.4.0.3 Makefile.SunOS.5.1
                        Makefile.SunOS.5.2  Makefile.SunOS.5.x
                        Makefile.Titan Makefile.ULTRIX  Makefile.UMAX
                        Makefile.Utah Makefile.dist sysexits.h
  Log:
  Initial round of conflict resolutions..  I need to do another
  pass over this and check it more closely, but my initial concern was
  to get it to all compile again.  Some of the obsoleted files 'cvs rm'ed.
  
  Revision  Changes    Path
  1.4       +85 -60    src/usr.sbin/sendmail/cf/cf/Makefile
  1.3       +3 -3      src/usr.sbin/sendmail/contrib/bitdomain.c
  1.3       +125 -6    src/usr.sbin/sendmail/makemap/makemap.c
  1.6       +9 -4      src/usr.sbin/sendmail/src/Makefile
  1.3       +406 -242  src/usr.sbin/sendmail/src/collect.c
  1.8       +1715 -345 src/usr.sbin/sendmail/src/conf.c
  1.5       +776 -160  src/usr.sbin/sendmail/src/conf.h
  1.7       +358 -180  src/usr.sbin/sendmail/src/daemon.c
  1.8       +889 -310  src/usr.sbin/sendmail/src/deliver.c
  1.5       +213 -112  src/usr.sbin/sendmail/src/domain.c
  1.3       +360 -75   src/usr.sbin/sendmail/src/headers.c
  1.3       +842 -239  src/usr.sbin/sendmail/src/main.c
  1.3       +369 -176  src/usr.sbin/sendmail/src/parseaddr.c
  1.4       +1084 -215 src/usr.sbin/sendmail/src/readcf.c
  1.3       +449 -172  src/usr.sbin/sendmail/src/recipient.c
  1.3       +670 -115  src/usr.sbin/sendmail/src/savemail.c
  1.3       +15 -2     src/usr.sbin/sendmail/src/sendmail.8
  1.3       +428 -165  src/usr.sbin/sendmail/src/sendmail.h
  1.3       +444 -191  src/usr.sbin/sendmail/src/srvrsmtp.c
  1.3       +177 -59   src/usr.sbin/sendmail/src/udb.c
  1.3       +223 -73   src/usr.sbin/sendmail/src/usersmtp.c
  1.3       +594 -144  src/usr.sbin/sendmail/src/util.c