From owner-svn-ports-all@FreeBSD.ORG  Wed Aug 13 22:45:46 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 777B0F28;
 Wed, 13 Aug 2014 22:45:46 +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 646552A22;
 Wed, 13 Aug 2014 22:45:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7DMjk1D088336;
 Wed, 13 Aug 2014 22:45:46 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7DMjkso088331;
 Wed, 13 Aug 2014 22:45:46 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201408132245.s7DMjkso088331@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Wed, 13 Aug 2014 22:45:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364819 - head/www/phpbb3
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.18-1
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: Wed, 13 Aug 2014 22:45:46 -0000

Author: marino
Date: Wed Aug 13 22:45:45 2014
New Revision: 364819
URL: http://svnweb.freebsd.org/changeset/ports/364819
QAT: https://qat.redports.org/buildarchive/r364819/

Log:
  www/phpbb3: Replace @sample keyword
  
  The @sample keyword got used here but it didn't work because the
  extension was php.sample instead of conf.sample.  Fix it with @unexec
  and @exec tricks.
  
  By the way, the previous commit to this port and the one that should
  have provided this @sample fix is:
  
  PR:		191456

Modified:
  head/www/phpbb3/Makefile
  head/www/phpbb3/pkg-plist

Modified: head/www/phpbb3/Makefile
==============================================================================
--- head/www/phpbb3/Makefile	Wed Aug 13 22:40:26 2014	(r364818)
+++ head/www/phpbb3/Makefile	Wed Aug 13 22:45:45 2014	(r364819)
@@ -3,6 +3,7 @@
 
 PORTNAME=	phpbb
 PORTVERSION=	3.0.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.phpbb.com/files/release/
 PKGNAMESUFFIX=	3

Modified: head/www/phpbb3/pkg-plist
==============================================================================
--- head/www/phpbb3/pkg-plist	Wed Aug 13 22:40:26 2014	(r364818)
+++ head/www/phpbb3/pkg-plist	Wed Aug 13 22:45:45 2014	(r364819)
@@ -131,7 +131,9 @@
 %%PHPBBDIR%%/cache/.htaccess
 %%PHPBBDIR%%/cache/index.htm
 %%PHPBBDIR%%/common.php
-@sample %%PHPBBDIR%%/config.php.sample
+@unexec if cmp -s %D/%%PHPBBDIR%%/config.php.sample %D/%%PHPBBDIR%%/config.php; then rm -f %D/%%PHPBBDIR%%/config.php; fi
+%%PHPBBDIR%%/config.php.sample
+@exec if [ ! -f %D/%%PHPBBDIR%%/config.php ] ; then cp -p %D/%F %B/config.php; fi
 %%PHPBBDIR%%/cron.php
 %%PHPBBDIR%%/docs/AUTHORS
 %%PHPBBDIR%%/docs/CHANGELOG.html