Date: Sun, 25 May 2014 19:13:04 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190210: [patch] Add staging support to www/jspwiki Message-ID: <201405251913.s4PJD4i9018564@cgiserv.freebsd.org> Resent-Message-ID: <201405251920.s4PJK0bm060538@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190210
>Category: ports
>Synopsis: [patch] Add staging support to www/jspwiki
>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: Sun May 25 19:20: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/jspwiki.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/jspwiki/Makefile b/www/jspwiki/Makefile
index 02a833e..3916b64 100644
--- a/www/jspwiki/Makefile
+++ b/www/jspwiki/Makefile
@@ -30,8 +30,6 @@ OPTIONS_SINGLE= AS
OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7
OPTIONS_DEFAULT= TOMCAT6
-NO_STAGE= yes
-
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
@@ -57,20 +55,12 @@ post-extract:
.endfor
do-install:
- ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${WEBAPPDIR}/${WEBAPP}
- @(cd ${WRKDIR}/${WEBAPP} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${WEBAPP})
- @for file in jspwiki.policy jspwiki.properties web.xml ; do \
- if [ ! -e "${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file}" ]; then \
- ${ECHO_MSG} " Installing local configuration file: ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file"; \
- ${CP} ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$${file}.example ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file; \
- else \
- ${ECHO_MSG} " Preserving local configuration file: ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file"; \
- fi; \
- done
+ @${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${STAGEDIR}${WEBAPPDIR}/${WEBAPP}
+ @(cd ${WRKDIR}/${WEBAPP} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${WEBAPP})
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/${PORTNAME}/|} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/${PORTNAME}/|} ${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?201405251913.s4PJD4i9018564>