From owner-svn-ports-head@FreeBSD.ORG Thu Jun 5 06:20:57 2014 Return-Path: Delivered-To: svn-ports-head@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 98743C0B; Thu, 5 Jun 2014 06:20:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 6D56D236B; Thu, 5 Jun 2014 06:20:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s556KvFn068615; Thu, 5 Jun 2014 06:20:57 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s556Kvne068614; Thu, 5 Jun 2014 06:20:57 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406050620.s556Kvne068614@svn.freebsd.org> From: Martin Wilke Date: Thu, 5 Jun 2014 06:20:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356595 - head/www/limesurvey X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 06:20:57 -0000 Author: miwi Date: Thu Jun 5 06:20:56 2014 New Revision: 356595 URL: http://svnweb.freebsd.org/changeset/ports/356595 QAT: https://qat.redports.org/buildarchive/r356595/ Log: - Stage support PR: 190217 Modified: head/www/limesurvey/Makefile Modified: head/www/limesurvey/Makefile ============================================================================== --- head/www/limesurvey/Makefile Thu Jun 5 06:20:04 2014 (r356594) +++ head/www/limesurvey/Makefile Thu Jun 5 06:20:56 2014 (r356595) @@ -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="${PHPSURVEYORU 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