- Update to 4.26.5 [1]

- Patch installed files to respect LOCALBASE [1]
- Reword COMMENT slightly to avoid truncation by pkg_info(1)
- Add SIZE to distinfo

PR:		ports/61967 [1]
Submitted by:	maintainer [1]

8 files changed, 412 insertions, 24 deletions

diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile
index 9d22d9bf3eb1..683ff2423660 100644
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.26.4
+PORTVERSION=	4.26.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	MailScanner-${PORTVERSION:C/\.([0-9]+)$/-\1/}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}
 
 MAINTAINER=	j.koopmann@seceidos.de
-COMMENT=	Powerful virus/spam scanning framework for Sendmail/Exim
+COMMENT=	Powerful virus/spam scanning framework for mail gateways
 
 BUILD_DEPENDS=	\
 	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
@@ -34,8 +34,11 @@ RUN_DEPENDS=	${BUILD_DEPENDS} \
 
 CONFLICTS=	MailScanner-[0-9]*
 
+PATCHLEVEL=	1
+
 USE_PERL5=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN8=		MailScanner.8
@@ -54,6 +57,12 @@ DOC_FILES=	INSTALL INSTALL.FreeBSD INSTALL.OpenBSD README
 ETC_FILES=	MailScanner.conf filename.rules.conf \
 		filetype.rules.conf spam.assassin.prefs.conf \
 		spam.lists.conf virus.scanners.conf
+USRLOCAL_FILES_LIB=	\
+		bitdefender-autoupdate f-prot-autoupdate \
+		f-secure-wrapper inoculan-autoupdate \
+		kavdaemonclient-wrapper mcafee-autoupdate \
+		nod32-autoupdate rav-autoupdate \
+		rav-wrapper sophos-autoupdate
 
 do-build:
 	${PERL} -pi -e \
@@ -81,8 +90,8 @@ do-build:
 		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
 		${WRKSRC}/lib/MailScanner/ConfigDefs.pl
-	${PERL} -pi \
-		-e 's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
+	${PERL} -pi -e \
+		's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
 	${PERL} -pi -e \
 		's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g;' \
 		${WRKSRC}/lib/clamav-wrapper
@@ -92,6 +101,11 @@ do-build:
 	${PERL} -pi -e \
 		's,/usr/bin/unzip,${LOCALBASE}/bin/unzip,g;' \
 		${WRKSRC}/lib/sophos-autoupdate
+.for FILE in ${USRLOCAL_FILES_LIB}
+	${PERL} -pi -e \
+		's,/usr/local,${LOCALBASE},g;' \
+		${WRKSRC}/lib/${FILE}
+.endfor
 
 do-install:
 	# Step 1: Install libexec files
@@ -160,6 +174,10 @@ do-install:
 		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
 	# Sophos install script
 	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
+	${PERL} -pi -e \
+		's,%%LOCALBASE%%,${LOCALBASE},g; \
+		s,%%PREFIX%%,${PREFIX},g;' \
+		${DOCSDIR}/Sophos.install.freebsd
 .if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
 	# Upgrading MailScanner.conf file... Please wait
 	@${WRKSRC}/bin/upgrade_MailScanner_conf \
diff --git a/mail/mailscanner-devel/distinfo b/mail/mailscanner-devel/distinfo
index 54429feb7913..d38480874e74 100644
--- a/mail/mailscanner-devel/distinfo
+++ b/mail/mailscanner-devel/distinfo
@@ -1 +1,2 @@
-MD5 (MailScanner-4.26-4.tar.gz) = 6c7ef8fe632f9f490bc63ef5a8972c43
+MD5 (MailScanner-4.26.5-1.tar.gz) = e6754fe4e210beeb6d04a307cc1fceb4
+SIZE (MailScanner-4.26.5-1.tar.gz) = 977929
diff --git a/mail/mailscanner-devel/files/Sophos.install.freebsd b/mail/mailscanner-devel/files/Sophos.install.freebsd
index f1df49606e82..6d4aedfd3b0d 100644
--- a/mail/mailscanner-devel/files/Sophos.install.freebsd
+++ b/mail/mailscanner-devel/files/Sophos.install.freebsd
@@ -1,4 +1,4 @@
-#!/usr/local/bin/bash
+!%%LOCALBASE%%/bin/bash
 #
 # $Id: Sophos.install,v 1.13.2.3 2003/06/07 17:20:39 jkf Exp $
 #
