From 6da7f1d5c2342bf815f20f2a6c1419e2151ab256 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 27 Aug 2015 17:14:20 +0000 Subject: [PATCH] - Fix build with DOCS disabled (port tried to install nonexistinent files) - Unsilence install commands - Switch to options helpers - Add NO_ARCH Approved by: portmgr blanket --- net/jgroups/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/jgroups/Makefile b/net/jgroups/Makefile index ae8ef03c132a..276c01e2b13c 100644 --- a/net/jgroups/Makefile +++ b/net/jgroups/Makefile @@ -17,26 +17,25 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jar +NO_ARCH= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar PORTDATA= * PORTDOCS= * -.include - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -.endif +DOCS_ALL_TARGET=javadoc do-install: ${INSTALL_DATA} ${WRKSRC}/dist/${DISTNAME}.Final.jar \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar @${MKDIR} ${STAGEDIR}${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-sources.jar \ + ${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-sources.jar \ ${STAGEDIR}${DATADIR}/ + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/dist/README ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/dist/README ${STAGEDIR}${DOCSDIR}/ @(cd ${WRKSRC}/dist && ${COPYTREE_SHARE} javadoc ${STAGEDIR}${DOCSDIR}) .include