From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 25 20:30:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8D35DE5F for ; Sun, 25 May 2014 20:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A1C22ECE for ; Sun, 25 May 2014 20:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PKU08m082723 for ; Sun, 25 May 2014 20:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4PKU0II082722; Sun, 25 May 2014 20:30:00 GMT (envelope-from gnats) Resent-Date: Sun, 25 May 2014 20:30:00 GMT Resent-Message-Id: <201405252030.s4PKU0II082722@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joseph Benden Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32CD2E50 for ; Sun, 25 May 2014 20:28:28 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 064C32EC5 for ; Sun, 25 May 2014 20:28:28 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PKSRhO051090 for ; Sun, 25 May 2014 20:28:27 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4PKSRFR051087; Sun, 25 May 2014 20:28:27 GMT (envelope-from nobody) Message-Id: <201405252028.s4PKSRFR051087@cgiserv.freebsd.org> Date: Sun, 25 May 2014 20:28:27 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190217: [patch] Add staging support to www/limesurvey X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2014 20:30:00 -0000 >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 # 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 >Release-Note: >Audit-Trail: >Unformatted: