mail/policyd2: fix $command_interpreter warning

While here, clean up a bit.  Use @sample keyword, wrap compound commands
with parentheses, customize WWWDIR, specify PORTDOCS explicitly, and
use MKDIR instead of INSTALL -d.

PR:		194678
Submitted by:	reiner (skoef.nl)

3 files changed, 116 insertions, 127 deletions

diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index fa6279becc9c..40bede30eb5a 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	policyd2
 PORTVERSION=	2.0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://devlabs.linuxassist.net/attachments/download/${DOWNLOAD_FOLDER}/
 DISTNAME=	cluebringer-${PORTVERSION}
@@ -27,9 +27,9 @@ SHEBANG_FILES=	cbpadmin \
 		database/convert-tsql \
 		database/whitelists/parse*
 
-WEBUIDIR=	${PREFIX}/www/policyd
+WWWDIR=		${PREFIX}/www/policyd
 PORTDOCS=	AUTHORS ChangeLog INSTALL TODO WISHLIST
-PORTDATA=	*
+PORTDATA=	contrib database
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE WEBUI
 OPTIONS_DEFAULT=MYSQL WEBUI
@@ -57,20 +57,18 @@ post-patch:
 		${WRKSRC}/cbpolicyd
 
 do-install:
-	@${INSTALL} -d ${STAGEDIR}${WEBUIDIR} ${STAGEDIR}${SITE_PERL}/cbp
-	cd ${WRKSRC}/webui && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBUIDIR}
-	cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} \* ${STAGEDIR}${SITE_PERL}/cbp
+	@${MKDIR} ${STAGEDIR}${WWWDIR} \
+		${STAGEDIR}${SITE_PERL}/cbp \
+		${STAGEDIR}${DATADIR} \
+		${STAGEDIR}${DOCSDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/cbpadmin ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/cbpolicyd ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/cluebringer.conf ${STAGEDIR}${PREFIX}/etc/cluebringer.conf.sample
-	@${INSTALL} -d ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} database ${STAGEDIR}${DATADIR}
-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Please check INSTALL file to configure!"
-	@${ECHO_MSG}
+	${INSTALL_DATA} ${WRKSRC}/cluebringer.conf \
+		${STAGEDIR}${PREFIX}/etc/cluebringer.conf.sample
+	(cd ${WRKSRC}/webui && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR})
+	(cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} \* ${STAGEDIR}${SITE_PERL}/cbp)
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} database ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/policyd2/files/policyd2.in b/mail/policyd2/files/policyd2.in
index a5443c618452..ef4359f9ecc2 100644
--- a/mail/policyd2/files/policyd2.in
+++ b/mail/policyd2/files/policyd2.in
@@ -19,7 +19,7 @@ name="policyd2"
 rcvar=policyd2_enable
 
 command="%%LOCALBASE%%/bin/cbpolicyd"
-command_interpreter="/usr/bin/perl"
+command_interpreter="%%LOCALBASE%%/bin/perl"
 
 load_rc_config $name
 
