This commit was generated by cvs2svn to compensate for changes in r64562,

which included commits to RCS files with non-trunk default branches.

3 files changed, 65 insertions, 96 deletions

diff --git a/contrib/sendmail/mail.local/Makefile b/contrib/sendmail/mail.local/Makefile
new file mode 100644
index 0000000..b560a30
--- /dev/null
+++ b/contrib/sendmail/mail.local/Makefile
@@ -0,0 +1,19 @@
+#       $Id: Makefile,v 8.5 1999/10/05 16:39:32 ca Exp $
+
+SHELL= /bin/sh
+BUILD=   ./Build
+OPTIONS= $(CONFIG) $(FLAGS)
+
+all: FRC
+	$(SHELL) $(BUILD) $(OPTIONS) $@
+clean: FRC
+	$(SHELL) $(BUILD) $(OPTIONS) $@
+install: FRC
+	$(SHELL) $(BUILD) $(OPTIONS) $@
+force-install: FRC
+	$(SHELL) $(BUILD) $(OPTIONS) $@
+
+fresh: FRC
+	$(SHELL) $(BUILD) $(OPTIONS) -c
+
+FRC:
diff --git a/contrib/sendmail/mail.local/Makefile.m4 b/contrib/sendmail/mail.local/Makefile.m4
index bf9a155e..f5344f8 100644
--- a/contrib/sendmail/mail.local/Makefile.m4
+++ b/contrib/sendmail/mail.local/Makefile.m4
@@ -1,106 +1,29 @@
-#
-#  This Makefile is designed to work on the old "make" program.
-#
-#	@(#)Makefile.m4	8.22	(Berkeley)	7/12/1998
-#
+include(confBUILDTOOLSDIR`/M4/switch.m4')
 
-# C compiler
-CC=	confCC
+bldPRODUCT_START(`executable', `mail.local')
+define(`bldNO_INSTALL')
+define(`bldSOURCES', `mail.local.c ')
+bldPUSH_SMLIB(`smutil')
+PREPENDDEF(`confENVDEF', `confMAPDEF')
+bldPRODUCT_END
 
