Date: Mon, 26 May 2014 20:05:18 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190280: [patch] Add staging support to www/moodle Message-ID: <201405262005.s4QK5IUw087914@cgiserv.freebsd.org> Resent-Message-ID: <201405262010.s4QKA0Nb068116@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190280
>Category: ports
>Synopsis: [patch] Add staging support to www/moodle
>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 20:10: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/moodle.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/moodle/Makefile b/www/moodle/Makefile
index a7dff63..c7cc456 100644
--- a/www/moodle/Makefile
+++ b/www/moodle/Makefile
@@ -20,7 +20,6 @@ OPTIONS_DEFAULT= ZLIB
NETWORK_DESC= Moodle Network functionality
MIMETEX_DESC= mimeTeX filter functionality
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMSSQL}
@@ -80,18 +79,18 @@ pre-install:
@${ECHO} @dirrm ${MOODLEDATADIR} >> ${PLIST}
do-install:
- @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${MOODLEDIR}
- @${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \;
+ @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR}
+ @${FIND} ${STAGEDIR}${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \;
@${ECHO_CMD} '@exec ${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \;' \
>> ${TMPPLIST}
- @${INSTALL} -d ${PREFIX}/${MOODLEDATADIR}
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDATADIR}
+ @${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDATADIR}' \
>> ${TMPPLIST}
- ${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR}
+ ${CHMOD} 755 ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
@${ECHO_CMD} '@exec ${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR}' >> ${TMPPLIST}
.if ${PORT_OPTIONS:MMIMETEX}
- ${LN} -sf ${PREFIX}/www/cgi-bin/mimetex.cgi ${PREFIX}/${MOODLEDIR}/filter/tex/mimetex.freebsd
+ ${LN} -sf ${PREFIX}/www/cgi-bin/mimetex.cgi ${STAGEDIR}${PREFIX}/${MOODLEDIR}/filter/tex/mimetex.freebsd
.endif
post-install:
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405262005.s4QK5IUw087914>