@@ -8,8 +8,8 @@
 # and unpacked the Sophos distribution.
 # Tweaked for FreeBSD.
 
-SOPHOS=/usr/local/Sophos
-SCRIPTS=/usr/local/libexec/MailScanner
+SOPHOS=%%LOCALBASE%%/Sophos
+SCRIPTS=%%PREFIX%%/libexec/MailScanner
 COMPD=freebsd.elf.tar.Z
 DISTRIB=freebsd.elf.tar
 
@@ -20,7 +20,7 @@ chmod -R go+rX ${SOPHOS}
 # Clear out any old libs from /usr/local/lib which is where
 # a default SAVI installation will have left them
 echo Clearing out old default Sophos installation libraries
-rm -f /usr/local/lib/libsavi.so*
+rm -f %%LOCALBASE%%/lib/libsavi.so*
 
 # Have we got to uncompress the distribution for them?
 if [ -f $COMPD ]; then
diff --git a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8 b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
index 676b7c4a1b72..83ccb3d49abd 100644
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
@@ -1,8 +1,12 @@
---- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8	Tue Dec  2 22:22:27 2003
-+++ docs/man/MailScanner.8	Tue Dec  2 22:23:08 2003
-@@ -1,4 +1,4 @@
+--- ../MailScanner-4.26.5.orig/docs/man/MailScanner.8	Mon Jan 26 16:20:56 2004
++++ docs/man/MailScanner.8	Mon Jan 26 16:21:58 2004
+@@ -1,7 +1,7 @@
 -.TH "MailScanner" "8" "4.25-10" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.26-3" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.26.5-1" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
- MailScanner \- Virus/Spam Scanner for Sendmail and Exim
+-MailScanner \- Virus/Spam Scanner for Sendmail and Exim
++MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
+ .SH "SYNOPSIS"
+ .LP 
+ \fBMailScanner\fR [\fIconfigfile\fR]
diff --git a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html
index fbd69895098f..0b599495bed9 100644
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html
@@ -1,9 +1,20 @@
---- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8.html	Tue Dec  2 22:22:27 2003
-+++ docs/man/MailScanner.8.html	Tue Dec  2 22:23:08 2003
+--- ../MailScanner-4.26.5.orig/docs/man/MailScanner.8.html	Mon Jan 26 16:20:56 2004
++++ docs/man/MailScanner.8.html	Mon Jan 26 16:21:58 2004
 @@ -1,5 +1,5 @@
  <!-- Creator     : groff version 1.19 -->
 -<!-- CreationDate: Wed Nov 19 17:14:30 2003 -->
-+<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
++<!-- CreationDate: Mon Jan 26 16:21:15 2004 -->
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
  "http://www.w3.org/TR/html4/loose.dtd">
  <html>
+@@ -27,8 +27,8 @@
+ <tr valign="top" align="left">
+ <td width="11%"></td>
+ <td width="89%">
+-<p>MailScanner &minus; Virus/Spam Scanner for Sendmail and
+-Exim</p>
++<p>MailScanner &minus; Virus/Spam Scanner for Sendmail, Exim
++and Postfix</p>
+ </td>
+ </table>
+ <a name="SYNOPSIS"></a>
diff --git a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5 b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
index 8e03c558f9c1..0e767f4fd238 100644
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
@@ -1,8 +1,149 @@
---- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5	Tue Dec  2 22:22:27 2003
-+++ docs/man/MailScanner.conf.5	Tue Dec  2 22:23:08 2003
+--- ../MailScanner-4.26.5.orig/docs/man/MailScanner.conf.5	Mon Jan 26 16:20:56 2004
++++ docs/man/MailScanner.conf.5	Mon Jan 26 16:21:58 2004
 @@ -1,4 +1,4 @@
 -.TH "MailScanner.conf" "5" "4.25-10" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.26-3" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.26.5-1" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner.conf \- Main configuration for MailScanner
