From owner-svn-ports-head@FreeBSD.ORG Sun Jun 29 18:31:50 2014 Return-Path: Delivered-To: svn-ports-head@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 DF8F4CD8; Sun, 29 Jun 2014 18:31:49 +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 C0D822ED2; Sun, 29 Jun 2014 18:31:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5TIVnrR065794; Sun, 29 Jun 2014 18:31:49 GMT (envelope-from sahil@svn.freebsd.org) Received: (from sahil@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5TIVnxl065792; Sun, 29 Jun 2014 18:31:49 GMT (envelope-from sahil@svn.freebsd.org) Message-Id: <201406291831.s5TIVnxl065792@svn.freebsd.org> From: Sahil Tandon Date: Sun, 29 Jun 2014 18:31:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359788 - head/www/geeklog X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2014 18:31:50 -0000 Author: sahil Date: Sun Jun 29 18:31:49 2014 New Revision: 359788 URL: http://svnweb.freebsd.org/changeset/ports/359788 QAT: https://qat.redports.org/buildarchive/r359788/ Log: - Refactor to supporting staging PR: 190114 Submitted by: Joseph Benden Modified: head/www/geeklog/Makefile head/www/geeklog/pkg-plist Modified: head/www/geeklog/Makefile ============================================================================== --- head/www/geeklog/Makefile Sun Jun 29 16:44:03 2014 (r359787) +++ head/www/geeklog/Makefile Sun Jun 29 18:31:49 2014 (r359788) @@ -16,24 +16,20 @@ USE_MYSQL= yes NO_BUILD= yes USE_PHP= yes -NO_STAGE= yes do-install: - @${INSTALL} -o ${WWWOWN} -g ${WWWGRP} -m 555 -d ${WWWDIR} + @${INSTALL} -o ${WWWOWN} -g ${WWWGRP} -m 555 -d ${STAGEDIR}${WWWDIR} @(cd ${WRKSRC} && \ - ${COPYTREE_SHARE} \* ${WWWDIR} "! -name db-config.php \ + ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR} "! -name db-config.php \ -or -name siteconfig.php") - @if [ ! -f ${WWWDIR}/db-config.php ]; then \ - ${INSTALL_DATA} ${WRKSRC}/db-config.php ${WWWDIR}/db-config.php; \ - fi - @if [ ! -f ${WWWDIR}/public_html/siteconfig.php ]; then \ - {INSTALL_DATA} ${WRKSRC}/public_html/siteconfig.php \ - ${WWWDIR}/public_html/siteconfig.php; \ - fi + @${INSTALL_DATA} ${WRKSRC}/db-config.php ${STAGEDIR}${WWWDIR}/db-config.php.sample; + @${INSTALL_DATA} ${WRKSRC}/public_html/siteconfig.php \ + ${STAGEDIR}${WWWDIR}/public_html/siteconfig.php.sample + @${RM} ${STAGEDIR}${WWWDIR}/public_html/siteconfig.php post-install: - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} .for i in db-config.php error.log siteconfig.php geeklog.rss - @${FIND} ${WWWDIR} -name ${i} | ${XARGS} ${CHMOD} 755 + @${FIND} ${STAGEDIR}${WWWDIR} -name ${i} | ${XARGS} ${CHMOD} 755 .endfor @${CAT} ${PKGMESSAGE} Modified: head/www/geeklog/pkg-plist ============================================================================== --- head/www/geeklog/pkg-plist Sun Jun 29 16:44:03 2014 (r359787) +++ head/www/geeklog/pkg-plist Sun Jun 29 18:31:49 2014 (r359788) @@ -1,5 +1,9 @@ -@unexec if [ "`md5 -q %D/%%WWWDIR%%/db-config.php`" = "e152b8b4ebd7e8b5bf05c9466f618bfa" ]; then rm -f %D/%%WWWDIR%%/db-config.php; fi -@unexec if [ "`md5 -q %D/%%WWWDIR%%/public_html/siteconfig.php`" = "a713c0e73d143db728d350010f7cf289" ]; then rm -f %D/%%WWWDIR%%/public_html/siteconfig.php; fi +@unexec if cmp -s %D/%%WWWDIR%%/db-config.php %D/%%WWWDIR%%/db-config.php.sample; then rm -f %D/%%WWWDIR%%/db-config.php; fi +%%WWWDIR%%/db-config.php.sample +@exec cp -n %D/%F %B/db-config.php +@unexec if cmp -s %D/%%WWWDIR%%/public_html/siteconfig.php %D/%%WWWDIR%%/public_html/siteconfig.php.sample; then rm -f %D/%%WWWDIR%%/public_html/siteconfig.php; fi +%%WWWDIR%%/public_html/siteconfig.php.sample +@exec cp -n %D/%F %B/siteconfig.php %%WWWDIR%%/INSTALL %%WWWDIR%%/backups/README %%WWWDIR%%/data/README