diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/Makefile /server-root/ports/mail/mailscanner/Makefile
--- /server-root/ports/mail/mailscanner.orig/Makefile	Fri Mar 19 17:26:08 2004
+++ /server-root/ports/mail/mailscanner/Makefile	Thu Apr  1 15:19:11 2004
@@ -2,14 +2,14 @@
 # Date created:				17 March 2003
 # Whom:					Jan-Peter Koopmann <j.koopmann@seceidos.de>
 #
-# $FreeBSD: ports/mail/mailscanner/Makefile,v 1.16 2004/03/19 16:26:08 arved Exp $
+# $FreeBSD: ports/mail/mailscannerl/Makefile,v 1.14 2004/03/19 16:20:20 arved Exp $
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.28.6
+PORTVERSION=	4.29.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
-DISTNAME=	MailScanner-${PORTVERSION}-${PATCHLEVEL}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}
 
 MAINTAINER=	j.koopmann@seceidos.de
 COMMENT=	Powerful virus/spam scanning framework for mail gateways
@@ -23,6 +23,7 @@
 	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
+	${SITE_PERL}/Convert/BinHex.pm:${PORTSDIR}/converters/p5-Convert-BinHex \
 	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
 	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
@@ -34,10 +35,11 @@
 
 CONFLICTS=	MailScanner-devel-*
 
+PATCHLEVEL=	1
+
 USE_PERL5=	yes
 
-PATCHLEVEL=	1
-WRKSRC=		${WRKDIR}/MailScanner-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN8=		MailScanner.8
@@ -73,7 +75,8 @@
 		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
 		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
-		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
+		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g; \
+		s,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g;' \
 		${WRKSRC}/etc/MailScanner.conf
 	${PERL} -pi -e \
 		's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g; \
@@ -107,7 +110,6 @@
 .endfor
 
 do-install:
-	#
 	# Step 1: Install libexec files
 	#
 	${MKDIR} ${PREFIX}/libexec/MailScanner
@@ -147,6 +149,7 @@
 	# Step 4: Install lib
 	#
 	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner
+	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner/CustomFunctions
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm \
 		${PREFIX}/lib/MailScanner/MailScanner.pm
 	cd ${WRKSRC}/lib/MailScanner && ${FIND} * -type f ! -name "*.orig" -exec \
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/distinfo /server-root/ports/mail/mailscanner/distinfo
--- /server-root/ports/mail/mailscanner.orig/distinfo	Fri Mar 19 17:26:08 2004
+++ /server-root/ports/mail/mailscanner/distinfo	Thu Apr  1 15:12:56 2004
@@ -1,2 +1,2 @@
-MD5 (MailScanner-4.28.6-1.tar.gz) = 5b736da352552059378974813b27d912
-SIZE (MailScanner-4.28.6-1.tar.gz) = 969939
+MD5 (MailScanner-4.29.7-1.tar.gz) = 89e6b726026007bd9e44ccfdb1048e11
+SIZE (MailScanner-4.29.7-1.tar.gz) = 980321
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8 /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8
--- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8	Fri Mar 19 17:26:08 2004
+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8	Thu Apr  1 15:16:28 2004
@@ -1,8 +1,8 @@
---- ../MailScanner-4.28.6.orig/docs/man/MailScanner.8	Thu Mar 18 13:45:26 2004
-+++ docs/man/MailScanner.8	Thu Mar 18 13:45:36 2004
+--- ../MailScanner-4.29.7.orig/docs/man/MailScanner.8	Thu Apr  1 15:14:21 2004
++++ docs/man/MailScanner.8	Thu Apr  1 15:16:01 2004
 @@ -1,4 +1,4 @@
--.TH "MailScanner" "8" "4.28.5" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.28.6" "Julian Field" "Mail"
+-.TH "MailScanner" "8" "4.29.5" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.29.7" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5 /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
--- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5	Fri Mar 19 17:26:08 2004
+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5	Thu Apr  1 15:16:28 2004
@@ -1,8 +1,8 @@
---- ../MailScanner-4.28.6.orig/docs/man/MailScanner.conf.5	Thu Mar 18 13:45:26 2004
-+++ docs/man/MailScanner.conf.5	Thu Mar 18 13:45:39 2004
+--- ../MailScanner-4.29.7.orig/docs/man/MailScanner.conf.5	Thu Apr  1 15:14:21 2004
++++ docs/man/MailScanner.conf.5	Thu Apr  1 15:16:09 2004
 @@ -1,4 +1,4 @@
