From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 20 14: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 92DFA5ED for ; Tue, 20 May 2014 14: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 704FF2B4E for ; Tue, 20 May 2014 14: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 s4KEU00D043749 for ; Tue, 20 May 2014 14: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 s4KEU0wM043748; Tue, 20 May 2014 14:30:00 GMT (envelope-from gnats) Resent-Date: Tue, 20 May 2014 14:30:00 GMT Resent-Message-Id: <201405201430.s4KEU0wM043748@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 [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 0D92A5D7 for ; Tue, 20 May 2014 14:28:57 +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 EFE6D2B43 for ; Tue, 20 May 2014 14:28:56 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KESuDK094112 for ; Tue, 20 May 2014 14:28:56 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4KESu8C094109; Tue, 20 May 2014 14:28:56 GMT (envelope-from nobody) Message-Id: <201405201428.s4KESu8C094109@cgiserv.freebsd.org> Date: Tue, 20 May 2014 14:28:56 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190008: [patch] Add staging support to www/atutor 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: Tue, 20 May 2014 14:30:00 -0000 >Number: 190008 >Category: ports >Synopsis: [patch] Add staging support to www/atutor >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: Tue May 20 14: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/atutor. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/atutor/Makefile b/www/atutor/Makefile index e7365c5..5ca5467 100644 --- a/www/atutor/Makefile +++ b/www/atutor/Makefile @@ -13,7 +13,6 @@ COMMENT= An Open Source Web-based Learning Content Management System (LCMS) USE_PHP= session mbstring zlib mysql WRKSRC= ${WRKDIR}/ATutor -NO_STAGE= yes .include NO_BUILD= yes @@ -30,15 +29,15 @@ pre-install: @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dirrm ${ATUTDIR}?g" >> ${PLIST} do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ ${WWWDIR}' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type d -exec ${CHMOD} a+x {} \; - @${INSTALL_DATA} -d ${ATUTDATDIR} - @${CHMOD} 777 ${ATUTDATDIR} + @${FIND} ${STAGEDIR}${WWWDIR} -type d -exec ${CHMOD} a+x {} \; + @${INSTALL_DATA} -d ${STAGEDIR}${ATUTDATDIR} + @${CHMOD} 777 ${STAGEDIR}${ATUTDATDIR} @${ECHO_CMD} '@exec ${CHMOD} 777 ${ATUTDATDIR}' >> ${TMPPLIST} - @${CHMOD} 666 ${WWWDIR}/${ATUTCONFIG} + @${CHMOD} 666 ${STAGEDIR}${WWWDIR}/${ATUTCONFIG} @${ECHO_CMD} '@exec ${CHMOD} 666 \ ${WWWDIR}/${ATUTCONFIG}' >> ${TMPPLIST} >Release-Note: >Audit-Trail: >Unformatted: