Date: Mon, 19 May 2014 16:16:26 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189957: [patch] Add staging support to www/yahoo-ui Message-ID: <201405191616.s4JGGQHn099204@cgiserv.freebsd.org> Resent-Message-ID: <201405191620.s4JGK259069836@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189957
>Category: ports
>Synopsis: [patch] Add staging support to www/yahoo-ui
>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: Mon May 19 16:20:02 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/yahoo-ui.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/yahoo-ui/Makefile b/www/yahoo-ui/Makefile
index e44ba5a..677e7b9 100644
--- a/www/yahoo-ui/Makefile
+++ b/www/yahoo-ui/Makefile
@@ -24,7 +24,6 @@ NO_BUILD= yes
OPTIONS_DEFINE= APACHE DOCS EXAMPLES
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MAPACHE}
@@ -65,22 +64,22 @@ post-patch: .SILENT
do-install:
@cd ${WRKSRC} && ${COPYTREE_SHARE} "assets build index.html \
- tests" ${WWWDIR}
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+ tests" ${STAGEDIR}${WWWDIR}
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
- @${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+ @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
- @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+ @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
post-install:
.if ${PORT_OPTIONS:MAPACHE}
.if !defined(MAINTAINER_MODE)
- @if [ -d "${CONFDIR}" ]; then \
- ${CP} ${WRKDIR}/${CONF} ${CONFDIR}; \
+ @if [ -d "${STAGEDIR}${CONFDIR}" ]; then \
+ ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}; \
else \
${ECHO_MSG} "" ; \
${ECHO_MSG} "Please check your Apache 2.x installation -" ; \
@@ -93,10 +92,10 @@ post-install:
@${CAT} ${PKGMESSAGE}
.endif
.if ${PORT_OPTIONS:MDOCS}
- @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
+ @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MNLS}
- @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
+ @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
.endif
.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?201405191616.s4JGGQHn099204>