--.TH "MailScanner.conf" "5" "4.28.5" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.28.6" "Julian Field" "Mail"
+-.TH "MailScanner.conf" "5" "4.29.5" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.29.7" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner.conf \- Main configuration for MailScanner
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-lib:clamav-wrapper /server-root/ports/mail/mailscanner/files/patch-lib:clamav-wrapper
--- /server-root/ports/mail/mailscanner.orig/files/patch-lib:clamav-wrapper	Wed Mar  3 08:07:48 2004
+++ /server-root/ports/mail/mailscanner/files/patch-lib:clamav-wrapper	Thu Apr  1 15:13:15 2004
@@ -1,5 +1,7 @@
---- ../MailScanner-4.27.7.orig/lib/clamav-wrapper	Mon Mar  1 15:28:58 2004
-+++ lib/clamav-wrapper	Mon Mar  1 15:30:00 2004
+$FreeBSD: ports/mail/mailscanner-devel/files/patch-lib:clamav-wrapper,v 1.1 2004/03/02 17:29:42 glewis Exp $
+
+--- ../MailScanner-4.27.5.orig/lib/clamav-wrapper	Thu Feb 26 15:25:51 2004
++++ lib/clamav-wrapper	Thu Feb 26 15:26:23 2004
 @@ -51,6 +51,9 @@
  
  # You may want to check this script for bash-isms
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/pkg-plist /server-root/ports/mail/mailscanner/pkg-plist
--- /server-root/ports/mail/mailscanner.orig/pkg-plist	Mon Mar  8 22:51:56 2004
+++ /server-root/ports/mail/mailscanner/pkg-plist	Thu Apr  1 15:11:26 2004
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/mail/mailscanner/pkg-plist,v 1.10 2004/03/08 21:51:56 sergei Exp $
+@comment $FreeBSD: ports/mail/mailscanner-devel/pkg-plist,v 1.11 2004/03/19 16:20:20 arved Exp $
 etc/MailScanner/MailScanner.conf.sample
 etc/MailScanner/filename.rules.conf.sample
 etc/MailScanner/filetype.rules.conf.sample
@@ -11,6 +11,7 @@
 etc/rc.d/mailscanner.sh.sample
 etc/rc.d/mta.sh.sample
 lib/MailScanner/MailScanner.pm
+lib/MailScanner/MailScanner/BinHex.pm
 lib/MailScanner/MailScanner/Config.pm
 lib/MailScanner/MailScanner/ConfigDefs.pl
 lib/MailScanner/MailScanner/CustomConfig.pm
@@ -42,6 +43,7 @@
 lib/MailScanner/MailScanner/ZMDiskStore.pm
 lib/MailScanner/MailScanner/ZMailer.pm
 lib/MailScanner/MailScanner/notes.txt
+lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
 libexec/MailScanner/MailScanner
 libexec/MailScanner/antivir-autoupdate.sample
 libexec/MailScanner/antivir-wrapper.sample
@@ -112,8 +114,6 @@
 %%DATADIR%%/reports/cy+en/inline.warning.html.sample
 %%DATADIR%%/reports/cy+en/inline.warning.txt.sample
 %%DATADIR%%/reports/cy+en/languages.conf.sample
-%%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.error.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.filename.report.txt.sample
@@ -125,6 +125,8 @@
 %%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
@@ -135,8 +137,6 @@
 %%DATADIR%%/reports/cz/inline.warning.html.sample
 %%DATADIR%%/reports/cz/inline.warning.txt.sample
 %%DATADIR%%/reports/cz/languages.conf.sample
-%%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/cz/sender.content.report.txt.sample
 %%DATADIR%%/reports/cz/sender.error.report.txt.sample
 %%DATADIR%%/reports/cz/sender.filename.report.txt.sample
