svn commit: r359788 - head/www/geeklog

[Sahil Tandon]

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 <joe at thrallingpenguin.com>

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 @@
- at unexec if [ "`md5 -q %D/%%WWWDIR%%/db-config.php`" = "e152b8b4ebd7e8b5bf05c9466f618bfa" ]; then rm -f %D/%%WWWDIR%%/db-config.php; fi
- at unexec if [ "`md5 -q %D/%%WWWDIR%%/public_html/siteconfig.php`" = "a713c0e73d143db728d350010f7cf289" ]; then rm -f %D/%%WWWDIR%%/public_html/siteconfig.php; fi
+ at 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
+ at exec cp -n %D/%F %B/db-config.php
+ at 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
+ at exec cp -n %D/%F %B/siteconfig.php
 %%WWWDIR%%/INSTALL
 %%WWWDIR%%/backups/README
 %%WWWDIR%%/data/README