From owner-svn-ports-all@FreeBSD.ORG  Thu May 14 20:17:21 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7F99A593;
 Thu, 14 May 2015 20:17:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6E7E11D5E;
 Thu, 14 May 2015 20:17:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4EKHLg8028649;
 Thu, 14 May 2015 20:17:21 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4EKHL4F028647;
 Thu, 14 May 2015 20:17:21 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201505142017.t4EKHL4F028647@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 14 May 2015 20:17:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r386358 - head/mail/policyd2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 May 2015 20:17:21 -0000

Author: mat
Date: Thu May 14 20:17:20 2015
New Revision: 386358
URL: https://svnweb.freebsd.org/changeset/ports/386358

Log:
  Don't overwrite the webui config file.
  
  PR:		200205
  Submitted by:	 Danilo G. Baio (dbaio)
  Sponsored by:	Absolight

Modified:
  head/mail/policyd2/Makefile
  head/mail/policyd2/pkg-plist

Modified: head/mail/policyd2/Makefile
==============================================================================
--- head/mail/policyd2/Makefile	Thu May 14 20:04:38 2015	(r386357)
+++ head/mail/policyd2/Makefile	Thu May 14 20:17:20 2015	(r386358)
@@ -3,7 +3,7 @@
 
 PORTNAME=	policyd2
 PORTVERSION=	2.0.14
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://download.policyd.org/v${PORTVERSION}/
 DISTNAME=	cluebringer-v${PORTVERSION}
@@ -70,6 +70,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cluebringer.conf \
 		${STAGEDIR}${PREFIX}/etc/cluebringer.conf.sample
 	(cd ${WRKSRC}/webui && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
+	${MV} ${STAGEDIR}${WWWDIR}/includes/config.php \
+		${STAGEDIR}${WWWDIR}/includes/config.php.sample
 	(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})

Modified: head/mail/policyd2/pkg-plist
==============================================================================
--- head/mail/policyd2/pkg-plist	Thu May 14 20:04:38 2015	(r386357)
+++ head/mail/policyd2/pkg-plist	Thu May 14 20:17:20 2015	(r386358)
@@ -91,7 +91,7 @@ bin/cbpolicyd
 %%WWWDIR%%/images/valid-css2.png
 %%WWWDIR%%/images/valid-xhtml10.png
 %%WWWDIR%%/images/wcag1AAA.png
-%%WWWDIR%%/includes/config.php
+@sample %%WWWDIR%%/includes/config.php.sample
 %%WWWDIR%%/includes/db.php
 %%WWWDIR%%/includes/footer.php
 %%WWWDIR%%/includes/header.php