The rest of the changes needed to support the new version of sendmail (8.11.0).

Beyond changes to the build system, this includes fixing up the sample
freebsd.mc configuration for changes in defaults and syntax, removing
outdated documentation, and updating the release notes.

1 files changed, 28 insertions, 11 deletions

diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index a1ea194..7eff247 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,7 +1,8 @@
 #	@(#)Makefile	8.8 (Berkeley) 3/28/97
 # $FreeBSD$
 
-SMDIR=	${.CURDIR}/../../contrib/sendmail/src
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SMDIR=	${SENDMAIL_DIR}/src
 .PATH:	${SMDIR}
 
 BINDIR?=/usr/libexec/sendmail
@@ -17,15 +18,15 @@ NIS=	-DNIS
 # Map extensions
 MAPS=	-DMAP_REGEX
 
-CFLAGS+=-I${SMDIR} ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
-CFLAGS+=-D_FFR_MAX_MIME_HEADER_LENGTH
-CFLAGS+=-D_FFR_MAX_HEADERS_LENGTH
+CFLAGS+=-I${SMDIR} -I${SENDMAIL_DIR}/include
+CFLAGS+=${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
 
-SRCS=	alias.c arpadate.c clock.c collect.c conf.c control.c convtime.c \
-	daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c \
-	main.c map.c mci.c mime.c parseaddr.c queue.c readcf.c recipient.c \
-	safefile.c savemail.c snprintf.c srvrsmtp.c stab.c stats.c \
-	sysexits.c trace.c udb.c usersmtp.c util.c version.c
+SRCS=	alias.c arpadate.c bf_torek.c clock.c collect.c conf.c control.c \
+	convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c \
+	macro.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \
+	readcf.c recipient.c savemail.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
 DPADD=	${LIBUTIL} ${LIBWRAP}
 LDADD=	-lutil -lwrap
 MAN1=	mailq.1 newaliases.1
@@ -33,11 +34,21 @@ MAN5=	aliases.5
 MAN8=	sendmail.8 
 BINMODE=4555
 
+.if exists(${.OBJDIR}/../../lib/libsmutil)
+LIBSMUTILDIR:=	${.OBJDIR}/../../lib/libsmutil
+.else
+LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
+.endif
+LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
+
+DPADD+=	${LIBSMUTIL}
+LDADD+=	${LIBSMUTIL}
+
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/log/sendmail.st
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/sendmail.hf \
-	    ${DESTDIR}/usr/share/misc
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \
+	    ${DESTDIR}/etc/mail/helpfile
 
 afterinstall:
 	@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/sendmail.cf -a \
@@ -46,5 +57,11 @@ afterinstall:
 		mv -f ${DESTDIR}/etc/sendmail.cf \
 		    ${DESTDIR}/etc/mail/sendmail.cf; \
 	fi
+	@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/aliases -a \
+	      ! -f ${DESTDIR}/etc/mail/aliases ]; then \
+		set -x; \
+		cp ${DESTDIR}/etc/aliases \
+		   ${DESTDIR}/etc/mail/aliases; \
+	fi
 
 .include <bsd.prog.mk>