svn commit: r364819 - head/www/phpbb3

[Bryan Drewery]

On 8/13/2014 5:45 PM, John Marino wrote:
> 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
> - at sample %%PHPBBDIR%%/config.php.sample
> + at 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
> + at 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
> 

This change is wrong. @sample does not require conf.sample, it only
requires .sample. It should be installing it as config.php.

/me goes to look

-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20140813/646c6e04/attachment.sig>