Date: Fri, 23 May 2014 03:12:06 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190130: [patch] Add staging support to www/habari Message-ID: <201405230312.s4N3C6j8092459@cgiserv.freebsd.org> Resent-Message-ID: <201405230320.s4N3K0aV011960@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190130
>Category: ports
>Synopsis: [patch] Add staging support to www/habari
>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 03: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/habari.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/habari/Makefile b/www/habari/Makefile
index 1fe0c48..a32ef4e 100644
--- a/www/habari/Makefile
+++ b/www/habari/Makefile
@@ -20,7 +20,6 @@ OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE
OPTIONS_DEFAULT= MYSQL
OPTIONS_DEFINE= DOCS
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
@@ -41,17 +40,17 @@ post-patch:
.endfor
do-install:
- @${MKDIR} ${WWWDIR}
- ${INSTALL_DATA} ${WRKSRC}/index.php ${WWWDIR}
+ @${MKDIR} ${STAGEDIR}${WWWDIR}
+ @${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${WWWDIR}
.for f in system user
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${WWWDIR})
+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${WWWDIR})
.endfor
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in LICENSE NOTICE README.md doc/MIT.txt
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
- @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} manual ${DOCSDIR})
+ @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR})
.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?201405230312.s4N3C6j8092459>