1 files changed, 47 insertions, 123 deletions

diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 4e4ae71c9e77..cd4da8d7e726 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -128,6 +128,9 @@ sbin/MailScanner
 %%DATADIR%%/reports/ca/stored.content.message.txt.sample
 %%DATADIR%%/reports/ca/stored.filename.message.txt.sample
 %%DATADIR%%/reports/ca/stored.virus.message.txt.sample
+%%DATADIR%%/reports/ca/deleted.size.message.txt.sample
+%%DATADIR%%/reports/ca/sender.size.report.txt.sample
+%%DATADIR%%/reports/ca/stored.size.message.txt.sample
 %%DATADIR%%/reports/cy+en/deleted.content.message.txt.sample
 %%DATADIR%%/reports/cy+en/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/cy+en/deleted.virus.message.txt.sample
@@ -152,6 +155,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/cy+en/sender.size.report.txt.sample
+%%DATADIR%%/reports/cy+en/stored.size.message.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
@@ -176,6 +182,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/cz/sender.size.report.txt.sample
+%%DATADIR%%/reports/cz/stored.size.message.txt.sample
 %%DATADIR%%/reports/de/README.1ST.sample
 %%DATADIR%%/reports/de/deleted.content.message.txt.sample
 %%DATADIR%%/reports/de/deleted.filename.message.txt.sample
@@ -201,6 +210,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/de/sender.size.report.txt.sample
+%%DATADIR%%/reports/de/stored.size.message.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
@@ -225,6 +237,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/dk/sender.size.report.txt.sample
+%%DATADIR%%/reports/dk/stored.size.message.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
@@ -249,6 +264,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/en/sender.size.report.txt.sample
+%%DATADIR%%/reports/en/stored.size.message.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
@@ -273,6 +291,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/es/sender.size.report.txt.sample
+%%DATADIR%%/reports/es/stored.size.message.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
@@ -297,6 +318,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/fr/sender.size.report.txt.sample
+%%DATADIR%%/reports/fr/stored.size.message.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
@@ -321,6 +345,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/hu/sender.size.report.txt.sample
+%%DATADIR%%/reports/hu/stored.size.message.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
@@ -345,6 +372,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/it/sender.size.report.txt.sample
+%%DATADIR%%/reports/it/stored.size.message.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
@@ -369,6 +399,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/nl/sender.size.report.txt.sample
+%%DATADIR%%/reports/nl/stored.size.message.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
@@ -393,6 +426,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/pt_br/sender.size.report.txt.sample
+%%DATADIR%%/reports/pt_br/stored.size.message.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
@@ -417,6 +453,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/ro/sender.size.report.txt.sample
+%%DATADIR%%/reports/ro/stored.size.message.txt.sample
 %%DATADIR%%/reports/se/README.sample
 %%DATADIR%%/reports/se/deleted.content.message.txt.sample
 %%DATADIR%%/reports/se/deleted.filename.message.txt.sample
@@ -442,6 +481,9 @@ sbin/MailScanner
 %%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/deleted.size.message.txt.sample
+%%DATADIR%%/reports/se/sender.size.report.txt.sample
+%%DATADIR%%/reports/se/stored.size.message.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
@@ -466,132 +508,14 @@ sbin/MailScanner
 %%DATADIR%%/reports/sk/stored.content.message.txt.sample
 %%DATADIR%%/reports/sk/stored.filename.message.txt.sample
 %%DATADIR%%/reports/sk/stored.virus.message.txt.sample
