2 files changed, 24 insertions, 15 deletions

diff --git a/mail/courier-pythonfilter/Makefile b/mail/courier-pythonfilter/Makefile
index 2c104a2b2f0e..733f613f433c 100644
--- a/mail/courier-pythonfilter/Makefile
+++ b/mail/courier-pythonfilter/Makefile
@@ -20,11 +20,16 @@ MAILUID=	465
 MAILGID=	465
 
 LOCALSTATEDIR=	/var/spool/courier
-SCRIPTSDIR=	${PREFIX}/libexec/filters
+PYSCRIPTSDIR=	${PREFIX}/libexec/filters
+
+PLIST_SUB+=	MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \
+		MAILUID="${MAILUID}" MAILGID="${MAILGID}" \
+		LOCALSTATEDIR="${LOCALSTATEDIR}"
+SUB_LIST+=	${PLIST_SUB}
 
 OPTIONS_DEFINE=	DEBUG NODUPLICATES LOCALSENDERS SPAMASSASSIN AUTO_WHITELIST WHITELIST_RELAY WHITELIST_AUTH \
 		WHITELIST_BLOCK WHITELIST_DNSWL WHITELIST_DNSWL DELIVEREDTO PRIVATEADDR SPFCHECK NOSUCCESSDSN \
-		COMEAGAIN GREYLIST DIALBACK RATELIMIT ATTACHMENTS QUOTA
+		COMEAGAIN GREYLIST DIALBACK RATELIMIT ATTACHMENTS QUOTA WHITELIST_SPF
 
 DEBUG_DESC=	debug module
 NODUPLICATES_DESC=	noduplicates module
@@ -37,7 +42,7 @@ WHITELIST_RELAY_DESC=	whitelist_relayclients module
 WHITELIST_AUTH_DESC=	whitelist_auth module
 WHITELIST_BLOCK_DESC=	whitelist_block module
 WHITELIST_DNSWL_DESC=	whitelist_dnswl module
-WHITELIST_SP_DESC=	Fwhitelist_spf module
+WHITELIST_SP_DESC=	whitelist_spf module
 DELIVEREDTO_DESC=	deliveredto module
 PRIVATEADDR_DESC=	privateaddr module
 SPFCHECK_DESC=	spfcheck module
@@ -55,10 +60,9 @@ RG1_DESC=	ClamAV Filter Option
 
 OPTIONS_DEFAULT=	DEBUG WHITELIST_RELAY WHITELIST_AUTH
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${SCRIPTSDIR}
+PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${PYSCRIPTSDIR}
 
 .if ${PORT_OPTIONS:MCLAMAV_CLAMD} && ! ${PORT_OPTIONS:MCLAMAV_LIB}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyclamd.py:${PORTSDIR}/security/py-pyclamd
@@ -143,9 +147,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pythonfilter
 
 post-install:
-	${MKDIR} ${LOCALSTATEDIR}/pythonfilter
-	${CHOWN} ${MAILOWN}:${MAILGRP} ${LOCALSTATEDIR}/pythonfilter
-	@if [ ! -f ${PREFIX}/etc/pythonfilter.conf ]; then cp -p ${PREFIX}/etc/pythonfilter.conf.sample ${PREFIX}/etc/pythonfilter.conf; fi
-	@if [ ! -f ${PREFIX}/etc/pythonfilter-modules.conf ]; then cp -p ${PREFIX}/etc/pythonfilter-modules.conf.sample ${PREFIX}/etc/pythonfilter-modules.conf; fi
+	@${MKDIR} ${STAGEDIR}${LOCALSTATEDIR}/pythonfilter
 
 .include <bsd.port.post.mk>
diff --git a/mail/courier-pythonfilter/pkg-plist b/mail/courier-pythonfilter/pkg-plist
index a6039fa290a5..f6a635c44d73 100644
--- a/mail/courier-pythonfilter/pkg-plist
+++ b/mail/courier-pythonfilter/pkg-plist
@@ -1,9 +1,5 @@
-@unexec if cmp -s %D/etc/pythonfilter.conf %D/etc/pythonfilter.conf.sample; then rm -f %D/etc/pythonfilter.conf; fi
-etc/pythonfilter.conf.sample
-@exec if [ ! -f %D/etc/pythonfilter.conf ]; then cp -p %D/etc/pythonfilter.conf.sample %D/etc/pythonfilter.conf; fi
-@unexec if cmp -s %D/etc/pythonfilter-modules.conf %D/etc/pythonfilter-modules.conf.sample; then rm -f %D/etc/pythonfilter-modules.conf; fi
-etc/pythonfilter-modules.conf.sample
-@exec if [ ! -f %D/etc/pythonfilter-modules.conf ]; then cp -p %D/etc/pythonfilter-modules.conf.sample %D/etc/pythonfilter-modules.conf; fi
+@sample etc/pythonfilter.conf.sample
+@sample etc/pythonfilter-modules.conf.sample
 libexec/filters/pythonfilter
 libexec/filters/pythonfilter-quarantine
 %%PYTHON_SITELIBDIR%%/courier/__init__.py
@@ -102,5 +98,17 @@ libexec/filters/pythonfilter-quarantine
 %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.py
 %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.pyc
 %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.pyo
+%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/top_level.txt
+@owner courier
+@group courier
+@dirrmtry %%LOCALSTATEDIR%%/pythonfilter
+@group courier
+@owner courier
+@dirrmtry %%LOCALSTATEDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/courier
 @dirrm %%PYTHON_SITELIBDIR%%/pythonfilter
+@dirrm %%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info
+@dirrmtry libexec/filters