diff --git a/mail/policyd2/pkg-plist b/mail/policyd2/pkg-plist
index 7b8b6573756b..004a6062c393 100644
--- a/mail/policyd2/pkg-plist
+++ b/mail/policyd2/pkg-plist
@@ -1,101 +1,6 @@
-www/policyd/accesscontrol-add.php
-www/policyd/accesscontrol-change.php
-www/policyd/accesscontrol-delete.php
-www/policyd/accesscontrol-main.php
-www/policyd/amavis-add.php
-www/policyd/amavis-change.php
-www/policyd/amavis-delete.php
-www/policyd/amavis-main.php
-www/policyd/checkhelo-add.php
-www/policyd/checkhelo-blacklist-add.php
-www/policyd/checkhelo-blacklist-change.php
-www/policyd/checkhelo-blacklist-delete.php
-www/policyd/checkhelo-blacklist-main.php
-www/policyd/checkhelo-change.php
-www/policyd/checkhelo-delete.php
-www/policyd/checkhelo-main.php
-www/policyd/checkhelo-whitelist-add.php
-www/policyd/checkhelo-whitelist-change.php
-www/policyd/checkhelo-whitelist-delete.php
-www/policyd/checkhelo-whitelist-main.php
-www/policyd/checkspf-add.php
-www/policyd/checkspf-change.php
-www/policyd/checkspf-delete.php
-www/policyd/checkspf-main.php
-www/policyd/greylisting-add.php
-www/policyd/greylisting-change.php
-www/policyd/greylisting-delete.php
-www/policyd/greylisting-main.php
-www/policyd/greylisting-whitelist-add.php
-www/policyd/greylisting-whitelist-change.php
-www/policyd/greylisting-whitelist-delete.php
-www/policyd/greylisting-whitelist-main.php
-www/policyd/images/bg.jpg
-www/policyd/images/bullet.jpg
-www/policyd/images/help.gif
-www/policyd/images/menuleft.gif
-www/policyd/images/menuright.gif
-www/policyd/images/specs_bottom.jpg
-www/policyd/images/strips_onside.jpg
-www/policyd/images/top2.jpg
-www/policyd/images/valid-css2.png
-www/policyd/images/valid-xhtml10.png
-www/policyd/images/wcag1AAA.png
-www/policyd/includes/config.php
-www/policyd/includes/db.php
-www/policyd/includes/footer.php
-www/policyd/includes/header.php
-www/policyd/includes/tooltipdata.php
-www/policyd/includes/tooltips.php
-www/policyd/index.php
-www/policyd/policy-add.php
-www/policyd/policy-change.php
-www/policyd/policy-delete.php
-www/policyd/policy-group-add.php
-www/policyd/policy-group-change.php
-www/policyd/policy-group-delete.php
-www/policyd/policy-group-main.php
-www/policyd/policy-group-member-add.php
-www/policyd/policy-group-member-change.php
-www/policyd/policy-group-member-delete.php
-www/policyd/policy-group-member-main.php
-www/policyd/policy-main.php
-www/policyd/policy-member-add.php
-www/policyd/policy-member-change.php
-www/policyd/policy-member-delete.php
-www/policyd/policy-member-main.php
-www/policyd/postfix-aliases-add.php
-www/policyd/postfix-aliases-change.php
-www/policyd/postfix-aliases-delete.php
-www/policyd/postfix-aliases-main.php
-www/policyd/postfix-distgroups-add.php
-www/policyd/postfix-distgroups-change.php
-www/policyd/postfix-distgroups-delete.php
-www/policyd/postfix-distgroups-main.php
-www/policyd/postfix-distgroups-member-add.php
-www/policyd/postfix-distgroups-member-change.php
-www/policyd/postfix-distgroups-member-delete.php
-www/policyd/postfix-distgroups-member-main.php
-www/policyd/postfix-mailboxes-add.php
-www/policyd/postfix-mailboxes-change.php
-www/policyd/postfix-mailboxes-delete.php
-www/policyd/postfix-mailboxes-main.php
-www/policyd/postfix-transports-add.php
-www/policyd/postfix-transports-change.php
-www/policyd/postfix-transports-delete.php
-www/policyd/postfix-transports-main.php
-www/policyd/quotas-add.php
-www/policyd/quotas-change.php
-www/policyd/quotas-delete.php
-www/policyd/quotas-limits-add.php
-www/policyd/quotas-limits-change.php
-www/policyd/quotas-limits-delete.php
-www/policyd/quotas-limits-main.php
-www/policyd/quotas-main.php
-www/policyd/stylesheet.css
-www/policyd/tooltips/BubbleTooltips.js
-www/policyd/tooltips/bt.css
-www/policyd/tooltips/bt.gif
+bin/cbpadmin
+bin/cbpolicyd
+@sample etc/cluebringer.conf.sample
 %%SITE_PERL%%/cbp/cache.pm
 %%SITE_PERL%%/cbp/config.pm
 %%SITE_PERL%%/cbp/dbilayer.pm
@@ -115,15 +20,101 @@ www/policyd/tooltips/bt.gif
 %%SITE_PERL%%/cbp/system.pm
 %%SITE_PERL%%/cbp/tracking.pm
 %%SITE_PERL%%/cbp/version.pm
