From owner-svn-ports-head@FreeBSD.ORG Sun Oct 12 15:59:53 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 364C415C; Sun, 12 Oct 2014 15:59:53 +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 08BEC826; Sun, 12 Oct 2014 15:59:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9CFxqSW024902; Sun, 12 Oct 2014 15:59:52 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9CFxqwD024901; Sun, 12 Oct 2014 15:59:52 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410121559.s9CFxqwD024901@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 12 Oct 2014 15:59:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370726 - 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-1 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: Sun, 12 Oct 2014 15:59:53 -0000 Author: antoine Date: Sun Oct 12 15:59:52 2014 New Revision: 370726 URL: https://svnweb.freebsd.org/changeset/ports/370726 QAT: https://qat.redports.org/buildarchive/r370726/ Log: - Allow staging as a regular user - Bump portrevision as files were not packaged with intended owner Modified: head/www/limesurvey/Makefile Modified: head/www/limesurvey/Makefile ============================================================================== --- head/www/limesurvey/Makefile Sun Oct 12 15:43:46 2014 (r370725) +++ head/www/limesurvey/Makefile Sun Oct 12 15:59:52 2014 (r370726) @@ -3,6 +3,7 @@ PORTNAME= limesurvey PORTVERSION= 1.91 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/1._LimeSurvey_stable/${PORTVERSION}+/ DISTNAME= ${PORTNAME}${PORTVERSION:S^.^^}plus-build10232-20110608 @@ -70,20 +71,23 @@ do-install: .endif @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} - @${ECHO_CMD} "@owner www" >> ${TMPPLIST} - @${ECHO_CMD} "@group www" >> ${TMPPLIST} - @${FIND} -s -d ${STAGEDIR}${WWWDIR} -type f -print | \ + @${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST} + @${FIND} -s -d ${STAGEDIR}${WWWDIR}/admin -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} + @${FIND} -s -d ${STAGEDIR}${WWWDIR}/admin -type d -print | \ + ${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dir #g" >> ${TMPPLIST} + @${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST} + @${FIND} -s -d ${STAGEDIR}${WWWDIR} ! -path "${STAGEDIR}${WWWDIR}/admin/*" -type f -print | \ + ${SED} -e "s#${STAGEDIR}${PREFIX}/##g" >> ${TMPPLIST} + @${FIND} -s -d ${STAGEDIR}${WWWDIR} -type d ! -path "${STAGEDIR}${WWWDIR}/admin*" -print | \ + ${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dir #g" >> ${TMPPLIST} + @${ECHO_CMD} "@owner" >> ${TMPPLIST} + @${ECHO_CMD} "@group" >> ${TMPPLIST} .include