Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/mailscanner/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile	13 Mar 2007 20:11:17 -0000	1.60
+++ Makefile	30 Mar 2007 10:02:35 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.58.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
Index: files/CHANGES.port
===================================================================
RCS file: /home/ncvs/ports/mail/mailscanner/files/CHANGES.port,v
retrieving revision 1.13
diff -u -r1.13 CHANGES.port
--- files/CHANGES.port	10 Feb 2007 12:56:36 -0000	1.13
+++ files/CHANGES.port	30 Mar 2007 10:02:35 -0000
@@ -1,3 +1,9 @@
+Version 4.58.9_2
+================
+- clamav-wrapper contained options unarj, unace and zoo. unace
+  seems to be dead and the other options are corrected to be
+  arj and unzoo.
+
 Version 4.58.9
 ================
 - Upgrade to MailScanner 4.58
Index: files/patch-lib-clamav-wrapper
===================================================================
RCS file: /home/ncvs/ports/mail/mailscanner/files/patch-lib-clamav-wrapper,v
retrieving revision 1.1
diff -u -r1.1 patch-lib-clamav-wrapper
--- files/patch-lib-clamav-wrapper	5 May 2006 10:38:03 -0000	1.1
+++ files/patch-lib-clamav-wrapper	30 Mar 2007 10:02:35 -0000
@@ -1,5 +1,5 @@
---- ../MailScanner-install-4.42.9.orig/lib/clamav-wrapper	Wed Jun  1 11:24:25 2005
-+++ lib/clamav-wrapper	Wed Jun  1 11:31:57 2005
+--- ../MailScanner-install-4.58.9.orig/lib/clamav-wrapper	Fri Mar 30 11:55:30 2007
++++ lib/clamav-wrapper	Fri Mar 30 11:55:54 2007
 @@ -51,6 +51,9 @@
  
  # You may want to check this script for bash-isms
@@ -10,7 +10,7 @@
  TempDir="/tmp/clamav.$$"
  ClamUser="clamav"
  ClamGroup="clamav"
-@@ -98,23 +101,23 @@
+@@ -98,23 +101,19 @@
  # LESS COMMON unpackers, which probably aren't installed by default
  # (hence disabled)
  # Uncomment ONE of the following lines if you have unrar installed
@@ -20,14 +20,13 @@
  
  # Uncomment ONE of the following lines if you have unarj installed
 -#ExtraScanOptions="$ExtraScanOptions --unarj"  
-+ExtraScanOptions="$ExtraScanOptions --unarj"  
++ExtraScanOptions="$ExtraScanOptions --arj"  
  #ExtraScanOptions="$ExtraScanOptions --unarj=/path/to/unarj" 
  
- # Uncomment ONE of the following lines if you have unace installed
+-# Uncomment ONE of the following lines if you have unace installed
 -#ExtraScanOptions="$ExtraScanOptions --unace"  
-+ExtraScanOptions="$ExtraScanOptions --unace"  
- #ExtraScanOptions="$ExtraScanOptions --unace=/path/to/unace" 
- 
+-#ExtraScanOptions="$ExtraScanOptions --unace=/path/to/unace" 
+-
  # Uncomment ONE of the following lines if you have lha installed
 -#ExtraScanOptions="$ExtraScanOptions --lha"  
 +ExtraScanOptions="$ExtraScanOptions --lha"  
@@ -35,7 +34,7 @@
  
  # Uncomment ONE of the following lines if you have zoo installed
 -#ExtraScanOptions="$ExtraScanOptions --zoo"  
-+ExtraScanOptions="$ExtraScanOptions --zoo"  
++ExtraScanOptions="$ExtraScanOptions --unzoo"  
  #ExtraScanOptions="$ExtraScanOptions --zoo=/path/to/unzoo" 
  
- # Uncomment next line if you need to disable Clam's DoS protection
+ # Now increase the allowed expansion size of zip files