-# Shell
-SHELL=	confSHELL
-
-# use O=-O (usual) or O=-g (debugging)
-O=	ifdef(`confOPTIMIZE', `confOPTIMIZE', `-O')
-
-# location of sendmail source directory
-SRCDIR=	ifdef(`confSRCDIR', `confSRCDIR', `../../src')
-
-# environment definitions (e.g., -D_AIX3)
-ENVDEF= -DNOT_SENDMAIL ifdef(`confENVDEF', `confENVDEF')
-
-# see also conf.h for additional compilation flags
-
-# include directories
-INCDIRS=-I${SRCDIR} confINCDIRS
-
-# loader options
-LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS')
-
-# library directories
-LIBDIRS=confLIBDIRS
-
-# libraries required on your system
-LIBS=	ifdef(`confLIBS', `confLIBS')
-
-# location of mail.local binary (usually /usr/sbin or /usr/etc)
-EBINDIR=${DESTDIR}ifdef(`confEBINDIR', `confEBINDIR', `/usr/libexec')
-
-# additional .o files needed
-OBJADD=	ifdef(`confOBJADD', `confOBJADD')
-
-undivert(1)
-
-###################  end of user configuration flags  ######################
-
-BUILDBIN=confBUILDBIN
-COPTS=	-I. ${INCDIRS} ${ENVDEF}
-CFLAGS=	$O ${COPTS}
-
-BEFORE=	snprintf.c confBEFORE
-OBJS=	mail.local.o snprintf.o ${OBJADD}
-
-NROFF=	ifdef(`confNROFF', `confNROFF', `groff -Tascii')
-MANDOC=	ifdef(`confMANDOC', `confMANDOC', `-mandoc')
-
-INSTALL=ifdef(`confINSTALL', `confINSTALL', `install')
-BINOWN=	ifdef(`confSBINOWN', `confSBINOWN', `root')
-BINGRP=	ifdef(`confSBINGRP', `confSBINGRP', `bin')
-BINMODE=ifdef(`confSBINMODE', `confSBINMODE', `4555')
-
-MANOWN=	ifdef(`confMANOWN', `confMANOWN', `bin')
-MANGRP=	ifdef(`confMANGRP', `confMANGRP', `bin')
-MANMODE=ifdef(`confMANMODE', `confMANMODE', `444')
-
-MANROOT=${DESTDIR}ifdef(`confMANROOT', `confMANROOT', `/usr/share/man/cat')
-MAN8=	${MANROOT}ifdef(`confMAN8', `confMAN8', `8')
-MAN8EXT=ifdef(`confMAN8EXT', `confMAN8EXT', `8')
-MAN8SRC=ifdef(`confMAN8SRC', `confMAN8SRC', `0')
-
-ALL=	mail.local mail.local.${MAN8SRC}
-
-all: ${ALL}
-
-mail.local: ${BEFORE} ${OBJS}
-	${CC} -o mail.local ${LDOPTS} ${OBJS} ${LIBDIRS} ${LIBS}
-
-snprintf.c: ${SRCDIR}/snprintf.c
-	-ln -s ${SRCDIR}/snprintf.c snprintf.c
-
-undivert(3)
-
-mail.local.${MAN8SRC}: mail.local.8
-	${NROFF} ${MANDOC} mail.local.8 > mail.local.${MAN8SRC}
+bldPRODUCT_START(`manpage', `mail.local')
+define(`bldSOURCES', `mail.local.8')
+bldPRODUCT_END
 
+divert(bldTARGETS_SECTION)
 install:
 	@echo "NOTE: This version of mail.local is not suited for some operating"
 	@echo "      systems such as HP-UX and Solaris.  Please consult the"
 	@echo "      README file in the mail.local directory.  You can force"
-	@echo "      the install using '${MAKE} force-install'."
+	@echo "      the install using 'Build force-install'."
 
-force-install: install-mail.local install-docs
+force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs')
 
 install-mail.local: mail.local
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} mail.local ${EBINDIR}
+	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR}
+divert
 
-install-docs: mail.local.${MAN8SRC}
-ifdef(`confNO_MAN_INSTALL', `dnl',
-`	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} mail.local.${MAN8SRC} ${MAN8}/mail.local.${MAN8EXT}')
+bldFINISH
 
-clean:
-	rm -f ${OBJS} mail.local mail.local.${MAN8SRC}
 
-################  Dependency scripts
-include(confBUILDTOOLSDIR/M4/depend/ifdef(`confDEPEND_TYPE', `confDEPEND_TYPE', 
-`generic').m4)dnl
-################  End of dependency scripts
diff --git a/contrib/sendmail/mail.local/README b/contrib/sendmail/mail.local/README
index 5da44bbf..56dac40 100644
--- a/contrib/sendmail/mail.local/README
+++ b/contrib/sendmail/mail.local/README
@@ -1,12 +1,39 @@
-#       @(#)README	8.1 (Berkeley) 2/17/1998
-
 This directory contains the source files for mail.local.
 
 This is not intended to be used on *stock* System V derived systems such as
 Solaris or HP-UX, since they use a totally different approach to mailboxes
 (essentially, they have a setgid program rather than setuid, and they rely
-on the ability to "give away"  files to do their work). 
+on the ability to "give away"  files to do their work).
 
 If you choose to run *this* mail.local on these systems then you may also
 need to replace the existing MUAs, as well as IMAP and POP servers, with
 ones that are compatible with the BSD interface.  You have been warned!
+
+For systems with maillock() support, compile with -DMAILLOCK and link with
+-lmail to use the maillock() routines.  This can be accomplished in your
+site.config.m4 file with:
+
+	APPENDDEF(`conf_mail_local_ENVDEF', `-DMAILLOCK')
+	APPENDDEF(`conf_mail_local_LIBS', `-lmail')
+
+Defining CONTENTLENGTH (-DCONTENTLENGTH) will build a mail.local which
+outputs a Content-Length: header.  Solaris 2.3 and later will automatically
+include Content-Length: support.  This can be accomplished in your
+site.config.m4 file with:
+
+	APPENDDEF(`conf_mail_local_ENVDEF', `-DCONTENTLENGTH')
+
+Defining MAILGID to a 'gid' (-DMAILGID=6) will cause mailboxes to be
+written group writable and with group 'gid'.  This can be accomplished in
+your site.config.m4 file with:
+
+	APPENDDEF(`conf_mail_local_ENVDEF', `-DMAILGID=6')
+
+mail.local will not be installed setuid root. To use it as local
+delivery agent without LMTP mode, use:
+
+	 MODIFY_MAILER_FLAGS(`LOCAL', `+S')
+
+in the .mc file.
+
+$Revision: 8.8 $, Last updated $Date: 1999/09/10 01:49:41 $