From owner-svn-ports-all@FreeBSD.ORG Thu Jun 5 05:21:43 2014 Return-Path: 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 86CB6731; Thu, 5 Jun 2014 05:21:43 +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 682752E7A; Thu, 5 Jun 2014 05:21:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s555Lhk5043531; Thu, 5 Jun 2014 05:21:43 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s555Lh6T043529; Thu, 5 Jun 2014 05:21:43 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406050521.s555Lh6T043529@svn.freebsd.org> From: Martin Wilke Date: Thu, 5 Jun 2014 05:21:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356587 - head/www/ojs2 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 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 05:21:43 -0000 Author: miwi Date: Thu Jun 5 05:21:42 2014 New Revision: 356587 URL: http://svnweb.freebsd.org/changeset/ports/356587 QAT: https://qat.redports.org/buildarchive/r356587/ Log: - Stage support PR: 190293 Modified: head/www/ojs2/Makefile head/www/ojs2/pkg-plist Modified: head/www/ojs2/Makefile ============================================================================== --- head/www/ojs2/Makefile Thu Jun 5 05:20:24 2014 (r356586) +++ head/www/ojs2/Makefile Thu Jun 5 05:21:42 2014 (r356587) @@ -27,7 +27,6 @@ OPTIONS_DEFAULT= MYSQL LDAP MEMCACHE_DESC= memcached cache system DB_DESC= DB backend -NO_STAGE= yes pre-install:: @${ECHO_MSG} "======================================================================" @${ECHO_MSG} "If you are upgrading please refer to docs/UPGRADE or browse to" @@ -71,27 +70,24 @@ PLIST_SUB+= ECHO_MSG=${ECHO_MSG} SUB_FILES= pkg-deinstall do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} "${NONDOCS}" ${WWWDIR} - @cd ${WRKSRC} && ${CP} config.inc.php ${WWWDIR}/config.inc.php.sample - @${INSTALL} -d ${WWWDIR}/cache/_db - @${INSTALL} -d ${WWWDIR}/cache/t_cache - @${INSTALL} -d ${WWWDIR}/cache/t_compile - @${INSTALL} -d ${WWWDIR}/cache/t_config - @${INSTALL} -d ${WWWDIR}/locale/en_US/images - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} "${NONDOCS}" ${STAGEDIR}${WWWDIR} + @cd ${WRKSRC} && ${CP} config.inc.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample + ${RM} ${STAGEDIR}${WWWDIR}/config.inc.php + @${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/_db + @${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/t_cache + @${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/t_compile + @${INSTALL} -d ${STAGEDIR}${WWWDIR}/cache/t_config + @${INSTALL} -d ${STAGEDIR}${WWWDIR}/locale/en_US/images + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 + @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \ ${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \ ${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST} -.if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRC}/${DOCS} && ${COPYTREE_SHARE} . ${DOCSDIR} -.endif - -post-install: - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC}/${DOCS} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include Modified: head/www/ojs2/pkg-plist ============================================================================== --- head/www/ojs2/pkg-plist Thu Jun 5 05:20:24 2014 (r356586) +++ head/www/ojs2/pkg-plist Thu Jun 5 05:21:42 2014 (r356587) @@ -3204,6 +3204,11 @@ %%WWWDIR%%/tools/rebuildSearchIndex.php %%WWWDIR%%/tools/runScheduledTasks.php %%WWWDIR%%/tools/upgrade.php +%%WWWDIR%%/cache/fc-locale-list.php +@dirrmtry %%WWWDIR%%/cache/_db +@dirrmtry %%WWWDIR%%/cache/t_cache +@dirrmtry %%WWWDIR%%/cache/t_compile +@dirrmtry %%WWWDIR%%/cache/t_config @dirrm %%WWWDIR%%/tools/includes @dirrm %%WWWDIR%%/tools @dirrm %%WWWDIR%%/templates/user