Date: Thu, 25 Nov 2021 14:48:14 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: a7d056709d46 - 2021Q4 - java/bouncycastle15: Simplify install target for ZIPSRC Message-ID: <202111251448.1APEmECv008915@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7d056709d46363428a103e7d1c3afdc7e5255cc commit a7d056709d46363428a103e7d1c3afdc7e5255cc Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-11-24 22:32:51 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-11-25 14:47:13 +0000 java/bouncycastle15: Simplify install target for ZIPSRC MFH: 2021Q4 Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. (cherry picked from commit 71a10a9b37b953afc3e044f58cd28d6e47de514f) --- java/bouncycastle15/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java/bouncycastle15/Makefile b/java/bouncycastle15/Makefile index 28eaac7e39af..c31271154515 100644 --- a/java/bouncycastle15/Makefile +++ b/java/bouncycastle15/Makefile @@ -64,13 +64,6 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}on-${DVERSION}.jar \ ${STAGEDIR}${JAVAJARDIR}/bcprov.jar -.if ${PORT_OPTIONS:MZIPSRC} - @${MKDIR} ${STAGEDIR}${DATADIR} -.for jar in ${JARS_SRC} - ${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}on-${DVERSION}/src.zip \ - ${STAGEDIR}${DATADIR}/${jar}-src.zip -.endfor -.endif do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -81,4 +74,11 @@ do-install-DOCS-on: ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${jar} .endfor +do-install-ZIPSRC-on: + @${MKDIR} ${STAGEDIR}${DATADIR} +.for jar in ${JARS_SRC} + ${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}on-${DVERSION}/src.zip \ + ${STAGEDIR}${DATADIR}/${jar}-src.zip +.endfor + .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111251448.1APEmECv008915>