6 files changed, 8 insertions, 7 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 0c8a6840a0ea..9414c2b5185b 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.40.11
+PORTVERSION=	4.41.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -40,7 +40,7 @@ PATCHLEVEL=	1
 USE_PERL5=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-install-${PORTVERSION}
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 
 MAN8=		MailScanner.8
 MAN5=		MailScanner.conf.5
@@ -232,7 +232,6 @@ do-install:
 			fi; \
 		fi; \
 	done
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},' pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 renew-wrapper: install
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 2cd69b52e89a..b1a50e38ad03 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,2 +1,2 @@
-MD5 (MailScanner-install-4.40.11-1.tar.gz) = afcf9a62303becc81b9661cbde81862a
-SIZE (MailScanner-install-4.40.11-1.tar.gz) = 4888691
+MD5 (MailScanner-install-4.41.3-1.tar.gz) = 6df068ec74fb07bd1d166c1ad5e69cd6
+SIZE (MailScanner-install-4.41.3-1.tar.gz) = 4925560
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.8 b/mail/mailscanner/files/patch-docs:man:MailScanner.8
index c1aa19701bc5..0d905251d1da 100644
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.8
+++ b/mail/mailscanner/files/patch-docs:man:MailScanner.8
@@ -2,7 +2,7 @@
 +++ docs/man/MailScanner.8	Fri Apr  1 16:10:33 2005
 @@ -1,4 +1,4 @@
 -.TH "MailScanner" "8" "4.38.2" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.40.10" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.41.3" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
index a2c54e1e6169..102d83691c83 100644
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
+++ b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
@@ -2,7 +2,7 @@
 +++ docs/man/MailScanner.conf.5	Fri Apr  1 16:10:37 2005
 @@ -1,4 +1,4 @@
 -.TH "MailScanner.conf" "5" "4.38.2" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.40.10" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.41.3" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner.conf \- Main configuration for MailScanner
diff --git a/mail/mailscanner/pkg-message b/mail/mailscanner/files/pkg-message.in
index edce99159358..edce99159358 100644
--- a/mail/mailscanner/pkg-message
+++ b/mail/mailscanner/files/pkg-message.in
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index fa6d6350e6fb..04543e839b88 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -118,6 +118,7 @@ libexec/MailScanner/vexira-wrapper.sample
 %%DATADIR%%/reports/ca/stored.content.message.txt.sample
 %%DATADIR%%/reports/ca/stored.filename.message.txt.sample
 %%DATADIR%%/reports/ca/stored.virus.message.txt.sample
+@exec mkdir -p %D/%%DATADIR%%/reports/cat
 %%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
@@ -498,6 +499,7 @@ libexec/MailScanner/vexira-wrapper.sample
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.63
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.0.0
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/index.html
+%%PORTDOCS%%@exec mkdir -p %D/%%DOCSDIR%%/install/tcp
 %%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch.txt
 %%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch2.txt
 %%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch3.txt