3 files changed, 22 insertions, 6 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index b5b39f6ba547..dcdcc0ef4ab2 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.78.9
+PORTVERSION=	4.78.17
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -41,7 +41,7 @@ BUILD_DEPENDS=	\
 	${SITE_PERL}/${PERL_ARCH}/IO/Handle.pm:${PORTSDIR}/devel/p5-IO \
 	${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite
 
-RUN_DEPENDS=	${BUILD_DEPENDS} \
+RUN_DEPENDS+=	${BUILD_DEPENDS} \
 		bash:${PORTSDIR}/shells/bash \
 		tnef:${PORTSDIR}/converters/tnef \
 		wget:${PORTSDIR}/ftp/wget
@@ -137,6 +137,10 @@ do-build:
 		's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g;' \
 		${WRKSRC}/bin/mailscanner_create_locks
 	${PERL} -pi -e \
+		's,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \
+		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
+		${WRKSRC}/bin/processing_messages_alert
+	${PERL} -pi -e \
 		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
 		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
 		s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
@@ -197,7 +201,8 @@ do-build:
 		s,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g;' \
 		${WRKSRC}/bin/update_spamassassin
 	${PERL} -pi -e \
-		's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g;' \
+		's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g; \
+		s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g;' \
 		${WRKSRC}/bin/clean.SA.cache
 	${PERL} -pi -e \
 		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
@@ -246,6 +251,10 @@ do-install:
 		${PREFIX}/libexec/MailScanner/clean.quarantine
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mailscanner_create_locks \
 		${PREFIX}/libexec/MailScanner/mailscanner_create_locks
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/processing_messages_alert \
+		${PREFIX}/libexec/MailScanner/processing_messages_alert
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/Quick.Peek \
+		${PREFIX}/libexec/MailScanner/Quick.Peek
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_bad_phishing_emails \
 		${PREFIX}/libexec/MailScanner/update_bad_phishing_emails
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_phishing_sites \
@@ -288,6 +297,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/mcp/${FILE} \
 		${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
 .endfor
+	${MKDIR} ${PREFIX}/etc/MailScanner/conf.d
+	${INSTALL_DATA} ${WRKSRC}/etc/conf.d/README \
+		${PREFIX}/etc/MailScanner/conf.d/README
 	#
 	# Step 4: Install files in share
 	#
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index a89b2d780ff7..e1a8568aaaea 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-MD5 (MailScanner-install-4.78.9-1.tar.gz) = 264b1b7cbb37117aced6f450d48a03d7
-SHA256 (MailScanner-install-4.78.9-1.tar.gz) = c389948605544d418c1a022d4a179430464840e5597ef13a4c11d1c7819ea0db
-SIZE (MailScanner-install-4.78.9-1.tar.gz) = 9111014
+MD5 (MailScanner-install-4.78.17-1.tar.gz) = 6c36f2ef4a424afebd82662f3d7be527
+SHA256 (MailScanner-install-4.78.17-1.tar.gz) = 331008bcb5ba1b742c283ae98a22e5fff8e46e92a2c6b435c8c098b4c39f1b33
+SIZE (MailScanner-install-4.78.17-1.tar.gz) = 9209407
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 44e6f96d3da6..cd971a55ff65 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -5,6 +5,7 @@ etc/MailScanner/country.domains.conf.sample
 etc/MailScanner/MailScanner.conf.sample
 etc/MailScanner/filename.rules.conf.sample
 etc/MailScanner/filetype.rules.conf.sample
+etc/MailScanner/conf.d/README
 etc/MailScanner/mcp/10_example.cf.sample
 etc/MailScanner/mcp/mcp.spam.assassin.prefs.conf.sample
 etc/MailScanner/mcp/v320.pre.sample
@@ -67,6 +68,8 @@ libexec/MailScanner/analyse_SpamAssassin_cache
 libexec/MailScanner/clean.SA.cache
 libexec/MailScanner/clean.quarantine
 libexec/MailScanner/mailscanner_create_locks
+libexec/MailScanner/processing_messages_alert
+libexec/MailScanner/Quick.Peek
 libexec/MailScanner/update_bad_phishing_emails
 libexec/MailScanner/update_phishing_sites
 libexec/MailScanner/update_bad_phishing_sites
@@ -568,6 +571,7 @@ sbin/MailScanner
 @dirrm lib/MailScanner/MailScanner/CustomFunctions
 @dirrm lib/MailScanner/MailScanner
 @dirrm lib/MailScanner
+@dirrm etc/MailScanner/conf.d
 @dirrm etc/MailScanner/mcp
 @dirrm etc/MailScanner/rules
 @dirrm etc/MailScanner