From 680742a49485f26e17ac04d18ac48ebf99a718b0 Mon Sep 17 00:00:00 2001
From: jeh <jeh@FreeBSD.org>
Date: Thu, 20 Nov 2003 11:00:19 +0000
Subject: 1) Update security/amavisd-new to amavisd-new-20030616-p6. 2)
 Incorporate changes from PR 57382:    - add rc.subr support    - cleanup sed
 variable replacement scripts    - add pointer to Clam Antivirus to
 installation message   PR 57382 was closed by mistake, I thought the contents
   have already been commited, while they were not.

PR:		59323
Submitted by:	milter@free.fr (1)
Submitted by:	Martin Matuska <martin@tradex.sk> (2)
Approved by:	MAINTAINER
---
 security/amavisd-new/Makefile | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'security/amavisd-new/Makefile')

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 6f393441795..c69775f5fda 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.p5
+PORTVERSION=	20030616.p6
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-p/}
@@ -35,6 +35,7 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-H
 		${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo
 
 USE_PERL5_RUN=	yes
+USE_RC_SUBR=	yes
 
 PKGINSTALL=	${WRKDIR}/INSTALL
 PKGDEINSTALL=	${WRKDIR}/DEINSTALL
@@ -63,23 +64,20 @@ CONFIGURE_WRKSRC=	${WRKSRC}/helper-progs
 BUILD_WRKSRC=	${WRKSRC}/helper-progs
 .endif
 
+SED_SCRIPT=	-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' \
+		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
+
 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}; \
+	for file in amavisd.sh amavis-milter.sh INSTALL DEINSTALL MESSAGE; do \
+		${SED} ${SED_SCRIPT} < ${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}; \
+		${SED} ${SED_SCRIPT} < ${WRKSRC}/$${file} > ${WRKDIR}/$${file}; \
 	done
 
 pre-install:
@@ -89,6 +87,7 @@ do-install:
 .if !defined(AMAVIS_NOMILTER)
 	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKDIR}/amavis-milter.sh ${PREFIX}/etc/rc.d
 .endif
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
-- 
cgit