Date: Thu, 22 May 2014 17:36:13 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190118: [patch] Add staging support to www/grails Message-ID: <201405221736.s4MHaDCA056925@cgiserv.freebsd.org> Resent-Message-ID: <201405221740.s4MHe0VE083022@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190118
>Category: ports
>Synopsis: [patch] Add staging support to www/grails
>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: Thu May 22 17:40: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/grails.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/grails/Makefile b/www/grails/Makefile
index 59c450f..41ea3a8 100644
--- a/www/grails/Makefile
+++ b/www/grails/Makefile
@@ -29,27 +29,26 @@ PLIST_FILES= ${SCRIPTFILES:S,^,bin/,} \
PLIST_DIRS= ${DATADIR:S,${PREFIX}/,,}/bin
SUB_FILES= edit-startGrails.sed pkg-message
-NO_STAGE= yes
do-install:
@${ECHO_MSG} -n ">> Installing data files in ${DATADIR}..."
@cd ${WRKSRC} \
- && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \
- && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+ && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \; \
+ && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
@${ECHO_MSG} " [ DONE ]"
@${ECHO_MSG} -n ">> Installing and symlinking executables..."
- @${MKDIR} ${DATADIR}/bin
+ @${MKDIR} ${STAGEDIR}${DATADIR}/bin
@${REINPLACE_CMD} -f ${WRKDIR}/edit-startGrails.sed ${WRKSRC}/bin/startGrails
.for file in ${SCRIPTFILES}
@${ECHO_MSG} -n " ${file}"
- @${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${DATADIR}/bin/${file}
- @${LN} -fs ${DATADIR}/bin/${file} ${PREFIX}/bin/${file}
+ @${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${STAGEDIR}${DATADIR}/bin/${file}
+ @${LN} -fs ${DATADIR}/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file}
.endfor
@${ECHO_MSG} " [ DONE ]"
.if !defined(NOPORTDOCS)
@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
@cd ${WRKSRC}/doc \
- && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
- && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+ && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
+ && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
@${ECHO_MSG} " [ DONE ]"
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405221736.s4MHaDCA056925>