Date: Tue, 20 May 2014 18:12:23 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190026: [patch] Add staging support to www/cmsmadesimple Message-ID: <201405201812.s4KICNLw029614@cgiserv.freebsd.org> Resent-Message-ID: <201405201820.s4KIK06H003790@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190026
>Category: ports
>Synopsis: [patch] Add staging support to www/cmsmadesimple
>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: Tue May 20 18:20: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@lucy:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Adds staging support to www/cmsmadesimple.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/cmsmadesimple/Makefile b/www/cmsmadesimple/Makefile
index 14e61c2..7c2a519 100644
--- a/www/cmsmadesimple/Makefile
+++ b/www/cmsmadesimple/Makefile
@@ -25,23 +25,22 @@ CMS_FILES= favicon_cms.ico fileloc.php include.php \
WRITABLE_DIRS= tmp tmp/templates_c tmp/cache \
uploads uploads/images modules
-NO_STAGE= yes
.include <bsd.port.pre.mk>
post-extract:
@cd ${WRKSRC} && ${RM} -f config.php
do-install:
.for i in ${CMS_DIRS}
- @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR}
+ @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR}
.endfor
.for i in ${CMS_FILES}
- @cd ${WRKSRC} && ${CP} ${i} ${WWWDIR}/${i}
+ @cd ${WRKSRC} && ${CP} ${i} ${STAGEDIR}${WWWDIR}/${i}
.endfor
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
- @${CHMOD} -R 755 ${WWWDIR}
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+ @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
- @if [ ! -f ${WWWDIR}/config.php ]; then \
- ${TOUCH} ${WWWDIR}/config.php ; fi
+ @if [ ! -f ${STAGEDIR}${WWWDIR}/config.php ]; then \
+ ${TOUCH} ${STAGEDIR}${WWWDIR}/config.php ; fi
post-install:
@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
@@ -50,12 +49,12 @@ post-install:
>> ${TMPPLIST}
.for i in ${WRITABLE_DIRS}
- @${CHMOD} 775 ${WWWDIR}/${i}
+ @${CHMOD} 775 ${STAGEDIR}${WWWDIR}/${i}
@${ECHO_CMD} '@exec ${CHMOD} 775 ${WWWDIR}/${i}' \
>> ${TMPPLIST}
.endfor
- @${CHMOD} 666 ${WWWDIR}/config.php
+ @${CHMOD} 666 ${STAGEDIR}${WWWDIR}/config.php
@${ECHO_CMD} '@exec ${CHMOD} 666 ${WWWDIR}/config.php' \
>> ${TMPPLIST}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405201812.s4KICNLw029614>