From ae2f644ff068379fd56b034060cdb2dd8f6416f6 Mon Sep 17 00:00:00 2001
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 8 Jan 2004 01:09:00 +0000
Subject: [PATCH] Upgrade security/amavisd-new

	Upgrade security/amavisd-new port to 20030616.p7

Also make portlint less unhappy wrt file

PR:		ports/61042
Submitted by:	Blaz Zupan <blaz@si.FreeBSD.org>
---
 security/amavisd-new/Makefile  | 10 +++++-----
 security/amavisd-new/distinfo  |  2 +-
 security/amavisd-new/pkg-plist |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index c69775f5fda0..a8b5c8364077 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.p6
+PORTVERSION=	20030616.p7
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-p/}
@@ -73,11 +73,11 @@ SED_SCRIPT=	-e 's,%%AMAVISUSER%%,${AMAVISUSER},g' \
 		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
 
 pre-build:
-	for file in amavisd.sh amavis-milter.sh INSTALL DEINSTALL MESSAGE; do \
-		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
+	for f in amavisd.sh amavis-milter.sh INSTALL DEINSTALL MESSAGE; do \
+		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${f}.tmpl > ${WRKDIR}/$${f}; \
 	done
-	for file in amavisd.conf amavisd; do \
-		${SED} ${SED_SCRIPT} < ${WRKSRC}/$${file} > ${WRKDIR}/$${file}; \
+	for f in amavisd.conf amavisd; do \
+		${SED} ${SED_SCRIPT} < ${WRKSRC}/$${f} > ${WRKDIR}/$${f}; \
 	done
 
 pre-install:
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index ae6a07ac2974..0a2c1c1d3dbe 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1 +1 @@
-MD5 (amavisd-new-20030616-p6.tar.gz) = a611af8b952707977b9851dc8fc81640
+MD5 (amavisd-new-20030616-p7.tar.gz) = e6f35be1e14861e3869debdd9bdfbfba
diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist
index 50b59198d5fc..41ebbd2b9149 100644
--- a/security/amavisd-new/pkg-plist
+++ b/security/amavisd-new/pkg-plist
@@ -3,8 +3,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README.chroot
 %%PORTDOCS%%%%DOCSDIR%%/README.contributed
+%%PORTDOCS%%%%DOCSDIR%%/README.courier
 %%PORTDOCS%%%%DOCSDIR%%/README.customize
 %%PORTDOCS%%%%DOCSDIR%%/README.exim_v3
+%%PORTDOCS%%%%DOCSDIR%%/README.exim_v3_app
 %%PORTDOCS%%%%DOCSDIR%%/README.exim_v4
 %%PORTDOCS%%%%DOCSDIR%%/README.exim_v4_app
 %%PORTDOCS%%%%DOCSDIR%%/README.exim_v4_app2