From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 31 16:09:33 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 85362CC7;
 Mon, 31 Mar 2014 16:09:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 57DF92A4;
 Mon, 31 Mar 2014 16:09:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2VG9XIv062109;
 Mon, 31 Mar 2014 16:09:33 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2VG9Wjh062107;
 Mon, 31 Mar 2014 16:09:32 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201403311609.s2VG9Wjh062107@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Mon, 31 Mar 2014 16:09:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349768 - head/devel/java-util-concurrent
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Mar 2014 16:09:33 -0000

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