6 files changed, 17 insertions, 14 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index b3a05346f338..98d694e5c580 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.57.6
-PORTREVISION=	1
+PORTVERSION=	4.58.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -122,7 +121,8 @@ USRLOCAL_FILES_LIB=	\
 		nod32-autoupdate rav-autoupdate \
 		rav-wrapper sophos-autoupdate
 
-USE_RC_SUBR=	mailscanner.sh mta.sh
+USE_RC_SUBR=	mailscanner mta
+SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
 post-extract:
 	cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* .
@@ -277,6 +277,7 @@ do-install:
 	# Sophos install script
 	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
+	cd ${FILESDIR} && ${INSTALL_DATA} CHANGES.port ${DOCSDIR}
 .endif
 	cd ${FILESDIR} && \
 		${INSTALL_MAN} ${MAN8} ${MAN5PREFIX}/man/man8
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 66edf2294dbb..c2ba583ebc8c 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-MD5 (MailScanner-install-4.57.6-1.tar.gz) = b025773a1854140f75dca48a52818ed3
-SHA256 (MailScanner-install-4.57.6-1.tar.gz) = 52cbacb22c6a82fc39b2aef89b74774e504bb8d4baf5530c225369b08ee52754
-SIZE (MailScanner-install-4.57.6-1.tar.gz) = 7051901
+MD5 (MailScanner-install-4.58.9-1.tar.gz) = 5c641a7d76beaa0bb7d9efcb04f6b333
+SHA256 (MailScanner-install-4.58.9-1.tar.gz) = 4e4f362fc8778c9a0deaff696f8c966081c4bf08227f3bd036f39fbbe6d7010c
+SIZE (MailScanner-install-4.58.9-1.tar.gz) = 7058345
diff --git a/mail/mailscanner/files/CHANGES.port b/mail/mailscanner/files/CHANGES.port
index 0cacc5a4af27..9396100790a1 100644
--- a/mail/mailscanner/files/CHANGES.port
+++ b/mail/mailscanner/files/CHANGES.port
@@ -1,3 +1,9 @@
+Version 4.58.9
+================
+- Upgrade to MailScanner 4.58
+- fix: CHANGES.port was not installed anymore
+- startscripts now honor RC_SUBR_SUFFIX
+
 Version 4.57.6_1
 ================
 - Upgrade to MailScanner 4.57
diff --git a/mail/mailscanner/files/mailscanner.sh.in b/mail/mailscanner/files/mailscanner.in
index 4cfeddc41be8..4cfeddc41be8 100644
--- a/mail/mailscanner/files/mailscanner.sh.in
+++ b/mail/mailscanner/files/mailscanner.in
diff --git a/mail/mailscanner/files/mta.sh.in b/mail/mailscanner/files/mta.in
index 759020deba41..fb3f433cbff7 100644
--- a/mail/mailscanner/files/mta.sh.in
+++ b/mail/mailscanner/files/mta.in
@@ -63,14 +63,7 @@ PATH=$PATH:/sbin:/usr/sbin; export PATH
 name="mta"
 rcvar=`set_rcvar`
 
-_mta_rc_script="%%PREFIX%%/etc/rc.d/mta"
-_mta_osversion="`sysctl -n kern.osreldate`"
-if [ \( "$_mta_osversion" -lt "600101" \) -o \
-	\( \( $_mta_osversion -ge 700000 \) -a \
-		\( $_mta_osversion -lt 700007 \) \) ]
-then
-	_mta_rc_script="${_mta_rc_script}.sh"
-fi
+_mta_rc_script="%%PREFIX%%/etc/rc.d/mta%%RC_SUBR_SUFFIX%%"
 
 load_rc_config $name
 
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index a29906d94729..a12c0550d131 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -22,6 +22,8 @@ lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
 lib/MailScanner/MailScanner/CustomFunctions/DavidHooton.pm
 lib/MailScanner/MailScanner/CustomFunctions/ZMRouterDirHash.pm
 lib/MailScanner/MailScanner/CustomFunctions/SpamWhitelist.pm
+lib/MailScanner/MailScanner/CustomFunctions/LastSpam.pm
+lib/MailScanner/MailScanner/CustomFunctions/Ruleset-from-Function.pm
 lib/MailScanner/MailScanner/Exim.pm
 lib/MailScanner/MailScanner/EximDiskStore.pm
 lib/MailScanner/MailScanner/GenericSpam.pm
@@ -513,6 +515,7 @@ sbin/MailScanner
 %%DATADIR%%/reports/sk/sender.size.report.txt.sample
 %%DATADIR%%/reports/sk/stored.size.message.txt.sample
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.port
 %%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.OpenBSD