+@@ -1408,6 +1408,29 @@
+ 
+ .br 
+ If a message is spam, and this option is set, then a header will be added to the message containing 1 character for each point in the SpamAssassin score. This allows users to choose for themselves the SpamAssassin scores at which they want to do different things with the message, such as file it or delete it. 
++
++
++.TP 
++\fBRebuild Bayes Every\fR
++Default: 0
++.br 
++
++.br 
++If you are using the Bayesian statistics engine on a busy server, you may well need to force a Bayesian database rebuild and expiry at regular intervals. This is measures in seconds. 24 hours = 86400 seconds. To disable this feature set this to 0.
++
++
++.TP 
++\fBWait During Bayes Rebuild\fR
++Default: no
++.br 
++
++.br 
++# The Bayesian database rebuild and expiry may take a 2 or 3 minutes
++# to complete. During this time you can either wait, or simply
++# disable SpamAssassin checks until it has completed.
++WaitDuringBayesRebuild = no
++
++
+ .SH "What to do with spam"
+ .TP 
+ \fBSpam Actions\fR
+@@ -1431,11 +1454,11 @@
+ .br 
+ 
+ .br 
+-"bounce" \- a rejection message is sent back to the sender 
++"forward" \- an email address is supplied, to which the message is forwarded 
+ .br 
+ 
+ .br 
+-"forward" \- an email address is supplied, to which the message is forwarded 
++"notify" \- Send the recipients a short notification that spam addressed to them was not delivered. They can then take action to request retrieval of the orginal message if they think it was not spam.
+ .br 
+ 
+ .br 
+@@ -1462,23 +1485,15 @@
+ 
+ .TP 
+ \fBSender Spam Report\fR
+-Default: /opt/MailScanner/etc/reports/en/sender.spam.report.txt
+-.br 
+-Default Linux: /etc/MailScanner/reports/en/sender.spam.report.txt
+-.br 
+-Default FreeBSD: /usr/local/share/MailScanner/reports/en/sender.spam.report.txt
++Default: %reports\-dir%/sender.spam.report.txt
+ .br 
+ 
+-.br W
+-hen the "bounce" spam action is applied to a message that triggered both a "Spam List" check and SpamAssassin, this file gives the text to put in that message. 
++.br 
++When the "bounce" spam action is applied to a message that triggered both a "Spam List" check and SpamAssassin, this file gives the text to put in that message. 
+ 
+ .TP 
+ \fBSender Spam List Report\fR
+-Default: /opt/MailScanner/etc/reports/en/sender.spam.rbl.report.txt
+-.br 
+-Default Linux: /etc/MailScanner/reports/en/sender.spam.rbl.report.txt
+-.br 
+-Default FreeBSD: /usr/local/share/MailScanner/reports/en/sender.spam.rbl.report.txt
++Default: %reports\-dir%/sender.spam.rbl.report.txt
+ .br 
+ 
+ .br 
+@@ -1486,11 +1501,7 @@
+  
+ .TP 
+ \fBSender SpamAssassin Report\fR
+-Default: /opt/MailScanner/etc/reports/en/sender.spam.sa.report.txt
+-.br 
+-Default Linux: /etc/MailScanner/reports/en/sender.spam.sa.report.txt
+-.br 
+-Default FreeBSD: /usr/local/share/MailScanner/reports/en/sender.spam.sa.report.txt
++Default: %reports\-dir%/sender.spam.sa.report.txt
+ .br 
+ 
+ .br 
+@@ -1498,15 +1509,20 @@
+ 
+ .TP 
+ \fBInline Spam Warning\fR
+-Default: /opt/MailScanner/etc/reports/en/inline.spam.warning.txt
++Default: %reports\-dir%/inline.spam.warning.txt
+ .br 
+-Default Linux: /etc/MailScanner/reports/en/inline.spam.warning.txt
++
+ .br 
+-Default FreeBSD: /usr/local/share/MailScanner/reports/en/inline.spam.warning.txt
++If you use the 'attachment' Spam Action or High Scoring Spam Action then this is the location of inline spam report that is inserted at the top of the message.
++
++.TP 
++\fBRecipient Spam Report\fR
++Default: %reports\-dir%/recipient.spam.report.txt
+ .br 
+ 
+ .br 
+-If you use the 'attachment' Spam Action or High Scoring Spam Action then this is the location of inline spam report that is inserted at the top of the message.
++If you use the 'notify' Spam Action or High Scoring Spam Action then this is the location of the notification message that is sent to the original recipients of the message.
++
+ .SH "System logging"
+ .TP 
+ \fBSyslog Facility\fR
+@@ -1515,12 +1531,12 @@
+ 
+ .br 
+ This is the name of the "facility" used by syslogd to log MailScanner's messages. If this doesn't mean anything to you, then either leave it alone or else read the "syslogd" man page. 
+-.TP
++.TP 
+ \fBLog Speed\fR
+ Default: no
+-.br
++.br 
+ 
+-.br
++.br 
+ Do you want to log the processing speed for each section of the code for a batch? This can be very useful for diagnosing speed problems, particularly in spam checking.
+ 
+ .TP 
+@@ -1530,6 +1546,14 @@
+ 
+ .br 
+ If this option is set, then every spam message will be logged to syslog. If you get a lot of spam, or your server load is high, you will want to leave this option switched off. But if you are having trouble with spam detection, setting this to "yes" temporarily can provide useful debugging output. 
++
++.TP 
++\fBLog Non Spam\fR
++Default: no
++.br 
++
++.br 
++Do you want all non\-spam to be logged? Useful if you want to see all the SpamAssassin reports of mail that was marked as non\-spam. Note: It will generate a lot of log traffic.
+ 
+ .TP 
+ \fBLog Permitted Filenames\fR
diff --git a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html
index d78f9334e05b..54d47a62a87d 100644
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html
@@ -1,9 +1,194 @@
---- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5.html	Tue Dec  2 22:22:27 2003
-+++ docs/man/MailScanner.conf.5.html	Tue Dec  2 22:23:08 2003
+--- ../MailScanner-4.26.5.orig/docs/man/MailScanner.conf.5.html	Mon Jan 26 16:20:56 2004
++++ docs/man/MailScanner.conf.5.html	Mon Jan 26 16:21:58 2004
 @@ -1,5 +1,5 @@
  <!-- Creator     : groff version 1.19 -->
 -<!-- CreationDate: Wed Nov 26 20:07:41 2003 -->
