- Update to 1.67

Changes from v1.66 -> v1.67 (new functionality)

 *    generic.c: AUTO_BLACK_LISTING was not being initialized which means
                 it couldnt of been working. patch by Benny Pedersen.
 *          *.c: records were taking twice as long to expire as what they
                 should be. Thanks to Sune Foldager for spotting this.
 *     contrib/: added debian startup/init file by Dietmar Braun.
 *       helo.c: used wrong variable for _expire. patch by Benny Pedersen.
 * policyd.spec: new rpm spec file. submitted by Catalin Muresan

- Fix missing documentation
- Fix startup script to not use '-' in rc variables.
- Fix pid filename in default configuration pid filename.
- Added postfix-policyd-stats to gather stats using syslog

PR:		ports/85868
Submitted by:	maintainer

3 files changed, 21 insertions, 13 deletions

diff --git a/mail/postfix-policyd-sf/Makefile b/mail/postfix-policyd-sf/Makefile
index ea3dbe04a678..fedb8ade5d34 100644
--- a/mail/postfix-policyd-sf/Makefile
+++ b/mail/postfix-policyd-sf/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	policyd-sf
+# New ports collection makefile for:	postfix-policyd-sf
 # Date created:				2005-08-02
 # Whom:					Xavier Beaudouin <kiwi@oav.net>
 #
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	policyd
-PORTVERSION=	1.66
+PORTVERSION=	1.67
 CATEGORIES=	mail
 MASTER_SITES=	http://policyd.sourceforge.net/
 PKGNAMEPREFIX=	postfix-
@@ -27,19 +27,27 @@ SUB_LIST+=	REALNAME=${REALNAME}
 
 ALL_TARGET=	linux
 
-PORTDOCS=	Changelog.txt README.txt License.txt WHITELIST.sql
+DOCS=		Changelog.txt README.txt License.txt DATABASE.mysql \
+		doc/WHITELIST.sql doc/SUPPORT.txt
+PORTDOCS=	*
 
 PLIST_FILES=	sbin/${REALNAME}-cleanup \
+		sbin/${REALNAME}-stats \
 		sbin/${REALNAME} \
 		etc/${REALNAME}.conf.sample
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,policyd.pid,postfix-policyd-sf.pid,' \
+		${WRKSRC}/policyd.conf
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cleanup ${PREFIX}/sbin/${REALNAME}-cleanup
+	${INSTALL_PROGRAM} ${WRKSRC}/stats ${PREFIX}/sbin/${REALNAME}-stats
 	${INSTALL_PROGRAM} ${WRKSRC}/policyd ${PREFIX}/sbin/${REALNAME}
 	${INSTALL_DATA} ${WRKSRC}/policyd.conf ${PREFIX}/etc/${REALNAME}.conf.sample
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	for f in ${PORTDOCS}; do \
+	for f in ${DOCS}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .endif
diff --git a/mail/postfix-policyd-sf/distinfo b/mail/postfix-policyd-sf/distinfo
index 617b17e23f62..1fa2d9c81ba9 100644
--- a/mail/postfix-policyd-sf/distinfo
+++ b/mail/postfix-policyd-sf/distinfo
@@ -1,2 +1,2 @@
-MD5 (policyd-v1.66.tar.gz) = f2d1562e636fcdcf08660f975538e038
-SIZE (policyd-v1.66.tar.gz) = 51338
+MD5 (policyd-v1.67.tar.gz) = 77c59852a7316d48a5f84bb6841fc23c
+SIZE (policyd-v1.67.tar.gz) = 52456
diff --git a/mail/postfix-policyd-sf/files/policyd.sh.in b/mail/postfix-policyd-sf/files/policyd.sh.in
index 78711a1ddf99..c00905530552 100644
--- a/mail/postfix-policyd-sf/files/policyd.sh.in
+++ b/mail/postfix-policyd-sf/files/policyd.sh.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 
-# PROVIDE: policyd
+# PROVIDE: postfix-policyd-sf
 # REQUIRE: LOGIN
 # BEFORE: mail
 # KEYWORD: FreeBSD shutdown
@@ -11,12 +11,12 @@
 #
 # Add the following lines to /etc/rc.conf to enable policyd:
 #
-# %%REALNAME%%_enable="YES"
+# postfix_policyd_sf_enable="YES"
 #
 
 . %%RC_SUBR%%
 
-name=%%REALNAME%%
+name=postfix_policyd_sf
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/%%REALNAME%%
@@ -30,11 +30,11 @@ stop_postcmd()
 
 # set defaults
 
-%%REALNAME%%_enable=${%%REALNAME%%_enable:-"NO"}
-%%REALNAME%%_pidfile=${%%REALNAME%%_pidfile:-"/var/run/%%REALNAME%%.pid"}
-%%REALNAME%%_flags=${%%REALNAME%%_flags:-"-c %%PREFIX%%/etc/%%REALNAME%%.conf"}
+postfix_policyd_sf_enable=${postfix_policyd_sf_enable:-"NO"}
+postfix_policyd_sf_pidfile=${postfix_policyd_sf_pidfile:-"/var/run/%%REALNAME%%.pid"}
+postfix_policyd_sf_flags=${postfix_policyd_sf_flags:-"-c %%PREFIX%%/etc/%%REALNAME%%.conf"}
 
-pidfile="${%%REALNAME%%_pidfile}"
+pidfile="${postfix_policyd_sf_pidfile}"
 
 load_rc_config $name
 run_rc_command "$1"