Date: Wed, 28 May 2014 23:23:37 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190361: [patch] Add staging support to www/prado Message-ID: <201405282323.s4SNNbFv054969@cgiserv.freebsd.org> Resent-Message-ID: <201405282330.s4SNU1nV052711@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190361 >Category: ports >Synopsis: [patch] Add staging support to www/prado >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: Wed May 28 23:30:01 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/prado. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/prado/Makefile b/www/prado/Makefile index 04a12d1..357a02b 100644 --- a/www/prado/Makefile +++ b/www/prado/Makefile @@ -22,7 +22,7 @@ USE_APACHE_RUN= 22+ NO_BUILD= yes WANT_PHP_WEB= yes USE_PHP= session -DEFAULT_PHP_VER=5 +DEFAULT_VERSIONS=php=5 SUB_FILES= pkg-message @@ -37,7 +37,6 @@ PLIST_SUB+= CONFDIR=${CONFDIR_REL} CONFDIR= ${PREFIX}/${CONFDIR_REL} CONFDIR_REL= ${APACHEETCDIR}/Includes -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MDOCS} @@ -111,10 +110,10 @@ confighelp: do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} "index.html ${DEMOS} \ - framework requirements tests" ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 - @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + framework requirements tests" ${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 @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ ${WWWDIR}' >> ${TMPPLIST} @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \ @@ -123,8 +122,9 @@ do-install: ${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST} post-install: - @if [ -d "${CONFDIR}" ]; then \ - ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/prado.conf; \ + @${MKDIR} ${STAGEDIR}${CONFDIR} + @if [ -d "${STAGEDIR}${CONFDIR}" ]; then \ + ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/prado.conf; \ else \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \ @@ -134,8 +134,8 @@ post-install: ${FALSE} ; \ fi .if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRCDOCS} && ${COPYTREE_SHARE} . ${DOCSDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} "HISTORY UPGRADE" ${DOCSDIR} + @cd ${WRKSRCDOCS} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} "HISTORY UPGRADE" ${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?201405282323.s4SNNbFv054969>