From nobody Sun May 1 16:38:04 2022 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 468621AAF9C4; Sun, 1 May 2022 16:38:05 +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 4KrsNF1Tytz4jmS; Sun, 1 May 2022 16:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651423085; 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=f6eCbNXgLlEGFXuFf2q+DSXC2oLXB5rmdPIH8R3ZGrs=; b=ZvizUt9/q6iXUxTJ8e8TBl7H/hDOFcA+4hqN1RQnriN2kpLMOanPhgQygUiM+AkzrCwyeh tnwqAJusnKxVzudvXrSIXaFRXXR6z/gs62rDHyjFHPK9Q1+mEloXU0A/VRQtd2lfgAWrw/ 62GGfs2IWDu/cksp/hT0skTNzt8dKfPuI/J2ctk5+2aIH0tsUkdcFeXY86+lD7aCr8aSfy RVYC97tELs3C5OXuGtDh108y+UcNwUStW9VfJm8m+t+ssPqu8BVVQIQO+OqRxyryHAKBiM REpy59lPRQdPiVr1LfNl2bP1W9h+nA8mfTT9QZMs3BEqBbF/z4Pn2osIaLpwQA== 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 0F371189DF; Sun, 1 May 2022 16:38:05 +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 241Gc41N093357; Sun, 1 May 2022 16:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241Gc4t2093356; Sun, 1 May 2022 16:38:04 GMT (envelope-from git) Date: Sun, 1 May 2022 16:38:04 GMT Message-Id: <202205011638.241Gc4t2093356@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: a9bb17ab1305 - 2022Q2 - databases/cassandra3: Fix build 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: a9bb17ab130555fa248a66ed0c7872d4b01fdf62 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651423085; 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=f6eCbNXgLlEGFXuFf2q+DSXC2oLXB5rmdPIH8R3ZGrs=; b=r4oaeDfmZDntwa+f112IXz2+BbWoNza2IMhDQTnJFyC7Q61SxMscnDlS1ocFWKq6QgeJZs +/ZllMQTIa6m/swGHIkYTz7S8J16JkWpSXTzfOJxZVpQFiMYzrnpSeE7eR5Jq15gfsmIOb JuxAk9d4dMJluR1Wxl22VpEXfPaxvsf34jTt8Dlyv/9wVq0C+3Y6VOUnQoRX26QWXo3wfN WtFDj5FwBz3Cc9NroTQoQsvbJk4yauG0yXIeP+58o9C83bLc/zd1NpHng5mL0u1EvIRZA2 frtBdEcsMepIfpd8qDOA3R2ISTGVAk3Qy3NPlib5QUWQH02fznUKQl1tVb4rcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651423085; a=rsa-sha256; cv=none; b=RHxxNWUq9CObx5SVLyTjqzTkeadYeUry37hel28SS5qA1z+ao+wFTXyweQM1wdccpUtgf4 3CCIvFobsOq1eaROKMD5Men6UlxKtAx7Ckaoy7TwCncofVNTmhMNoEN/zirxs8EzReZTLR H/FuRFQEiP4URKEZP78AgJEM3d/+UKOsUKFRETPKNwvwrj+ikOe+K0KwAQ4nMw9C4A2BpB ZM4dAlbpjWmJjXpvT2YhcFAy5nAZHSehOFfdbSfANtjaEmPf3zUQOlmwJlBVvXm6znVqwa IuM1eAntckaY5JhupMVP4UOlyVdTFs9T6T/4cIJqhU5OlG0LNJYjnCEZ/TVQtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9bb17ab130555fa248a66ed0c7872d4b01fdf62 commit a9bb17ab130555fa248a66ed0c7872d4b01fdf62 Author: Angelo Polo AuthorDate: 2022-04-20 14:59:38 +0000 Commit: Mikael Urankar CommitDate: 2022-05-01 16:06:19 +0000 databases/cassandra3: Fix build Add missing patches. PR: 261220 (cherry picked from commit 81ab4a37d966e58420baa0b6df712a2a3dbdbdce) --- databases/cassandra3/Makefile | 2 +- databases/cassandra3/distinfo | 6 ++--- .../files/patch-.build_build-resolver.xml | 27 ---------------------- databases/cassandra3/files/patch-build.xml | 11 ++++++++- databases/cassandra3/pkg-plist | 1 + 5 files changed, 15 insertions(+), 32 deletions(-) diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile index 0a5ef015f4ab..67a03878de90 100644 --- a/databases/cassandra3/Makefile +++ b/databases/cassandra3/Makefile @@ -28,7 +28,7 @@ USE_RC_SUBR= cassandra USE_GITHUB= yes GH_ACCOUNT= polo-language -GH_TAGNAME= 84496b0 +GH_TAGNAME= 0150ddc TEST_TARGET= test diff --git a/databases/cassandra3/distinfo b/databases/cassandra3/distinfo index 2eda971f75aa..bb1acd7b188a 100644 --- a/databases/cassandra3/distinfo +++ b/databases/cassandra3/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1642239227 +TIMESTAMP = 1650466481 SHA256 (apache-cassandra-3.11.11-repo.tar.gz) = 0501ab9fa4d5baecaa29153a78044ef2341feda5ab748b8adb72a6efda2a240b SIZE (apache-cassandra-3.11.11-repo.tar.gz) = 57546653 -SHA256 (polo-language-cassandra-3.11.11-84496b0_GH0.tar.gz) = 4271a3336cfd745674f8bf3ca7ebd4b5cf9be2570aa1e69821d2cb370e018f07 -SIZE (polo-language-cassandra-3.11.11-84496b0_GH0.tar.gz) = 12786216 +SHA256 (polo-language-cassandra-3.11.11-0150ddc_GH0.tar.gz) = ff3e305bbe317af11674862487753875bb9f26e7550cb796cb995e640a2a9511 +SIZE (polo-language-cassandra-3.11.11-0150ddc_GH0.tar.gz) = 12427444 diff --git a/databases/cassandra3/files/patch-.build_build-resolver.xml b/databases/cassandra3/files/patch-.build_build-resolver.xml deleted file mode 100644 index 2629ddab11c9..000000000000 --- a/databases/cassandra3/files/patch-.build_build-resolver.xml +++ /dev/null @@ -1,27 +0,0 @@ ---- .build/build-resolver.xml.orig 2022-01-03 17:11:14 UTC -+++ .build/build-resolver.xml -@@ -182,7 +182,7 @@ - - - -- -+ - - - -@@ -216,7 +216,7 @@ - - - -- -+ - - - -@@ -243,4 +243,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/databases/cassandra3/files/patch-build.xml b/databases/cassandra3/files/patch-build.xml index 9fa2d9fe1c6a..2d8db414ee5c 100644 --- a/databases/cassandra3/files/patch-build.xml +++ b/databases/cassandra3/files/patch-build.xml @@ -1,4 +1,4 @@ ---- build.xml.orig 2021-07-25 16:37:33 UTC +--- build.xml.orig 2022-01-15 09:03:19 UTC +++ build.xml @@ -20,6 +20,8 @@ @@ -34,6 +34,15 @@ +@@ -704,7 +707,7 @@ + + + +- + + @@ -894,6 +897,88 @@ diff --git a/databases/cassandra3/pkg-plist b/databases/cassandra3/pkg-plist index c59b00644bde..d7df43679c4a 100644 --- a/databases/cassandra3/pkg-plist +++ b/databases/cassandra3/pkg-plist @@ -30,6 +30,7 @@ %%DATADIR%%/lib/disruptor-3.0.1.jar %%DATADIR%%/lib/ecj-4.4.2.jar %%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip +%%DATADIR%%/lib/geomet-0.1.0.zip %%DATADIR%%/lib/guava-18.0.jar %%DATADIR%%/lib/HdrHistogram-2.1.9.jar %%DATADIR%%/lib/high-scale-lib-1.0.6.jar