diff -ur mailscanner/Makefile mailscanner.new/Makefile
--- mailscanner/Makefile	2012-01-02 15:38:33.000000000 -0500
+++ mailscanner.new/Makefile	2012-03-09 08:38:32.000000000 -0500
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.83.5
-PORTREVISION=	1
+PORTVERSION=	4.84.5
+#PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -47,7 +47,7 @@
 
 CONFLICTS=	MailScanner-devel-[0-9]*
 
-PATCHLEVEL=	1
+PATCHLEVEL=	2
 
 USE_PERL5=	yes
 
diff -ur mailscanner/distinfo mailscanner.new/distinfo
--- mailscanner/distinfo	2011-06-18 12:35:08.000000000 -0400
+++ mailscanner.new/distinfo	2012-03-09 08:38:43.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (MailScanner-install-4.83.5-1.tar.gz) = 1c1fda2e9fc2268674e4228f2ec14d2c1d781fd0b9d3ae97ccaf487bdbcf8160
-SIZE (MailScanner-install-4.83.5-1.tar.gz) = 9507037
+SHA256 (MailScanner-install-4.84.5-2.tar.gz) = 3467a53159cc95a8b4f93a326a59e2d3acc0ad6f90f048f048742fe13ac741f1
+SIZE (MailScanner-install-4.84.5-2.tar.gz) = 9510489
diff -ur mailscanner/files/CHANGES.port mailscanner.new/files/CHANGES.port
--- mailscanner/files/CHANGES.port	2011-06-18 12:35:08.000000000 -0400
+++ mailscanner.new/files/CHANGES.port	2012-03-09 13:20:28.000000000 -0500
@@ -1,5 +1,9 @@
 Version 4.84.5
 ==============
+- Upgrade to 4.84.5
+
+Version 4.83.5
+==============
 - Upgrade to 4.83.5
 - Remove extra config file targets-- config files are handled automatically
   in pkg-(de)?install scripts now.
diff -ur mailscanner/files/patch-lib-clamav-wrapper mailscanner.new/files/patch-lib-clamav-wrapper
--- mailscanner/files/patch-lib-clamav-wrapper	2009-04-30 09:34:40.000000000 -0400
+++ mailscanner.new/files/patch-lib-clamav-wrapper	2012-03-09 08:43:30.000000000 -0500
@@ -1,5 +1,5 @@
---- ./lib/clamav-wrapper.orig	2009-03-27 09:07:39.000000000 -0400
-+++ ./lib/clamav-wrapper	2009-03-27 09:08:46.000000000 -0400
+--- ./lib/clamav-wrapper.orig	2011-08-20 08:32:02.000000000 -0400
++++ ./lib/clamav-wrapper	2012-03-09 08:41:47.000000000 -0500
 @@ -51,6 +51,9 @@
  
  # You may want to check this script for bash-isms
@@ -7,6 +7,6 @@
 +PATH=$PATH:/usr/local/bin
 +export PATH
 +
- TempDir="/tmp/clamav.$$"
+ #TempDir="/tmp/clamav.$$"
+ TempDir=$(mktemp) || { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
  ClamUser="clamav"
- ClamGroup="clamav"