Index: head/security/amavisd-new/Makefile
===================================================================
--- head/security/amavisd-new/Makefile	(revision 83969)
+++ head/security/amavisd-new/Makefile	(revision 83970)
@@ -1,106 +1,107 @@
 # New ports collection makefile for:	amavisd-new
 # Date created:				05 Jun 2002
 # Whom:					Christopher K Davis (ckd-freebsd@ckdhr.com)
 #
 # $FreeBSD$
 #
 # 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/}
 
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Performance-enhanced daemonized version of amavis-perl
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/IO/Socket/UNIX.pm:${PORTSDIR}/devel/p5-IO \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
 		${SITE_PERL}/MIME/Words.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 		${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
 		${SITE_PERL}/${PERL_ARCH}/Convert/UUlib.pm:${PORTSDIR}/converters/p5-Convert-UUlib \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${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
 
 USE_PERL5_RUN=	yes
 
 PKGINSTALL=	${WRKDIR}/INSTALL
 PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
 AMAVISUSER?=	vscan
 AMAVISGROUP?=	vscan
 AMAVISDIR?=	/var/amavis
 AMAVISQUARANTINE?=	/var/virusmails
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.p.+//}
 
 .if !exists(/usr/lib/libmilter.so) && !exists(${PREFIX}/lib/libmilter.so)
 AMAVIS_NOMILTER="@comment "
 .endif
 
 PLIST_SUB+=	AMAVIS_NOMILTER=${AMAVIS_NOMILTER}
 
 .if defined(AMAVIS_NOMILTER)
 do-build:
 	@${ECHO} libmilter not available, not building amavis-milter and amavis
 .else
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-user=${AMAVISUSER} --with-runtime-dir=${AMAVISDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/helper-progs
 BUILD_WRKSRC=	${WRKSRC}/helper-progs
 .endif
 
 pre-build:
 	for file in amavisd.sh INSTALL DEINSTALL MESSAGE; do \
 		${SED} -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \
 		       -e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \
 		       -e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \
 		       -e 's,%%AMAVISQUARANTINE%%,${AMAVISQUARANTINE},g' \
 		       -e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		       -e 's,%%PREFIX%%,${PREFIX},g' \
 	               < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
 	done
 	for file in amavisd.conf amavisd; do \
 		${SED} -e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \
 		       -e 's,%%AMAVISGROUP%%,${AMAVISGROUP},g' \
 		       -e 's,%%AMAVISDIR%%,${AMAVISDIR},g' \
 		       -e 's,%%AMAVISQUARANTINE%%,${AMAVISQUARANTINE},g' \
 		       -e 's,%%PREFIX%%,${PREFIX},g' \
 		       < ${WRKSRC}/$${file} > ${WRKDIR}/$${file}; \
 	done
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
 
 do-install:
 .if !defined(AMAVIS_NOMILTER)
 	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin
 .endif
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.sh ${PREFIX}/etc/rc.d
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in AAAREADME.first INSTALL LICENSE RELEASE_NOTES README_FILES/*
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/security/amavisd-new/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/security/amavisd-new/distinfo
===================================================================
--- head/security/amavisd-new/distinfo	(revision 83969)
+++ head/security/amavisd-new/distinfo	(revision 83970)
@@ -1 +1 @@
-MD5 (amavisd-new-20030314-p2.tar.gz) = a6c5c52237e3bc352bc2db07fface5af
+MD5 (amavisd-new-20030616-p2.tar.gz) = 713a3ffc090481f72e5bb450b4a1f9ab

Property changes on: head/security/amavisd-new/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/security/amavisd-new/files/patch-amavisd.conf
===================================================================
--- head/security/amavisd-new/files/patch-amavisd.conf	(revision 83969)
+++ head/security/amavisd-new/files/patch-amavisd.conf	(revision 83970)
@@ -1,49 +1,40 @@
---- 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')
  
  # $mydomain serves as a quick default for some other configuration settings.
  # More refined control is available with each individual setting further down.
 @@ -60,8 +60,8 @@
  
  # Set the user and group to which the daemon will change if started as root
  # (otherwise just keep the UID unchanged, and these settings have no effect):
 -$daemon_user  = 'vscan';	# (no default;  customary: vscan or amavis)
 -$daemon_group = 'sweep';	# (no default;  customary: vscan or amavis)
 +$daemon_user  = '%%AMAVISUSER%%';	# (no default;  customary: vscan or amavis)
 +$daemon_group = '%%AMAVISGROUP%%';	# (no default;  customary: vscan or amavis)
  
  # 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
 -$log_level = 2;		  # (defaults to 0)
 +$log_level = 0;		  # (defaults to 0)
  
  # 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)
  #
 -$QUARANTINEDIR = '/var/virusmails';
 +$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
  
  #$virus_quarantine_method = "local:virus-%i-%n";    # default
  #$spam_quarantine_method  = "local:spam-%b-%i-%n";  # default

Property changes on: head/security/amavisd-new/files/patch-amavisd.conf
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/security/amavisd-new/pkg-plist
===================================================================
--- head/security/amavisd-new/pkg-plist	(revision 83969)
+++ head/security/amavisd-new/pkg-plist	(revision 83970)
@@ -1,23 +1,24 @@
 %%PORTDOCS%%share/doc/amavisd-new/AAAREADME.first
 %%PORTDOCS%%share/doc/amavisd-new/INSTALL
 %%PORTDOCS%%share/doc/amavisd-new/LICENSE
 %%PORTDOCS%%share/doc/amavisd-new/README.chroot
 %%PORTDOCS%%share/doc/amavisd-new/README.contributed
 %%PORTDOCS%%share/doc/amavisd-new/README.customize
 %%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
 %%PORTDOCS%%share/doc/amavisd-new/README.performance
 %%PORTDOCS%%share/doc/amavisd-new/README.postfix
 %%PORTDOCS%%share/doc/amavisd-new/README.sendmail
 %%PORTDOCS%%share/doc/amavisd-new/README.sendmail-dual
 %%PORTDOCS%%share/doc/amavisd-new/RELEASE_NOTES
 %%PORTDOCS%%@dirrm share/doc/amavisd-new
 etc/amavisd.conf-dist
 etc/rc.d/amavisd.sh
 %%AMAVIS_NOMILTER%%sbin/amavis
 %%AMAVIS_NOMILTER%%sbin/amavis-milter
 sbin/amavisd

Property changes on: head/security/amavisd-new/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property