Rename of current sendmail package to sendmail813 to make way for

new sendmail 8.14.x tree in pkgsrc.

Changes to the original package include:
- Path changes in Makefile and Makefile.common to reflect new location under
  mail/ of this package
- Fix a bunch of issues found by pkg_lint

33 files changed, 904 insertions, 0 deletions

diff --git a/mail/sendmail813/DESCR b/mail/sendmail813/DESCR
new file mode 100644
index 00000000000..460d04ee70c
--- /dev/null
+++ b/mail/sendmail813/DESCR
@@ -0,0 +1,8 @@
+Sendmail acts as a unified "post office" to which all mail can be
+submitted.  Address interpretation is controlled by a production
+system, which can parse both domain-based addressing and old-style
+"ad hoc" addresses.  The production system is powerful enough to
+rewrite addresses in the message header to conform to the standards
+of a number of common target networks, including old (NCP/RFC733)
+Arpanet, new (TCP/RFC822) Arpanet, UUCP, and Phonenet. Sendmail
+also implements an SMTP server, message queueing, and aliasing.
diff --git a/mail/sendmail813/MESSAGE b/mail/sendmail813/MESSAGE
new file mode 100644
index 00000000000..23524117cef
--- /dev/null
+++ b/mail/sendmail813/MESSAGE
@@ -0,0 +1,21 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+To use "${PKGNAME}" as the system's mail transport agent you have
+to install "${PREFIX}/share/examples/sendmail/mailer.conf" as global
+mailwrapper configuration file.  The command below will do that for you:
+
+ln -fs ${PREFIX}/share/examples/sendmail/mailer.conf /etc/mailer.conf
+
+If you are changing the database format used by sendmail you must run
+"newaliases" and "makemap" in order to re-create the databases.
+
+You may also need to install (and/or customize) the configuration files
+for Sendmail before it will be operational.  "cd" to the directory
+
+    ${PREFIX}/share/sendmail/cf
+
+and read the file README for instructions on creating and installing
+configuration files.
+
+===========================================================================
diff --git a/mail/sendmail813/Makefile b/mail/sendmail813/Makefile
new file mode 100644
index 00000000000..10aee01f56a
--- /dev/null
+++ b/mail/sendmail813/Makefile
@@ -0,0 +1,99 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+.include "../../mail/sendmail813/Makefile.common"
+
+PKGNAME=	sendmail-${DIST_VERS}
+COMMENT=	The well known Mail Transport Agent
+
+CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
+
+MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
+PLIST_SRC=	${WRKDIR}/.PLIST_SRC
+
+SMRSH_CMDDIR?=	${PREFIX}/libexec/sm.bin
+PLIST_SUBST+=	SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
+RCD_SCRIPTS=	sendmail smmsp
+
+# Not OWN_DIRS, so that the admin doesn't get a suggestion to delete the
+# queue dirs if they are nonempty at deinstall (probably undesirable).
+#
+MAKE_DIRS_PERMS+=	/var/spool/clientmqueue smmsp smmsp 0770
+MAKE_DIRS_PERMS+=	/var/spool/mqueue ${ROOT_USER} ${ROOT_GROUP} 0755
+
+PKG_GROUPS=		smmsp
+PKG_USERS=		smmsp:smmsp
+PKG_GECOS.smmsp=	Sendmail Message Submission Program
+
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	../mailer.conf include/sm/conf.h smrsh/smrsh.8 cf/cf/Makefile
+SUBST_SED.paths+=	-e "s|@@BINGRP@@|${BINGRP}|g"
+SUBST_SED.paths+=	-e "s|@@BINOWN@@|${BINOWN}|g"
+SUBST_SED.paths+=	-e "s|@@INSTALL@@|${INSTALL}|g"
+SUBST_SED.paths+=	-e "s|@@PREFIX@@|${PREFIX}|g"
+SUBST_SED.paths+=	-e "s|@@SMRSH_CMDDIR@@|${SMRSH_CMDDIR}|g"
+SUBST_MESSAGE.paths=	Fixing paths.
+
+REPLACE_PERL=		contrib/socketmapClient.pl contrib/socketmapServer.pl
+
+post-patch: make-sendmail-siteconfig
+.if !empty(PKG_OPTIONS:Mtcpwrappers)
+	cat ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Mldap)
+	cat ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Mdb2)
+	cat ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Mdb4)
+	cat ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Mtls)
+	cat ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Msasl)
+	cat ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
+.endif
+
+post-extract:
+	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+
+do-build:
+	cd ${WRKSRC} && env ${MAKE_ENV} ./Build
+
+post-build:
+	cp ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
+	cp ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
+
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail
+
+post-install:
+	${INSTALL_DATA_DIR} ${SMRSH_CMDDIR}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sendmail
+	${INSTALL_DATA_DIR} ${PREFIX}/share/sendmail
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sendmail
+	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
+		${PREFIX}/share/examples/sendmail/
+	cd ${WRKSRC}/cf && pax -rw -pp -pm -s',^.*\.orig$$,,' . ${PREFIX}/share/sendmail
+	chown -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
+
+	${INSTALL_DATA} ${WRKSRC}/obj.`${UNAME} -srm | tr \  . | tr \/ - | sed s/sun4./sun4/`/libsm/libsm.a \
+		${PREFIX}/lib
+
+	${INSTALL_DATA} \
+		${WRKSRC}/obj.`${UNAME} -srm | tr \  . | tr \/ - | sed s/sun4./sun4/`/libsmutil/libsmutil.a \
+		${PREFIX}/lib
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmap*.pl \
+		${PREFIX}/share/examples/sendmail/
+	${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/sendmail
+	${INSTALL_DATA} ${WRKSRC}/cf/README ${PREFIX}/share/doc/sendmail
+	${INSTALL_DATA} ${WRKSRC}/sendmail/SECURITY ${PREFIX}/share/doc/sendmail
+	${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${PREFIX}/share/doc/sendmail
+	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${PREFIX}/share/doc/sendmail
+
+.include "../../mk/bsd.pkg.mk"
+
+# has to be below include for bsd.pkg.mk, else substition fails
+OBJDIR!=	${ECHO} obj.`${UNAME} -srm | tr \  . | tr \/ -`
diff --git a/mail/sendmail813/Makefile.common b/mail/sendmail813/Makefile.common
new file mode 100644
index 00000000000..d2a057655e6
--- /dev/null
+++ b/mail/sendmail813/Makefile.common
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+#
+# Makefile fragment shared with libmilter
+#
+
+DISTNAME=	sendmail.${DIST_VERS}
+CATEGORIES=	mail
+MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
+		ftp://ftp.sendmail.org/pub/sendmail/past-releases/ \
+		ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
+		ftp://ftp.ayamura.org/pub/sendmail/
+
+MAINTAINER=	jnemeth@NetBSD.org
+HOMEPAGE=	http://www.sendmail.org/
+
+LICENSE=	sendmail-license
+
+DISTINFO_FILE?=	${.CURDIR}/../../mail/sendmail813/distinfo
+FILESDIR?=	${.CURDIR}/../../mail/sendmail813/files
+PATCHDIR?=	${.CURDIR}/../../mail/sendmail813/patches
+
+DIST_VERS=	8.13.8
+
+MAKE_ENV+=	BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
+		BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
+		BUILDLINK_DIR=${BUILDLINK_DIR:Q} \
+		SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
+SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
+
+BUILD_DEFS+=	SMRSH_CMDDIR
+
+WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
+USE_TOOLS+=	gm4
+MAKE_ENV+=	M4=${TOOLS_M4:Q}
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+.PHONY: make-sendmail-siteconfig
+make-sendmail-siteconfig:
+	${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
+	${CHMOD} +w ${SITECONFIG}
+
+.if !empty(PKG_OPTIONS:Minet6)
+	${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
+.  if ${OPSYS} != "SunOS" && ${OPSYS} != "BSDOS" && ${OPSYS} != "DragonFly"
+	${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
+.  endif
+.endif
+	${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
diff --git a/mail/sendmail813/PLIST b/mail/sendmail813/PLIST
new file mode 100644
index 00000000000..136ca140383
--- /dev/null
+++ b/mail/sendmail813/PLIST
@@ -0,0 +1,235 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+bin/hoststat
+bin/mailq
+bin/newaliases
+bin/purgestat
+bin/vacation
+lib/libsm.a
+lib/libsmutil.a
+libexec/sendmail/sendmail
+libexec/sendmail/smrsh
+man/man1/mailq.1
+man/man1/newaliases.1
+man/man1/vacation.1
+man/man5/aliases.5
+man/man8/editmap.8
+man/man8/mailstats.8
+man/man8/makemap.8
+man/man8/praliases.8
+man/man8/sendmail.8
+man/man8/smrsh.8
+sbin/editmap
+sbin/mailstats
+sbin/makemap
+sbin/praliases
+share/doc/sendmail/README
+share/doc/sendmail/RELEASE_NOTES
+share/doc/sendmail/SECURITY
+share/doc/sendmail/op.me
+share/doc/sendmail/op.ps
+share/examples/rc.d/sendmail
+share/examples/rc.d/smmsp
+share/examples/sendmail/mailer.conf
+share/examples/sendmail/socketmapClient.pl
+share/examples/sendmail/socketmapServer.pl
+share/misc/helpfile
+share/sendmail/README
+share/sendmail/cf/Build
+share/sendmail/cf/Makefile
+share/sendmail/cf/README
+share/sendmail/cf/chez.cs.mc
+share/sendmail/cf/clientproto.mc
+share/sendmail/cf/cs-hpux10.mc
+share/sendmail/cf/cs-hpux9.mc
+share/sendmail/cf/cs-osf1.mc
+share/sendmail/cf/cs-solaris2.mc
+share/sendmail/cf/cs-sunos4.1.mc
+share/sendmail/cf/cs-ultrix4.mc
+share/sendmail/cf/cyrusproto.mc
+share/sendmail/cf/generic-bsd4.4.cf
+share/sendmail/cf/generic-bsd4.4.mc
+share/sendmail/cf/generic-hpux10.cf
+share/sendmail/cf/generic-hpux10.mc
+share/sendmail/cf/generic-hpux9.cf
+share/sendmail/cf/generic-hpux9.mc
+share/sendmail/cf/generic-linux.cf
+share/sendmail/cf/generic-linux.mc
+share/sendmail/cf/generic-mpeix.cf
+share/sendmail/cf/generic-mpeix.mc
+share/sendmail/cf/generic-nextstep3.3.cf
+share/sendmail/cf/generic-nextstep3.3.mc
+share/sendmail/cf/generic-osf1.cf
+share/sendmail/cf/generic-osf1.mc
+share/sendmail/cf/generic-solaris.cf
+share/sendmail/cf/generic-solaris.mc
+share/sendmail/cf/generic-sunos4.1.cf
+share/sendmail/cf/generic-sunos4.1.mc
+share/sendmail/cf/generic-ultrix4.cf
+share/sendmail/cf/generic-ultrix4.mc
+share/sendmail/cf/huginn.cs.mc
+share/sendmail/cf/knecht.mc
+share/sendmail/cf/mail.cs.mc
+share/sendmail/cf/mail.eecs.mc
+share/sendmail/cf/mailspool.cs.mc
+share/sendmail/cf/python.cs.mc
+share/sendmail/cf/s2k-osf1.mc
+share/sendmail/cf/s2k-ultrix4.mc
+share/sendmail/cf/submit.cf
+share/sendmail/cf/submit.mc
+share/sendmail/cf/tcpproto.mc
+share/sendmail/cf/ucbarpa.mc
+share/sendmail/cf/ucbvax.mc
+share/sendmail/cf/uucpproto.mc
+share/sendmail/cf/vangogh.cs.mc
+share/sendmail/domain/Berkeley.EDU.m4
+share/sendmail/domain/CS.Berkeley.EDU.m4
+share/sendmail/domain/EECS.Berkeley.EDU.m4
+share/sendmail/domain/S2K.Berkeley.EDU.m4
+share/sendmail/domain/berkeley-only.m4
+share/sendmail/domain/generic.m4
+share/sendmail/feature/accept_unqualified_senders.m4
+share/sendmail/feature/accept_unresolvable_domains.m4
+share/sendmail/feature/access_db.m4
+share/sendmail/feature/allmasquerade.m4
+share/sendmail/feature/always_add_domain.m4
+share/sendmail/feature/authinfo.m4
+share/sendmail/feature/bestmx_is_local.m4
+share/sendmail/feature/bitdomain.m4
+share/sendmail/feature/blacklist_recipients.m4
+share/sendmail/feature/compat_check.m4
+share/sendmail/feature/conncontrol.m4
+share/sendmail/feature/delay_checks.m4
+share/sendmail/feature/dnsbl.m4
+share/sendmail/feature/domaintable.m4
+share/sendmail/feature/enhdnsbl.m4
+share/sendmail/feature/generics_entire_domain.m4
+share/sendmail/feature/genericstable.m4
+share/sendmail/feature/greet_pause.m4
+share/sendmail/feature/ldap_routing.m4
+share/sendmail/feature/limited_masquerade.m4
+share/sendmail/feature/local_lmtp.m4
+share/sendmail/feature/local_no_masquerade.m4
+share/sendmail/feature/local_procmail.m4
+share/sendmail/feature/lookupdotdomain.m4
+share/sendmail/feature/loose_relay_check.m4
+share/sendmail/feature/mailertable.m4
+share/sendmail/feature/masquerade_entire_domain.m4
+share/sendmail/feature/masquerade_envelope.m4
+share/sendmail/feature/msp.m4
+share/sendmail/feature/mtamark.m4
+share/sendmail/feature/no_default_msa.m4
+share/sendmail/feature/nocanonify.m4
+share/sendmail/feature/notsticky.m4
+share/sendmail/feature/nouucp.m4
+share/sendmail/feature/nullclient.m4
+share/sendmail/feature/preserve_local_plus_detail.m4
+share/sendmail/feature/preserve_luser_host.m4
+share/sendmail/feature/promiscuous_relay.m4
+share/sendmail/feature/queuegroup.m4
+share/sendmail/feature/ratecontrol.m4
+share/sendmail/feature/redirect.m4
+share/sendmail/feature/relay_based_on_MX.m4
+share/sendmail/feature/relay_entire_domain.m4
+share/sendmail/feature/relay_hosts_only.m4
+share/sendmail/feature/relay_local_from.m4
+share/sendmail/feature/relay_mail_from.m4
+share/sendmail/feature/smrsh.m4
+share/sendmail/feature/stickyhost.m4
+share/sendmail/feature/use_client_ptr.m4
+share/sendmail/feature/use_ct_file.m4
+share/sendmail/feature/use_cw_file.m4
+share/sendmail/feature/uucpdomain.m4
+share/sendmail/feature/virtuser_entire_domain.m4
+share/sendmail/feature/virtusertable.m4
+share/sendmail/hack/cssubdomain.m4
+share/sendmail/m4/cf.m4
+share/sendmail/m4/cfhead.m4
+share/sendmail/m4/proto.m4
+share/sendmail/m4/version.m4
+share/sendmail/mailer/cyrus.m4
+share/sendmail/mailer/cyrusv2.m4
+share/sendmail/mailer/fax.m4
+share/sendmail/mailer/local.m4
+share/sendmail/mailer/mail11.m4
+share/sendmail/mailer/phquery.m4
+share/sendmail/mailer/pop.m4
+share/sendmail/mailer/procmail.m4
+share/sendmail/mailer/qpage.m4
+share/sendmail/mailer/smtp.m4
+share/sendmail/mailer/usenet.m4
+share/sendmail/mailer/uucp.m4
+share/sendmail/ostype/a-ux.m4
+share/sendmail/ostype/aix3.m4
+share/sendmail/ostype/aix4.m4
+share/sendmail/ostype/aix5.m4
+share/sendmail/ostype/altos.m4
+share/sendmail/ostype/amdahl-uts.m4
+share/sendmail/ostype/bsd4.3.m4
+share/sendmail/ostype/bsd4.4.m4
+share/sendmail/ostype/bsdi.m4
+share/sendmail/ostype/bsdi1.0.m4
+share/sendmail/ostype/bsdi2.0.m4
+share/sendmail/ostype/darwin.m4
+share/sendmail/ostype/dgux.m4
+share/sendmail/ostype/domainos.m4
+share/sendmail/ostype/dragonfly.m4
+share/sendmail/ostype/dynix3.2.m4
+share/sendmail/ostype/freebsd4.m4
+share/sendmail/ostype/freebsd5.m4
+share/sendmail/ostype/freebsd6.m4
+share/sendmail/ostype/gnu.m4
+share/sendmail/ostype/hpux10.m4
+share/sendmail/ostype/hpux11.m4
+share/sendmail/ostype/hpux9.m4
+share/sendmail/ostype/irix4.m4
+share/sendmail/ostype/irix5.m4
+share/sendmail/ostype/irix6.m4
+share/sendmail/ostype/isc4.1.m4
+share/sendmail/ostype/linux.m4
+share/sendmail/ostype/maxion.m4
+share/sendmail/ostype/mklinux.m4
+share/sendmail/ostype/mpeix.m4
+share/sendmail/ostype/nextstep.m4
+share/sendmail/ostype/openbsd.m4
+share/sendmail/ostype/osf1.m4
+share/sendmail/ostype/powerux.m4
+share/sendmail/ostype/ptx2.m4
+share/sendmail/ostype/qnx.m4
+share/sendmail/ostype/riscos4.5.m4
+share/sendmail/ostype/sco-uw-2.1.m4
+share/sendmail/ostype/sco3.2.m4
+share/sendmail/ostype/sinix.m4
+share/sendmail/ostype/solaris2.m4
+share/sendmail/ostype/solaris2.ml.m4
+share/sendmail/ostype/solaris2.pre5.m4
+share/sendmail/ostype/solaris8.m4
+share/sendmail/ostype/sunos3.5.m4
+share/sendmail/ostype/sunos4.1.m4
+share/sendmail/ostype/svr4.m4
+share/sendmail/ostype/ultrix4.m4
+share/sendmail/ostype/unicos.m4
+share/sendmail/ostype/unicosmk.m4
+share/sendmail/ostype/unicosmp.m4
+share/sendmail/ostype/unixware7.m4
+share/sendmail/ostype/unknown.m4
+share/sendmail/ostype/uxpds.m4
+share/sendmail/sendmail.schema
+share/sendmail/sh/makeinfo.sh
+share/sendmail/siteconfig/uucp.cogsci.m4
+share/sendmail/siteconfig/uucp.old.arpa.m4
+share/sendmail/siteconfig/uucp.ucbarpa.m4
+share/sendmail/siteconfig/uucp.ucbvax.m4
+@dirrm share/sendmail/siteconfig
+@dirrm share/sendmail/sh
+@dirrm share/sendmail/ostype
+@dirrm share/sendmail/mailer
+@dirrm share/sendmail/m4
+@dirrm share/sendmail/hack
+@dirrm share/sendmail/feature
+@dirrm share/sendmail/domain
+@dirrm share/sendmail/cf
+@dirrm share/sendmail
+@unexec ${RMDIR} %D/share/examples/sendmail 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} ${SMRSH_CMDDIR} 2>/dev/null || ${TRUE}
+@dirrm share/doc/sendmail
+@dirrm libexec/sendmail
diff --git a/mail/sendmail813/distinfo b/mail/sendmail813/distinfo
new file mode 100644
index 00000000000..c48b9d6b796
--- /dev/null
+++ b/mail/sendmail813/distinfo
@@ -0,0 +1,18 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+SHA1 (sendmail.8.13.8.tar.gz) = 8e97c10f52efe5204c08f6cb3f90c08e077ac505
+RMD160 (sendmail.8.13.8.tar.gz) = a5d333b073d681f056421e836df4067f331a8ac8
+Size (sendmail.8.13.8.tar.gz) = 2010975 bytes
+SHA1 (patch-aa) = b7ceece7760e3d637016da039f8429c1fb89f2cf
+SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
+SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
+SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
+SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
+SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
+SHA1 (patch-ag) = 672c3e8a0c897f2c721d45393d85d4ea819d55a6
+SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
+SHA1 (patch-ai) = 8ade5888074ad9a328f87d66836c04eacf7785d5
+SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
+SHA1 (patch-ak) = 43b26ff1c78d4360909455124a382f65394377b3
+SHA1 (patch-al) = f5d8cef8c4abba5d5ae813b754c16037190a7ef1
+SHA1 (patch-am) = d84eedbff0f037c1db341255dc9e1877866f12c7
diff --git a/mail/sendmail813/files/mailer.conf b/mail/sendmail813/files/mailer.conf
new file mode 100644
index 00000000000..8a3ab79c2bb
--- /dev/null
+++ b/mail/sendmail813/files/mailer.conf
@@ -0,0 +1,10 @@
+#	$NetBSD: mailer.conf,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+#
+# Execute the "real" sendmail program, named @@PREFIX@@/libexec/sendmail/sendmail
+#
+sendmail	@@PREFIX@@/libexec/sendmail/sendmail
+send-mail	@@PREFIX@@/libexec/sendmail/sendmail
+mailq		@@PREFIX@@/libexec/sendmail/sendmail
+newaliases	@@PREFIX@@/libexec/sendmail/sendmail
+hoststat	@@PREFIX@@/libexec/sendmail/sendmail
+purgestat	@@PREFIX@@/libexec/sendmail/sendmail
diff --git a/mail/sendmail813/files/sendmail.sh b/mail/sendmail813/files/sendmail.sh
new file mode 100755
index 00000000000..3ec66d6418f
--- /dev/null
+++ b/mail/sendmail813/files/sendmail.sh
@@ -0,0 +1,58 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: sendmail.sh,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+#
+
+# PROVIDE: mail
+# REQUIRE: LOGIN
+#	we make mail start late, so that things like .forward's are not
+#	processed until the system is fully operational
+
+
+. /etc/rc.subr
+
+name="sendmail"
+rcvar=$name
+command="/usr/sbin/${name}"
+pidfile="@VARBASE@/run/${name}.pid"
+required_files="/etc/mail/sendmail.cf"
+start_precmd="sendmail_precmd"
+makemap="@PREFIX@/sbin/makemap"
+newaliases="@PREFIX@/bin/newaliases"
+smbin="@PREFIX@/libexec/sendmail/sendmail"
+check_files="aliases access genericstable virtusertable domaintable mailertable"
+sendmail_flags="-Lsm-mta -bd -q30m"
+
+sendmail_precmd()
+{
+	# check modifications on /etc/mail/ databases
+	for f in ${check_files}; do
+		if [ -r "/etc/mail/$f.db" ] && [ -r "/etc/mail/$f" ]; then
+			if [ ! "/etc/mail/$f" -ot "/etc/mail/$f.db" ]; then
+				echo \
+	    "${name}: /etc/mail/$f newer than /etc/mail/$f.db, regenerating"
+				if [ "x$f" = "xaliases" ]; then
+					${newaliases}
+				else
+					${makemap} hash \
+						/etc/mail/$f < /etc/mail/$f	
+				fi
+			fi
+		fi
+	done
+
+	# check existence on /etc/mail/ databases
+	for f in ${check_files}; do
+		if [ ! -r "/etc/mail/$f.db" ] && [ -r "/etc/mail/$f" ]; then
+			echo "${name}: /etc/mail/$f.db not present, generating"
+			if [ "x$f" = "xaliases" ]; then
+				${newaliases}
+			else
+				${makemap} hash /etc/mail/$f < /etc/mail/$f
+			fi
+		fi
+	done
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/sendmail813/files/site.config.m4 b/mail/sendmail813/files/site.config.m4
new file mode 100644
index 00000000000..233e32772cf
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4
@@ -0,0 +1,25 @@
+# $NetBSD: site.config.m4,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# pathnames specific to pkgsrc
+#
+define(`confEBINDIR', `${PREFIX}/libexec/sendmail')
+define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
+define(`confSBINDIR', `${PREFIX}/sbin')
+define(`confUBINDIR', `${PREFIX}/bin')
+define(`confHFDIR', `${PREFIX}/share/misc')
+define(`confINSTALL_RAWMAN', 'yes')
+define(`confDONT_INSTALL_CATMAN', 'yes')
+define(`confMANROOT', `${PREFIX}/${PKGMANDIR}/man')
+define(`confMANROOTMAN', `${PREFIX}/${PKGMANDIR}/man')
+define(`confMAN1EXT', `1')
+define(`confMAN3EXT', `3')
+define(`confMAN4EXT', `4')
+define(`confMAN5EXT', `5')
+define(`confMAN8EXT', `8')
+APPENDDEF(`confENVDEF', `-I${PREFIX}/include -DSMRSH_CMDDIR=\"${SMRSH_CMDDIR}\"')
+APPENDDEF(`confLIBS', `-L${PREFIX}/lib')
+APPENDDEF(`confMAPDEF', `-DSOCKETMAP')
+
+# the following are handled by pkgsrc
+define(`confINST_DEP',`')
+define(`confNO_STATISTICS_INSTALL')
diff --git a/mail/sendmail813/files/site.config.m4-db2 b/mail/sendmail813/files/site.config.m4-db2
new file mode 100644
index 00000000000..86ac7dac762
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4-db2
@@ -0,0 +1,5 @@
+# $NetBSD: site.config.m4-db2,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# enable db2
+APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db2')
+APPENDDEF(`confLIBS', `-ldb2')
diff --git a/mail/sendmail813/files/site.config.m4-db4 b/mail/sendmail813/files/site.config.m4-db4
new file mode 100644
index 00000000000..8ca1022c790
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4-db4
@@ -0,0 +1,5 @@
+# $NetBSD: site.config.m4-db4,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# enable db4
+APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db4')
+APPENDDEF(`confLIBS', `-ldb4')
diff --git a/mail/sendmail813/files/site.config.m4-ldap b/mail/sendmail813/files/site.config.m4-ldap
new file mode 100644
index 00000000000..2f3b5d0baa2
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4-ldap
@@ -0,0 +1,5 @@
+# $NetBSD: site.config.m4-ldap,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# enable ldap
+APPENDDEF(`confMAPDEF', `-DLDAPMAP')
+APPENDDEF(`confLIBS', `-lldap -llber')
diff --git a/mail/sendmail813/files/site.config.m4-milter b/mail/sendmail813/files/site.config.m4-milter
new file mode 100644
index 00000000000..1c1bbd6ca56
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4-milter
@@ -0,0 +1,4 @@
+# $NetBSD: site.config.m4-milter,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# enable milter
+APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER')
diff --git a/mail/sendmail813/files/site.config.m4-sasl2 b/mail/sendmail813/files/site.config.m4-sasl2
new file mode 100644
index 00000000000..998531babe7
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4-sasl2
@@ -0,0 +1,5 @@
+# $NetBSD: site.config.m4-sasl2,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# enable SASL 2
+APPENDDEF(`confENVDEF', `-DSASL=2')
+APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
diff --git a/mail/sendmail813/files/site.config.m4-starttls b/mail/sendmail813/files/site.config.m4-starttls
new file mode 100644
index 00000000000..4b97784faa4
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4-starttls
@@ -0,0 +1,5 @@
+# $NetBSD: site.config.m4-starttls,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# enable STARTTLS
+APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
+APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail813/files/site.config.m4-tcpwrappers b/mail/sendmail813/files/site.config.m4-tcpwrappers
new file mode 100644
index 00000000000..711cdaaa3f3
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4-tcpwrappers
@@ -0,0 +1,5 @@
+# $NetBSD: site.config.m4-tcpwrappers,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# enable tcpwrappers
+APPENDDEF(`confENVDEF', `-DTCPWRAPPERS')
+APPENDDEF(`conf_sendmail_LIBS', `-lwrap')
diff --git a/mail/sendmail813/files/site.config.m4-v6 b/mail/sendmail813/files/site.config.m4-v6
new file mode 100644
index 00000000000..54b23807df1
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4-v6
@@ -0,0 +1,4 @@
+# $NetBSD: site.config.m4-v6,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# enable IPv6 
+APPENDDEF(`confENVDEF', `-DNETINET6')
diff --git a/mail/sendmail813/files/site.config.m4-v6-not-solaris b/mail/sendmail813/files/site.config.m4-v6-not-solaris
new file mode 100644
index 00000000000..5304aaf83c3
--- /dev/null
+++ b/mail/sendmail813/files/site.config.m4-v6-not-solaris
@@ -0,0 +1,4 @@
+# $NetBSD: site.config.m4-v6-not-solaris,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+# enable IPv6 - not Solaris
+APPENDDEF(`confENVDEF', `-DNEEDSGETIPNODE')
diff --git a/mail/sendmail813/files/smmsp.sh b/mail/sendmail813/files/smmsp.sh
new file mode 100755
index 00000000000..63e2744b90d
--- /dev/null
+++ b/mail/sendmail813/files/smmsp.sh
@@ -0,0 +1,28 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: smmsp.sh,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+#
+
+# REQUIRE: mail
+
+#	The only function of the smmsp process is to push locally
+#	collected mail (which got stuck in the local client queue)
+#	to a more fully functional smtp relay.  It is not a fully
+#	functional smtp daemon.
+#
+#	It can, however, be used as a completely unprivileged
+#	replacement for hosts that were previously using a "null
+#	client" configuration and a smart relay.
+
+. /etc/rc.subr
+
+name="smmsp"
+rcvar=$name
+command="/usr/sbin/sendmail"
+pidfile="@VARBASE@/spool/clientmqueue/sm-client.pid"
+required_files="/etc/mail/submit.cf"
+smbin="@PREFIX@/libexec/sendmail/sendmail"
+smmsp_flags="-Lsm-msp-queue -Ac -q30m"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/sendmail813/options.mk b/mail/sendmail813/options.mk
new file mode 100644
index 00000000000..dd2e5fab561
--- /dev/null
+++ b/mail/sendmail813/options.mk
@@ -0,0 +1,52 @@
+# $NetBSD: options.mk,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
+PKG_SUPPORTED_OPTIONS=	inet6 db2 db4 ldap sasl tls tcpwrappers
+PKG_SUGGESTED_OPTIONS=	tcpwrappers
+
+PKG_OPTIONS_LEGACY_OPTS+=	starttls:tls
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Berkeley DB version 2/4 format for on disk databases e.g. aliases
+###
+.if !empty(PKG_OPTIONS:Mdb2)
+.  include "../../databases/db/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mdb4)
+.  include "../../databases/db4/buildlink3.mk"
+.endif
+
+###
+### Use OpenLDAP for remote database access
+###
+.if !empty(PKG_OPTIONS:Mldap)
+.  include "../../databases/openldap-client/buildlink3.mk"
+.endif
+
+###
+### Use SASL/v2 for SMTP AUTH
+###
+.if !empty(PKG_OPTIONS:Msasl)
+.  include "../../security/cyrus-sasl/buildlink3.mk"
+.endif
+
+###
+### Use OpenSSL libraries for SMTP STARTTLS support
+###
+.if !empty(PKG_OPTIONS:Mtls)
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+###
+### Use tcpwrappers for network access control to sendmail
+###
+.if !empty(PKG_OPTIONS:Mtcpwrappers)
+.  include "../../security/tcp_wrappers/buildlink3.mk"
+.endif
+
+###
+### IPv6 support.
+###
+.if !empty(PKG_OPTIONS:Minet6)
+.endif
diff --git a/mail/sendmail813/patches/patch-aa b/mail/sendmail813/patches/patch-aa
new file mode 100644
index 00000000000..8d293404eae
--- /dev/null
+++ b/mail/sendmail813/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- devtools/OS/NetBSD.orig	Sun Jun 27 00:19:35 2004
++++ devtools/OS/NetBSD	Sun Jun 27 00:24:11 2004
+@@ -7,13 +7,14 @@
+ define(`confLIBS', `-lutil')
+ define(`confENVDEF', ` -DNETISO')
+ define(`confDEPEND_TYPE', `CC-M')
+-define(`confSBINGRP', `wheel')
+-define(`confUBINOWN', `root')
+-define(`confUBINGRP', `wheel')
+-define(`confMANOWN', `root')
+-define(`confMANGRP', `wheel')
++define(`confSBINGRP', `${BSD_BINGRP}')
++define(`confUBINOWN', `${BSD_BINOWN}')
++define(`confUBINGRP', `${BSD_BINGRP}')
++define(`confMANOWN', `${BSD_MANOWN}')
++define(`confMANGRP', `${BSD_MANGRP}')
+ define(`confMAN1EXT', `0')
+ define(`confMAN3EXT', `0')
+ define(`confMAN4EXT', `0')
+ define(`confMAN5EXT', `0')
+ define(`confMAN8EXT', `0')
++define(`confLDOPTS', `${LDFLAGS}')
diff --git a/mail/sendmail813/patches/patch-ab b/mail/sendmail813/patches/patch-ab
new file mode 100644
index 00000000000..1aa685eb26b
--- /dev/null
+++ b/mail/sendmail813/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- devtools/OS/SunOS.5.6.orig	Fri Mar 22 11:59:26 2002
++++ devtools/OS/SunOS.5.6	Mon Sep 16 15:05:30 2002
+@@ -11,6 +11,7 @@
+ define(`confENVDEF', `-DSOLARIS=20600')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
+ define(`confLIBS', `-lsocket -lnsl -lkstat')
++define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
+ define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail813/patches/patch-ac b/mail/sendmail813/patches/patch-ac
new file mode 100644
index 00000000000..cfbf8b4d9eb
--- /dev/null
+++ b/mail/sendmail813/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- devtools/OS/SunOS.5.7.orig	Fri Mar 22 11:59:26 2002
++++ devtools/OS/SunOS.5.7	Mon Sep 16 15:07:08 2002
+@@ -11,6 +11,7 @@
+ define(`confENVDEF', `-DSOLARIS=20700')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
+ define(`confLIBS', `-lsocket -lnsl')
++define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
+ define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail813/patches/patch-ad b/mail/sendmail813/patches/patch-ad
new file mode 100644
index 00000000000..6760699e4ae
--- /dev/null
+++ b/mail/sendmail813/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- devtools/OS/SunOS.5.8.orig	Fri Mar 22 11:59:26 2002
++++ devtools/OS/SunOS.5.8	Mon Sep 16 15:09:28 2002
+@@ -10,6 +10,7 @@
+ define(`confENVDEF', `-DSOLARIS=20800 -DNETINET6')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
+ define(`confLIBS', `-lsocket -lnsl')
++define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
+ define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail813/patches/patch-ae b/mail/sendmail813/patches/patch-ae
new file mode 100644
index 00000000000..e1e6738337d
--- /dev/null
+++ b/mail/sendmail813/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- devtools/OS/SunOS.5.9.orig	Fri Mar 22 11:59:26 2002
++++ devtools/OS/SunOS.5.9	Mon Sep 16 15:11:10 2002
+@@ -10,6 +10,7 @@
+ define(`confENVDEF', `-DSOLARIS=20900 -DNETINET6')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
+ define(`confLIBS', `-lsocket -lnsl')
++define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
+ define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail813/patches/patch-af b/mail/sendmail813/patches/patch-af
new file mode 100644
index 00000000000..771f20dd12f
--- /dev/null
+++ b/mail/sendmail813/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- sendmail/conf.c.orig	Sat Aug 17 02:56:01 2002
++++ sendmail/conf.c	Mon Sep 16 15:13:22 2002
+@@ -4352,7 +4352,8 @@
+ 
+ #if NETINET6
+ 	if (type == AF_INET6 &&
+-	    IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr))
++	    (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr) ||
++	    IN6_IS_ADDR_LINKLOCAL((struct in6_addr *) addr)))
+ 	{
+ 		/* Avoid reverse lookup for IPv6 unspecified address */
+ 		SM_SET_H_ERRNO(HOST_NOT_FOUND);
diff --git a/mail/sendmail813/patches/patch-ag b/mail/sendmail813/patches/patch-ag
new file mode 100644
index 00000000000..7bdcbd7f7b9
--- /dev/null
+++ b/mail/sendmail813/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- include/sm/conf.h.orig	2006-01-27 18:43:44.000000000 +0000
++++ include/sm/conf.h
+@@ -801,7 +801,11 @@ extern unsigned int sleepX __P((unsigned
+ #  ifndef LA_TYPE
+ #   define LA_TYPE	LA_SUBR
+ #  endif /* ! LA_TYPE */
++#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900)
++#  define SFS_TYPE	SFS_STATVFS     /* use <sys/statvfs.h> statfs() impl */
++#else
+ #  define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
++#endif
+ #  define SPT_TYPE	SPT_PSSTRINGS	/* use PS_STRINGS pointer */
+ # endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN)*/
+ 
diff --git a/mail/sendmail813/patches/patch-ah b/mail/sendmail813/patches/patch-ah
new file mode 100644
index 00000000000..3d937e3800e
--- /dev/null
+++ b/mail/sendmail813/patches/patch-ah
@@ -0,0 +1,38 @@
+$NetBSD: patch-ah,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- smrsh/smrsh.8.orig	2004-08-06 04:55:35.000000000 +0100
++++ smrsh/smrsh.8
+@@ -39,7 +39,7 @@ Briefly,
+ .I smrsh
+ limits programs to be in a single directory,
+ by default
+-/usr/adm/sm.bin,
++@@SMRSH_CMDDIR@@,
+ allowing the system administrator to choose the set of acceptable commands,
+ and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
+ It also rejects any commands with the characters
+@@ -56,7 +56,7 @@ so forwarding to ``/usr/ucb/vacation'',
+ and
+ ``vacation''
+ all actually forward to
+-``/usr/adm/sm.bin/vacation''.
++``@@SMRSH_CMDDIR@@/vacation''.
+ .PP
+ System administrators should be conservative about populating
+ the sm.bin directory.
+@@ -86,13 +86,9 @@ to adjust the default search path
+ (defaults to ``/bin:/usr/bin:/usr/ucb'')
+ and/or \-DSMRSH_CMDDIR=\e"\fIdir\fP\e"
+ to change the default program directory
+-(defaults to ``/usr/adm/sm.bin'').
++(defaults to ``@@SMRSH_CMDDIR@@'').
+ .SH FILES
+-/usr/adm/sm.bin \- default directory for restricted programs on most OSs
+-.PP
+-/var/adm/sm.bin \- directory for restricted programs on HP UX and Solaris
+-.PP
+-/usr/libexec/sm.bin \- directory for restricted programs on FreeBSD (>= 3.3) and DragonFly BSD
++@@SMRSH_CMDDIR@@ \- default directory for restricted programs
+ 
+ .SH SEE ALSO
+ sendmail(8)
diff --git a/mail/sendmail813/patches/patch-ai b/mail/sendmail813/patches/patch-ai
new file mode 100644
index 00000000000..3f6cbcc8b9f
--- /dev/null
+++ b/mail/sendmail813/patches/patch-ai
@@ -0,0 +1,53 @@
+$NetBSD: patch-ai,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- sendmail/mci.c.orig	2005-07-12 22:27:44.000000000 +0000
++++ sendmail/mci.c
+@@ -20,6 +20,7 @@ SM_RCSID("@(#)$Id: mci.c,v 8.216 2005/07
+ #endif /* NETINET || NETINET6 */
+ 
+ #include <dirent.h>
++#include <limits.h>
+ 
+ static int	mci_generate_persistent_path __P((const char *, char *,
+ 						  int, bool));
+@@ -717,7 +718,11 @@ mci_lock_host_statfile(mci)
+ {
+ 	int save_errno = errno;
+ 	int retVal = EX_OK;
++#if defined(PATH_MAX)
++	char fname[PATH_MAX];
++#else
+ 	char fname[MAXPATHLEN];
++#endif
+ 
+ 	if (HostStatDir == NULL || mci->mci_host == NULL)
+ 		return EX_OK;
+@@ -1135,7 +1140,7 @@ mci_traverse_persistent(action, pathname
+ 					pathname, sm_errstring(errno));
+ 			return -1;
+ 		}
+-		len = sizeof(newpath) - MAXNAMLEN - 3;
++		len = sizeof(newpath) - 2; /* enough space for '/' and NUL */
+ 		if (sm_strlcpy(newpath, pathname, len) >= len)
+ 		{
+ 			if (tTd(56, 2))
+@@ -1145,6 +1150,7 @@ mci_traverse_persistent(action, pathname
+ 		}
+ 		newptr = newpath + strlen(newpath);
+ 		*newptr++ = '/';
++		len = sizeof(newpath) - (newptr - newpath);
+ 
+ 		/*
+ 		**  repeat until no file has been removed
+@@ -1161,9 +1167,8 @@ mci_traverse_persistent(action, pathname
+ 				if (e->d_name[0] == '.')
+ 					continue;
+ 
+-				(void) sm_strlcpy(newptr, e->d_name,
+-					       sizeof newpath -
+-					       (newptr - newpath));
++				if (sm_strlcpy(newptr, e->d_name, len) >= len)
++					continue;
+ 
+ 				if (StopRequest)
+ 					stop_sendmail();
diff --git a/mail/sendmail813/patches/patch-aj b/mail/sendmail813/patches/patch-aj
new file mode 100644
index 00000000000..6b449922ae1
--- /dev/null
+++ b/mail/sendmail813/patches/patch-aj
@@ -0,0 +1,18 @@
+$NetBSD: patch-aj,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- cf/cf/Makefile.orig	2005-06-13 22:16:34.000000000 -0400
++++ cf/cf/Makefile
+@@ -25,10 +25,10 @@ CHMOD=	chmod
+ ROMODE=	444
+ RM=	rm -f
+ # use our own install program; should be really confINSTALL
+-INSTALL=../../devtools/bin/install.sh
++INSTALL=@@INSTALL@@
+ # CF file ownership/permissions
+-CFOWN=root
+-CFGRP=bin
++CFOWN=@@BINOWN@@
++CFGRP=@@BINGRP@@
+ CFMODE=0444
+ 
+ 
diff --git a/mail/sendmail813/patches/patch-ak b/mail/sendmail813/patches/patch-ak
new file mode 100644
index 00000000000..c0420a91360
--- /dev/null
+++ b/mail/sendmail813/patches/patch-ak
@@ -0,0 +1,23 @@
+$NetBSD: patch-ak,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+From: http://www.sendmail.org/patches/client_name.assert.p0
+(file path fixed to be relative to source top)
+
+Index: srvrsmtp.c
+===================================================================
+RCS file: /cvs/sendmail/srvrsmtp.c,v
+retrieving revision 8.948
+diff -u -r8.948 srvrsmtp.c
+--- sendmail/srvrsmtp.c	15 Aug 2006 23:24:58 -0000	8.948
++++ sendmail/srvrsmtp.c	24 Aug 2006 16:47:19 -0000
+@@ -945,7 +945,9 @@
+ 		char *response;
+ 
+ 		q = macvalue(macid("{client_name}"), e);
+-		SM_ASSERT(q != NULL);
++		SM_ASSERT(q != NULL || OpMode == MD_SMTP);
++		if (q == NULL)
++			q = "localhost";
+ 		response = milter_connect(q, RealHostAddr, e, &state);
+ 		switch (state)
+ 		{
diff --git a/mail/sendmail813/patches/patch-al b/mail/sendmail813/patches/patch-al
new file mode 100644
index 00000000000..dd93f51ba4d
--- /dev/null
+++ b/mail/sendmail813/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- devtools/OS/SunOS.5.10.orig	2006-12-30 07:59:24.000000000 +1300
++++ devtools/OS/SunOS.5.10
+@@ -10,6 +10,7 @@ define(`confMAPDEF', `-DNDBM -DNIS -DNIS
+ define(`confENVDEF', `-DSOLARIS=21000 -DNETINET6')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
+ define(`confLIBS', `-lsocket -lnsl')
++define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
+ define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail813/patches/patch-am b/mail/sendmail813/patches/patch-am
new file mode 100644
index 00000000000..c6c98a44550
--- /dev/null
+++ b/mail/sendmail813/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1.1.1 2007/04/17 10:16:53 jnemeth Exp $
+
+--- devtools/OS/SunOS.5.11.orig	2006-12-30 07:59:28.000000000 +1300
++++ devtools/OS/SunOS.5.11
+@@ -10,6 +10,7 @@ define(`confMAPDEF', `-DNDBM -DNIS -DNIS
+ define(`confENVDEF', `-DSOLARIS=21100 -DNETINET6')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
+ define(`confLIBS', `-lsocket -lnsl')
++define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
+ define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')