Date: Wed, 21 May 2014 22:51:30 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190093: [patch] Add staging support to www/fswiki Message-ID: <201405212251.s4LMpUXt078219@cgiserv.freebsd.org> Resent-Message-ID: <201405212300.s4LN0016045958@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190093
>Category: ports
>Synopsis: [patch] Add staging support to www/fswiki
>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 21 23:00: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/fswiki.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/fswiki/Makefile b/www/fswiki/Makefile
index 4701fff..e80c39e 100644
--- a/www/fswiki/Makefile
+++ b/www/fswiki/Makefile
@@ -17,22 +17,21 @@ RUN_DEPENDS= ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode \
USES= perl5 zip
NO_BUILD= yes
-NO_STAGE= yes
post-extract:
${SED} -e 's|__DATADIR__|${DATADIR}|' ${FILESDIR}/setup.sh \
>${WRKSRC}/setup.sh
do-install:
- -${MKDIR} ${DATADIR}
+ -${MKDIR} ${STAGEDIR}${DATADIR}
cd ${WRKSRC}; \
for d in `${FIND} * -type d`; do \
- ${MKDIR} ${DATADIR}/$${d}; \
+ ${MKDIR} ${STAGEDIR}${DATADIR}/$${d}; \
done
cd ${WRKSRC}; \
for i in `${FIND} . -type f | ${GREP} -v .orig`; do \
- ${INSTALL_DATA} $${i} ${DATADIR}/$${i}; \
+ ${INSTALL_DATA} $${i} ${STAGEDIR}${DATADIR}/$${i}; \
done
- ${INSTALL_SCRIPT} ${WRKSRC}/wiki.cgi ${DATADIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${DATADIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/wiki.cgi ${STAGEDIR}${DATADIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${STAGEDIR}${DATADIR}
.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405212251.s4LMpUXt078219>