Index: head/mail/postgrey/Makefile
===================================================================
--- head/mail/postgrey/Makefile	(revision 467558)
+++ head/mail/postgrey/Makefile	(revision 467559)
@@ -1,85 +1,85 @@
 # Created by: Will Andrews <will@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	postgrey
 PORTVERSION=	1.37
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://postgrey.schweikert.ch/pub/ \
 		http://postgrey.schweikert.ch/pub/old/
 
 MAINTAINER=	ports.maintainer@evilphi.com
 COMMENT=	Greylisting policy server for Postfix
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB \
 		p5-IO-Multiplex>=0:devel/p5-IO-Multiplex \
 		p5-Parse-Syslog>=0:textproc/p5-Parse-Syslog \
 		p5-Net-DNS>=0:dns/p5-Net-DNS \
 		p5-Net-Server>=0:net/p5-Net-Server \
 		p5-NetAddr-IP>=0:net-mgmt/p5-NetAddr-IP
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
 USE_RC_SUBR=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 POD2MAN?=	pod2man
 PORTDOCS=	README Changes README.exim
 
 POSTGREY_DBDIR?=	/var/db/postgrey
 POSTGREY_GROUP?=	postgrey
 POSTGREY_RUNDIR?=	/var/run/postgrey
 POSTGREY_USER?=		postgrey
 
 SUB_LIST=	POSTGREY_DBDIR=${POSTGREY_DBDIR} \
 		POSTGREY_RUNDIR=${POSTGREY_RUNDIR}
 
 PLIST_SUB+=	POSTGREY_DBDIR=${POSTGREY_DBDIR} \
 		POSTGREY_GROUP=${POSTGREY_GROUP} \
 		POSTGREY_RUNDIR=${POSTGREY_RUNDIR} \
 		POSTGREY_USER=${POSTGREY_USER}
 
 USERS=		${POSTGREY_USER}
 GROUPS=		${POSTGREY_GROUP}
 
 MANPAGES=	postgrey.1 policy-test.1 postgreyreport.1
 ETCFILES=	whitelist_clients whitelist_recipients
 
 SHEBANG_FILES=	postgrey policy-test contrib/postgreyreport
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#nogroup#${POSTGREY_GROUP}#' \
 		-e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey
 	@${REINPLACE_CMD} -e 's#/etc/postfix#${PREFIX}&#' \
 		${WRKSRC}/postgrey ${WRKSRC}/postgrey_whitelist_*
 	@${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${POSTGREY_DBDIR}#' \
 		${WRKSRC}/postgrey ${WRKSRC}/contrib/postgreyreport
 
 do-install:
 	${POD2MAN} ${WRKSRC}/postgrey ${WRKSRC}/postgrey.1
 	${POD2MAN} ${WRKSRC}/policy-test ${WRKSRC}/policy-test.1
 	${POD2MAN} ${WRKSRC}/contrib/postgreyreport ${WRKSRC}/postgreyreport.1
 	${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport \
 		${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/postfix ${STAGEDIR}${POSTGREY_DBDIR} \
 		${STAGEDIR}${POSTGREY_RUNDIR}
 .for i in ${ETCFILES}
 	${INSTALL_DATA} ${WRKSRC}/postgrey_${i} \
 		${STAGEDIR}${PREFIX}/etc/postfix/postgrey_${i}.sample
 .endfor
 	cd ${WRKSRC} && \
 		${INSTALL_MAN} ${MANPAGES} ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/mail/postgrey/files/postgrey.in
===================================================================
--- head/mail/postgrey/files/postgrey.in	(revision 467558)
+++ head/mail/postgrey/files/postgrey.in	(revision 467559)
@@ -1,43 +1,43 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: postgrey
 # REQUIRE: LOGIN
 # BEFORE: mail
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable postgrey:
 #
 # postgrey_enable (bool)        Set to 'YES' to enable
 #                               Default: NO
 # postgrey_dbdir (path)         Location of postgrey database files.
-#                               Default: %%PG_DBDIR%%
+#                               Default: %%POSTGREY_DBDIR%%
 # postgrey_flags (extra args)   Additional command-line parameters.
 #                               Default: --inet=10023
 #
 # Note:
 #
 # postgrey_flags must include a --inet or --unix option or postgrey will
 # not run.  Change the --dbdir option with postgrey_dbdir.  Please see
 # the postgrey(1) man page or perldoc postgrey for more information.
 
 . /etc/rc.subr
 
 name=postgrey
 rcvar=postgrey_enable
 
 load_rc_config $name
 
 : ${postgrey_enable:=NO}
-: ${postgrey_dbdir:=%%PG_DBDIR%%}
+: ${postgrey_dbdir:=%%POSTGREY_DBDIR%%}
 : ${postgrey_flags:=--inet=10023}
 
 command=%%PREFIX%%/sbin/postgrey
 extra_commands=reload
-pidfile=%%PG_RUNDIR%%/postgrey.pid
-required_dirs="${postgrey_dbdir} %%PG_RUNDIR%%"
+pidfile=%%POSTGREY_RUNDIR%%/postgrey.pid
+required_dirs="${postgrey_dbdir} %%POSTGREY_RUNDIR%%"
 
 command_args="-d --pidfile=${pidfile} --dbdir=${postgrey_dbdir}"
 
 run_rc_command "$1"