From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 25 21:30:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97DFDE1 for ; Sun, 25 May 2014 21: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 74AFC236F for ; Sun, 25 May 2014 21: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 s4PLU075003423 for ; Sun, 25 May 2014 21: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 s4PLU0VA003422; Sun, 25 May 2014 21:30:00 GMT (envelope-from gnats) Resent-Date: Sun, 25 May 2014 21:30:00 GMT Resent-Message-Id: <201405252130.s4PLU0VA003422@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 4A471E8F for ; Sun, 25 May 2014 21:21:55 +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 37D63231F for ; Sun, 25 May 2014 21:21:55 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PLLtNs028729 for ; Sun, 25 May 2014 21:21:55 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4PLLtVr028724; Sun, 25 May 2014 21:21:55 GMT (envelope-from nobody) Message-Id: <201405252121.s4PLLtVr028724@cgiserv.freebsd.org> Date: Sun, 25 May 2014 21:21:55 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190226: [patch] Add staging support to www/mahara 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 21:30:00 -0000 >Number: 190226 >Category: ports >Synopsis: [patch] Add staging support to www/mahara >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 21: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/mahara. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/mahara/Makefile b/www/mahara/Makefile index 7a588ca..75c6532 100644 --- a/www/mahara/Makefile +++ b/www/mahara/Makefile @@ -9,13 +9,12 @@ MASTER_SITES= http://launchpad.net/${PORTNAME}/1.1/${PORTVERSION}/+download/ MAINTAINER= wen@FreeBSD.org COMMENT= An open source ePortfolio system -USE_BZIP2= yes +USES= tar:bzip2 USE_PHP= session json curl xml xmlrpc openssl simplexml OPTIONS_DEFINE= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL -NO_STAGE= yes .include .if ${PORT_OPTIONS:MMYSQL} @@ -42,15 +41,15 @@ pre-install: @${ECHO} @dirrm ${MAHARADATADIR} >> ${PLIST} do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} - @${INSTALL} -d ${PREFIX}/${MAHARADATADIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} + @${INSTALL} -d ${STAGEDIR}${PREFIX}/${MAHARADATADIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST} - @${CHMOD} -R 755 ${WWWDIR} + @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' >> ${TMPPLIST} - @${CHMOD} -R a+w ${PREFIX}/${MAHARADATADIR} + @${CHMOD} -R a+w ${STAGEDIR}${PREFIX}/${MAHARADATADIR} @${ECHO_CMD} '@exec ${CHMOD} -R a+w ${PREFIX}/${MAHARADATADIR}' >> ${TMPPLIST} post-install: >Release-Note: >Audit-Trail: >Unformatted: