diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2000-08-12 22:39:25 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2000-08-12 22:39:25 +0000 |
commit | 002ef51d6eb85e40acd7d5111adaccddc33e3880 (patch) | |
tree | 372ed1ec3b3cdaae188c1397c5724ee2a49a924c /usr.sbin | |
parent | b107abc272e6f4eb2fa7e8fd4e2008fb91cd2914 (diff) | |
download | FreeBSD-src-002ef51d6eb85e40acd7d5111adaccddc33e3880.zip FreeBSD-src-002ef51d6eb85e40acd7d5111adaccddc33e3880.tar.gz |
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.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/mailstats/Makefile | 17 | ||||
-rw-r--r-- | usr.sbin/makemap/Makefile | 26 | ||||
-rw-r--r-- | usr.sbin/praliases/Makefile | 25 | ||||
-rw-r--r-- | usr.sbin/sendmail/Makefile | 39 |
4 files changed, 88 insertions, 19 deletions
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile index d8bec3e..6a7520c 100644 --- a/usr.sbin/mailstats/Makefile +++ b/usr.sbin/mailstats/Makefile @@ -1,9 +1,22 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 +# $FreeBSD$ + +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +.PATH: ${SENDMAIL_DIR}/mailstats PROG= mailstats +SRCS= mailstats.c MAN8= mailstats.8 -CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src +CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -DNOT_SENDMAIL + +.if exists(${.OBJDIR}/../../lib/libsmutil) +LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil +.else +LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR +.endif +LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a -.PATH: ${.CURDIR}/../../contrib/sendmail/mailstats +DPADD+= ${LIBSMUTIL} +LDADD+= ${LIBSMUTIL} .include <bsd.prog.mk> diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile index 735e285..d92368c 100644 --- a/usr.sbin/makemap/Makefile +++ b/usr.sbin/makemap/Makefile @@ -1,12 +1,30 @@ # @(#)Makefile 8.4 (Berkeley) 6/10/97 +# $FreeBSD$ + +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +.PATH: ${SENDMAIL_DIR}/makemap PROG= makemap -SRCS= makemap.c safefile.c snprintf.c +SRCS= makemap.c MAN8= makemap.8 -CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src -DNEWDB -DNOT_SENDMAIL +CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +CFLAGS+=-DNEWDB -DNOT_SENDMAIL + +.if exists(${.OBJDIR}/../../lib/libsmdb) +LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb +.else +LIBSMDBDIR!= cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR +.endif +LIBSMDB:= ${LIBSMDBDIR}/libsmdb.a -.PATH: ${.CURDIR}/../../contrib/sendmail/makemap \ - ${.CURDIR}/../../contrib/sendmail/src +.if exists(${.OBJDIR}/../../lib/libsmutil) +LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil +.else +LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR +.endif +LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a +DPADD+= ${LIBSMDB} ${LIBSMUTIL} +LDADD+= ${LIBSMDB} ${LIBSMUTIL} .include <bsd.prog.mk> diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile index 9c13bc0..57fbaa0 100644 --- a/usr.sbin/praliases/Makefile +++ b/usr.sbin/praliases/Makefile @@ -1,9 +1,30 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 +# $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/sendmail/praliases +SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +.PATH: ${SENDMAIL_DIR}/praliases PROG= praliases +SRCS= praliases.c MAN8= praliases.8 -CFLAGS+=-I${.CURDIR}/../../contrib/sendmail/src -DNEWDB +CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +CFLAGS+=-DNEWDB -DNOT_SENDMAIL + +.if exists(${.OBJDIR}/../../lib/libsmdb) +LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb +.else +LIBSMDBDIR!= cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR +.endif +LIBSMDB:= ${LIBSMDBDIR}/libsmdb.a + +.if exists(${.OBJDIR}/../../lib/libsmutil) +LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil +.else +LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR +.endif +LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a + +DPADD+= ${LIBSMDB} ${LIBSMUTIL} +LDADD+= ${LIBSMDB} ${LIBSMUTIL} .include <bsd.prog.mk> 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> |