Date: Tue, 20 May 2014 16:41:16 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190018: [patch] Add staging support to www/cakephp11 Message-ID: <201405201641.s4KGfGUJ042326@cgiserv.freebsd.org> Resent-Message-ID: <201405201650.s4KGo02h032178@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405201641.s4KGfGUJ042326>