From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 28 23:30:02 2014
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
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 1E4951CA
for <freebsd-ports-bugs@smarthost.ysv.freebsd.org>;
Wed, 28 May 2014 23:30:02 +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 EF1BD217F
for <freebsd-ports-bugs@smarthost.ysv.freebsd.org>;
Wed, 28 May 2014 23:30:01 +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 s4SNU1vv052712
for <freebsd-ports-bugs@freefall.freebsd.org>; Wed, 28 May 2014 23:30:01 GMT
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4SNU1nV052711;
Wed, 28 May 2014 23:30:01 GMT (envelope-from gnats)
Resent-Date: Wed, 28 May 2014 23:30:01 GMT
Resent-Message-Id: <201405282330.s4SNU1nV052711@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 <joe@thrallingpenguin.com>
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 7D7C1F6D
for <freebsd-gnats-submit@FreeBSD.org>; Wed, 28 May 2014 23:23:37 +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 50E5D212F
for <freebsd-gnats-submit@FreeBSD.org>; Wed, 28 May 2014 23:23:37 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SNNbI5054972
for <freebsd-gnats-submit@FreeBSD.org>; Wed, 28 May 2014 23:23:37 GMT
(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4SNNbFv054969;
Wed, 28 May 2014 23:23:37 GMT (envelope-from nobody)
Message-Id: <201405282323.s4SNNbFv054969@cgiserv.freebsd.org>
Date: Wed, 28 May 2014 23:23:37 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Subject: ports/190361: [patch] Add staging support to www/prado
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs/>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 May 2014 23:30:02 -0000
>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: