From nobody Thu Nov 25 01:02:23 2021 X-Original-To: dev-commits-ports-main@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 7B97218B28B4; Thu, 25 Nov 2021 01:02:24 +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 4J003348Xhz4tTJ; Thu, 25 Nov 2021 01:02:23 +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 482CA14250; Thu, 25 Nov 2021 01:02:23 +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 1AP12NmP016509; Thu, 25 Nov 2021 01:02:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AP12Nvw016508; Thu, 25 Nov 2021 01:02:23 GMT (envelope-from git) Date: Thu, 25 Nov 2021 01:02:23 GMT Message-Id: <202111250102.1AP12Nvw016508@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 71a10a9b37b9 - main - java/bouncycastle15: Simplify install target for ZIPSRC List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 71a10a9b37b953afc3e044f58cd28d6e47de514f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637802143; 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=P8H6xHrmT0u3PK5cm0O8zlEakVI3seHLmI3nUTH+/mQ=; b=oQHZCs0/tkhQ3efbRVaqiMIAzCkTn2iDRoPBar+PHghao/7gBLTjHsK1Ff5BYqzRMSG+ad Gpfat/OANusFRajaqPm0Pq0Yf3XAKLD8ESpGjyh7WSOn4dPQz0Rp47Bu2MgfpdHHYJRj3U a2XktVQi2d/4L7dLRfezljt4fLWXKWK012wxh2AXSCAW8EW01ZRvUiy11FsHkSuq/c5P9E u/UPmREsizW9aXtCmDBYFdt0Fa48mNFULRg2OoYsSHPQ+dwlH87nD25IMss5xCp/3Rf1QB vE6wY22qTMn3VFc9TqqcBCtEDyzgpukhaflNs94t/geVujDU5J1Rz4inh4fcUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637802143; a=rsa-sha256; cv=none; b=yj1XPY+y+LTvEweHVgz7FaoXD9DyyYPsRHR5UyzE+HMYtCQcHqT01kdn3uxhUPVSMl1j9S TdsTBO3z7kdzUlETlLjmAyihKhFw7jXGQCg03EwwclI9dVUi7YPZMB2sc41qqs5hvyMe3b 8jwWtfpvXcWoAFavqbt8uL5m/9xdYvBpDz12aAX3G8HZzXqYUs8sUi07wWyIs0eyOX1w4v oKhmLZNu32WkNgd39Z1b9SdCb0cJcWFf/0+21B1k9XTTNOhyM6L0sYLZq1VU3yqg7e+LRQ brqF7jIqfAKn+QEEQDgg02pJx8ZepA+VelOyLpCWqQq+1cSmDegtwhoLr0vPLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=71a10a9b37b953afc3e044f58cd28d6e47de514f commit 71a10a9b37b953afc3e044f58cd28d6e47de514f Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-11-24 22:32:51 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-11-25 00:58:08 +0000 java/bouncycastle15: Simplify install target for ZIPSRC MFH: 2021Q4 Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. --- 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