Date: Fri, 30 May 2014 18:19:16 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355887 - head/java/jakarta-commons-lang Message-ID: <201405301819.s4UIJGuQ001450@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri May 30 18:19:15 2014 New Revision: 355887 URL: http://svnweb.freebsd.org/changeset/ports/355887 QAT: https://qat.redports.org/buildarchive/r355887/ Log: - Add staging support - Convert to new options framework Modified: head/java/jakarta-commons-lang/Makefile Modified: head/java/jakarta-commons-lang/Makefile ============================================================================== --- head/java/jakarta-commons-lang/Makefile Fri May 30 18:04:27 2014 (r355886) +++ head/java/jakarta-commons-lang/Makefile Fri May 30 18:19:15 2014 (r355887) @@ -16,22 +16,22 @@ LICENSE= APACHE20 USE_JAVA= yes JAVA_VERSION= 1.6+ - USE_ANT= yes - ALL_TARGET= jar -.if !defined(NOPORTDOCS) -ALL_TARGET+= javadoc -PORTDOCS= * -.endif JARFILE= ${PORTNAME}-${PORTVERSION}.jar DESTJARFILE= ${PORTNAME}.jar PLIST_FILES= %%JAVAJARDIR%%/${DESTJARFILE} +PORTDOCS= * + +OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.pre.mk> +.if ${PORT_OPTIONS:MDOCS} +ALL_TARGET+= javadoc +.endif + 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} != "" @@ -39,16 +39,11 @@ MAKE_ARGS+= -Djdk.javadoc=${JDK_API} .endif do-install: - @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..." - @${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE} - @${ECHO_MSG} " [ DONE ]" - -.if !defined(NOPORTDOCS) - @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..." - @cd ${WRKSRC}/target/apidocs \ - && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \ - && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; - @${ECHO_MSG} " [ DONE ]" + ${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} \ + ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE} +.if ${PORT_OPTIONS:MDOCS} + (cd ${WRKSRC}/target/apidocs && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${DOCSDIR}) .endif .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405301819.s4UIJGuQ001450>