Date: Tue, 1 Apr 2014 07:56:06 +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: r349822 - head/devel/jgoodies-common Message-ID: <201404010756.s317u6o6053735@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Tue Apr 1 07:56:06 2014 New Revision: 349822 URL: http://svnweb.freebsd.org/changeset/ports/349822 QAT: https://qat.redports.org/buildarchive/r349822/ Log: - Add staging support - More precise LICENSE - Define DOCS option Modified: head/devel/jgoodies-common/Makefile Modified: head/devel/jgoodies-common/Makefile ============================================================================== --- head/devel/jgoodies-common/Makefile Tue Apr 1 06:14:22 2014 (r349821) +++ head/devel/jgoodies-common/Makefile Tue Apr 1 07:56:06 2014 (r349822) @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S|.| MAINTAINER= ports@FreeBSD.org COMMENT= Abstract and helper classes used by all other JGoodies libs -LICENSE= BSD +LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit @@ -28,13 +28,16 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER JARFILE= ${PORTNAME}.jar PLIST_FILES= %%JAVAJARDIR%%/${JARFILE} +PORTDOCS= * + +OPTIONS_DEFINE= DOCS -.if !defined(NOPORTDOCS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= javadoc -PORTDOCS= * .endif -NO_STAGE= yes post-patch: ${REINPLACE_CMD} 's|haltonfailure="no"|haltonfailure="yes"|' \ ${WRKSRC}/build.xml @@ -49,12 +52,14 @@ post-patch: .endif do-install: - ${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${CP} -R ${WRKSRC}/README.html ${WRKSRC}/RELEASE-NOTES.txt ${WRKSRC}/docs ${DOCSDIR}/ - @${CP} -R ${WRKSRC}/build/docs/api ${DOCSDIR}/docs - # Documentation, including javadoc-generated, was installed in ${DOCSDIR}. + ${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${STAGEDIR}${JAVAJARDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README.html RELEASE-NOTES.txt \ + ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/build/docs && ${COPYTREE_SHARE} api \ + ${STAGEDIR}${DOCSDIR}/docs) .endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404010756.s317u6o6053735>