Date: Fri, 23 May 2014 16:44:46 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190147: [patch] Add staging support to www/ilias Message-ID: <201405231644.s4NGik65041491@cgiserv.freebsd.org> Resent-Message-ID: <201405231650.s4NGo0Gn020269@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190147
>Category: ports
>Synopsis: [patch] Add staging support to www/ilias
>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 23 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/ilias.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index 8f1c2b2..8bb1f2d 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -35,7 +35,6 @@ SUB_LIST= ILIASDATADIR=${ILIASDATADIR}
OPTIONS_DEFINE= SCORM2004 Checker Mail Docs
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSCORM2004}
@@ -59,12 +58,12 @@ post-extract:
@cd ${WRKSRC} && ${MV} docs ${WRKDIR}
do-install:
- @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
- @${CHMOD} -R 755 ${WWWDIR}
- @${INSTALL} -d ${PREFIX}/${ILIASDATADIR}
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${ILIASDATADIR}
- @${CHMOD} -R 755 ${PREFIX}/${ILIASDATADIR}
+ @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+ @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
+ @${INSTALL} -d ${STAGEDIR}${PREFIX}/${ILIASDATADIR}
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${ILIASDATADIR}
+ @${CHMOD} -R 755 ${STAGEDIR}${PREFIX}/${ILIASDATADIR}
@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
>> ${TMPPLIST}
@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' >>${TMPPLIST}
@@ -73,7 +72,7 @@ do-install:
@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${PREFIX}/${ILIASDATADIR}' >>${TMPPLIST}
.if ${PORT_OPTIONS:MDOCS}
- @cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
+ @cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405231644.s4NGik65041491>