-+<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
++<!-- CreationDate: Mon Jan 26 16:21:15 2004 -->
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
  "http://www.w3.org/TR/html4/loose.dtd">
  <html>
+@@ -3780,6 +3780,51 @@
+ file it or delete it.</p>
+ </td>
+ </table>
++<!-- INDENTATION -->
++<table width="100%" border=0 rules="none" frame="void"
++       cols="2" cellspacing="0" cellpadding="0">
++<tr valign="top" align="left">
++<td width="11%"></td>
++<td width="89%">
++<p><b>Rebuild Bayes Every</b></p></td>
++</table>
++<!-- INDENTATION -->
++<table width="100%" border=0 rules="none" frame="void"
++       cols="2" cellspacing="0" cellpadding="0">
++<tr valign="top" align="left">
++<td width="22%"></td>
++<td width="78%">
++<p>Default: 0</p>
++<!-- INDENTATION -->
++<p>If you are using the Bayesian statistics engine on a busy
++server, you may well need to force a Bayesian database
++rebuild and expiry at regular intervals. This is measures in
++seconds. 24 hours = 86400 seconds. To disable this feature
++set this to 0.</p>
++</td>
++</table>
++<!-- INDENTATION -->
++<table width="100%" border=0 rules="none" frame="void"
++       cols="2" cellspacing="0" cellpadding="0">
++<tr valign="top" align="left">
++<td width="11%"></td>
++<td width="89%">
++<p><b>Wait During Bayes Rebuild</b></p></td>
++</table>
++<!-- INDENTATION -->
++<table width="100%" border=0 rules="none" frame="void"
++       cols="2" cellspacing="0" cellpadding="0">
++<tr valign="top" align="left">
++<td width="22%"></td>
++<td width="78%">
++<p>Default: no</p>
++<!-- INDENTATION -->
++<p># The Bayesian database rebuild and expiry may take a 2
++or 3 minutes # to complete. During this time you can either
++wait, or simply # disable SpamAssassin checks until it has
++completed. WaitDuringBayesRebuild = no</p>
++</td>
++</table>
+ <a name="What to do with spam"></a>
+ <h2>What to do with spam</h2>
+ <!-- INDENTATION -->
+@@ -3810,12 +3855,14 @@
+ <p>&quot;store&quot; &minus; the message is stored in the
+ quarantine</p>
+ <!-- INDENTATION -->
+-<p>&quot;bounce&quot; &minus; a rejection message is sent
+-back to the sender</p>
+-<!-- INDENTATION -->
+ <p>&quot;forward&quot; &minus; an email address is supplied,
+ to which the message is forwarded</p>
+ <!-- INDENTATION -->
++<p>&quot;notify&quot; &minus; Send the recipients a short
++notification that spam addressed to them was not delivered.
++They can then take action to request retrieval of the
++orginal message if they think it was not spam.</p>
++<!-- INDENTATION -->
+ <p>&quot;striphtml&quot; &minus; convert all in&minus;line
+ HTML content in the message to be stripped to plain text,
+ which removes all images and scripts and so can be used to
+@@ -3888,14 +3935,9 @@
+ <tr valign="top" align="left">
+ <td width="22%"></td>
+ <td width="78%">
+-<p>Default:
+-/opt/MailScanner/etc/reports/en/sender.spam.report.txt<br>
+-Default Linux:
+-/etc/MailScanner/reports/en/sender.spam.report.txt<br>
+-Default FreeBSD:
+-/usr/local/share/MailScanner/reports/en/sender.spam.report.txt</p>
++<p>Default: %reports&minus;dir%/sender.spam.report.txt</p>
+ <!-- INDENTATION -->
+-<p>hen the &quot;bounce&quot; spam action is applied to a
++<p>When the &quot;bounce&quot; spam action is applied to a
+ message that triggered both a &quot;Spam List&quot; check
+ and SpamAssassin, this file gives the text to put in that
+ message.</p>
+@@ -3916,11 +3958,7 @@
+ <td width="22%"></td>
+ <td width="78%">
+ <p>Default:
+-/opt/MailScanner/etc/reports/en/sender.spam.rbl.report.txt<br>
+-Default Linux:
+-/etc/MailScanner/reports/en/sender.spam.rbl.report.txt<br>
+-Default FreeBSD:
+-/usr/local/share/MailScanner/reports/en/sender.spam.rbl.report.txt</p>
++%reports&minus;dir%/sender.spam.rbl.report.txt</p>
+ <!-- INDENTATION -->
+ <p>When the &quot;bounce&quot; spam action is applied to a
+ message that triggered a &quot;Spam List&quot; check, this
+@@ -3942,11 +3980,7 @@
+ <td width="22%"></td>
+ <td width="78%">
+ <p>Default:
+-/opt/MailScanner/etc/reports/en/sender.spam.sa.report.txt<br>
+-Default Linux:
+-/etc/MailScanner/reports/en/sender.spam.sa.report.txt<br>
+-Default FreeBSD:
+-/usr/local/share/MailScanner/reports/en/sender.spam.sa.report.txt</p>
++%reports&minus;dir%/sender.spam.sa.report.txt</p>
+ <!-- INDENTATION -->
+ <p>When the &quot;bounce&quot; spam action is applied to a
+ message that triggered SpamAssassin, this file gives the
+@@ -3967,18 +4001,36 @@
+ <tr valign="top" align="left">
+ <td width="22%"></td>
+ <td width="78%">
+-<p>Default:
+-/opt/MailScanner/etc/reports/en/inline.spam.warning.txt<br>
+-Default Linux:
+-/etc/MailScanner/reports/en/inline.spam.warning.txt<br>
+-Default FreeBSD:
+-/usr/local/share/MailScanner/reports/en/inline.spam.warning.txt</p>
++<p>Default: %reports&minus;dir%/inline.spam.warning.txt</p>
+ <!-- INDENTATION -->
+ <p>If you use the &rsquo;attachment&rsquo; Spam Action or
+ High Scoring Spam Action then this is the location of inline
+ spam report that is inserted at the top of the message.</p>
+ </td>
+ </table>
++<!-- INDENTATION -->
++<table width="100%" border=0 rules="none" frame="void"
++       cols="2" cellspacing="0" cellpadding="0">
++<tr valign="top" align="left">
++<td width="11%"></td>
++<td width="89%">
++<p><b>Recipient Spam Report</b></p></td>
++</table>
++<!-- INDENTATION -->
++<table width="100%" border=0 rules="none" frame="void"
++       cols="2" cellspacing="0" cellpadding="0">
++<tr valign="top" align="left">
++<td width="22%"></td>
++<td width="78%">
++<p>Default:
++%reports&minus;dir%/recipient.spam.report.txt</p>
++<!-- INDENTATION -->
++<p>If you use the &rsquo;notify&rsquo; Spam Action or High
++Scoring Spam Action then this is the location of the
++notification message that is sent to the original recipients
++of the message.</p>
++</td>
++</table>
+ <a name="System logging"></a>
+ <h2>System logging</h2>
+ <!-- INDENTATION -->
+@@ -4047,6 +4099,28 @@
+ off. But if you are having trouble with spam detection,
+ setting this to &quot;yes&quot; temporarily can provide
+ useful debugging output.</p>
++</td>
++</table>
++<!-- INDENTATION -->
++<table width="100%" border=0 rules="none" frame="void"
++       cols="2" cellspacing="0" cellpadding="0">
++<tr valign="top" align="left">
++<td width="11%"></td>
++<td width="89%">
++<p><b>Log Non Spam</b></p></td>
++</table>
++<!-- INDENTATION -->
++<table width="100%" border=0 rules="none" frame="void"
++       cols="2" cellspacing="0" cellpadding="0">
++<tr valign="top" align="left">
++<td width="22%"></td>
++<td width="78%">
++<p>Default: no</p>
++<!-- INDENTATION -->
++<p>Do you want all non&minus;spam to be logged? Useful if
++you want to see all the SpamAssassin reports of mail that
++was marked as non&minus;spam. Note: It will generate a lot
++of log traffic.</p>
+ </td>
+ </table>
+ <!-- INDENTATION -->
diff --git a/mail/mailscanner-devel/pkg-plist b/mail/mailscanner-devel/pkg-plist
index 2fd7f3b670f4..de586dad5361 100644
--- a/mail/mailscanner-devel/pkg-plist
+++ b/mail/mailscanner-devel/pkg-plist
@@ -96,6 +96,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/cy+en/stored.content.message.txt.sample
 %%DATADIR%%/reports/cy+en/stored.filename.message.txt.sample
 %%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
