svn commit: r356587 - head/www/ojs2

[Martin Wilke]

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 <bsd.port.mk>

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
+ at dirrmtry %%WWWDIR%%/cache/_db
+ at dirrmtry %%WWWDIR%%/cache/t_cache
+ at dirrmtry %%WWWDIR%%/cache/t_compile
+ at dirrmtry %%WWWDIR%%/cache/t_config
 @dirrm %%WWWDIR%%/tools/includes
 @dirrm %%WWWDIR%%/tools
 @dirrm %%WWWDIR%%/templates/user