-%%PORTDOCS%%%%DOCSDIR%%/ellen2.old.jpg
-%%PORTDOCS%%%%DOCSDIR%%/ellenweblogo.png
-%%PORTDOCS%%%%DOCSDIR%%/Book.Dec04-Aug05.pdf
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.port
-%%PORTDOCS%%%%DOCSDIR%%/FreeBSD.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%DATADIR%%/reports/sk/deleted.size.message.txt.sample
+%%DATADIR%%/reports/sk/sender.size.report.txt.sample
+%%DATADIR%%/reports/sk/stored.size.message.txt.sample
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
+%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.OpenBSD
-%%PORTDOCS%%%%DOCSDIR%%/MailScannerFlyer.pdf
-%%PORTDOCS%%%%DOCSDIR%%/QuickInstall.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
-%%PORTDOCS%%%%DOCSDIR%%/README.sql-logging
-%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/book.cover.gif
-%%PORTDOCS%%%%DOCSDIR%%/building.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs.html
-%%PORTDOCS%%%%DOCSDIR%%/donations.shtml
-%%PORTDOCS%%%%DOCSDIR%%/downloadgraphs.shtml
-%%PORTDOCS%%%%DOCSDIR%%/downloads.shtml
-%%PORTDOCS%%%%DOCSDIR%%/ecs.css
-%%PORTDOCS%%%%DOCSDIR%%/ellen2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/faq.shtml
-%%PORTDOCS%%%%DOCSDIR%%/images/JulianField1_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/bigmailscannerlogo.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/smallmailscannerlogo.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField3.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField4.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField5.jpg
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.new.html
-%%PORTDOCS%%%%DOCSDIR%%/install/ClamAVModule.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/OS-virus-scan-web.htm
-%%PORTDOCS%%%%DOCSDIR%%/install/README.trend
-%%PORTDOCS%%%%DOCSDIR%%/install/SAVI.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/codestatus.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/conf.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/exim-old.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/exim.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/filesnscripts.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/gcc.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/index.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/linux.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/mailscanner.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/mcafee.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.1.1
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.1.1
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.1.1
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.55
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.61
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.63
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.0.0
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.0.3
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.0.4
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.1.0
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.0
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.3
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.4
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.1.0
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.61
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.63
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.0.0
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.0.3
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.0.4
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.1.0
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch2.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch3.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch4.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/osborne.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/other.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/perl.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/postfix.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/sendmail.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/solaris9.txt
-%%PORTDOCS%%%%DOCSDIR%%/install/sophos.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/spamassassin.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/tnef.shtml
-%%PORTDOCS%%%%DOCSDIR%%/install/zmailer.shtml
-%%PORTDOCS%%%%DOCSDIR%%/introduction.shtml
-%%PORTDOCS%%%%DOCSDIR%%/last-spam-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/mailscanner_trans.gif
-%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8
-%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8.html
-%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5
-%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/mrtg.shtml
-%%PORTDOCS%%%%DOCSDIR%%/newinv4.shtml
-%%PORTDOCS%%%%DOCSDIR%%/nextversion.shtml
-%%PORTDOCS%%%%DOCSDIR%%/oldnews.shtml
-%%PORTDOCS%%%%DOCSDIR%%/osdir.png
-%%PORTDOCS%%%%DOCSDIR%%/performance.shtml
-%%PORTDOCS%%%%DOCSDIR%%/phishing3.png
-%%PORTDOCS%%%%DOCSDIR%%/phishingcartoon.gif
-%%PORTDOCS%%%%DOCSDIR%%/poetry.shtml
-%%PORTDOCS%%%%DOCSDIR%%/poweredby.google.gif
-%%PORTDOCS%%%%DOCSDIR%%/poweredby.transtec.gif
-%%PORTDOCS%%%%DOCSDIR%%/phishing.html
-%%PORTDOCS%%%%DOCSDIR%%/phishing.jpg
-%%PORTDOCS%%%%DOCSDIR%%/phishing2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/phishingnet.info/index.html
-%%PORTDOCS%%%%DOCSDIR%%/phishingnet.info/PhishingNet.gif
-%%PORTDOCS%%%%DOCSDIR%%/pressreleases.html
-%%PORTDOCS%%%%DOCSDIR%%/presentations.html
-%%PORTDOCS%%%%DOCSDIR%%/press.html
-%%PORTDOCS%%%%DOCSDIR%%/qmail/qmail-queue.zip
-%%PORTDOCS%%%%DOCSDIR%%/readme.shtml
-%%PORTDOCS%%%%DOCSDIR%%/reject.html
-%%PORTDOCS%%%%DOCSDIR%%/sobig.html
-%%PORTDOCS%%%%DOCSDIR%%/store.html
-%%PORTDOCS%%%%DOCSDIR%%/support.html
-%%PORTDOCS%%%%DOCSDIR%%/transtec.logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/users.shtml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/qmail
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/mcp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/install
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/phishingnet.info
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%SPAMASSASSIN%%%%SPAMASSASSIN_SYMLINK%%@exec [ -e %D/etc/mail/spamassassin/mailscanner.cf ] ||  ln -s %D/etc/MailScanner/spam.assassin.prefs.conf %D/etc/mail/spamassassin/mailscanner.cf
 %%SPAMASSASSIN%%%%SPAMASSASSIN_SYMLINK%%@unexec [ -L %D/etc/mail/spamassassin/mailscanner.cf ] &&  rm -f %D/etc/mail/spamassassin/mailscanner.cf