+%%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/cz/deleted.content.message.txt.sample
 %%DATADIR%%/reports/cz/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
@@ -117,6 +119,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/cz/stored.content.message.txt.sample
 %%DATADIR%%/reports/cz/stored.filename.message.txt.sample
 %%DATADIR%%/reports/cz/stored.virus.message.txt.sample
+%%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/de/README.1ST.sample
 %%DATADIR%%/reports/de/deleted.content.message.txt.sample
 %%DATADIR%%/reports/de/deleted.filename.message.txt.sample
@@ -139,6 +143,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/de/stored.content.message.txt.sample
 %%DATADIR%%/reports/de/stored.filename.message.txt.sample
 %%DATADIR%%/reports/de/stored.virus.message.txt.sample
+%%DATADIR%%/reports/de/recipient.spam.report.txt.sample
+%%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
 %%DATADIR%%/reports/dk/deleted.content.message.txt.sample
 %%DATADIR%%/reports/dk/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
@@ -160,6 +166,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/dk/stored.content.message.txt.sample
 %%DATADIR%%/reports/dk/stored.filename.message.txt.sample
 %%DATADIR%%/reports/dk/stored.virus.message.txt.sample
+%%DATADIR%%/reports/dk/recipient.spam.report.txt.sample
+%%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
 %%DATADIR%%/reports/en/deleted.content.message.txt.sample
 %%DATADIR%%/reports/en/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/en/deleted.virus.message.txt.sample
