svn commit: r364850 - in head/www: autoindex2 phpbb3

[John Marino]

Author: marino
Date: Thu Aug 14 15:20:29 2014
New Revision: 364850
URL: http://svnweb.freebsd.org/changeset/ports/364850
QAT: https://qat.redports.org/buildarchive/r364850/

Log:
  Use @sample keyword on two ports I thought couldn't use it
  
  Possible due to extreme sleep deprivation, I was confused about the
  limitations of the @sample keyword.  The two www ports I modified last
  night, phpbb3 and autoindex2, both could use @sample with config.php,
  so go back and clean up my own mess.  No revbump necessary as this is
  functionally equivalent to what is there now.

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

Modified: head/www/autoindex2/pkg-plist
==============================================================================
--- head/www/autoindex2/pkg-plist	Thu Aug 14 15:00:54 2014	(r364849)
+++ head/www/autoindex2/pkg-plist	Thu Aug 14 15:20:29 2014	(r364850)
@@ -3,9 +3,7 @@
 @mode 644
 %%INSTALLDIR%%/.htpasswd.autoindex.sample
 @mode 664
- at unexec if cmp -s %D/%%INSTALLDIR%%/config.php.sample %D/%%INSTALLDIR%%/config.php; then rm -f %D/%%INSTALLDIR%%/config.php; fi
-%%INSTALLDIR%%/config.php.sample
- at exec if [ ! -f %D/%%INSTALLDIR%%/config.php ] ; then cp -p %D/%F %B/config.php; fi
+ at sample %%INSTALLDIR%%/config.php.sample
 @mode
 %%INSTALLDIR%%/hidden_files
 %%INSTALLDIR%%/change_log.html

Modified: head/www/phpbb3/pkg-plist
==============================================================================
--- head/www/phpbb3/pkg-plist	Thu Aug 14 15:00:54 2014	(r364849)
+++ head/www/phpbb3/pkg-plist	Thu Aug 14 15:20:29 2014	(r364850)
@@ -131,9 +131,7 @@
 %%PHPBBDIR%%/cache/.htaccess
 %%PHPBBDIR%%/cache/index.htm
 %%PHPBBDIR%%/common.php
- 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
+ at sample %%PHPBBDIR%%/config.php.sample
 %%PHPBBDIR%%/cron.php
 %%PHPBBDIR%%/docs/AUTHORS
 %%PHPBBDIR%%/docs/CHANGELOG.html