From owner-svn-ports-branches@freebsd.org Mon Oct 19 16:45:53 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3D65A10D13; Mon, 19 Oct 2015 16:45:52 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 A57277F2; Mon, 19 Oct 2015 16:45:52 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JGjpfp059056; Mon, 19 Oct 2015 16:45:51 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JGjpNx059055; Mon, 19 Oct 2015 16:45:51 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510191645.t9JGjpNx059055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 19 Oct 2015 16:45:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399698 - branches/2015Q4/net/spread-j X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 16:45:53 -0000 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 +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