@@ -181,6 +189,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/en/stored.content.message.txt.sample
 %%DATADIR%%/reports/en/stored.filename.message.txt.sample
 %%DATADIR%%/reports/en/stored.virus.message.txt.sample
+%%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/en/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/es/deleted.content.message.txt.sample
 %%DATADIR%%/reports/es/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/es/deleted.virus.message.txt.sample
@@ -202,6 +212,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/es/stored.content.message.txt.sample
 %%DATADIR%%/reports/es/stored.filename.message.txt.sample
 %%DATADIR%%/reports/es/stored.virus.message.txt.sample
+%%DATADIR%%/reports/es/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/es/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/fr/deleted.content.message.txt.sample
 %%DATADIR%%/reports/fr/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
@@ -223,6 +235,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/fr/stored.content.message.txt.sample
 %%DATADIR%%/reports/fr/stored.filename.message.txt.sample
 %%DATADIR%%/reports/fr/stored.virus.message.txt.sample
+%%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/fr/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/hu/deleted.content.message.txt.sample
 %%DATADIR%%/reports/hu/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
@@ -244,6 +258,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/hu/stored.content.message.txt.sample
 %%DATADIR%%/reports/hu/stored.filename.message.txt.sample
 %%DATADIR%%/reports/hu/stored.virus.message.txt.sample
