Update to 2.0.14.

Sponsored by:	Absolight

3 files changed, 44 insertions, 12 deletions

diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index a024895622c0..f62f64972e7b 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -2,25 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	policyd2
-PORTVERSION=	2.0.12
-PORTREVISION=	4
+PORTVERSION=	2.0.14
+PORTREVISION=	0
 CATEGORIES=	mail
-MASTER_SITES=	http://devlabs.linuxassist.net/attachments/download/${DOWNLOAD_FOLDER}/
-DISTNAME=	cluebringer-${PORTVERSION}
+MASTER_SITES=	http://download.policyd.org/v${PORTVERSION}/
+DISTNAME=	cluebringer-v${PORTVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Policyd v2 is a multi-platform policy server for popular MTAs
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
 		p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
 		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
 		p5-Cache-FastMmap>=0:${PORTSDIR}/devel/p5-Cache-FastMmap
 
-USES=		perl5 shebangfix
+USES=		perl5 shebangfix tar:xz
 NO_BUILD=	yes
-BINMODE=	0755
 USE_RC_SUBR=	policyd2
-DOWNLOAD_FOLDER=	222
 BASH_CMD=	/bin/sh
 SHEBANG_FILES=	cbpadmin \
 		cbpolicyd \
@@ -29,10 +30,13 @@ SHEBANG_FILES=	cbpadmin \
 
 WWWDIR=		${PREFIX}/www/policyd
 PORTDOCS=	AUTHORS ChangeLog INSTALL TODO WISHLIST
-PORTDATA=	contrib database
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE WEBUI
 OPTIONS_DEFAULT=MYSQL WEBUI
+MYSQL_DESC=	Add a dependency on DBD::mysql
+PGSQL_DESC=	Add a dependency on DBD::Pg
+SQLITE_DESC=	Add a dependency on DBD:SQLite
+WEBUI_DESC=	Add a dependency on the corresponding PHP pdo driver
 
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
@@ -65,8 +69,8 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cbpolicyd ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/cluebringer.conf \
 		${STAGEDIR}${PREFIX}/etc/cluebringer.conf.sample
-	(cd ${WRKSRC}/webui && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR})
-	(cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/cbp)
+	(cd ${WRKSRC}/webui && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
+	(cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/cbp)
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} database ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
diff --git a/mail/policyd2/distinfo b/mail/policyd2/distinfo
index 896ba9070347..ca6067d51b65 100644
--- a/mail/policyd2/distinfo
+++ b/mail/policyd2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cluebringer-2.0.12.tar.gz) = 7141fd64a0056957331d5c1a3af8c21d77519c34b370748d6d3fb37556bd091d
-SIZE (cluebringer-2.0.12.tar.gz) = 140169
+SHA256 (cluebringer-v2.0.14.tar.xz) = 85e59a231bcac2b9d193198da4a07eae2e397ba441278454b92329283939b6bc
+SIZE (cluebringer-v2.0.14.tar.xz) = 96224
diff --git a/mail/policyd2/pkg-plist b/mail/policyd2/pkg-plist
index 004a6062c393..4a23225a312e 100644
--- a/mail/policyd2/pkg-plist
+++ b/mail/policyd2/pkg-plist
@@ -20,6 +20,34 @@ bin/cbpolicyd
 %%SITE_PERL%%/cbp/system.pm
 %%SITE_PERL%%/cbp/tracking.pm
 %%SITE_PERL%%/cbp/version.pm
+%%DATADIR%%/contrib/amavisd-new/amavisd-new-2.5.3_policyd-200802070918.patch
+%%DATADIR%%/contrib/amavisd-new/amavisd-new-2.6.1_policyd-200807052230.patch
+%%DATADIR%%/contrib/amavisd-new/amavisd-policyd.pm
+%%DATADIR%%/contrib/httpd/cluebringer-httpd.conf
+%%DATADIR%%/contrib/initscripts/Fedora/cbpolicyd
+%%DATADIR%%/contrib/postfix/alias_to_mailbox_map.cf
+%%DATADIR%%/contrib/postfix/aliases.cf
+%%DATADIR%%/contrib/postfix/bcc.cf
+%%DATADIR%%/contrib/postfix/distribution_lists.cf
+%%DATADIR%%/contrib/postfix/mailbox_domains.cf
+%%DATADIR%%/contrib/postfix/mailboxes.cf
+%%DATADIR%%/contrib/postfix/main.cf_snippet
+%%DATADIR%%/contrib/postfix/quotas.cf
+%%DATADIR%%/contrib/postfix/relay_domains.cf
+%%DATADIR%%/contrib/postfix/schema/postfix.tsql
+%%DATADIR%%/contrib/postfix/transports.cf
+%%DATADIR%%/database/access_control.tsql
+%%DATADIR%%/database/amavis.tsql
+%%DATADIR%%/database/checkhelo.tsql
+%%DATADIR%%/database/checkspf.tsql
+%%DATADIR%%/database/convert-tsql
+%%DATADIR%%/database/core.tsql
+%%DATADIR%%/database/greylisting.tsql
+%%DATADIR%%/database/quotas.tsql
+%%DATADIR%%/database/whitelists/checkhelo-whitelistings.txt
+%%DATADIR%%/database/whitelists/greylist-whitelistings.txt
+%%DATADIR%%/database/whitelists/parse-checkhelo-whitelist
+%%DATADIR%%/database/whitelists/parse-greylisting-whitelist
 %%WWWDIR%%/accesscontrol-add.php
 %%WWWDIR%%/accesscontrol-change.php
 %%WWWDIR%%/accesscontrol-delete.php