@@ -148,6 +148,8 @@
 %%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
@@ -159,8 +161,6 @@
 %%DATADIR%%/reports/de/inline.warning.html.sample
 %%DATADIR%%/reports/de/inline.warning.txt.sample
 %%DATADIR%%/reports/de/languages.conf.sample
-%%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/de/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/de/sender.content.report.txt.sample
 %%DATADIR%%/reports/de/sender.error.report.txt.sample
 %%DATADIR%%/reports/de/sender.filename.report.txt.sample
@@ -172,6 +172,8 @@
 %%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
@@ -182,8 +184,6 @@
 %%DATADIR%%/reports/dk/inline.warning.html.sample
 %%DATADIR%%/reports/dk/inline.warning.txt.sample
 %%DATADIR%%/reports/dk/languages.conf.sample
-%%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/dk/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/dk/sender.content.report.txt.sample
 %%DATADIR%%/reports/dk/sender.error.report.txt.sample
 %%DATADIR%%/reports/dk/sender.filename.report.txt.sample
@@ -195,6 +195,8 @@
 %%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
@@ -205,8 +207,6 @@
 %%DATADIR%%/reports/en/inline.warning.html.sample
 %%DATADIR%%/reports/en/inline.warning.txt.sample
 %%DATADIR%%/reports/en/languages.conf.sample
-%%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/en/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/en/sender.content.report.txt.sample
 %%DATADIR%%/reports/en/sender.error.report.txt.sample
 %%DATADIR%%/reports/en/sender.filename.report.txt.sample
@@ -218,6 +218,8 @@
 %%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
@@ -228,8 +230,6 @@
 %%DATADIR%%/reports/es/inline.warning.html.sample
 %%DATADIR%%/reports/es/inline.warning.txt.sample
 %%DATADIR%%/reports/es/languages.conf.sample
-%%DATADIR%%/reports/es/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/es/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/es/sender.content.report.txt.sample
 %%DATADIR%%/reports/es/sender.error.report.txt.sample
 %%DATADIR%%/reports/es/sender.filename.report.txt.sample
@@ -241,6 +241,8 @@
 %%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
@@ -251,8 +253,6 @@
 %%DATADIR%%/reports/fr/inline.warning.html.sample
 %%DATADIR%%/reports/fr/inline.warning.txt.sample
 %%DATADIR%%/reports/fr/languages.conf.sample
-%%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/fr/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/fr/sender.content.report.txt.sample
 %%DATADIR%%/reports/fr/sender.error.report.txt.sample
 %%DATADIR%%/reports/fr/sender.filename.report.txt.sample
@@ -264,6 +264,8 @@
 %%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
@@ -274,8 +276,6 @@
 %%DATADIR%%/reports/hu/inline.warning.html.sample
 %%DATADIR%%/reports/hu/inline.warning.txt.sample
 %%DATADIR%%/reports/hu/languages.conf.sample
-%%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/hu/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/hu/sender.content.report.txt.sample
 %%DATADIR%%/reports/hu/sender.error.report.txt.sample
 %%DATADIR%%/reports/hu/sender.filename.report.txt.sample
@@ -287,6 +287,8 @@
 %%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
@@ -297,8 +299,6 @@
 %%DATADIR%%/reports/it/inline.warning.html.sample
 %%DATADIR%%/reports/it/inline.warning.txt.sample
 %%DATADIR%%/reports/it/languages.conf.sample
-%%DATADIR%%/reports/it/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/it/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/it/sender.content.report.txt.sample
 %%DATADIR%%/reports/it/sender.error.report.txt.sample
 %%DATADIR%%/reports/it/sender.filename.report.txt.sample
@@ -310,6 +310,8 @@
 %%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
@@ -320,8 +322,6 @@
 %%DATADIR%%/reports/nl/inline.warning.html.sample
 %%DATADIR%%/reports/nl/inline.warning.txt.sample
 %%DATADIR%%/reports/nl/languages.conf.sample
