svn commit: r349768 - head/devel/java-util-concurrent

[Pawel Pekala]

Author: pawel
Date: Mon Mar 31 16:09:32 2014
New Revision: 349768
URL: http://svnweb.freebsd.org/changeset/ports/349768
QAT: https://qat.redports.org/buildarchive/r349768/

Log:
  - Add staging support
  - Define DOCS option
  - Fix WWW line in pkg-descr

Modified:
  head/devel/java-util-concurrent/Makefile
  head/devel/java-util-concurrent/pkg-descr

Modified: head/devel/java-util-concurrent/Makefile
==============================================================================
--- head/devel/java-util-concurrent/Makefile	Mon Mar 31 16:02:09 2014	(r349767)
+++ head/devel/java-util-concurrent/Makefile	Mon Mar 31 16:09:32 2014	(r349768)
@@ -17,30 +17,26 @@ JAVA_VERSION=	1.6+
 
 USE_ANT=	yes
 ALL_TARGET=	dist
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-.endif
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-.if !defined(NOPORTDOCS)
 PORTDOCS=	apidocs index.html
-.endif
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+ALL_TARGET+=	javadoc
+.endif
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/lib/${DISTNAME}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
-	@cd ${WRKSRC}/docs \
-	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/apidocs/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/apidocs/{} \;
-	@${INSTALL_DATA} ${WRKSRC}/intro.html ${DOCSDIR}/index.html
-	@${ECHO_MSG} " [ DONE ]"
+	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/${DISTNAME}.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/apidocs
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/apidocs)
+	${INSTALL_DATA} ${WRKSRC}/intro.html ${STAGEDIR}${DOCSDIR}/index.html
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/java-util-concurrent/pkg-descr
==============================================================================
--- head/devel/java-util-concurrent/pkg-descr	Mon Mar 31 16:02:09 2014	(r349767)
+++ head/devel/java-util-concurrent/pkg-descr	Mon Mar 31 16:09:32 2014	(r349768)
@@ -16,4 +16,4 @@ Plus some utilities and frameworks that 
 
 This package was the precursor to java.util.concurrent.
 
-WWW:	http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
+WWW: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html