6 files changed, 52 insertions, 18 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 79cda4a17706..64aaaa6a2ee5 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -24,6 +24,8 @@ 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
+SENDMAIL=	${PREFIX}/sbin/sendmail
+PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==}
 
 # Options to define Features:
 # SENDMAIL_WITHOUT_IPV6=yes
@@ -42,6 +44,10 @@ LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap2
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 PKGNAMESUFFIX?=	-sasl
 .endif
+.if defined(SENDMAIL_WITH_SASL2)
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+PKGNAMESUFFIX?=	-sasl2
+.endif
 .if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
 PKGNAMESUFFIX?=	-tls
 .endif
@@ -62,6 +68,9 @@ SITE+=	${FILESDIR}/site.config.m4.tls
 .if defined(SENDMAIL_WITH_SASL)
 SITE+=	${FILESDIR}/site.config.m4.sasl
 .endif
+.if defined(SENDMAIL_WITH_SASL2)
+SITE+=	${FILESDIR}/site.config.m4.sasl2
+.endif
 .if defined(SENDMAIL_WITH_LDAP)
 SITE+=	${FILESDIR}/site.config.m4.ldap
 .endif
@@ -74,8 +83,6 @@ SITE+=	${FILESDIR}/site.config.m4.milter
 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 \
@@ -193,9 +200,15 @@ mailer.conf:
 		${DESTDIR}/etc/mail/mailer.conf
 .endif
 
-submit.cf:
+# create sumbit.cf on older systems
+#
+submit.cf:	${DESTDIR}/etc/mail/submit.cf
+
+${DESTDIR}/etc/mail/submit.mc:
 	${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \
 		${DESTDIR}/etc/mail/submit.mc
+
+${DESTDIR}/etc/mail/submit.cf:	${DESTDIR}/etc/mail/submit.mc
 	@( cd ${DESTDIR}/etc/mail && ${MAKE} \
 		SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \
 		SENDMAIL_MC=submit )
diff --git a/mail/sendmail/files/site.config.m4.sasl2 b/mail/sendmail/files/site.config.m4.sasl2
new file mode 100644
index 000000000000..b4b621570afc
--- /dev/null
+++ b/mail/sendmail/files/site.config.m4.sasl2
@@ -0,0 +1,4 @@
+APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
+APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL=2')
+APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
+APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
diff --git a/mail/sendmail/pkg-message b/mail/sendmail/pkg-message
index 376f77d3d543..3628cb1d5a0c 100644
--- a/mail/sendmail/pkg-message
+++ b/mail/sendmail/pkg-message
@@ -2,7 +2,7 @@
 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
+/usr/ports/mail/sendmail$ make submit.cf
 
 you should add in /etc/make.conf:
 SENDMAIL_CF_DIR=	%%PREFIX%%/share/sendmail/cf
@@ -14,16 +14,15 @@ 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
+FEATURE(`msp','[mailhub.do.main]`)dnl
 
-and set your flags in /etc/rc.conf:
+in FreeBSD-RELEASE < 4.6 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
+/usr/ports/mail/sendmail$ make mailer.conf
 
 Your '/etc/mail/mailer.conf' should look like this:
 #
@@ -33,7 +32,8 @@ sendmail	%%PREFIX%%/sbin/sendmail
 send-mail	%%PREFIX%%/sbin/sendmail
 mailq		%%PREFIX%%/sbin/sendmail
 newaliases	%%PREFIX%%/sbin/sendmail
+hoststat	%%PREFIX%%/sbin/sendmail
+purgestat	%%PREFIX%%/sbin/sendmail
 
 You may also need to update /etc/rc.conf.
 ---------------------------------------------------
-
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 79cda4a17706..64aaaa6a2ee5 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -24,6 +24,8 @@ 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
+SENDMAIL=	${PREFIX}/sbin/sendmail
+PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==}
 
 # Options to define Features:
 # SENDMAIL_WITHOUT_IPV6=yes
@@ -42,6 +44,10 @@ LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap2
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 PKGNAMESUFFIX?=	-sasl
 .endif
+.if defined(SENDMAIL_WITH_SASL2)
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+PKGNAMESUFFIX?=	-sasl2
+.endif
 .if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
 PKGNAMESUFFIX?=	-tls
 .endif
@@ -62,6 +68,9 @@ SITE+=	${FILESDIR}/site.config.m4.tls
 .if defined(SENDMAIL_WITH_SASL)
 SITE+=	${FILESDIR}/site.config.m4.sasl
 .endif
+.if defined(SENDMAIL_WITH_SASL2)
+SITE+=	${FILESDIR}/site.config.m4.sasl2
+.endif
 .if defined(SENDMAIL_WITH_LDAP)
 SITE+=	${FILESDIR}/site.config.m4.ldap
 .endif
@@ -74,8 +83,6 @@ SITE+=	${FILESDIR}/site.config.m4.milter
 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 \
@@ -193,9 +200,15 @@ mailer.conf:
 		${DESTDIR}/etc/mail/mailer.conf
 .endif
 
-submit.cf:
+# create sumbit.cf on older systems
+#
+submit.cf:	${DESTDIR}/etc/mail/submit.cf
+
+${DESTDIR}/etc/mail/submit.mc:
 	${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \
 		${DESTDIR}/etc/mail/submit.mc
+
+${DESTDIR}/etc/mail/submit.cf:	${DESTDIR}/etc/mail/submit.mc
 	@( cd ${DESTDIR}/etc/mail && ${MAKE} \
 		SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \
 		SENDMAIL_MC=submit )
diff --git a/mail/sendmail812/files/site.config.m4.sasl2 b/mail/sendmail812/files/site.config.m4.sasl2
new file mode 100644
index 000000000000..b4b621570afc
--- /dev/null
+++ b/mail/sendmail812/files/site.config.m4.sasl2
@@ -0,0 +1,4 @@
+APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
+APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL=2')
+APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
+APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
diff --git a/mail/sendmail812/pkg-message b/mail/sendmail812/pkg-message
index 376f77d3d543..3628cb1d5a0c 100644
--- a/mail/sendmail812/pkg-message
+++ b/mail/sendmail812/pkg-message
@@ -2,7 +2,7 @@
 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
+/usr/ports/mail/sendmail$ make submit.cf
 
 you should add in /etc/make.conf:
 SENDMAIL_CF_DIR=	%%PREFIX%%/share/sendmail/cf
@@ -14,16 +14,15 @@ 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
+FEATURE(`msp','[mailhub.do.main]`)dnl
 
-and set your flags in /etc/rc.conf:
+in FreeBSD-RELEASE < 4.6 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
+/usr/ports/mail/sendmail$ make mailer.conf
 
 Your '/etc/mail/mailer.conf' should look like this:
 #
@@ -33,7 +32,8 @@ sendmail	%%PREFIX%%/sbin/sendmail
 send-mail	%%PREFIX%%/sbin/sendmail
 mailq		%%PREFIX%%/sbin/sendmail
 newaliases	%%PREFIX%%/sbin/sendmail
+hoststat	%%PREFIX%%/sbin/sendmail
+purgestat	%%PREFIX%%/sbin/sendmail
 
 You may also need to update /etc/rc.conf.
 ---------------------------------------------------
-