Date: Fri, 30 May 2014 16:03:23 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190418: [patch] Add staging support to www/scloader Message-ID: <201405301603.s4UG3NbG041891@cgiserv.freebsd.org> Resent-Message-ID: <201405301610.s4UGA0Qq011615@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190418
>Category: ports
>Synopsis: [patch] Add staging support to www/scloader
>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 30 16:10: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/scloader.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/scloader/Makefile b/www/scloader/Makefile
index 08d6469..cc597d3 100644
--- a/www/scloader/Makefile
+++ b/www/scloader/Makefile
@@ -22,22 +22,22 @@ PORTDOCS= README history todo
DOS2UNIX_REGEX= .+\.[^j][^a][^r]$
-NO_STAGE= yes
do-configure:
${SED} -e "s|%%JAVA%%|${LOCALBASE}/bin/java|" \
-e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \
${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}
do-install:
- ${INSTALL} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/scloader.jar ${JAVAJARDIR}
+ ${INSTALL} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+ ${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+ ${INSTALL_DATA} ${WRKSRC}/scloader.jar ${STAGEDIR}${JAVAJARDIR}
.ifndef NOPORTDOCS
- ${MKDIR} ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
.endfor
- ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/samples/loader.cnf ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/samples/loader.cnf ${STAGEDIR}${DOCSDIR}
PORTDOCS+= manual.html loader.cnf
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405301603.s4UG3NbG041891>