ports/190293: [patch] Add staging support to www/ojs2

[Joseph Benden]

>Number:         190293
>Category:       ports
>Synopsis:       [patch] Add staging support to www/ojs2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 26 23:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Joseph Benden
>Release:        FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014     root at lucy:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Adds staging support to www/ojs2.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/ojs2/Makefile b/www/ojs2/Makefile
index 023fdd3..d187944 100644
--- a/www/ojs2/Makefile
+++ b/www/ojs2/Makefile
@@ -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,24 +70,25 @@ 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}
+	@cd ${WRKSRC}/${DOCS} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
 
 post-install:
diff --git a/www/ojs2/pkg-plist b/www/ojs2/pkg-plist
index 7c6b000..272fdeb 100644
--- a/www/ojs2/pkg-plist
+++ b/www/ojs2/pkg-plist
@@ -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


>Release-Note:
>Audit-Trail:
>Unformatted: