5 files changed, 20 insertions, 30 deletions

diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index ffbd96837501..5e592e589598 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    postgrey
 # Date created:				24 August 2004
-# Whom:					Will Andrews <will@freebsd.org>
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	postgrey
-PORTVERSION=	1.27
+PORTVERSION=	1.28
 CATEGORIES=	mail
-MASTER_SITES=	http://postgrey.schweikert.ch/pub/
+MASTER_SITES=	http://postgrey.schweikert.ch/pub/ LOCAL/beech
 
 MAINTAINER=	haroldp@internal.org
 COMMENT=	Greylisting policy server for Postfix
@@ -20,7 +20,10 @@ RUN_DEPENDS=	${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
 USE_PERL5_RUN=	yes
 USE_RC_SUBR=	postgrey
 NO_BUILD=	yes
-
+SUB_FILES=	pkg-install
+SUB_LIST=	USER=${PGY_USERNAME} UID=${PGY_USERID} GROUP=${PGY_GROUPNAME} \
+		GID=${PGY_GROUPID} ETCFILES="${ETCFILES}" \
+		POSTGREYDIR=${PGY_DIR}
 ETCFILES=	whitelist_clients whitelist_recipients
 PGY_USERNAME?=	postgrey
 PGY_USERID?=	225
@@ -28,31 +31,17 @@ PGY_GROUPNAME?=	${PGY_USERNAME}
 PGY_GROUPID?=	${PGY_USERID}
 PGY_DIR?=	/var/db/postgrey
 
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-
-.include <bsd.port.pre.mk>
-
-# Sys::Syslog::openlog won't return 1 for success in perl 5.00503, and causes
-# "Couldn't open syslog[] at ... Net/Server.pm line ..." problem.
-# See the thread of http://lists.ee.ethz.ch/postgrey/msg00001.html
-.if ${PERL_LEVEL} < 500600
-IGNORE=	needs perl 5.6.0 or higher, install lang/perl5.8 and try again
-.endif
-
 post-patch:
-	${REINPLACE_CMD} -e "s#/etc/#${PREFIX}/etc/#" ${WRKSRC}/postgrey
+	@${REINPLACE_CMD} -e "s#/etc/#${PREFIX}/etc/#" ${WRKSRC}/postgrey
+	@${REINPLACE_CMD} -e '/^my.*DEFAULT_DBDIR/s|/var/spool/postfix/postgrey|${PGY_DIR}|' \
+	${WRKSRC}/postgrey
 
 pre-install:
-	${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' \
-		-e 's#%%POSTGREYDIR%%#${PGY_DIR}#g' ${MASTERDIR}/pkg-install > \
-		${PKGINSTALL}
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport ${PREFIX}/sbin
 	${MKDIR} ${PREFIX}/etc/postfix
 .for i in ${ETCFILES}
@@ -60,6 +49,6 @@ do-install:
 .endfor
 
 post-install:
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/postgrey/distinfo b/mail/postgrey/distinfo
index 99b2c8dbc4a5..bd07ded0c947 100644
--- a/mail/postgrey/distinfo
+++ b/mail/postgrey/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgrey-1.27.tar.gz) = df3a8b4a0c6ab7e8e5bb5be0de096c47
-SHA256 (postgrey-1.27.tar.gz) = b29f9e6a0648ea8cddd6c96ea827bb33b8346605f6d45d6ebb33a1af8470ce42
-SIZE (postgrey-1.27.tar.gz) = 29221
+MD5 (postgrey-1.28.tar.gz) = 5d9d8a5c62f32fe7584aba2863774926
+SHA256 (postgrey-1.28.tar.gz) = a47ccc0654bc168a68d15a79bd021647292984c4a0c3a67d7a5ff57957b3f8fa
+SIZE (postgrey-1.28.tar.gz) = 33445
diff --git a/mail/postgrey/pkg-install b/mail/postgrey/files/pkg-install.in
index 19c0559c570a..f13c20d305a1 100644
--- a/mail/postgrey/pkg-install
+++ b/mail/postgrey/files/pkg-install.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/mail/postgrey/files/pkg-install.in,v 1.1 2007-06-27 21:13:24 beech Exp $
 
 PATH=/bin:/usr/bin:/usr/sbin
 
diff --git a/mail/postgrey/pkg-descr b/mail/postgrey/pkg-descr
index ffd931c2794a..81b7e45c3212 100644
--- a/mail/postgrey/pkg-descr
+++ b/mail/postgrey/pkg-descr
@@ -1,4 +1,4 @@
 Postgrey is a program which implements greylisting and is
 designed to work with the Postfix MTA.
 
-WWW: http://isg.ee.ethz.ch/tools/postgrey/
+WWW:  http://postgrey.schweikert.ch/
diff --git a/mail/postgrey/pkg-plist b/mail/postgrey/pkg-plist
index b093c6b3287b..cf8b3648ba25 100644
--- a/mail/postgrey/pkg-plist
+++ b/mail/postgrey/pkg-plist
@@ -1,6 +1,7 @@
 @unexec if cmp -s %D/etc/postfix/dist-postgrey_whitelist_recipients %D/etc/postfix/postgrey_whitelist_recipients; then rm -f %D/etc/postfix/postgrey_whitelist_recipients; fi
 @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/policy-test
 sbin/postgreyreport
 etc/postfix/dist-postgrey_whitelist_recipients
 etc/postfix/dist-postgrey_whitelist_clients