- update amavisd-new to 20030616.p5.

- fix dependency on devel/p5-IO, which should only be used when
  perl older than 5.6.1 is installed.
- enable cpio for extraction of tar archives, which uses much less
  memory than Archive::Tar (suggested by amavisd-new author)

PR:		56013
Submitted by:	Blaz Zupan <blaz.zupan@amis.net>

4 files changed, 45 insertions, 30 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 19e43848dffe..6f393441795e 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -7,7 +7,7 @@
 # Based on amavisd ports makefile.
 
 PORTNAME=	amavisd-new
-PORTVERSION=	20030616.p2
+PORTVERSION=	20030616.p5
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-p/}
@@ -15,8 +15,7 @@ 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 \
+RUN_DEPENDS=	${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 \
@@ -104,4 +103,10 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500601
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/IO/Socket/UNIX.pm:${PORTSDIR}/devel/p5-IO
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 4b456d4e78f1..fd2a4b7d715a 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1 +1 @@
-MD5 (amavisd-new-20030616-p2.tar.gz) = 713a3ffc090481f72e5bb450b4a1f9ab
+MD5 (amavisd-new-20030616-p5.tar.gz) = 13c76432e957ccd302856f64526483a2
diff --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd
index 7cd539f058c8..39380b6b2b1b 100644
--- a/security/amavisd-new/files/patch-amavisd
+++ b/security/amavisd-new/files/patch-amavisd
@@ -1,11 +1,20 @@
---- amavisd.orig	Fri Jan 10 22:03:39 2003
-+++ amavisd	Thu Mar  6 21:18:38 2003
-@@ -5070,7 +5070,7 @@
- my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)]);
- $amavisd_path = $1  if $amavisd_path =~ m{^([A-Za-z0-9/._=+-]+)$};    # untaint
+--- amavisd.orig	Mon Aug 25 18:07:56 2003
++++ amavisd	Mon Aug 25 20:47:40 2003
+@@ -3903,7 +3903,7 @@
+ 	/^\.lzo$/  && defined $lzop
+ 	    && return do_uncompress($part,$tempdir,"$lzop -d -c");
+ 	/^\.cpio$/ && defined $cpio && return do_cpio($part,$tempdir);
+-#	/^\.tar$/  && defined $cpio && return do_cpio($part,$tempdir);
++	/^\.tar$/  && defined $cpio && return do_cpio($part,$tempdir);
+ 	/^\.tar$/  && return do_tar($part,$tempdir);  # fallback
+ 	/^\.zip$/  && return do_unzip($part,0,$tempdir);
+ 	/^\.rar$/  && return do_unrar($part,0,$tempdir);
+@@ -6260,7 +6260,7 @@
+ my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)], 0);
+ $amavisd_path = $1 if $amavisd_path=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)}; # untaint
  
 -my($config_file) = '/etc/amavisd.conf';  # default location of config file
 +my($config_file) = '%%PREFIX%%/etc/amavisd.conf';  # default location of config file
  if (@ARGV >= 2 && $ARGV[0] eq '-c') {    # override by command line option -c
      shift @ARGV; $config_file = shift @ARGV;
-     $config_file = $1  if $config_file =~ m{^([A-Za-z0-9/._=+-]+)$};  # untaint
+     $config_file = $1 if $config_file=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)};# untaint
diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist
index 16225ec70779..782cf24a57b0 100644
--- a/security/amavisd-new/pkg-plist
+++ b/security/amavisd-new/pkg-plist
@@ -1,22 +1,23 @@
-%%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
+%%PORTDOCS%%%%DOCSDIR%%/AAAREADME.first
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README.chroot
+%%PORTDOCS%%%%DOCSDIR%%/README.contributed
+%%PORTDOCS%%%%DOCSDIR%%/README.customize
+%%PORTDOCS%%%%DOCSDIR%%/README.exim_v3
+%%PORTDOCS%%%%DOCSDIR%%/README.exim_v4
+%%PORTDOCS%%%%DOCSDIR%%/README.exim_v4_app
+%%PORTDOCS%%%%DOCSDIR%%/README.exim_v4_app2
+%%PORTDOCS%%%%DOCSDIR%%/README.lookups
+%%PORTDOCS%%%%DOCSDIR%%/README.milter
+%%PORTDOCS%%%%DOCSDIR%%/README.old.scanners
+%%PORTDOCS%%%%DOCSDIR%%/README.performance
+%%PORTDOCS%%%%DOCSDIR%%/README.policy-on-notifications
+%%PORTDOCS%%%%DOCSDIR%%/README.postfix
+%%PORTDOCS%%%%DOCSDIR%%/README.sendmail
+%%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 etc/amavisd.conf-dist
 etc/rc.d/amavisd.sh
 %%AMAVIS_NOMILTER%%sbin/amavis