From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 20 17:30: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 9EDB4D82 for ; Tue, 20 May 2014 17: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 7AC0A2CC9 for ; Tue, 20 May 2014 17: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 s4KHU0SN083740 for ; Tue, 20 May 2014 17: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 s4KHU0ZW083739; Tue, 20 May 2014 17:30:00 GMT (envelope-from gnats) Resent-Date: Tue, 20 May 2014 17:30:00 GMT Resent-Message-Id: <201405201730.s4KHU0ZW083739@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 967A1C92 for ; Tue, 20 May 2014 17:23:07 +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 83F662C81 for ; Tue, 20 May 2014 17:23:07 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KHN7CJ007878 for ; Tue, 20 May 2014 17:23:07 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4KHN7Fu007875; Tue, 20 May 2014 17:23:07 GMT (envelope-from nobody) Message-Id: <201405201723.s4KHN7Fu007875@cgiserv.freebsd.org> Date: Tue, 20 May 2014 17:23:07 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190021: [patch] Add staging support to www/cakephp21 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 17:30:00 -0000 >Number: 190021 >Category: ports >Synopsis: [patch] Add staging support to www/cakephp21 >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 17: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/cakephp21. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/cakephp21/Makefile b/www/cakephp21/Makefile index 2128ec9..e88013e 100644 --- a/www/cakephp21/Makefile +++ b/www/cakephp21/Makefile @@ -26,7 +26,7 @@ NO_BUILD= yes USES= gettext USE_PHP= ctype session WANT_PHP_WEB= yes -DEFAULT_PHP_VER=5 +DEFAULT_VERSIONS= php=5 CAKE_CONF_FILES= \ app/Config/acl.php \ @@ -51,7 +51,6 @@ MEMCACHE_DESC= Enable Memcached caching engine client CONFDIR= ${PREFIX}/${CONFDIR_REL} CONFDIR_REL= ${APACHEETCDIR}/Includes -NO_STAGE= yes .include WITH_PHP_CGI?= /cgi-bin/php @@ -141,43 +140,44 @@ post-patch: do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} \ - ".htaccess app lib index.php plugins vendors" ${WWWDIR} + ".htaccess app lib index.php plugins vendors" ${STAGEDIR}${WWWDIR} .if ! ${PORT_OPTIONS:MPROD} # If installed in development mode, get rid of .htaccess files, # as noted by: # http://book.cakephp.org/view/42/The-Configuration-Class#CakePHP-Core-Configuration-Variables-44 - @${FIND} ${WWWDIR} -type f -name .htaccess -exec ${RM} {} \; + @${FIND} ${STAGEDIR}${WWWDIR} -type f -name .htaccess -exec ${RM} {} \; @${ECHO_CMD} '@exec ${FIND} ${WWWDIR:S|^${PREFIX}/|%D/|} -type f -name .htaccess -exec ${RM} {} \;' >> ${TMPPLIST} .endif # Get rid of the empty placeholder files - @${FIND} ${WWWDIR} -type f -name empty -size 0 -exec ${RM} {} \; + @${FIND} ${STAGEDIR}${WWWDIR} -type f -name empty -size 0 -exec ${RM} {} \; @${ECHO_CMD} '@exec ${FIND} ${WWWDIR:S|^${PREFIX}/|%D/|} -type f -name empty -size 0 -exec ${RM} {} \;' >> ${TMPPLIST} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 + @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \ ${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \ ${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST} # Fix the permissions of the Cake console script - @${CHMOD} 755 ${WWWDIR}/${CAKE_CONSOLE} + @${CHMOD} 755 ${STAGEDIR}${WWWDIR}/${CAKE_CONSOLE} @${ECHO_CMD} '@exec ${CHMOD} 755 ${WWWDIR}/${CAKE_CONSOLE}' >> ${TMPPLIST} post-install: @for i in ${CAKE_CONF_FILES}; do \ if [ ! -f ${WWWDIR}/$$i -a -f ${WRKSRC}/$$i.default ]; then \ - ${INSTALL_DATA} ${WRKSRC}/$$i.default ${WWWDIR}/$$i; \ + ${INSTALL_DATA} ${WRKSRC}/$$i.default ${STAGEDIR}${WWWDIR}/$$i; \ fi \ done .if ${PORT_OPTIONS:MAP} - @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 -" ; \ @@ -188,8 +188,8 @@ post-install: fi .endif .if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} .if ${CGI_EXT} == "-cgi" >Release-Note: >Audit-Trail: >Unformatted: