Don't make a sendmail smtpd link, it will be confused with beck's smtpd.

diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile
index 7740db5..5333f76 100644 (file)
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.4 2000/04/04 13:58:28 millert Exp $
+#      $OpenBSD: Makefile,v 1.5 2000/04/06 01:05:37 millert Exp $
 
 PROG=  sendmail
 
@@ -12,7 +12,7 @@ SRCS= main.c alias.c arpadate.c bf_torek.c clock.c collect.c \
        sfsasl.c shmticklib.c srvrsmtp.c stab.c stats.c sysexits.c \
        timers.c trace.c udb.c usersmtp.c util.c version.c
 MAN=   aliases.5 mailq.1 newaliases.1 sendmail.8
-MLINKS=        sendmail.8 smtpd.8 sendmail.8 hoststat.1 sendmail.8 purgestat.1
+MLINKS=        sendmail.8 sendmail.8 hoststat.1 sendmail.8 purgestat.1
 BINDIR=        /usr/libexec/sendmail
 BINOWN=        root
 BINGRP=        bin

diff --git a/gnu/usr.sbin/sendmail/sendmail/sendmail.8 b/gnu/usr.sbin/sendmail/sendmail/sendmail.8
index 79fcbfa..6b958f0 100644 (file)
--- a/gnu/usr.sbin/sendmail/sendmail/sendmail.8
+++ b/gnu/usr.sbin/sendmail/sendmail/sendmail.8
@@ -24,7 +24,6 @@
 .Op Fl v
 .Nm hoststat
 .Nm purgestat
-.Nm smtpd
 .Sh DESCRIPTION
 .Nm Sendmail
 sends a message to one or more
@@ -546,12 +545,6 @@ If invoked as
 .Nm purgestat ,
 .Nm sendmail
 will purge expired entries from the persistent host status database.
-If invoked as
-.Nm smtpd ,
-.Nm sendmail
-will act as a daemon, as if the
-.Fl bd
-option were specified.
 .Sh NOTES
 .Nm sendmail
 often gets blamed for many problems

diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 91d03a2..8c45d6b 100644 (file)
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.2 2000/04/04 02:41:19 millert Exp $
+#      $OpenBSD: Makefile,v 1.3 2000/04/06 01:05:38 millert Exp $
 
 PROG=  mailwrapper
 MAN=   mailwrapper.8 mailer.conf.5
@@ -8,7 +8,6 @@ LDADD+= -lutil
 
 afterinstall:
        ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/sbin/sendmail
-       ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/sbin/smtpd
        ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/bin/newaliases
        ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/bin/mailq
        ln -fs /usr/sbin/mailwrapper ${DESTDIR}/usr/bin/hoststat