From nobody Thu Nov 25 14:48:14 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A83AE188AF87; Thu, 25 Nov 2021 14:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J0LN13942z3mf7; Thu, 25 Nov 2021 14:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A895C1F357; Thu, 25 Nov 2021 14:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1APEmEdL008916; Thu, 25 Nov 2021 14:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1APEmECv008915; Thu, 25 Nov 2021 14:48:14 GMT (envelope-from git) Date: Thu, 25 Nov 2021 14:48:14 GMT Message-Id: <202111251448.1APEmECv008915@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a7d056709d46 - 2021Q4 - java/bouncycastle15: Simplify install target for ZIPSRC List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: a7d056709d46363428a103e7d1c3afdc7e5255cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637851698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUDIqzK68cDrk0rr3Bgcd7aILpiky1uPtbWAo0qVv7I=; b=ug2rX7TjsodI7wliaIOUnKfBTZYDFBnc6rjeqVpzbdN7qKcRZOTarzEk0ULDBVvgkE8MRH alg+lVdrwWgnJS9tFNbfE61n/PyQNBBCO70KvT3PEAz2i7NOknx2pzvM7zTDrLKHWjGclI nBtOZ7O6kXXF65gwdt+CTFfWTb5O6XCJh9YAJ7jpKWCtF9SLzOlwnHcahYat4fIlIqenrG oj8u4KoGMxEZAhIfPSwH7kdp0+2dFuwV/UZrsjJEa1YbQZurBDseyFVs8goDsPa5vUgMRS OcmLcW8DuEXGJpe6A5Gau3sX2lfFTz+PhqTZE2ZAJWqX4c2EWHAdTSDNoIsmLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637851698; a=rsa-sha256; cv=none; b=v9ciLz96HiwMTKl1++kzCC7HmpG1KRFLDDbVASR2hmKokqFOugSm2Ts/4axuhVdvAZQeFh 4yZzk+fYY7esWZ85q1AcTbrCraGchomm6ZLE14nhZzDe2fHbXWcaKAhlE+8lUR4/fWyb7y 66U2iA0ZHtS4RCrzMOe9F1/KvzotWOyVqPLCtwdT4WcJg2EmJhsxn72cDDGNFlvnScCwXe bY614TDT6/HP1bo0m8oFMjjRqVg1MSyZssov4knCbS41EuQoDLMr8O4+rzfnx2vcaHDrS3 UEuH7onrN+SyaN3uyf8gQ9zDNNJZWl+sOP+K2FoUkFDDx0BsXELb+QnVexPGYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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