From owner-svn-ports-all@FreeBSD.ORG Tue Apr 29 06:48:03 2014 Return-Path: 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 C05926F7; Tue, 29 Apr 2014 06:48:03 +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 938061925; Tue, 29 Apr 2014 06:48:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3T6m3ZN082191; Tue, 29 Apr 2014 06:48:03 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3T6m3em082190; Tue, 29 Apr 2014 06:48:03 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201404290648.s3T6m3em082190@svn.freebsd.org> From: Max Brazhnikov Date: Tue, 29 Apr 2014 06:48:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352579 - head/java/jakarta-commons-collections 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2014 06:48:03 -0000 Author: makc Date: Tue Apr 29 06:48:03 2014 New Revision: 352579 URL: http://svnweb.freebsd.org/changeset/ports/352579 QAT: https://qat.redports.org/buildarchive/r352579/ Log: java/jakarta-commons-collections: - Add stage support - Drop unneeded JAVA_VERSION - Convert NOPORTDOCS to option - Clean up Makefile Modified: head/java/jakarta-commons-collections/Makefile Modified: head/java/jakarta-commons-collections/Makefile ============================================================================== --- head/java/jakarta-commons-collections/Makefile Tue Apr 29 06:01:16 2014 (r352578) +++ head/java/jakarta-commons-collections/Makefile Tue Apr 29 06:48:03 2014 (r352579) @@ -13,40 +13,28 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Classes that extend/augment the Java Collections Framework USE_JAVA= yes -JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= jar -.if !defined(NOPORTDOCS) -ALL_TARGET+= javadoc +PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar OTHERDOCS= DEVELOPERS-GUIDE.html LICENSE.txt PROPOSAL.html README.txt RELEASE-NOTES.html PORTDOCS= apidocs ${OTHERDOCS} -.endif -JARFILE= ${PORTNAME}-${PORTVERSION}.jar -DESTJARFILE= ${PORTNAME}.jar -PLIST_FILES+= %%JAVAJARDIR%%/${DESTJARFILE} - -NO_STAGE= yes -.include - -JDK_API!= (${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1 -.if ${JDK_API} != "" -MAKE_ARGS+= -Djavadoc.links=${JDK_API} -.endif + +OPTIONS_DEFINE= DOCS + +DOCS_ALL_TARGET= javadoc + +.include do-install: - @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..." - @${MKDIR} ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} - @${ECHO_MSG} " [ DONE ]" - -.if !defined(NOPORTDOCS) - @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/build/docs && ${FIND} apidocs \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1 - @${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ - @${ECHO_MSG} " [ DONE ]" + @${MKDIR} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}-${PORTVERSION}.jar \ + ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/build/docs && \ + ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .endif -.include +.include