svn commit: r395438 - head/net/jgroups

Dmitry Marakasov amdmi3 at FreeBSD.org
Thu Aug 27 17:14:21 UTC 2015


Author: amdmi3
Date: Thu Aug 27 17:14:20 2015
New Revision: 395438
URL: https://svnweb.freebsd.org/changeset/ports/395438

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

Modified:
  head/net/jgroups/Makefile

Modified: head/net/jgroups/Makefile
==============================================================================
--- head/net/jgroups/Makefile	Thu Aug 27 16:59:39 2015	(r395437)
+++ head/net/jgroups/Makefile	Thu Aug 27 17:14:20 2015	(r395438)
@@ -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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>


More information about the svn-ports-all mailing list