9 files changed, 31 insertions, 37 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index d3c217396ee2..aa524ff1b4a2 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.35.11
+PORTVERSION=	4.36.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -209,6 +209,18 @@ do-install:
 	   ${ECHO} "Changes in MailScanner.conf found. Please look at \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \
 	fi
+	# Upgrading langauages.conf... Please wait... ATTENTION: English version only!
+	@${WRKSRC}/bin/upgrade_languages_conf \
+		${DATADIR}/reports/en/languages.conf \
+		${DATADIR}/reports/en/languages.conf.sample > \
+		${DATADIR}/reports/en/languages.conf.new.${PORTVERSION} \
+		2> /dev/null
+	@if diff -b -B -q ${DATADIR}/reports/en/languages.conf \
+		${DATADIR}/reports/en/languages.conf.new.${PORTVERSION} ; \
+	  then  ${ECHO} "No changes in languages.conf found" ; \
+		${RM} ${DATADIR}/reports/en/languages.conf.new.${PORTVERSION} ; \
+	  else  ${CP} ${DATADIR}/reports/en/languages.conf.new.${PORTVERSION} ${DATADIR}/reports/en/languages.conf ; \
+	fi
 .endif
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},' pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 7af63d1a4fdd..b754581077fa 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,2 +1,2 @@
-MD5 (MailScanner-install-4.35.11-1.tar.gz) = 2ce8d93b6526c33791ad696a7e61cc7d
-SIZE (MailScanner-install-4.35.11-1.tar.gz) = 5508189
+MD5 (MailScanner-install-4.36.4-1.tar.gz) = 322f1b5d8f7e5f0f0bbf53046f1d2a20
+SIZE (MailScanner-install-4.36.4-1.tar.gz) = 5622620
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.8 b/mail/mailscanner/files/patch-docs:man:MailScanner.8
index fb64df8a43c0..01a8554699ef 100644
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.8
+++ b/mail/mailscanner/files/patch-docs:man:MailScanner.8
@@ -1,8 +1,8 @@
---- ../MailScanner-install-4.35.9.orig/docs/man/MailScanner.8	Mon Nov  1 18:03:10 2004
-+++ docs/man/MailScanner.8	Mon Nov  1 18:03:23 2004
+--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.8	Wed Dec 15 20:31:43 2004
++++ docs/man/MailScanner.8	Wed Dec 15 20:32:20 2004
 @@ -1,4 +1,4 @@
 -.TH "MailScanner" "8" "4.34.8" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.35.9" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.36.4" "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.8.html b/mail/mailscanner/files/patch-docs:man:MailScanner.8.html
index 19480f0ff7d7..3b3e9fa91b61 100644
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.8.html
+++ b/mail/mailscanner/files/patch-docs:man:MailScanner.8.html
@@ -1,5 +1,5 @@
---- ../MailScanner-install-4.35.9.orig/docs/man/MailScanner.8.html	Mon Nov  1 18:03:10 2004
-+++ docs/man/MailScanner.8.html	Mon Nov  1 18:03:28 2004
+--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.8.html	Wed Dec 15 20:31:43 2004
++++ docs/man/MailScanner.8.html	Wed Dec 15 20:32:06 2004
 @@ -1,5 +1,5 @@
  <!-- Creator     : groff version 1.19 -->
 -<!-- CreationDate: Fri Oct 15 15:13:21 2004 -->
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
index f10f705b1b3a..b635ac216b41 100644
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
+++ b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
@@ -1,8 +1,8 @@
---- ../MailScanner-install-4.35.9.orig/docs/man/MailScanner.conf.5	Mon Nov  1 18:03:10 2004
-+++ docs/man/MailScanner.conf.5	Mon Nov  1 18:03:31 2004
+--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.conf.5	Wed Dec 15 20:31:43 2004
++++ docs/man/MailScanner.conf.5	Wed Dec 15 20:32:29 2004
 @@ -1,4 +1,4 @@
 -.TH "MailScanner.conf" "5" "4.34.8" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.35.9" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.36.4" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner.conf \- Main configuration for MailScanner
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html
index 4831d0626ce1..b8ec85079357 100644
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html
+++ b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html
@@ -1,5 +1,5 @@
---- ../MailScanner-install-4.35.9.orig/docs/man/MailScanner.conf.5.html	Mon Nov  1 18:03:10 2004
-+++ docs/man/MailScanner.conf.5.html	Mon Nov  1 18:03:33 2004
+--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.conf.5.html	Wed Dec 15 20:31:43 2004
++++ docs/man/MailScanner.conf.5.html	Wed Dec 15 20:32:12 2004
 @@ -1,5 +1,5 @@
  <!-- Creator     : groff version 1.19 -->
 -<!-- CreationDate: Fri Oct 22 08:13:20 2004 -->