+%%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/hu/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/it/deleted.content.message.txt.sample
 %%DATADIR%%/reports/it/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/it/deleted.virus.message.txt.sample
@@ -265,6 +281,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/it/stored.content.message.txt.sample
 %%DATADIR%%/reports/it/stored.filename.message.txt.sample
 %%DATADIR%%/reports/it/stored.virus.message.txt.sample
+%%DATADIR%%/reports/it/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/it/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/nl/deleted.content.message.txt.sample
 %%DATADIR%%/reports/nl/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
@@ -286,6 +304,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/nl/stored.content.message.txt.sample
 %%DATADIR%%/reports/nl/stored.filename.message.txt.sample
 %%DATADIR%%/reports/nl/stored.virus.message.txt.sample
+%%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/nl/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/pt_br/deleted.content.message.txt.sample
 %%DATADIR%%/reports/pt_br/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/pt_br/deleted.virus.message.txt.sample
@@ -307,6 +327,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/pt_br/stored.content.message.txt.sample
 %%DATADIR%%/reports/pt_br/stored.filename.message.txt.sample
 %%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
+%%DATADIR%%/reports/pt_br/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/pt_br/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/ro/deleted.content.message.txt.sample
 %%DATADIR%%/reports/ro/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
@@ -328,6 +350,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/ro/stored.content.message.txt.sample
 %%DATADIR%%/reports/ro/stored.filename.message.txt.sample
 %%DATADIR%%/reports/ro/stored.virus.message.txt.sample
+%%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/ro/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/se/README.sample
 %%DATADIR%%/reports/se/deleted.content.message.txt.sample
 %%DATADIR%%/reports/se/deleted.filename.message.txt.sample
@@ -350,6 +374,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/se/stored.content.message.txt.sample
 %%DATADIR%%/reports/se/stored.filename.message.txt.sample
 %%DATADIR%%/reports/se/stored.virus.message.txt.sample
+%%DATADIR%%/reports/se/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/se/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/sk/deleted.content.message.txt.sample
 %%DATADIR%%/reports/sk/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
@@ -371,6 +397,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/sk/stored.content.message.txt.sample
 %%DATADIR%%/reports/sk/stored.filename.message.txt.sample
 %%DATADIR%%/reports/sk/stored.virus.message.txt.sample
+%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/sk/recipient.spam.report.txt.sample
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL