ports/89198: [maintainer update] security/amavisd-milter

[Petr Rehor]

>Number:         89198
>Category:       ports
>Synopsis:       [maintainer update] security/amavisd-milter
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 17 15:40:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Petr Rehor
>Release:        FreeBSD 5.3-RELEASE-p22-i386 i386
>Organization:
>Environment:
System: FreeBSD charon.rx.cz 5.3-RELEASE-p22-i386 FreeBSD 5.3-RELEASE-p22-i386 #0: Fri Oct 28 13:21:20 UTC 2005 root at marvin.rx.cz:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- Update to 1.0.3
- Fix pid file location in startup script (thanks to Andrzej Tobola)
- Properly set rc.conf default values
>How-To-Repeat:
	
>Fix:

	

--- amavisd-milter.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	13 Nov 2005 16:28:47 -0000	1.1
+++ Makefile	15 Nov 2005 22:29:11 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amavisd-milter
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	security mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,14 +25,16 @@
 
 SUB_FILES=	pkg-message
 SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
-		AMAVISDIR=${AMAVISDIR} \
+		AMAVISDIR=${AMAVISDIR}
 
 DOCS=		AUTHORS CHANGES INSTALL LICENSE README TODO
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	RC_DIR=${RC_DIR} \
 		RC_SUFX=${RC_SUFX} \
+		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///}
 
 post-install:
 .if !defined(NOPORTDOCS)
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	13 Nov 2005 16:28:47 -0000	1.1
+++ distinfo	15 Nov 2005 22:26:07 -0000
@@ -1,2 +1,2 @@
-MD5 (amavisd-milter-1.0.2.tar.gz) = b661a4b8cf2986e5c6aa2a86d61d04c3
-SIZE (amavisd-milter-1.0.2.tar.gz) = 126640
+MD5 (amavisd-milter-1.0.3.tar.gz) = 595cf90f782123cb30fb0c26d9bb05da
+SIZE (amavisd-milter-1.0.3.tar.gz) = 126822
Index: files/amavisd-milter.sh.in
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/files/amavisd-milter.sh.in,v
retrieving revision 1.1
diff -u -r1.1 amavisd-milter.sh.in
--- files/amavisd-milter.sh.in	13 Nov 2005 16:28:47 -0000	1.1
+++ files/amavisd-milter.sh.in	15 Nov 2005 22:32:59 -0000
@@ -15,10 +15,10 @@
 #
 
 # Set defaults
-amavisd_milter_enable="NO"
-amavisd_milter_flags=""
-amavisd_milter_pidfile="%%AMAVISGROUP%%/amavisd-milter.pid"
-amavisd_milter_user="%%AMAVISUSER%%"
+: ${amavisd_milter_enable:="NO"}
+: ${amavisd_milter_flags:=""}
+: ${amavisd_milter_pidfile:="%%AMAVISDIR%%/amavisd-milter.pid"}
+: ${amavisd_milter_user:="%%AMAVISUSER%%"}
 
 . %%RC_SUBR%%
 
--- amavisd-milter.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: