Date: Sun, 25 May 2014 20:28:27 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190217: [patch] Add staging support to www/limesurvey Message-ID: <201405252028.s4PKSRFR051087@cgiserv.freebsd.org> Resent-Message-ID: <201405252030.s4PKU0II082722@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190217 >Category: ports >Synopsis: [patch] Add staging support to www/limesurvey >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: Sun May 25 20:30: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/limesurvey. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile index 1321086..87219f6 100644 --- a/www/limesurvey/Makefile +++ b/www/limesurvey/Makefile @@ -21,7 +21,6 @@ GD_DESC= Install PHP gd extension LDAP_DESC= Install PHP LDAP extension ZIP_DESC= Install PHP zip extension -NO_STAGE= yes .include <bsd.port.options.mk> # http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey#Make_sure_you_can_use_LimeSurvey_on_your_website @@ -59,7 +58,7 @@ SUB_LIST= PHPSURVEYORURL="${PHPSURVEYORURL}" \ PHPSURVEYORDIR= ${WWWDOCROOT}/${PHPSURVEYORURL} do-install: - ${MKDIR} "${WWWDIR}" + ${MKDIR} "${STAGEDIR}${WWWDIR}" .if ${PORT_OPTIONS:MPGSQL} ${SED} -E \ -e 's/^(\$$databasetype[[:space:]]*=[[:space:]]*'"')mysql('"'.*)$$/\1postgres\2/' \ @@ -69,21 +68,22 @@ do-install: .else ${MV} "${WRKSRC}"/config.php "${WRKSRC}"/config.php-dist .endif - ${TEST} -e "${WWWDIR}"/config.php || ${CP} -p "${WRKSRC}"/config.php-dist "${WRKSRC}"/config.php - @cd "${WRKSRC}" && ${COPYTREE_SHARE} . "${WWWDIR}" - ${MKDIR} "${WWWDIR}"/tmp - ${CHOWN} -R "${WWWOWN}:${WWWGRP}" "${WWWDIR}" - ${CHMOD} 755 "${WWWDIR}"/tmp - ${CHMOD} 755 "${WWWDIR}"/templates - ${CHMOD} 755 "${WWWDIR}"/upload - ${CHOWN} -R 0 "${WWWDIR}"/admin - ${CHMOD} -R go-w "${WWWDIR}"/admin + @cd "${WRKSRC}" && ${COPYTREE_SHARE} . "${STAGEDIR}${WWWDIR}" + ${MKDIR} "${STAGEDIR}${WWWDIR}"/tmp + ${CHOWN} -R "${WWWOWN}:${WWWGRP}" "${STAGEDIR}${WWWDIR}" + ${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/tmp + ${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/templates + ${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/upload + ${CHOWN} -R 0 "${STAGEDIR}${WWWDIR}"/admin + ${CHMOD} -R go-w "${STAGEDIR}${WWWDIR}"/admin post-install: @${CAT} ${PKGMESSAGE} - @${FIND} -s -d ${WWWDIR} -type f -print | \ - ${SED} -e "s#${PREFIX}/##g" >> ${TMPPLIST} - @${FIND} -s -d ${WWWDIR} -type d -print | \ - ${SED} -E -e "s#${PREFIX}/#@dirrm #g" >> ${TMPPLIST} + @${ECHO_CMD} "@owner www" >> ${TMPPLIST} + @${ECHO_CMD} "@group www" >> ${TMPPLIST} + @${FIND} -s -d ${STAGEDIR}${WWWDIR} -type f -print | \ + ${SED} -e "s#${STAGEDIR}${PREFIX}/##g" >> ${TMPPLIST} + @${FIND} -s -d ${STAGEDIR}${WWWDIR} -type d -print | \ + ${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dirrm #g" >> ${TMPPLIST} .include <bsd.port.mk> >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405252028.s4PKSRFR051087>