This commit was manufactured by cvs2svn to create tag 'RELEASE_4_6_1'.release/4.6.1

19 files changed, 0 insertions, 843 deletions

diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
deleted file mode 100644
index 1dbe583978d1..000000000000
--- a/mail/sendmail812/Makefile
+++ /dev/null
@@ -1,201 +0,0 @@
-# New ports collection makefile for:	sendmail
-# Date created:				20 Apr 2000
-# Whom:					dirk.meyer@dinoex.sub.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sendmail
-PORTVERSION=	8.12.3
-PORTREVISION=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
-DISTNAME=	${PORTNAME}.${PORTVERSION}
-
-MAINTAINER=	dinoex@FreeBSD.org
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WCONF=		${WRKSRC}/devtools/Site
-SITE=		${FILESDIR}/site.config.m4.pre4
-PLIST=		${WRKDIR}/.PLIST.more
-DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
-		sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING
-MAN1=		mailq.1 newaliases.1 vacation.1
-MAN5=		aliases.5
-MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
-		mail.local.8 rmail.8 editmap.8
-
-# Options to define Features:
-# SENDMAIL_WITHOUT_IPV6=yes
-# SENDMAIL_WITHOUT_MILTER=yes
-# SENDMAIL_WITH_TLS=yes
-# SENDMAIL_WITH_SASL=yes
-# SENDMAIL_WITH_LDAP=yes
-
-.if defined(SENDMAIL_WITH_LDAP)
-PKGNAMESUFFIX?=	-ldap
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap2
-.endif
-.if defined(SENDMAIL_WITH_SASL)
-LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-PKGNAMESUFFIX?=	-sasl
-.endif
-.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
-PKGNAMESUFFIX?=	-tls
-USE_OPENSSL=	yes
-.endif
-
-# Build site.config.m4
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
-SITE+=	${FILESDIR}/site.config.m4
-.if ! defined(SENDMAIL_WITHOUT_IPV6)
-SITE+=	${FILESDIR}/site.config.m4.ipv6
-.endif
-.endif
-.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
-.if ! exists(${DESTDIR}/etc/mail/mailer.conf)
-SITE+=	${FILESDIR}/site.config.m4.ssl
-.endif
-SITE+=	${FILESDIR}/site.config.m4.tls
-.endif
-.if defined(SENDMAIL_WITH_SASL)
-SITE+=	${FILESDIR}/site.config.m4.sasl
-.endif
-.if defined(SENDMAIL_WITH_LDAP)
-SITE+=	${FILESDIR}/site.config.m4.ldap
-.endif
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-SITE+=	${FILESDIR}/site.config.m4.milter
-.endif
-
-# install directly if no mailwrapper support
-.if ! exists(${DESTDIR}/etc/mail/mailer.conf)
-PREFIX?=	${DESTDIR}/usr
-MANPREFIX?=	${DESTDIR}/usr/share
-.endif
-PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==}
-SENDMAIL=	${PREFIX}/sbin/sendmail
-
-post-extract:
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/sm-client.sh \
-		> ${WRKSRC}/sm-client.sh
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/sendmail.sh \
-		> ${WRKSRC}/sendmail.sh
-
-do-configure:
-	${PERL} -pi -e "s,\`-pthread\',\`${PTHREAD_LIBS}\'," \
-			${WRKSRC}/devtools/OS/FreeBSD
-	${PERL} -pi -e "s,\`-O\',\`${CFLAGS}\'," ${WRKSRC}/devtools/OS/FreeBSD
-	${SED} -e "s=%%PREFIX%%=${PREFIX}=" -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
-		${SITE} > ${WCONF}/site.config.m4
-
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-post-build:
-	( cd ${WRKSRC}/libmilter && ${MAKE} )
-.endif
-
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
-.endif
-	if ! pw groupshow smmsp; then pw groupadd smmsp -g 90; fi
-	if ! pw usershow smmsp; then pw useradd smmsp -g smmsp -u 90 \
-		-h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC} && find cf -type f | \
-	${AWK} '{print "share/sendmail/" $$1}' >>${PLIST}
-	@cd ${WRKSRC} && find -d cf -type d | \
-	${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST}
-	@${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST}
-.for i in ${DOCS}
-	@${ECHO_CMD} `${BASENAME} ${i}` | \
-	${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST}
-.endfor
-	@${ECHO_CMD} "@dirrm share/doc/sendmail" >>${PLIST}
-.endif
-
-# We want mail.local and rmail for our system.
-# the build install catmans only, we have to fix this.
-post-install:
-	( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
-	( cd ${WRKSRC}/rmail && ${MAKE} force-install )
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	${MKDIR} ${PREFIX}/include/libmilter
-	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
-		${WRKSRC}/include/libmilter/mfdef.h \
-		${PREFIX}/include/libmilter/
-	${INSTALL_DATA} \
-	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
-	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsm/libsm.a \
-	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsmutil/libsmutil.a \
-	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsmdb/libsmdb.a \
-	 ${PREFIX}/lib/
-.endif
-	${INSTALL_SCRIPT} ${WRKSRC}/sm-client.sh \
-		${PREFIX}/etc/rc.d/sm-client.sh.sample
-	${INSTALL_SCRIPT} ${WRKSRC}/sendmail.sh \
-		${PREFIX}/etc/rc.d/sendmail.sh.sample
-	${CHOWN} smmsp:smmsp /var/spool/clientmqueue
-	${CHMOD} 770 /var/spool/clientmqueue
-.for i in ${MAN8}
-	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
-.endfor
-.for i in ${MAN5}
-	@${RM} -f ${MANPREFIX}/man/cat5/${i} ${MANPREFIX}/man/cat5/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man5
-.endfor
-.for i in ${MAN1}
-	@${RM} -f ${MANPREFIX}/man/cat1/${i} ${MANPREFIX}/man/cat1/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man1
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/sendmail ${DOCSDIR}
-	@${TAR} -C ${WRKSRC} -cf - cf | \
-		${TAR} -C ${PREFIX}/share/sendmail -xf -
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${DOCSDIR}/op.ps
-	${INSTALL_DATA} ${WRKSRC}/devtools/README ${DOCSDIR}/DEVTOOLS
-	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
-	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
-	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
-	${MKDIR} ${DOCSDIR}/libmilter
-	@${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
-		${TAR} -C ${DOCSDIR}/libmilter -xf -
-.endif
-.endif
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
-	@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
-
-mailer.conf:
-	@${SED} \
-	-e "s=^sendmail[ 	]*/.*$$=sendmail	${SENDMAIL}=" \
-	-e "s=^send-mail[ 	]*/.*$$=send-mail	${SENDMAIL}=" \
-	-e "s=^mailq[ 	]*/.*$$=mailq		${SENDMAIL}=" \
-	-e "s=^newaliases[ 	]*/.*$$=newaliases	${SENDMAIL}=" \
-	-e "s=^hoststat[ 	]*/.*$$=hoststat	${SENDMAIL}=" \
-	-e "s=^purgestat[ 	]*/.*$$=purgestat	${SENDMAIL}=" \
-	 ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
-	${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
-		${DESTDIR}/etc/mail/mailer.conf
-.endif
-
-submit.cf:
-	${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \
-		${DESTDIR}/etc/mail/submit.mc
-	@( cd ${DESTDIR}/etc/mail && ${MAKE} \
-		SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \
-		SENDMAIL_MC=submit )
-
-.include <bsd.port.pre.mk>
-
-.if exists(${FILESDIR}/site.config.m4.local)
-SITE+=	${FILESDIR}/site.config.m4.local
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/sendmail812/distinfo b/mail/sendmail812/distinfo
deleted file mode 100644
index 363717bc73bb..000000000000
--- a/mail/sendmail812/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sendmail.8.12.3.tar.gz) = 5f376123cf75b51d95b9ca4caf386fdb
diff --git a/mail/sendmail812/files/patch-aa b/mail/sendmail812/files/patch-aa
deleted file mode 100644
index c353c5ad932f..000000000000
--- a/mail/sendmail812/files/patch-aa
+++ /dev/null
@@ -1,237 +0,0 @@
-diff -ur cf/m4/cfhead.m4.orig cf/m4/cfhead.m4
---- cf/m4/cfhead.m4.orig	Sun Jun 10 03:45:13 2001
-+++ cf/m4/cfhead.m4	Fri Jun 15 06:47:34 2001
-@@ -260,7 +261,8 @@
- define(`_REC_FULL_AUTH_', `$.$?{auth_type}(authenticated as ${auth_authen} $?{auth_author}for ${auth_author} $.with ${auth_type}')
- define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)')
- define(`_REC_END_', `for $u; $|;
--	$.$b')
-+	$.$b$?g
-+	(envelope-from $g)$.')
- define(`_REC_TLS_', `(version=${tls_version} cipher=${cipher} bits=${cipher_bits} verify=${verify})$.$?u')
- define(`_REC_BY_', `$.by $j ($v/$Z)$?r with $r$. id $i$?{tls_version}')
- define(`confRECEIVED_HEADER', `_REC_HDR_
-diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
---- cf/ostype/bsd4.4.m4	Sun Apr 25 22:00:56 1999
-+++ src/contrib/sendmail/cf/ostype/bsd4.4.m4	Wed Oct  4 23:19:29 2000
-@@ -16,5 +16,6 @@
- divert(0)
- VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro Exp $')
- ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
- ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
-+ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl
- ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl
-diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
---- cf/sh/makeinfo.sh	Sun Feb  7 08:26:25 1999
-+++ src/contrib/sendmail/cf/sh/makeinfo.sh	Wed Oct  4 23:19:29 2000
-@@ -52,7 +54,7 @@
- else
- 	host=`uname -n`
- fi
--echo '#####' built by $user@$host on `date`
-+echo '#####' built by $user@$host on `LC_TIME=C date`
- echo '#####' in `pwd` | sed 's/\/tmp_mnt//'
- echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
- echo "define(\`__HOST__', $host)dnl"
-diff -ur include/sendmail/pathnames.h.orig include/sendmail/pathnames.h
---- include/sendmail/pathnames.h.orig	Fri Mar 23 23:09:44 2001
-+++ include/sendmail/pathnames.h	Mon May  7 08:32:45 2001
-@@ -41,7 +41,7 @@
- #  endif /* ! _PATH_MAILDIR */
- 
- #  ifndef _PATH_LOCTMP
--#   define _PATH_LOCTMP		"/tmp/local.XXXXXX"
-+#   define _PATH_LOCTMP		"/var/tmp/local.XXXXXX"
- #  endif /* ! _PATH_LOCTMP */
- 
- #  ifndef _PATH_HOSTS
-diff -ur mail.local/mail.local.8.orig mail.local/mail.local.8
---- mail.local/mail.local.8.orig	Fri Apr  6 01:27:35 2001
-+++ mail.local/mail.local.8	Thu May 31 07:36:03 2001
-@@ -16,9 +16,9 @@
- \- store mail in a mailbox
- .SH SYNOPSIS
- .B mail.local
--.RB [ \-7 "] [" \-b "] [" \-d "] [" \-D
-+.RB [ \-7 "] [" \-b "] [" \-B "] [" \-d "] [" \-D
- .IR mbdb ]
--.RB [ \-l "] [" \-f 
-+.RB [ \-l "] [" \-s "] [" \-f 
- \fIfrom\fR|\fB\-r\fR
- .IR from ]
- .RB [ \-h
-@@ -38,6 +41,11 @@
- .B \-7
- Do not advertise 8BITMIME support in LMTP mode.
- .TP 
-+.B \-B
-+Turn off the attempts to notify the
-+.Dq biff
-+service.
-+.TP 
- .B \-b
- Return a permanent error instead of a temporary error
- if a mailbox exceeds quota.
-@@ -56,6 +64,13 @@
- .TP
- .B \-l
- Turn on LMTP mode.
-+.TP
-+.B \-s
-+Turn off the
-+.Xr fsync 2
-+call that forces the mailbox to be committed to disk before returning a
-+.Dq success
-+status.
- .TP 
- .BI \-r " from"
- Specify the sender's name (for backward compatibility).
-@@ -97,7 +112,7 @@
- .SH FILES
- .PD 0.2v
- .TP 2.2i
--/tmp/local.XXXXXX
-+/var/tmp/local.XXXXXX
- temporary files
- .TP
- /var/mail/user
-@@ -108,7 +123,6 @@
- .PD
- .SH SEE ALSO
- mail(1), 
--xsend(1), 
- flock(2), 
- getservbyname(3), 
- comsat(8), 
-diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
---- mail.local/mail.local.c.orig	Thu May 10 02:58:31 2001
-+++ mail.local/mail.local.c	Thu May 31 07:39:04 2001
-@@ -130,6 +132,8 @@
- bool	HoldErrs = false;		/* Hold errors in ErrBuf */
- bool	LMTPMode = false;
- bool	BounceQuota = false;		/* permanent error when over quota */
-+bool	NoBiff = false;
-+bool	NoFsync = false;
- char	*HomeMailFile = NULL;		/* store mail in homedir */
- 
- void	deliver __P((int, char *));
-@@ -172,7 +176,7 @@
- # endif /* LOG_MAIL */
- 
- 	from = NULL;
--	while ((ch = getopt(argc, argv, "7bdD:f:h:r:l")) != -1)
-+	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:ls")) != -1)
- 	{
- 		switch(ch)
- 		{
-@@ -180,6 +184,10 @@
- 			EightBitMime = false;
- 			break;
- 
-+		  case 'B':
-+			NoBiff = true;
-+			break;
-+
- 		  case 'b':		/* bounce mail when over quota. */
- 			BounceQuota = true;
- 			break;
-@@ -215,6 +223,10 @@
- 			LMTPMode = true;
- 			break;
- 
-+		  case 's':
-+			NoFsync = true;
-+			break;
-+
- 		  case '?':
- 		  default:
- 			usage();
-@@ -224,7 +236,8 @@
- 	argv += optind;
- 
- 	/* initialize biff structures */
--	notifybiff(NULL);
-+	if (!NoBiff)
-+		notifybiff(NULL);
- 
- 	err = sm_mbdb_initialize(mbdbname);
- 	if (err != EX_OK)
-@@ -1128,6 +1141,7 @@
- 
- 	/* Get the starting offset of the new message for biff. */
- 	curoff = lseek(mbfd, (off_t) 0, SEEK_END);
-+	if (!NoBiff)
- 	(void) sm_snprintf(biffmsg, sizeof(biffmsg), "%s@%lld\n",
- 			   name, (LONGLONG_T) curoff);
- 
-@@ -1190,7 +1204,7 @@
- 	}
- 
- 	/* Flush to disk, don't wait for update. */
--	if (fsync(mbfd) < 0)
-+	if (!NoFsync && fsync(mbfd) < 0)
- 	{
- 		mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno));
- err3:
-@@ -1216,7 +1230,7 @@
- 		mailerr(errcode, "%s: %s", path, sm_errstring(errno));
- 		(void) truncate(path, curoff);
- 	}
--	else
-+	else if (!NoBiff)
- 		notifybiff(biffmsg);
- 
- 	if (setreuid(0, 0) < 0)
-@@ -1395,7 +1409,8 @@
- usage()
- {
- 	ExitVal = EX_USAGE;
--	mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] user ...");
-+	mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-s] [-f from|-r from] [-h filename] user ...");
-+
- 	exit(ExitVal);
- }
- 
-diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
---- rmail/rmail.c	Sun Sep 17 00:20:25 2000
-+++ src/contrib/sendmail/rmail/rmail.c	Mon Nov  6 11:23:42 2000
-@@ -318,7 +320,11 @@
- 	args[i++] = _PATH_SENDMAIL;	/* Build sendmail's argument list. */
- 	args[i++] = "-G";		/* relay submission */
- 	args[i++] = "-oee";		/* No errors, just status. */
-+#ifdef QUEUE_ONLY
- 	args[i++] = "-odq";		/* Queue it, don't try to deliver. */
-+#else
-+	args[i++] = "-odi";		/* Deliver in foreground. */
-+#endif
- 	args[i++] = "-oi";		/* Ignore '.' on a line by itself. */
- 
- 	/* set from system and protocol used */
-diff -ur smrsh/smrsh.8.orig smrsh/smrsh.8
---- smrsh/smrsh.8.orig	Wed Jan 24 01:40:47 2001
-+++ smrsh/smrsh.8	Mon May  7 08:32:45 2001
-@@ -39,7 +41,7 @@
- .I smrsh
- limits programs to be in a single directory,
- by default
--/usr/adm/sm.bin,
-+/usr/libexec/sm.bin,
- 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
-@@ -50,13 +52,12 @@
- ``"|exec /usr/local/bin/procmail -f- /etc/procmailrcs/user || exit 75"''
- .PP
- Initial pathnames on programs are stripped,
--so forwarding to ``/usr/ucb/vacation'',
--``/usr/bin/vacation'',
-+so forwarding to ``/usr/bin/vacation'',
- ``/home/server/mydir/bin/vacation'',
- and
- ``vacation''
- all actually forward to
--``/usr/adm/sm.bin/vacation''.
-+``/usr/libexec/sm.bin/vacation''.
- .PP
- System administrators should be conservative about populating
- the sm.bin directory.
diff --git a/mail/sendmail812/files/patch-stable b/mail/sendmail812/files/patch-stable
deleted file mode 100644
index f077974ae0e4..000000000000
--- a/mail/sendmail812/files/patch-stable
+++ /dev/null
@@ -1,135 +0,0 @@
---- cf/m4/proto.m4	2002/04/02 23:42:42	8.639
-+++ cf/m4/proto.m4	2002/04/16 21:21:26	8.640
-@@ -1204,6 +1204,7 @@
- R$+ $| $|		$: $(macro {Host} $@ $) $1	no h or {Host}
- R$+ $| $| $+		$: $1			h not set, {Host} set
- R$+ $| +$* $| $*	$: $1			h is +detail, {Host} set
-+R$+ $| $* @ $+ $| $*	$: $(macro {Host} $@ @$3 $) $1	set {Host} to host in h
- R$+ $| $+ $| $*		$: $(macro {Host} $@ @$2 $) $1	set {Host} to h
- ')dnl
- 
---- include/sm/os/sm_os_freebsd.h	2002/03/10 22:41:03	1.10
-+++ include/sm/os/sm_os_freebsd.h	2002/04/15 17:17:05	1.11
-@@ -31,11 +31,7 @@
- #endif
- 
- #ifndef SM_CONF_SHM
--# ifdef __sparc64__
--#  define SM_CONF_SHM	0
--# else /* __sparc64__ */
--#  define SM_CONF_SHM	1
--# endif /* __sparc64__ */
-+# define SM_CONF_SHM	1
- #endif /* SM_CONF_SHM */
- #ifndef SM_CONF_SEM
- # define SM_CONF_SEM	1
---- sendmail/mailq.1	2000/12/23 19:37:48	8.18
-+++ sendmail/mailq.1	2002/04/12 05:07:58	8.19
-@@ -18,5 +18,6 @@
- .SH SYNOPSIS
- .B mailq
-+.RB [ \-Ac ]
- .RB [ \-v ]
- .SH DESCRIPTION
- .B Mailq
-@@ -45,7 +46,13 @@
- .B Mailq
- is identical to ``sendmail -bp''.
- .PP
--The options are as follows:
-+The relevant options are as follows:
-+.TP
-+.B \-Ac
-+Show the mail submission queue specified in
-+.I /etc/mail/submit.cf
-+instead of the MTA queue specified in
-+.IR /etc/mail/sendmail.cf .
- .TP
- .B \-v
- Print verbose information.  
---- sendmail/main.c	2002/02/27 23:49:52	8.876
-+++ sendmail/main.c	2002/04/11 02:51:38	8.877
-@@ -726,6 +726,8 @@
- 	(void) sm_signal(SIGPIPE, SIG_IGN);
- 	OldUmask = umask(022);
- 	FullName = getextenv("NAME");
-+	if (FullName != NULL)
-+		FullName = newstr(FullName);
- 
- 	/*
- 	**  Initialize name server if it is going to be used.
---- sendmail/milter.c	2002/03/05 00:23:47	8.194
-+++ sendmail/milter.c	2002/04/14 03:55:07	8.196
-@@ -1737,6 +1737,7 @@
- 	int mid;
- 	char *v;
- 	char *buf, *bp;
-+	char exp[MAXLINE];
- 	ssize_t s;
- 
- 	/* sanity check */
-@@ -1753,7 +1754,8 @@
- 		v = macvalue(mid, e);
- 		if (v == NULL)
- 			continue;
--		s += strlen(macros[i]) + 1 + strlen(v) + 1;
-+		expand(v, exp, sizeof(exp), e);
-+		s += strlen(macros[i]) + 1 + strlen(exp) + 1;
- 	}
- 
- 	if (s < 0)
-@@ -1770,14 +1772,15 @@
- 		v = macvalue(mid, e);
- 		if (v == NULL)
- 			continue;
-+		expand(v, exp, sizeof(exp), e);
- 
- 		if (tTd(64, 10))
- 			sm_dprintf("milter_send_macros(%s, %c): %s=%s\n",
--				m->mf_name, cmd, macros[i], v);
-+				m->mf_name, cmd, macros[i], exp);
- 
- 		(void) sm_strlcpy(bp, macros[i], s - (bp - buf));
- 		bp += strlen(bp) + 1;
--		(void) sm_strlcpy(bp, v, s - (bp - buf));
-+		(void) sm_strlcpy(bp, exp, s - (bp - buf));
- 		bp += strlen(bp) + 1;
- 	}
- 	(void) milter_write(m, SMFIC_MACRO, buf, s,
-@@ -2900,8 +2903,6 @@
- 		{
- 			int err;
- 
--# if NOFTRUNCATE
--			/* XXX: Not much we can do except rewind it */
- 			err = sm_io_error(e->e_dfp);
- 			(void) sm_io_flush(e->e_dfp, SM_TIME_DEFAULT);
- 
-@@ -2917,16 +2918,26 @@
- 			/* errno is set implicitly by fseek() before return */
- 			err = sm_io_seek(e->e_dfp, SM_TIME_DEFAULT,
- 					 0, SEEK_SET);
-+			if (err < 0)
-+			{
-+				MILTER_DF_ERROR("milter_replbody: sm_io_seek %s: %s");
-+				return -1;
-+			}
-+# if NOFTRUNCATE
-+			/* XXX: Not much we can do except rewind it */
-+			errno = EINVAL;
-+			MILTER_DF_ERROR("milter_replbody: ftruncate not available on this platform (%s:%s)");
-+			return -1;
- # else /* NOFTRUNCATE */
- 			err = ftruncate(sm_io_getinfo(e->e_dfp,
- 						      SM_IO_WHAT_FD, NULL),
- 					0);
--# endif /* NOFTRUNCATE */
- 			if (err < 0)
- 			{
- 				MILTER_DF_ERROR("milter_replbody: sm_io ftruncate %s: %s");
- 				return -1;
- 			}
-+# endif /* NOFTRUNCATE */
- 		}
- 
- 		if (prevsize > e->e_msgsize)
diff --git a/mail/sendmail812/files/pkg-milter b/mail/sendmail812/files/pkg-milter
deleted file mode 100644
index 7e4bab67915c..000000000000
--- a/mail/sendmail812/files/pkg-milter
+++ /dev/null
@@ -1,46 +0,0 @@
-include/libmilter/mfapi.h
-include/libmilter/mfdef.h
-lib/libmilter.a
-lib/libsm.a
-lib/libsmutil.a
-lib/libsmdb.a
-@dirrm include/libmilter
-%%PORTDOCS%%share/doc/sendmail/MILTER
-%%PORTDOCS%%share/doc/sendmail/libmilter/api.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/design.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.fig
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.jpg
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.ps
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.fig
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.jpg
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.ps
-%%PORTDOCS%%share/doc/sendmail/libmilter/index.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/installation.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/other.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/overview.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/sample.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_chgheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_delrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getpriv.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getsymval.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_main.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_register.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_replacebody.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setbacklog.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setconn.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setpriv.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setreply.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_settimeout.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_abort.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_body.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_close.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_connect.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envfrom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eoh.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_header.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_helo.html
-%%PORTDOCS%%@dirrm share/doc/sendmail/libmilter
diff --git a/mail/sendmail812/files/sendmail.sh b/mail/sendmail812/files/sendmail.sh
deleted file mode 100644
index 33c01e0621a4..000000000000
--- a/mail/sendmail812/files/sendmail.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-# 
-if ! test -x %%PREFIX%%/sbin/sendmail
-then
-	exit 0
-fi
-#
-case "$1" in
-start)
-	# If there is a global system configuration file, suck it in.
-	#
-	if [ -r /etc/defaults/rc.conf ]; then
-		. /etc/defaults/rc.conf
-		source_rc_confs
-	elif [ -r /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
-
-	# Flags to sendmail (as a server)
-	sendmail_flags="${sendmail_flags--L sm-mta -bd -q30m}"
-	# Flags for sendmail_msp_queue daemon.
-	sendmail_msp_queue_flags="
-		${sendmail_msp_queue_flags--L sm-msp-queue -Ac -q30m}"
-	#
-        %%PREFIX%%/sbin/sendmail ${sendmail_flags} &&
-        echo -n ' sendmail'
-        %%PREFIX%%/sbin/sendmail ${sendmail_msp_queue_flags} &&
-        echo -n ' sm-msp-queue'
-	;;
-stop)
-	if test -e /var/run/sendmail.pid
-	then
-		kill `head -1 /var/run/sendmail.pid`
-		rm -f /var/run/sendmail.pid
-	fi
-	if test -e /var/spool/clientmqueue/sm-client.pid
-	then
-		kill `head -1 /var/spool/clientmqueue/sm-client.pid`
-		rm -f /var/spool/clientmqueue/sm-client.pid
-	fi
-	;;
-restart)
-	if test -e /var/run/sendmail.pid
-	then
-		kill -1 `head -1 /var/run/sendmail.pid`
-	fi
-	if test -e /var/spool/clientmqueue/sm-client.pid
-	then
-		kill -1 `head -1 /var/spool/clientmqueue/sm-client.pid`
-	fi
-	;;
-*)
-	echo "Usage: ${0##*/}: { start | stop | restart }" 2>&1
-	exit 65
-	;;
-esac
diff --git a/mail/sendmail812/files/site.config.m4 b/mail/sendmail812/files/site.config.m4
deleted file mode 100644
index adc2b11bf108..000000000000
--- a/mail/sendmail812/files/site.config.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-define(`confEBINDIR',`%%PREFIX%%/libexec')
-define(`confMANROOT',`%%PREFIX%%/man/cat')
-define(`confMANROOTMAN',`%%PREFIX%%/man/man')
-define(`confMBINDIR',`%%PREFIX%%/sbin')
-define(`confSBINDIR',`%%PREFIX%%/sbin')
-define(`confUBINDIR',`%%PREFIX%%/bin')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
-APPENDDEF(`conf_sendmail_LIBS', `-lwrap')"
diff --git a/mail/sendmail812/files/site.config.m4.ipv6 b/mail/sendmail812/files/site.config.m4.ipv6
deleted file mode 100644
index 41f0cccf3a1d..000000000000
--- a/mail/sendmail812/files/site.config.m4.ipv6
+++ /dev/null
@@ -1,2 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-DNETINET6')
-APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6')
diff --git a/mail/sendmail812/files/site.config.m4.ldap b/mail/sendmail812/files/site.config.m4.ldap
deleted file mode 100644
index 24f5ba307842..000000000000
--- a/mail/sendmail812/files/site.config.m4.ldap
+++ /dev/null
@@ -1,25 +0,0 @@
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`conf_libsm_ENVDEF', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_libsm_ENVDEF', `-DLDAPMAP')     
-APPENDDEF(`conf_libsm_LIBS', `-lldap')
-APPENDDEF(`conf_libsm_LIBS', `-llber')
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DLDAPMAP')     
-APPENDDEF(`conf_sendmail_LIBS', `-lldap')
-APPENDDEF(`conf_sendmail_LIBS', `-llber')
-APPENDDEF(`conf_editmap_LIBS', `-lldap')
-APPENDDEF(`conf_editmap_LIBS', `-llber')
-APPENDDEF(`conf_mail_local_LIBS', `-lldap')
-APPENDDEF(`conf_mail_local_LIBS', `-llber')
-APPENDDEF(`conf_mailstats_LIBS', `-lldap')
-APPENDDEF(`conf_mailstats_LIBS', `-llber')
-APPENDDEF(`conf_makemap_LIBS', `-lldap')
-APPENDDEF(`conf_makemap_LIBS', `-llber')
-APPENDDEF(`conf_praliases_LIBS', `-lldap')
-APPENDDEF(`conf_praliases_LIBS', `-llber')
-APPENDDEF(`conf_rmail_LIBS', `-lldap')
-APPENDDEF(`conf_rmail_LIBS', `-llber')
-APPENDDEF(`conf_smrsh_LIBS', `-lldap')
-APPENDDEF(`conf_smrsh_LIBS', `-llber')
-APPENDDEF(`conf_vacation_LIBS', `-lldap')
-APPENDDEF(`conf_vacation_LIBS', `-llber')
diff --git a/mail/sendmail812/files/site.config.m4.milter b/mail/sendmail812/files/site.config.m4.milter
deleted file mode 100644
index de11295aa6f3..000000000000
--- a/mail/sendmail812/files/site.config.m4.milter
+++ /dev/null
@@ -1,2 +0,0 @@
-APPENDDEF(`conf_libmilter_ENVDEF', `-DMILTER')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER')
diff --git a/mail/sendmail812/files/site.config.m4.pre4 b/mail/sendmail812/files/site.config.m4.pre4
deleted file mode 100644
index 6edccedcdf8e..000000000000
--- a/mail/sendmail812/files/site.config.m4.pre4
+++ /dev/null
@@ -1,4 +0,0 @@
-APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DPICKY_HELO_CHECK')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')
diff --git a/mail/sendmail812/files/site.config.m4.sasl b/mail/sendmail812/files/site.config.m4.sasl
deleted file mode 100644
index 9aac5e47921b..000000000000
--- a/mail/sendmail812/files/site.config.m4.sasl
+++ /dev/null
@@ -1,4 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl')
diff --git a/mail/sendmail812/files/site.config.m4.ssl b/mail/sendmail812/files/site.config.m4.ssl
deleted file mode 100644
index 9e291b26e856..000000000000
--- a/mail/sendmail812/files/site.config.m4.ssl
+++ /dev/null
@@ -1,3 +0,0 @@
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DHASSRANDOMDEV')
diff --git a/mail/sendmail812/files/site.config.m4.tls b/mail/sendmail812/files/site.config.m4.tls
deleted file mode 100644
index e310d3fc3601..000000000000
--- a/mail/sendmail812/files/site.config.m4.tls
+++ /dev/null
@@ -1,3 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_1')
-APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail812/files/sm-client.sh b/mail/sendmail812/files/sm-client.sh
deleted file mode 100644
index 6e5429c29303..000000000000
--- a/mail/sendmail812/files/sm-client.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/sm-client.sh,v 1.3 2002-04-06 08:17:34 dinoex Exp $
-# 
-if ! test -x %%PREFIX%%/sbin/sendmail
-then
-	exit 0
-fi
-case "$1" in
-start)
-	%%PREFIX%%/sbin/sendmail -L sm-msp-queue -Ac -q30m
-	echo -n ' sm-msp-queue'
-	;;
-stop)
-	if test -e /var/spool/clientmqueue/sm-client.pid
-	then
-		kill `head -1 /var/spool/clientmqueue/sm-client.pid`
-		rm -f /var/spool/clientmqueue/sm-client.pid
-	fi
-	;;
-restart)
-	if test -e /var/spool/clientmqueue/sm-client.pid
-	then
-		kill -1 `head -1 /var/spool/clientmqueue/sm-client.pid`
-	fi
-	;;
-*)
-	echo "Usage: ${0##*/}: { start | stop | restart }" 2>&1
-	exit 65
-	;;
-esac
diff --git a/mail/sendmail812/pkg-comment b/mail/sendmail812/pkg-comment
deleted file mode 100644
index d25358f26867..000000000000
--- a/mail/sendmail812/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Reliable, highly configurable mail transfer agent with utilities
diff --git a/mail/sendmail812/pkg-descr b/mail/sendmail812/pkg-descr
deleted file mode 100644
index 21e2ecf498f9..000000000000
--- a/mail/sendmail812/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Sendmail implements a general purpose internetwork mail routing facility
-under the UNIX operating system.  It is not tied to any one transport
-protocol - its function may be likened to a crossbar switch, relaying
-messages from one domain into another.  In the process, it can do a limited
-amount of message header editing to put the message into a format that is
-appropriate for the receiving domain.  All of this is done under the
-control of a configuration file.
-
-Sendmail is a trademark of Sendmail, Inc.
-
-WWW: http://www.sendmail.org/
diff --git a/mail/sendmail812/pkg-message b/mail/sendmail812/pkg-message
deleted file mode 100644
index 376f77d3d543..000000000000
--- a/mail/sendmail812/pkg-message
+++ /dev/null
@@ -1,39 +0,0 @@
----------------------------------------------------
-If you update your configuration from 8.11.x you need to install an
-additional config file: /etc/mail/submit.cf, you can generate it
-by calling the target 'submit.cf', submit.mc will be installed too.
-$ make submit.cf
-
-you should add in /etc/make.conf:
-SENDMAIL_CF_DIR=	%%PREFIX%%/share/sendmail/cf
-
-To activate only the delivery from the local submission queue see:
-%%PREFIX%%/etc/rc.d/sm-client.sh.sample
-
-To activate all sendmail processes see:
-%%PREFIX%%/etc/rc.d/sendmail.sh.sample
-
-To deliver all local mail to your mailhub, edit the last line of submit.mc:
-FEATURE(`msp','mailhub.do.main`)dnl
-
-and set your flags in /etc/rc.conf:
-sendmail_flags="-L sm-msp-queue -Ac -q1m"
-
-You can delete /etc/mail/sendmail.cf when you don't need a daemon listen.
-To update your configuration look at %%PREFIX%%/share/sendmail/cf/README.
----------------------------------------------------
-To activate sendmail as your default mailer, call the target 'mailer.conf':
-$ make mailer.conf
-
-Your '/etc/mail/mailer.conf' should look like this:
-#
-# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
-#
-sendmail	%%PREFIX%%/sbin/sendmail
-send-mail	%%PREFIX%%/sbin/sendmail
-mailq		%%PREFIX%%/sbin/sendmail
-newaliases	%%PREFIX%%/sbin/sendmail
-
-You may also need to update /etc/rc.conf.
----------------------------------------------------
-
diff --git a/mail/sendmail812/pkg-plist b/mail/sendmail812/pkg-plist
deleted file mode 100644
index 64efb7699cb2..000000000000
--- a/mail/sendmail812/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.11 2002-04-06 08:17:33 dinoex Exp $
-@exec if ! pw groupshow smmsp 2>/dev/null; then pw groupadd smmsp -g 90; fi
-@exec if ! pw usershow smmsp 2>/dev/null; then pw useradd smmsp -g smmsp -u 90 -h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
-@exec mkdir -p /var/spool/clientmqueue
-@exec chown smmsp:smmsp /var/spool/clientmqueue
-@exec chmod 770 /var/spool/clientmqueue
-@unexec if pw usershow smmsp | grep -q 90:90; then pw userdel smmsp; fi
-@comment (removed by userdel) pw groupdel smmsp
-bin/hoststat
-bin/mailq
-bin/newaliases
-bin/purgestat
-bin/rmail
-bin/vacation
-etc/rc.d/sm-client.sh.sample
-etc/rc.d/sendmail.sh.sample
-libexec/mail.local
-libexec/smrsh
-sbin/editmap
-sbin/mailstats
-sbin/makemap
-sbin/praliases
-@group smmsp
-sbin/sendmail
-@group
-@comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
-@exec chmod 2555 sbin/sendmail
-%%PORTDOCS%%share/doc/sendmail/op.ps
-%%PORTDOCS%%share/doc/sendmail/DEVTOOLS
-%%PORTDOCS%%share/doc/sendmail/SENDMAIL
-%%PORTDOCS%%share/doc/sendmail/MAIL.LOCAL
-%%PORTDOCS%%share/doc/sendmail/SMRSH