Date: Fri, 30 May 2014 15:37:57 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190414: [patch] Add staging support to www/sakai Message-ID: <201405301537.s4UFbvLO086127@cgiserv.freebsd.org> Resent-Message-ID: <201405301540.s4UFe095097645@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190414
>Category: ports
>Synopsis: [patch] Add staging support to www/sakai
>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: Fri May 30 15:40: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/sakai.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/sakai/Makefile b/www/sakai/Makefile
index 2a955b3..77851a7 100644
--- a/www/sakai/Makefile
+++ b/www/sakai/Makefile
@@ -23,7 +23,6 @@ TOMCAT_DIR= ${PREFIX}/apache-tomcat-6.0
PLIST_SUB+= TOMCAT_DIR=${TOMCAT_DIR:S|^${PREFIX}/||} \
SAKAI_VER="${PORTVERSION}"
-NO_STAGE= yes
post-extract:
@cd ${WRKSRC}/webapps && `${LS} -1 |${SED} 's/.war//' >> ${WRKSRC}/list`
@cd ${WRKSRC}/webapps && ${MKDIR} `${CAT} ${WRKSRC}/list`
@@ -33,9 +32,9 @@ post-extract:
do-install:
.for i in ${SYSTEM_DIR}
cd ${WRKSRC}/${i} && ${FIND} . -type d \
- -exec ${INSTALL} -d ${TOMCAT_DIR}/${i}/{} \;
+ -exec ${INSTALL} -d ${STAGEDIR}${TOMCAT_DIR}/${i}/{} \;
cd ${WRKSRC}/${i} && ${FIND} . -type f \
- -exec ${INSTALL} -m 644 {} ${TOMCAT_DIR}/${i}/{} \;
+ -exec ${INSTALL} -m 644 {} ${STAGEDIR}${TOMCAT_DIR}/${i}/{} \;
.endfor
@${CAT} ${PKGMESSAGE}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405301537.s4UFbvLO086127>