From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 20 18:20: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 CCD7CE62 for ; Tue, 20 May 2014 18:20: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 A951621A9 for ; Tue, 20 May 2014 18:20: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 s4KIK0Mq003797 for ; Tue, 20 May 2014 18:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4KIK06H003790; Tue, 20 May 2014 18:20:00 GMT (envelope-from gnats) Resent-Date: Tue, 20 May 2014 18:20:00 GMT Resent-Message-Id: <201405201820.s4KIK06H003790@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 08CC1B70 for ; Tue, 20 May 2014 18:12:24 +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 CFE41211E for ; Tue, 20 May 2014 18:12:23 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KICNev029619 for ; Tue, 20 May 2014 18:12:23 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4KICNLw029614; Tue, 20 May 2014 18:12:23 GMT (envelope-from nobody) Message-Id: <201405201812.s4KICNLw029614@cgiserv.freebsd.org> Date: Tue, 20 May 2014 18:12:23 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190026: [patch] Add staging support to www/cmsmadesimple 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 18:20:01 -0000 >Number: 190026 >Category: ports >Synopsis: [patch] Add staging support to www/cmsmadesimple >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 18:20: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/cmsmadesimple. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/cmsmadesimple/Makefile b/www/cmsmadesimple/Makefile index 14e61c2..7c2a519 100644 --- a/www/cmsmadesimple/Makefile +++ b/www/cmsmadesimple/Makefile @@ -25,23 +25,22 @@ CMS_FILES= favicon_cms.ico fileloc.php include.php \ WRITABLE_DIRS= tmp tmp/templates_c tmp/cache \ uploads uploads/images modules -NO_STAGE= yes .include post-extract: @cd ${WRKSRC} && ${RM} -f config.php do-install: .for i in ${CMS_DIRS} - @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR} .endfor .for i in ${CMS_FILES} - @cd ${WRKSRC} && ${CP} ${i} ${WWWDIR}/${i} + @cd ${WRKSRC} && ${CP} ${i} ${STAGEDIR}${WWWDIR}/${i} .endfor - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${CHMOD} -R 755 ${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} + @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR} - @if [ ! -f ${WWWDIR}/config.php ]; then \ - ${TOUCH} ${WWWDIR}/config.php ; fi + @if [ ! -f ${STAGEDIR}${WWWDIR}/config.php ]; then \ + ${TOUCH} ${STAGEDIR}${WWWDIR}/config.php ; fi post-install: @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \ @@ -50,12 +49,12 @@ post-install: >> ${TMPPLIST} .for i in ${WRITABLE_DIRS} - @${CHMOD} 775 ${WWWDIR}/${i} + @${CHMOD} 775 ${STAGEDIR}${WWWDIR}/${i} @${ECHO_CMD} '@exec ${CHMOD} 775 ${WWWDIR}/${i}' \ >> ${TMPPLIST} .endfor - @${CHMOD} 666 ${WWWDIR}/config.php + @${CHMOD} 666 ${STAGEDIR}${WWWDIR}/config.php @${ECHO_CMD} '@exec ${CHMOD} 666 ${WWWDIR}/config.php' \ >> ${TMPPLIST} >Release-Note: >Audit-Trail: >Unformatted: