4 files changed, 10 insertions, 17 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 2e6510fe0c96..19e43848dffe 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -7,8 +7,7 @@
 # Based on amavisd ports makefile.
 
 PORTNAME=	amavisd-new
-PORTVERSION=	20030314.p2
-PORTREVISION=	1
+PORTVERSION=	20030616.p2
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-p/}
@@ -29,7 +28,9 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/IO/Socket/UNIX.pm:${PORTSDIR}/devel/p5-IO
 		${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
 		${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
 		${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc \
+		${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze \
 		${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha \
+		${LOCALBASE}/bin/lzop:${PORTSDIR}/archivers/lzop \
 		${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj \
 		${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
 		${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 87e061e8e155..4b456d4e78f1 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1 +1 @@
-MD5 (amavisd-new-20030314-p2.tar.gz) = a6c5c52237e3bc352bc2db07fface5af
+MD5 (amavisd-new-20030616-p2.tar.gz) = 713a3ffc090481f72e5bb450b4a1f9ab
diff --git a/security/amavisd-new/files/patch-amavisd.conf b/security/amavisd-new/files/patch-amavisd.conf
index 011f0a4c4fd8..d830e1b41509 100644
--- a/security/amavisd-new/files/patch-amavisd.conf
+++ b/security/amavisd-new/files/patch-amavisd.conf
@@ -1,9 +1,9 @@
---- amavisd.conf.orig	Wed Apr 30 19:04:16 2003
-+++ amavisd.conf	Sun May 18 20:18:14 2003
+--- amavisd.conf.orig	Wed Jun 25 17:22:46 2003
++++ amavisd.conf	Wed Jun 25 17:26:42 2003
 @@ -51,7 +51,7 @@
  # $MYHOME serves as a quick default for some other configuration settings.
  # More refined control is available with each individual setting further down.
- # $MYHOME is never used directly by the program. No trailing slash!
+ # $MYHOME is not used directly by the program. No trailing slash!
 -#$MYHOME = '/var/lib/amavis';   # (default is '/var/amavis')
 +$MYHOME = '%%AMAVISDIR%%';   # (default is '/var/amavis')
  
@@ -20,7 +20,7 @@
  
  # Runtime working directory (cwd), and a place where
  # temporary directories for unpacking mail are created.
-@@ -269,7 +269,7 @@
+@@ -271,7 +271,7 @@
  # 3: server, client
  # 4: decompose parts
  # 5: more debug details
@@ -29,16 +29,7 @@
  
  # Customizeable template for the most interesting log file entry (e.g. with
  # $log_level=0) (take care to properly quote Perl special characters like '\')
-@@ -413,7 +413,7 @@
- # See README.lookups for syntax.
- #
- $viruses_that_fake_sender_re = new_RE(
--  qr'nimda|hybris|klez|bugbear|yaha|braid|sobig'i );
-+  qr'nimda|hybris|klez|bugbear|yaha|braid|sobig|fizzer'i );
- 
- 
- # where to send ADMIN VIRUS NOTIFICATIONS (should be a fully qualified address)
-@@ -479,7 +479,7 @@
+@@ -496,7 +496,7 @@
  #   or a directory (no trailing slash)
  #   (the default value is undef, meaning no quarantine)
  #
diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist
index 4b428310ae20..16225ec70779 100644
--- a/security/amavisd-new/pkg-plist
+++ b/security/amavisd-new/pkg-plist
@@ -7,6 +7,7 @@
 %%PORTDOCS%%share/doc/amavisd-new/README.exim_v3
 %%PORTDOCS%%share/doc/amavisd-new/README.exim_v4
 %%PORTDOCS%%share/doc/amavisd-new/README.exim_v4_app
+%%PORTDOCS%%share/doc/amavisd-new/README.exim_v4_app2
 %%PORTDOCS%%share/doc/amavisd-new/README.lookups
 %%PORTDOCS%%share/doc/amavisd-new/README.milter
 %%PORTDOCS%%share/doc/amavisd-new/README.old.scanners