ports/100291: [PATCH] mail/postgrey: update to 1.26

[Yen-Ming Lee]

>Number:         100291
>Category:       ports
>Synopsis:       [PATCH] mail/postgrey: update to 1.26
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 14 13:50:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue Jul 11 12:39:20 CST 2006
>Description:
- Update to 1.26
- Utilize USE_RC_SUBR and SUB_FILES

Added file(s):
- files/postgrey.in

Removed file(s):
- files/postgrey.sh

Port maintainer (haroldp at internal.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- postgrey-1.26.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/postgrey/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- Makefile	10 May 2006 22:36:58 -0000	1.13
+++ Makefile	14 Jul 2006 13:43:05 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postgrey
-PORTVERSION=	1.24
+PORTVERSION=	1.26
 CATEGORIES=	mail
 MASTER_SITES=	http://isg.ee.ethz.ch/tools/postgrey/pub/
 
@@ -18,7 +18,7 @@
 		${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB
 
 USE_PERL5_RUN=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	postgrey
 NO_BUILD=	yes
 
 ETCFILES=	whitelist_clients whitelist_recipients
@@ -44,8 +44,6 @@
 	${REINPLACE_CMD} -e "s#/etc/#${PREFIX}/etc/#" ${WRKSRC}/postgrey
 
 pre-install:
-	${SED}	-e 's#%%PREFIX%%#${PREFIX}#g' -e 's#%%RC_SUBR%%#${RC_SUBR}#g' \
-		${FILESDIR}/postgrey.sh > ${WRKDIR}/postgrey.sh
 	${SED}	-e 's#%%USER%%#${PGY_USERNAME}#g' -e 's#%%UID%%#${PGY_USERID}#g' \
 		-e 's#%%GROUP%%#${PGY_GROUPNAME}#g' -e 's#%%GID%%#${PGY_GROUPID}#g' \
 		-e 's#%%PREFIX%%#${PREFIX}#g' -e 's#%%ETCFILES%%#${ETCFILES}#g' \
@@ -56,7 +54,6 @@
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKDIR}/postgrey.sh ${PREFIX}/etc/rc.d
 	${MKDIR} ${PREFIX}/etc/postfix
 .for i in ${ETCFILES}
 	${INSTALL_DATA} ${WRKSRC}/postgrey_${i} ${PREFIX}/etc/postfix/dist-postgrey_${i}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/mail/postgrey/distinfo,v
retrieving revision 1.8
diff -u -u -r1.8 distinfo
--- distinfo	18 Jan 2006 15:30:35 -0000	1.8
+++ distinfo	14 Jul 2006 13:43:05 -0000
@@ -1,3 +1,3 @@
-MD5 (postgrey-1.24.tar.gz) = db11f4da47ee28252cf2ddd160308d7e
-SHA256 (postgrey-1.24.tar.gz) = 266506813ee56314ea3f2e96dbfe0c7cbfe8a8548f3718f2d0952b0370683b77
-SIZE (postgrey-1.24.tar.gz) = 27444
+MD5 (postgrey-1.26.tar.gz) = 7fb26d0d33abfcb14af53ae1f3f4f98a
+SHA256 (postgrey-1.26.tar.gz) = 7441bf6aaf5ef0098da3bfde407768889d4a85886c99bd8d159c6dd21f30e7cb
+SIZE (postgrey-1.26.tar.gz) = 29221
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/mail/postgrey/pkg-plist,v
retrieving revision 1.4
diff -u -u -r1.4 pkg-plist
--- pkg-plist	12 May 2006 14:28:16 -0000	1.4
+++ pkg-plist	14 Jul 2006 13:43:05 -0000
@@ -2,7 +2,6 @@
 @unexec if cmp -s %D/etc/postfix/dist-postgrey_whitelist_clients %D/etc/postfix/postgrey_whitelist_clients; then rm -f %D/etc/postfix/postgrey_whitelist_clients; fi
 sbin/postgrey
 sbin/postgreyreport
-etc/rc.d/postgrey.sh
 etc/postfix/dist-postgrey_whitelist_recipients
 etc/postfix/dist-postgrey_whitelist_clients
 @dirrmtry etc/postfix
Index: files/postgrey.in
===================================================================
RCS file: files/postgrey.in
diff -N files/postgrey.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/postgrey.in	14 Jul 2006 13:43:05 -0000
@@ -0,0 +1,44 @@
+#!/bin/sh
+# $FreeBSD$
+#
+
+# PROVIDE: postgrey
+# REQUIRE: LOGIN
+# BEFORE: mail
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable postgrey:
+#
+# postgrey_enable="YES"
+#
+# See perldoc postgrey for flags
+#
+
+. %%RC_SUBR%%
+
+name=postgrey
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/postgrey
+required_dirs=/var/db/postgrey
+extra_commands=reload
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+  rm -f $pidfile
+}
+
+# set defaults
+
+postgrey_enable=${postgrey_enable:-"NO"}
+postgrey_pidfile=${postgrey_pidfile:-"/var/run/postgrey.pid"}
+postgrey_flags=${postgrey_flags:-"--pidfile=${postgrey_pidfile} \
+	--inet=10023 -d --user=postgrey --group=postgrey --dbdir=/var/db/postgrey"}
+
+pidfile="${postgrey_pidfile}"
+
+load_rc_config $name
+run_rc_command "$1"
Index: files/postgrey.sh
===================================================================
RCS file: files/postgrey.sh
diff -N files/postgrey.sh
--- files/postgrey.sh	20 Feb 2006 20:47:14 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/mail/postgrey/files/postgrey.sh,v 1.5 2006/02/20 20:47:14 dougb Exp $
-#
-
-# PROVIDE: postgrey
-# REQUIRE: LOGIN
-# BEFORE: mail
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable postgrey:
-#
-# postgrey_enable="YES"
-#
-# See perldoc postgrey for flags
-#
-
-. %%RC_SUBR%%
-
-name=postgrey
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/postgrey
-required_dirs=/var/db/postgrey
-extra_commands=reload
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
-  rm -f $pidfile
-}
-
-# set defaults
-
-postgrey_enable=${postgrey_enable:-"NO"}
-postgrey_pidfile=${postgrey_pidfile:-"/var/run/postgrey.pid"}
-postgrey_flags=${postgrey_flags:-"--pidfile=${postgrey_pidfile} \
-	--inet=10023 -d --user=postgrey --group=postgrey --dbdir=/var/db/postgrey"}
-
-pidfile="${postgrey_pidfile}"
-
-load_rc_config $name
-run_rc_command "$1"
--- postgrey-1.26.patch ends here ---

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