From fc37e9702ff34bebb509df59801b757cc6f2420e Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Sat, 31 May 2014 14:53:53 +0000 Subject: [PATCH] - Add staging support - Convert to new options framework, add EXAMPLES option --- java/netrexx/Makefile | 27 +++++++++------------------ java/netrexx/pkg-plist | 4 ++-- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile index 5b0f827915e5..2aa42e13c231 100644 --- a/java/netrexx/Makefile +++ b/java/netrexx/Makefile @@ -15,8 +15,7 @@ NO_BUILD= yes USES= zip USE_JAVA= yes -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS EXAMPLES pre-patch: for file in ${WRKSRC}/bin/NetRexxC.sh ${WRKSRC}/read.me.first; do \ @@ -30,21 +29,13 @@ post-patch: ${WRKSRC}/bin/NetRexxC.sh do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/bin/NetRexxC.sh ${PREFIX}/bin - @${LN} -sf ${PREFIX}/bin/NetRexxC.sh ${PREFIX}/bin/nrc - - @${INSTALL_DATA} ${WRKSRC}/lib/NetRexxC.jar ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/runlib/NetRexxR.jar ${JAVAJARDIR} - -.if !defined(NOPORTDOCS) - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/bin/hello.nrx \ - ${EXAMPLESDIR} - @cd ${WRKSRC}/browse && \ - ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; - @cd ${WRKSRC}/browse && \ - ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; -.endif + ${INSTALL_SCRIPT} ${WRKSRC}/bin/NetRexxC.sh ${STAGEDIR}${PREFIX}/bin + ${LN} -sf ${PREFIX}/bin/NetRexxC.sh ${STAGEDIR}${PREFIX}/bin/nrc + ${INSTALL_DATA} ${WRKSRC}/lib/NetRexxC.jar ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/runlib/NetRexxR.jar ${STAGEDIR}${JAVAJARDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/bin/hello.nrx ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/browse && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) post-install: @${ECHO} "==================== IBM LICENSE ====================" @@ -53,4 +44,4 @@ post-install: @${ECHO} "==================== IMPORTANT!! ====================" @${CAT} ${WRKSRC}/read.me.first -.include +.include diff --git a/java/netrexx/pkg-plist b/java/netrexx/pkg-plist index f37425f778f1..5f154785fc1c 100644 --- a/java/netrexx/pkg-plist +++ b/java/netrexx/pkg-plist @@ -129,10 +129,10 @@ bin/nrc %%PORTDOCS%%%%DOCSDIR%%/ArchText.nrx %%PORTDOCS%%%%DOCSDIR%%/wordclock.html %%PORTDOCS%%%%DOCSDIR%%/ArchText.class -%%PORTDOCS%%%%EXAMPLESDIR%%/hello.nrx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello.nrx %%JAVAJARDIR%%/NetRexxC.jar %%JAVAJARDIR%%/NetRexxR.jar %%PORTDOCS%%@dirrm %%DOCSDIR%%/netrexx/lang %%PORTDOCS%%@dirrm %%DOCSDIR%%/netrexx %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%