Date: Mon, 19 Oct 2015 16:45:51 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399698 - branches/2015Q4/net/spread-j Message-ID: <201510191645.t9JGjpNx059055@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Oct 19 16:45:51 2015 New Revision: 399698 URL: https://svnweb.freebsd.org/changeset/ports/399698 Log: MFH: r399695 - Fix staging WITHOUT=DOCS Approved by: ports-secteam blanket Modified: branches/2015Q4/net/spread-j/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/net/spread-j/Makefile ============================================================================== --- branches/2015Q4/net/spread-j/Makefile Mon Oct 19 16:42:58 2015 (r399697) +++ branches/2015Q4/net/spread-j/Makefile Mon Oct 19 16:45:51 2015 (r399698) @@ -18,38 +18,35 @@ USE_JAVA= YES JAVA_VERSION= 1.6+ PKGMESSAGE= ${WRKSRC}/../license.txt -OPTIONS_DEFINE= DOCS EXAMPLES - ANT?= ${LOCALBASE}/bin/ant ANT_PARAMS+= -Dlib.dir=${STAGEDIR}${JAVAJARDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/java PLIST_SUB+= PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}" -.include <bsd.port.options.mk> +PORTDOCS= * + +OPTIONS_DEFINE= DOCS EXAMPLES -.if empty(PORT_OPTIONS:MDOCS) -ANT_TARGET= jar -.else -ANT_TARGET= javadocs jar -PORTDOCS+= java -.endif +DOCS_VARS= DOCS_ANT_TARGET=javadocs do-build: (cd ${WRKSRC} && \ - ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT} ${ANT_TARGET} ${ANT_PARAMS}) + ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT} jar ${DOCS_ANT_TARGET} ${ANT_PARAMS}) do-install: (cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS}) - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${EXAMPLESDIR}/java + +do-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/java ${INSTALL_DATA} ${WRKSRC}/recThread.java ${STAGEDIR}${EXAMPLESDIR}/java ${INSTALL_DATA} ${WRKSRC}/Flooder.java ${STAGEDIR}${EXAMPLESDIR}/java ${INSTALL_DATA} ${WRKSRC}/User.java ${STAGEDIR}${EXAMPLESDIR}/java - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR}/java + +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR}/java ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/java - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR}/java/html - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR}/java/html/spread - ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR}/java/html/spread/class-use + ${MKDIR} ${STAGEDIR}${DOCSDIR}/java/html/spread/class-use ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}/java/html ${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${STAGEDIR}${DOCSDIR}/java/html ${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${STAGEDIR}${DOCSDIR}/java/html/spread
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510191645.t9JGjpNx059055>