-bin/cbpadmin
-bin/cbpolicyd
-@unexec if cmp -s %D/etc/cluebringer.conf.sample %D/etc/cluebringer.conf; then rm -f %D/etc/cluebringer.conf; fi
-etc/cluebringer.conf.sample
-@exec if [ ! -f %D/etc/cluebringer.conf ] ; then cp -p %D/%F %B/etc/cluebringer.conf; chmod +w %B/etc/cluebringer.conf; fi
-@dirrm www/policyd/tooltips
-@dirrm www/policyd/includes
-@dirrm www/policyd/images
-@dirrmtry www/policyd
-@dirrm %%SITE_PERL%%/cbp/protocols
-@dirrm %%SITE_PERL%%/cbp/modules
-@dirrm %%SITE_PERL%%/cbp
+%%WWWDIR%%/accesscontrol-add.php
+%%WWWDIR%%/accesscontrol-change.php
+%%WWWDIR%%/accesscontrol-delete.php
+%%WWWDIR%%/accesscontrol-main.php
+%%WWWDIR%%/amavis-add.php
+%%WWWDIR%%/amavis-change.php
+%%WWWDIR%%/amavis-delete.php
+%%WWWDIR%%/amavis-main.php
+%%WWWDIR%%/checkhelo-add.php
+%%WWWDIR%%/checkhelo-blacklist-add.php
+%%WWWDIR%%/checkhelo-blacklist-change.php
+%%WWWDIR%%/checkhelo-blacklist-delete.php
+%%WWWDIR%%/checkhelo-blacklist-main.php
+%%WWWDIR%%/checkhelo-change.php
+%%WWWDIR%%/checkhelo-delete.php
+%%WWWDIR%%/checkhelo-main.php
+%%WWWDIR%%/checkhelo-whitelist-add.php
+%%WWWDIR%%/checkhelo-whitelist-change.php
+%%WWWDIR%%/checkhelo-whitelist-delete.php
+%%WWWDIR%%/checkhelo-whitelist-main.php
+%%WWWDIR%%/checkspf-add.php
+%%WWWDIR%%/checkspf-change.php
+%%WWWDIR%%/checkspf-delete.php
+%%WWWDIR%%/checkspf-main.php
+%%WWWDIR%%/greylisting-add.php
+%%WWWDIR%%/greylisting-change.php
+%%WWWDIR%%/greylisting-delete.php
+%%WWWDIR%%/greylisting-main.php
+%%WWWDIR%%/greylisting-whitelist-add.php
+%%WWWDIR%%/greylisting-whitelist-change.php
+%%WWWDIR%%/greylisting-whitelist-delete.php
+%%WWWDIR%%/greylisting-whitelist-main.php
+%%WWWDIR%%/images/bg.jpg
+%%WWWDIR%%/images/bullet.jpg
+%%WWWDIR%%/images/help.gif
+%%WWWDIR%%/images/menuleft.gif
+%%WWWDIR%%/images/menuright.gif
+%%WWWDIR%%/images/specs_bottom.jpg
+%%WWWDIR%%/images/strips_onside.jpg
+%%WWWDIR%%/images/top2.jpg
+%%WWWDIR%%/images/valid-css2.png
+%%WWWDIR%%/images/valid-xhtml10.png
+%%WWWDIR%%/images/wcag1AAA.png
+%%WWWDIR%%/includes/config.php
+%%WWWDIR%%/includes/db.php
+%%WWWDIR%%/includes/footer.php
+%%WWWDIR%%/includes/header.php
+%%WWWDIR%%/includes/tooltipdata.php
+%%WWWDIR%%/includes/tooltips.php
+%%WWWDIR%%/index.php
+%%WWWDIR%%/policy-add.php
+%%WWWDIR%%/policy-change.php
+%%WWWDIR%%/policy-delete.php
+%%WWWDIR%%/policy-group-add.php
+%%WWWDIR%%/policy-group-change.php
+%%WWWDIR%%/policy-group-delete.php
+%%WWWDIR%%/policy-group-main.php
+%%WWWDIR%%/policy-group-member-add.php
+%%WWWDIR%%/policy-group-member-change.php
+%%WWWDIR%%/policy-group-member-delete.php
+%%WWWDIR%%/policy-group-member-main.php
+%%WWWDIR%%/policy-main.php
+%%WWWDIR%%/policy-member-add.php
+%%WWWDIR%%/policy-member-change.php
+%%WWWDIR%%/policy-member-delete.php
+%%WWWDIR%%/policy-member-main.php
+%%WWWDIR%%/postfix-aliases-add.php
+%%WWWDIR%%/postfix-aliases-change.php
+%%WWWDIR%%/postfix-aliases-delete.php
+%%WWWDIR%%/postfix-aliases-main.php
+%%WWWDIR%%/postfix-distgroups-add.php
+%%WWWDIR%%/postfix-distgroups-change.php
+%%WWWDIR%%/postfix-distgroups-delete.php
+%%WWWDIR%%/postfix-distgroups-main.php
+%%WWWDIR%%/postfix-distgroups-member-add.php
+%%WWWDIR%%/postfix-distgroups-member-change.php
+%%WWWDIR%%/postfix-distgroups-member-delete.php
+%%WWWDIR%%/postfix-distgroups-member-main.php
+%%WWWDIR%%/postfix-mailboxes-add.php
+%%WWWDIR%%/postfix-mailboxes-change.php
+%%WWWDIR%%/postfix-mailboxes-delete.php
+%%WWWDIR%%/postfix-mailboxes-main.php
+%%WWWDIR%%/postfix-transports-add.php
+%%WWWDIR%%/postfix-transports-change.php
+%%WWWDIR%%/postfix-transports-delete.php
+%%WWWDIR%%/postfix-transports-main.php
+%%WWWDIR%%/quotas-add.php
+%%WWWDIR%%/quotas-change.php
+%%WWWDIR%%/quotas-delete.php
+%%WWWDIR%%/quotas-limits-add.php
+%%WWWDIR%%/quotas-limits-change.php
+%%WWWDIR%%/quotas-limits-delete.php
+%%WWWDIR%%/quotas-limits-main.php
+%%WWWDIR%%/quotas-main.php
+%%WWWDIR%%/stylesheet.css
+%%WWWDIR%%/tooltips/BubbleTooltips.js
+%%WWWDIR%%/tooltips/bt.css
+%%WWWDIR%%/tooltips/bt.gif