diff --git a/mail/mailscanner/files/patch-lib:MailScanner:Message.pm b/mail/mailscanner/files/patch-lib:MailScanner:Message.pm
deleted file mode 100644
index 9d2c9bf41290..000000000000
--- a/mail/mailscanner/files/patch-lib:MailScanner:Message.pm
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../MailScanner-install-4.35.11.orig/lib/MailScanner/Message.pm	Wed Nov 10 08:31:01 2004
-+++ lib/MailScanner/Message.pm	Wed Nov 10 08:33:19 2004
-@@ -4043,6 +4043,8 @@
-     $squashedtext =~ s#%([0-9a-f][0-9a-f])#chr(hex('0x' . $1))#gei; # Unescape
-     $squashedtext =~ s/\s+//g; # Remove any whitespace
-     $squashedtext =~ s/\\/\//g;
-+    $squashedtext =~ s/(\<\/?[^>]*\>)*//ig; # Remove tags
-+    #$squashedtext =~ s/^(\<\/?(br|p|ul)\>)*//ig; # Remove leading br, p, ul tags
-     #print STDERR "Text = \"$text\"\n";
-     #print STDERR "1SquashedText = \"$squashedtext\"\n";
-     #print STDERR "1LinkURL      = \"$DisarmLinkURL\"\n";
-@@ -4055,9 +4057,11 @@
-       $linkurl =~ s/\%a0//g;
-       $linkurl =~ s#%([0-9a-f][0-9a-f])#chr(hex('0x' . $1))#gei; # Unescape
-       $linkurl =~ s/\s+//; # Remove any whitespace
-+      #$linkurl =~ s/(\<\/?[^>]*\>)*//ig; # Remove tags
-+      #$linkurl =~ s/^(\<\/?(br|p|ul)\>)*//ig; # Remove leading br, p, ul tags
-       $linkurl =~ s/^(https?|ftp):\/\///;
-       $linkurl =~ s/\/.*$//; # Only compare up to the first '/' (hostname only)
--      $linkurl =~ s/\<\/?(br|p)\>$//i; # Remove trailing <br> and <p> tags
-+      $linkurl =~ s/(\<\/?(br|p|ul)\>)*$//ig; # Remove trailing br, p, ul tags
-       $linkurl =~ s/\/$//; # LinkURL is trimmed -- note
-       #print STDERR "2SquashedText = \"$squashedtext\"\n";
-       #print STDERR "2LinkURL      = \"$linkurl\"\n";
diff --git a/mail/mailscanner/pkg-message b/mail/mailscanner/pkg-message
index 125ed173ca23..edce99159358 100644
--- a/mail/mailscanner/pkg-message
+++ b/mail/mailscanner/pkg-message
@@ -31,6 +31,10 @@
 	to update your virus-wrappers, autoupdates, reports and
 	languages.conf
 
+	The english languages.conf is updated automatically. For all
+	other versions use the update_languages_conf tool found
+	in the work directory of this port.
+
 	Sophos users: Please take a look at the Sophos install
 	script %%PREFIX%%/share/doc/MailScanner/Sophos.install.freebsd
 
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index f4a8c7a813ff..94c4b8e5b521 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -80,6 +80,7 @@ libexec/MailScanner/nod32-wrapper.sample
 libexec/MailScanner/norman-autoupdate.sample
 libexec/MailScanner/norman-wrapper.sample
 libexec/MailScanner/panda-wrapper.sample
+libexec/MailScanner/panda-autoupdate.sample
 libexec/MailScanner/rav-autoupdate.sample
 libexec/MailScanner/rav-wrapper.sample
 libexec/MailScanner/sophos-autoupdate.sample
@@ -524,6 +525,7 @@ libexec/MailScanner/vexira-wrapper.sample
 %%PORTDOCS%%%%DOCSDIR%%/poweredby.transtec.gif
 %%PORTDOCS%%%%DOCSDIR%%/phishing.html
 %%PORTDOCS%%%%DOCSDIR%%/phishing.jpg
+%%PORTDOCS%%%%DOCSDIR%%/phishing2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pressreleases.html
 %%PORTDOCS%%%%DOCSDIR%%/presentations.html
 %%PORTDOCS%%%%DOCSDIR%%/press.html