-%%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/nl/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/nl/sender.content.report.txt.sample
 %%DATADIR%%/reports/nl/sender.error.report.txt.sample
 %%DATADIR%%/reports/nl/sender.filename.report.txt.sample
@@ -333,6 +333,8 @@
 %%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
@@ -343,8 +345,6 @@
 %%DATADIR%%/reports/pt_br/inline.warning.html.sample
 %%DATADIR%%/reports/pt_br/inline.warning.txt.sample
 %%DATADIR%%/reports/pt_br/languages.conf.sample
-%%DATADIR%%/reports/pt_br/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/pt_br/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/pt_br/sender.content.report.txt.sample
 %%DATADIR%%/reports/pt_br/sender.error.report.txt.sample
 %%DATADIR%%/reports/pt_br/sender.filename.report.txt.sample
@@ -356,6 +356,8 @@
 %%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
@@ -366,8 +368,6 @@
 %%DATADIR%%/reports/ro/inline.warning.html.sample
 %%DATADIR%%/reports/ro/inline.warning.txt.sample
 %%DATADIR%%/reports/ro/languages.conf.sample
-%%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/ro/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/ro/sender.content.report.txt.sample
 %%DATADIR%%/reports/ro/sender.error.report.txt.sample
 %%DATADIR%%/reports/ro/sender.filename.report.txt.sample
@@ -379,6 +379,8 @@
 %%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
@@ -390,8 +392,6 @@
 %%DATADIR%%/reports/se/inline.warning.html.sample
 %%DATADIR%%/reports/se/inline.warning.txt.sample
 %%DATADIR%%/reports/se/languages.conf.sample
-%%DATADIR%%/reports/se/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/se/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/se/sender.content.report.txt.sample
 %%DATADIR%%/reports/se/sender.error.report.txt.sample
 %%DATADIR%%/reports/se/sender.filename.report.txt.sample
@@ -403,6 +403,8 @@
 %%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
@@ -413,8 +415,6 @@
 %%DATADIR%%/reports/sk/inline.warning.html.sample
 %%DATADIR%%/reports/sk/inline.warning.txt.sample
 %%DATADIR%%/reports/sk/languages.conf.sample
-%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/sk/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/sk/sender.content.report.txt.sample
 %%DATADIR%%/reports/sk/sender.error.report.txt.sample
 %%DATADIR%%/reports/sk/sender.filename.report.txt.sample
@@ -426,8 +426,11 @@
 %%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%%/FreeBSD.html
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.OpenBSD
@@ -435,7 +438,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
 %%PORTDOCS%%%%DOCSDIR%%/README.sql-logging
-%%PORTDOCS%%%%DOCSDIR%%/FreeBSD.html
 %%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
 %%PORTDOCS%%%%DOCSDIR%%/building.txt
 %%PORTDOCS%%%%DOCSDIR%%/donations.shtml
@@ -495,6 +497,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8.html
 %%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5
 %%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5.html
+%%PORTDOCS%%%%DOCSDIR%%/qmail/qmail-queue.zip
 %%PORTDOCS%%%%DOCSDIR%%/mrtg.shtml
 %%PORTDOCS%%%%DOCSDIR%%/newinv4.shtml
 %%PORTDOCS%%%%DOCSDIR%%/nextversion.shtml
@@ -508,7 +511,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/press.html
 %%PORTDOCS%%%%DOCSDIR%%/readme.shtml
 %%PORTDOCS%%%%DOCSDIR%%/reject.html
-%%PORTDOCS%%%%DOCSDIR%%/qmail/qmail-queue.zip
 %%PORTDOCS%%%%DOCSDIR%%/sobig.html
 %%PORTDOCS%%%%DOCSDIR%%/support.html
 %%PORTDOCS%%%%DOCSDIR%%/transtec.logo.gif
@@ -538,6 +540,7 @@
 @dirrm %%DATADIR%%/reports
 @dirrm %%DATADIR%%
 @dirrm libexec/MailScanner
+@dirrm lib/MailScanner/MailScanner/CustomFunctions
 @dirrm lib/MailScanner/MailScanner
 @dirrm lib/MailScanner
 @dirrm etc/MailScanner/rules