Attachment 143385 Details for Bug 190634 – Added stage support to scloader

Added stage support to scloader

scloader-staging.patch.txt (text/plain), 1.18 KB, created by joe on 2014-06-04 22:50:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-06-04 22:50:06 UTC

Size: 1.18 KB

patch

obsolete

>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
>

Actions: View

Attachments on bug 190634: 143385