Removal of sendmail 8.12.x branch from pkgsrc. We already have the

8.13.x and will soon have the 8.14.x branches in pkgsrc.

31 files changed, 0 insertions, 851 deletions

diff --git a/mail/sendmail812/DESCR b/mail/sendmail812/DESCR
deleted file mode 100644
index 3dd2e5933dd..00000000000
--- a/mail/sendmail812/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Sendmail acts 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/sendmail812/MESSAGE b/mail/sendmail812/MESSAGE
deleted file mode 100644
index 6e86a15da3b..00000000000
--- a/mail/sendmail812/MESSAGE
+++ /dev/null
@@ -1,21 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/10/12 21:05:25 tv 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/sendmail812/Makefile b/mail/sendmail812/Makefile
deleted file mode 100644
index 6b21c723b21..00000000000
--- a/mail/sendmail812/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/10/12 21:05:25 tv Exp $
-
-.include "options.mk"
-.include "../../mail/sendmail812/Makefile.common"
-
-PKGNAME=	sendmail-${DIST_VERS}
-PKGREVISION=	5
-COMMENT=	The well known Mail Transport Agent
-HAS_SIG=	yes
-
-CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
-
-MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
-PKG_GROUPS=		smmsp
-PKG_USERS=		smmsp:smmsp
-PKG_GECOS.smmsp=	Sendmail Message Submission Program
-
-# 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
-
-post-patch: make-sendmail-siteconfig
-.if !empty(PKG_OPTIONS:Mtcpwrappers)
-	${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
-	${ECHO} -n ' TCPWRAPPERS' >>${DESCR_SRC}
-.endif
-.if !empty(PKG_OPTIONS:Mldap)
-	${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
-	${ECHO} -n ' LDAP' >>${DESCR_SRC}
-.endif
-.if !empty(PKG_OPTIONS:Mdb4)
-	${CAT} ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
-	${ECHO} -n ' DB4' >>${DESCR_SRC}
-.elif !empty(PKG_OPTIONS:Mdb2)
-	${CAT} ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
-	${ECHO} -n ' DB2' >>${DESCR_SRC}
-.endif
-.if !empty(PKG_OPTIONS:Mtls)
-	${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
-	${ECHO} -n ' STARTTLS' >>${DESCR_SRC}
-.endif
-.if !empty(PKG_OPTIONS:Msasl)
-	${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
-	${ECHO} -n ' SASL2' >>${DESCR_SRC}
-.endif
-	${ECHO} >>${DESCR_SRC}
-
-do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
-
-post-build:
-	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
-	  <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.sendmail
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
-.if !empty(PKG_OPTIONS:Mdb2)
-	${ECHO} "" >>${MESSAGE_SRC}
-	${ECHO} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all" >>${MESSAGE_SRC}
-	${ECHO} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"." >>${MESSAGE_SRC}
-	${ECHO} >>${PLIST_SRC} "@exec mv -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || true"
-	${ECHO} >>${PLIST_SRC} "@unexec mv -f /usr/sbin/makemap.8.8 /usr/sbin/makemap || true"
-.endif
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sendmail
-	${INSTALL_DATA_DIR} ${PREFIX}/share/sendmail
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf.sendmail ${PREFIX}/share/examples/sendmail/mailer.conf
-	cd ${WRKSRC}/cf && ${PAX} -rw -pp -pm . ${PREFIX}/share/sendmail
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
-.if !empty(PKG_OPTIONS:Mdb2)
-	${MV} -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || ${TRUE}
-.endif
-	${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
-
-.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/sendmail812/Makefile.common b/mail/sendmail812/Makefile.common
deleted file mode 100644
index b04a62ca88a..00000000000
--- a/mail/sendmail812/Makefile.common
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile.common,v 1.14 2007/04/06 00:20:33 tv Exp $
-#
-# Makefile fragment [formerly] 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.kyoto.wide.ad.jp/pub/mail/sendmail/
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	8.12.11.p0
-
-MAINTAINER=	jnemeth@NetBSD.org
-HOMEPAGE=	http://www.sendmail.org/
-
-LICENSE=	no-profit
-
-DISTINFO_FILE=	${.CURDIR}/../../mail/sendmail812/distinfo
-FILESDIR=	${.CURDIR}/../../mail/sendmail812/files
-PATCHDIR=	${.CURDIR}/../../mail/sendmail812/patches
-
-DIST_VERS=	8.12.11
-
-MAKE_ENV+=	BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
-		BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
-		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
-SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
-
-DESCR_SRC=	${WRKDIR}/.DESCR_SRC
-
-WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
-USE_TOOLS+=	gm4
-MAKE_ENV+=	M4=${TOOLS_M4:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-make-sendmail-siteconfig:
-	${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
-	${CHMOD} +w ${SITECONFIG}
-	${CP} ${PKGDIR}/DESCR ${DESCR_SRC}
-	${ECHO} '---' >>${DESCR_SRC}
-	${ECHO} -n 'compiled features:' >>${DESCR_SRC}
-.if !empty(PKG_OPTIONS:Minet6)
-	${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
-.if ${OPSYS} != "SunOS" && ${OPSYS} != "BSDOS"
-	${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
-.endif
-	${ECHO} -n ' INET6' >>${DESCR_SRC}
-.endif
-.if ${OPSYS} == "SunOS"
-	${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
-.endif
-	${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
-	${ECHO} -n ' MILTER' >>${DESCR_SRC}
diff --git a/mail/sendmail812/PLIST b/mail/sendmail812/PLIST
deleted file mode 100644
index 70955766ba7..00000000000
--- a/mail/sendmail812/PLIST
+++ /dev/null
@@ -1,215 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/10/12 21:05:25 tv 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/examples/sendmail/mailer.conf
-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/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/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/no_default_msa.m4
-share/sendmail/feature/nocanonify.m4
-share/sendmail/feature/nodns.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/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_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/dynix3.2.m4
-share/sendmail/ostype/freebsd4.m4
-share/sendmail/ostype/freebsd5.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/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 libexec/sendmail
-@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
-@dirrm share/examples/sendmail
diff --git a/mail/sendmail812/distinfo b/mail/sendmail812/distinfo
deleted file mode 100644
index 031107cf05f..00000000000
--- a/mail/sendmail812/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.7 2006/09/11 17:18:09 tv Exp $
-
-SHA1 (8.12.11.p0) = aeef47bf434c13d91ba1c1e777cf81a2ba283290
-RMD160 (8.12.11.p0) = 267afdf9abc4636d0750bddf3b7bd16fe9b2fd5b
-Size (8.12.11.p0) = 71804 bytes
-SHA1 (sendmail.8.12.11.tar.gz) = ce1ba0e50740c548f8555f1a905d8514e6637f95
-RMD160 (sendmail.8.12.11.tar.gz) = a80ceccbe3425ea01ce6cb89f2226f83b3562b64
-Size (sendmail.8.12.11.tar.gz) = 1899112 bytes
-SHA1 (patch-aa) = cf9a68f5e6d6fd6e13a806a7d1e6ebab18fc9c6f
-SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
-SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
-SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
-SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
-SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
-SHA1 (patch-ag) = 4e84e709338eecc0dc14a6df42d8071fee1938a3
-SHA1 (patch-ah) = b876e92147bce47fee5f77106c2a1b281fac743f
-SHA1 (patch-ai) = d17bc0a551fa5efd59f4822ca59049e166e59d86
-SHA1 (patch-aj) = 6901b3efacf02ba5f71fbfb6056b1eced9d4c037
-SHA1 (patch-ak) = 2668680ec507ce4b59acae1a985e3af105c51816
-SHA1 (patch-al) = 95b7de0a68015256e372a7151b49c2a27e10f463
diff --git a/mail/sendmail812/files/mailer.conf b/mail/sendmail812/files/mailer.conf
deleted file mode 100644
index a6a1933a6d6..00000000000
--- a/mail/sendmail812/files/mailer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: mailer.conf,v 1.1.1.1 2004/08/30 19:56:46 adrianp 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/sendmail812/files/site.config.m4 b/mail/sendmail812/files/site.config.m4
deleted file mode 100644
index b2fd5331d7c..00000000000
--- a/mail/sendmail812/files/site.config.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: site.config.m4,v 1.2 2006/10/12 21:05:25 tv 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')
-APPENDDEF(`confLIBS', `-L${PREFIX}/lib')
-
-# the following are handled by pkgsrc
-define(`confINST_DEP',`')
-define(`confNO_STATISTICS_INSTALL')
diff --git a/mail/sendmail812/files/site.config.m4-db2 b/mail/sendmail812/files/site.config.m4-db2
deleted file mode 100644
index b5c360b8ed8..00000000000
--- a/mail/sendmail812/files/site.config.m4-db2
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-db2,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable db2
-APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db2')
-APPENDDEF(`confLIBS', `-ldb2')
diff --git a/mail/sendmail812/files/site.config.m4-db4 b/mail/sendmail812/files/site.config.m4-db4
deleted file mode 100644
index 620da5dd2a5..00000000000
--- a/mail/sendmail812/files/site.config.m4-db4
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-db4,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable db4
-APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db4')
-APPENDDEF(`confLIBS', `-ldb4')
diff --git a/mail/sendmail812/files/site.config.m4-ldap b/mail/sendmail812/files/site.config.m4-ldap
deleted file mode 100644
index a64017fe043..00000000000
--- a/mail/sendmail812/files/site.config.m4-ldap
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-ldap,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable ldap
-APPENDDEF(`confMAPDEF', `-DLDAPMAP')
-APPENDDEF(`confLIBS', `-lldap -llber')
diff --git a/mail/sendmail812/files/site.config.m4-milter b/mail/sendmail812/files/site.config.m4-milter
deleted file mode 100644
index 5bb55578fd2..00000000000
--- a/mail/sendmail812/files/site.config.m4-milter
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: site.config.m4-milter,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable milter
-APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER')
diff --git a/mail/sendmail812/files/site.config.m4-sasl2 b/mail/sendmail812/files/site.config.m4-sasl2
deleted file mode 100644
index 70199afe7de..00000000000
--- a/mail/sendmail812/files/site.config.m4-sasl2
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-sasl2,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable SASL 2
-APPENDDEF(`confENVDEF', `-DSASL=2')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
diff --git a/mail/sendmail812/files/site.config.m4-solaris b/mail/sendmail812/files/site.config.m4-solaris
deleted file mode 100644
index 0ab7a6d18e2..00000000000
--- a/mail/sendmail812/files/site.config.m4-solaris
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: site.config.m4-solaris,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# man pathnames specific for Solaris
-#
-define(`confMAN1EXT', `0')
-define(`confMAN3EXT', `0')
-define(`confMAN4EXT', `0')
-define(`confMAN5EXT', `0')
-define(`confMAN8EXT', `0')
diff --git a/mail/sendmail812/files/site.config.m4-starttls b/mail/sendmail812/files/site.config.m4-starttls
deleted file mode 100644
index 6be6f7ea7fa..00000000000
--- a/mail/sendmail812/files/site.config.m4-starttls
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-starttls,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable STARTTLS
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
-APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail812/files/site.config.m4-tcpwrappers b/mail/sendmail812/files/site.config.m4-tcpwrappers
deleted file mode 100644
index 4c2fd8b8698..00000000000
--- a/mail/sendmail812/files/site.config.m4-tcpwrappers
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: site.config.m4-tcpwrappers,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable tcpwrappers
-APPENDDEF(`confENVDEF', `-DTCPWRAPPERS')
-APPENDDEF(`conf_sendmail_LIBS', `-lwrap')
diff --git a/mail/sendmail812/files/site.config.m4-v6 b/mail/sendmail812/files/site.config.m4-v6
deleted file mode 100644
index 5b5971e614c..00000000000
--- a/mail/sendmail812/files/site.config.m4-v6
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: site.config.m4-v6,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-# enable IPv6 
-APPENDDEF(`confENVDEF', `-DNETINET6')
diff --git a/mail/sendmail812/files/site.config.m4-v6-not-solaris b/mail/sendmail812/files/site.config.m4-v6-not-solaris
deleted file mode 100644
index 9f8203bb232..00000000000
--- a/mail/sendmail812/files/site.config.m4-v6-not-solaris
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: site.config.m4-v6-not-solaris,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
-
-APPENDDEF(`confENVDEF', `-DNEEDSGETIPNODE')
diff --git a/mail/sendmail812/options.mk b/mail/sendmail812/options.mk
deleted file mode 100644
index f2aa404b878..00000000000
--- a/mail/sendmail812/options.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:24 ghen Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
-PKG_OPTIONS_OPTIONAL_GROUPS=	database
-PKG_OPTIONS_GROUP.database=	db2 db4
-PKG_SUPPORTED_OPTIONS=	inet6 ldap sasl tls tcpwrappers sendmail-socketmap
-PKG_SUGGESTED_OPTIONS=	tcpwrappers
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	db2
-.endif
-
-.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
-
-###
-### Enable Sendmail SOCKETMAP support
-###
-.if !empty(PKG_OPTIONS:Msendmail-socketmap)
-USE_TOOLS+=	perl:run
-REPLACE_PERL=	contrib/socketmapClient.pl contrib/socketmapServer.pl
-.endif
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-.endif
diff --git a/mail/sendmail812/patches/patch-aa b/mail/sendmail812/patches/patch-aa
deleted file mode 100644
index eba618135db..00000000000
--- a/mail/sendmail812/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/08/30 19:56:45 adrianp Exp $
-
---- devtools/OS/NetBSD.orig	2002-03-21 15:59:25.000000000 -0800
-+++ devtools/OS/NetBSD
-@@ -6,13 +6,15 @@ dnl	Place personal settings in devtools/
- define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
- 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_BINOWN}')
-+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/sendmail812/patches/patch-ab b/mail/sendmail812/patches/patch-ab
deleted file mode 100644
index 42f5ad729ae..00000000000
--- a/mail/sendmail812/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/08/30 19:56:45 adrianp 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/sendmail812/patches/patch-ac b/mail/sendmail812/patches/patch-ac
deleted file mode 100644
index 2e2a0a6ad74..00000000000
--- a/mail/sendmail812/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/08/30 19:56:45 adrianp 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/sendmail812/patches/patch-ad b/mail/sendmail812/patches/patch-ad
deleted file mode 100644
index 5b855e84750..00000000000
--- a/mail/sendmail812/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/08/30 19:56:45 adrianp 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/sendmail812/patches/patch-ae b/mail/sendmail812/patches/patch-ae
deleted file mode 100644
index bd417e49c6e..00000000000
--- a/mail/sendmail812/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/08/30 19:56:45 adrianp 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/sendmail812/patches/patch-af b/mail/sendmail812/patches/patch-af
deleted file mode 100644
index 73a1eba9ca6..00000000000
--- a/mail/sendmail812/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/08/30 19:56:45 adrianp 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/sendmail812/patches/patch-ag b/mail/sendmail812/patches/patch-ag
deleted file mode 100644
index 909580fc09b..00000000000
--- a/mail/sendmail812/patches/patch-ag
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/09/08 22:32:39 abs Exp $
-
---- include/sm/conf.h.orig	2004-01-07 13:52:16.000000000 +1300
-+++ include/sm/conf.h
-@@ -780,7 +780,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__) */
- 
-@@ -894,7 +898,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
- #  if defined(__NetBSD__) && (NetBSD > 199307 || NetBSD0_9 > 1)
- #   undef SPT_TYPE
- #   define SPT_TYPE	SPT_BUILTIN	/* setproctitle is in libc */
-@@ -902,6 +910,9 @@ extern unsigned int sleepX __P((unsigned
- #  if defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3))
- #   define HASURANDOMDEV	1	/* has /dev/urandom(4) */
- #  endif /* defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3)) */
-+#  if defined(__NetBSD__)
-+#   define SMRSH_CMDDIR		"/usr/libexec/sm.bin"
-+#  endif /* defined(__NetBSD__) */
- #  if defined(__FreeBSD__)
- #   define HASSETLOGIN	1	/* has setlogin(2) */
- #   if __FreeBSD_version >= 227001
diff --git a/mail/sendmail812/patches/patch-ah b/mail/sendmail812/patches/patch-ah
deleted file mode 100644
index b10b3f3cf40..00000000000
--- a/mail/sendmail812/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/06/14 18:57:34 adrianp Exp $
-
---- sendmail/deliver.c.orig	2006-06-13 21:35:58.000000000 +0100
-+++ sendmail/deliver.c
-@@ -4566,7 +4566,7 @@ putbody(mci, e, separator)
- 		/* now do the hard work */
- 		boundaries[0] = NULL;
- 		mci->mci_flags |= MCIF_INHEADER;
--		if (mime8to7(mci, e->e_header, e, boundaries, M87F_OUTER) ==
-+		if (mime8to7(mci, e->e_header, e, boundaries, M87F_OUTER, 0) ==
- 								SM_IO_EOF)
- 			goto writeerr;
- 	}
-@@ -4597,7 +4597,7 @@ putbody(mci, e, separator)
- 			SuprErrs = true;
- 
- 		if (mime8to7(mci, e->e_header, e, boundaries,
--				M87F_OUTER|M87F_NO8TO7) == SM_IO_EOF)
-+				M87F_OUTER|M87F_NO8TO7, 0) == SM_IO_EOF)
- 			goto writeerr;
- 
- 		/* restore SuprErrs */
diff --git a/mail/sendmail812/patches/patch-ai b/mail/sendmail812/patches/patch-ai
deleted file mode 100644
index 2e2ced50ad9..00000000000
--- a/mail/sendmail812/patches/patch-ai
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/06/14 18:57:34 adrianp Exp $
-
---- sendmail/mime.c.orig	2006-06-13 21:35:58.000000000 +0100
-+++ sendmail/mime.c
-@@ -80,6 +80,7 @@ static bool	MapNLtoCRLF;
- **		boundaries -- the currently pending message boundaries.
- **			NULL if we are processing the outer portion.
- **		flags -- to tweak processing.
-+**		level -- recursion level.
- **
- **	Returns:
- **		An indicator of what terminated the message part:
-@@ -96,12 +97,13 @@ struct args
- };
- 
- int
--mime8to7(mci, header, e, boundaries, flags)
-+mime8to7(mci, header, e, boundaries, flags, level)
- 	register MCI *mci;
- 	HDR *header;
- 	register ENVELOPE *e;
- 	char **boundaries;
- 	int flags;
-+	int level;
- {
- 	register char *p;
- 	int linelen;
-@@ -122,6 +124,18 @@ mime8to7(mci, header, e, boundaries, fla
- 	char pvpbuf[MAXLINE];
- 	extern unsigned char MimeTokenTab[256];
- 
-+	if (level > MAXMIMENESTING)
-+	{
-+		if (!bitset(EF_TOODEEP, e->e_flags))
-+		{
-+			if (tTd(43, 4))
-+				sm_dprintf("mime8to7: too deep, level=%d\n",
-+					   level);
-+			usrerr("mime8to7: recursion level %d exceeded",
-+				level);
-+			e->e_flags |= EF_DONT_MIME|EF_TOODEEP;
-+		}
-+	}
- 	if (tTd(43, 1))
- 	{
- 		sm_dprintf("mime8to7: flags = %x, boundaries =", flags);
-@@ -242,7 +256,9 @@ mime8to7(mci, header, e, boundaries, fla
- 	*/
- 
- 	if (sm_strcasecmp(type, "multipart") == 0 &&
--	    (!bitset(M87F_NO8BIT, flags) || bitset(M87F_NO8TO7, flags)))
-+	    (!bitset(M87F_NO8BIT, flags) || bitset(M87F_NO8TO7, flags)) &&
-+	    !bitset(EF_TOODEEP, e->e_flags)
-+	   )
- 	{
- 
- 		if (sm_strcasecmp(subtype, "digest") == 0)
-@@ -286,10 +302,13 @@ mime8to7(mci, header, e, boundaries, fla
- 		}
- 		if (i >= MAXMIMENESTING)
- 		{
--			usrerr("mime8to7: multipart nesting boundary too deep");
-+			if (tTd(43, 4))
-+				sm_dprintf("mime8to7: too deep, i=%d\n", i);
-+			if (!bitset(EF_TOODEEP, e->e_flags))
-+				usrerr("mime8to7: multipart nesting boundary too deep");
- 
- 			/* avoid bounce loops */
--			e->e_flags |= EF_DONT_MIME;
-+			e->e_flags |= EF_DONT_MIME|EF_TOODEEP;
- 		}
- 		else
- 		{
-@@ -333,7 +352,8 @@ mime8to7(mci, header, e, boundaries, fla
- 				goto writeerr;
- 			if (tTd(43, 101))
- 				putline("+++after putheader", mci);
--			bt = mime8to7(mci, hdr, e, boundaries, flags);
-+			bt = mime8to7(mci, hdr, e, boundaries, flags,
-+				      level + 1);
- 			if (bt == SM_IO_EOF)
- 				goto writeerr;
- 		}
-@@ -374,7 +394,8 @@ mime8to7(mci, header, e, boundaries, fla
- 
- 	if (sm_strcasecmp(type, "message") == 0)
- 	{
--		if (!wordinclass(subtype, 's'))
-+		if (!wordinclass(subtype, 's') ||
-+		    bitset(EF_TOODEEP, e->e_flags))
- 		{
- 			flags |= M87F_NO8BIT;
- 		}
-@@ -397,7 +418,8 @@ mime8to7(mci, header, e, boundaries, fla
- 			    !bitset(M87F_NO8TO7, flags) &&
- 			    !putline("MIME-Version: 1.0", mci))
- 				goto writeerr;
--			bt = mime8to7(mci, hdr, e, boundaries, flags);
-+			bt = mime8to7(mci, hdr, e, boundaries, flags,
-+				      level + 1);
- 			mci->mci_flags &= ~MCIF_INMIME;
- 			return bt;
- 		}
diff --git a/mail/sendmail812/patches/patch-aj b/mail/sendmail812/patches/patch-aj
deleted file mode 100644
index 014e8225b9c..00000000000
--- a/mail/sendmail812/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/06/14 18:57:34 adrianp Exp $
-
---- sendmail/sendmail.h.orig	2006-06-13 21:35:58.000000000 +0100
-+++ sendmail/sendmail.h
-@@ -942,6 +942,7 @@ struct envelope
- #define EF_TOOBIG	0x02000000L	/* message is too big */
- #define EF_SPLIT	0x04000000L	/* envelope has been split */
- #define EF_UNSAFE	0x08000000L	/* unsafe: read from untrusted source */
-+#define EF_TOODEEP	0x10000000L	/* message is nested too deep */
- 
- #define DLVR_NOTIFY	0x01
- #define DLVR_RETURN	0x02
-@@ -1592,7 +1593,7 @@ EXTERN unsigned long	PrivacyFlags;	/* pr
- 
- /* functions */
- extern bool	mime7to8 __P((MCI *, HDR *, ENVELOPE *));
--extern int	mime8to7 __P((MCI *, HDR *, ENVELOPE *, char **, int));
-+extern int	mime8to7 __P((MCI *, HDR *, ENVELOPE *, char **, int, int));
- 
- /*
- **  Flags passed to returntosender.
diff --git a/mail/sendmail812/patches/patch-ak b/mail/sendmail812/patches/patch-ak
deleted file mode 100644
index f65d21e1b07..00000000000
--- a/mail/sendmail812/patches/patch-ak
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/06/14 18:57:34 adrianp Exp $
-
---- sendmail/version.c.orig	2006-06-14 19:54:25.000000000 +0100
-+++ sendmail/version.c
-@@ -17,2 +17,2 @@ SM_RCSID("@(#)$Id: version.c,v 8.104.2.2
- 
--char	Version[] = "8.12.11.20060308";
-+char	Version[] = "8.12.11.20060614";
diff --git a/mail/sendmail812/patches/patch-al b/mail/sendmail812/patches/patch-al
deleted file mode 100644
index 0fe011daa25..00000000000
--- a/mail/sendmail812/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/09/05 20:06:06 tv Exp $
-
---- sendmail/main.c.orig	2003-11-06 19:09:31.000000000 -0500
-+++ sendmail/main.c
-@@ -2910,6 +2910,7 @@ finis(drop, cleanup, exitstat)
- 				dropenvelope(CurEnv, true, false);
- 				sm_rpool_free(CurEnv->e_rpool);
- 				CurEnv->e_rpool = NULL;
-+				CurEnv->e_to = NULL;
- 			}
- 			else
- 				poststats(StatFile);