From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 20 16:50: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 A314720A for ; Tue, 20 May 2014 16:50: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 7F9272901 for ; Tue, 20 May 2014 16:50: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 s4KGo0ja032179 for ; Tue, 20 May 2014 16:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4KGo02h032178; Tue, 20 May 2014 16:50:00 GMT (envelope-from gnats) Resent-Date: Tue, 20 May 2014 16:50:00 GMT Resent-Message-Id: <201405201650.s4KGo02h032178@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 BF8AEDE9 for ; Tue, 20 May 2014 16:41:16 +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 933272866 for ; Tue, 20 May 2014 16:41:16 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KGfGXk042327 for ; Tue, 20 May 2014 16:41:16 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4KGfGUJ042326; Tue, 20 May 2014 16:41:16 GMT (envelope-from nobody) Message-Id: <201405201641.s4KGfGUJ042326@cgiserv.freebsd.org> Date: Tue, 20 May 2014 16:41:16 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190018: [patch] Add staging support to www/cakephp11 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 16:50:00 -0000 >Number: 190018 >Category: ports >Synopsis: [patch] Add staging support to www/cakephp11 >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 16:50: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/cakephp11. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/cakephp11/Makefile b/www/cakephp11/Makefile index 9515c3c..a2d8ee7 100644 --- a/www/cakephp11/Makefile +++ b/www/cakephp11/Makefile @@ -22,7 +22,7 @@ NO_BUILD= yes USE_PHP= pcre session WANT_PHP_WEB= yes -DEFAULT_PHP_VER=5 +DEFAULT_VERSIONS= php=5 SUB_FILES= pkg-message @@ -36,7 +36,6 @@ PLIST_SUB+= CONFDIR=${CONFDIR_REL} CONFDIR= ${PREFIX}/${CONFDIR_REL} CONFDIR_REL= ${APACHEETCDIR}/Includes -NO_STAGE= yes .include WITH_PHP_CGI?= /cgi-bin/php @@ -97,19 +96,20 @@ confighelp: @${ECHO_MSG} "" do-install: - @${MKDIR} ${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR} @${CP} -R ${WRKSRC}/.htaccess \ ${WRKSRC}/app \ ${WRKSRC}/cake \ ${WRKSRC}/index.php \ - ${WRKSRC}/vendors ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 - @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + ${WRKSRC}/vendors ${STAGEDIR}${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} + @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 + @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 post-install: - @if [ -d "${CONFDIR}" ]; then \ - ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/cakephp.conf; \ + @${MKDIR} ${STAGEDIR}${CONFDIR} + @if [ -d "${STAGEDIR}${CONFDIR}" ]; then \ + ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/cakephp.conf; \ else \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \ @@ -119,8 +119,8 @@ post-install: ${FALSE} ; \ fi .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} .if ${CGI_EXT} == "-cgi" >Release-Note: >Audit-Trail: >Unformatted: