git: 81ab4a37d966 - main - databases/cassandra3: Fix build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 20 Apr 2022 15:02:51 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=81ab4a37d966e58420baa0b6df712a2a3dbdbdce
commit 81ab4a37d966e58420baa0b6df712a2a3dbdbdce
Author: Angelo Polo <language.devel@gmail.com>
AuthorDate: 2022-04-20 14:59:38 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2022-04-20 15:02:37 +0000
databases/cassandra3: Fix build
Add missing patches.
PR: 261220
---
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 @@
-
- <!-- files.pythonhosted.org -->
- <get src="https://files.pythonhosted.org/packages/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
-- <get src="https://files.pythonhosted.org/packages/2e/a4/6dcb84af409b7bc0c258a0d6bd7e14231724d9a46b750c048f09d74d870c/six-1.7.3-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
-+ <get src="https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" dest="${localm2}/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
-
- <!-- python-driver -->
- <get src="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
-@@ -216,7 +216,7 @@
- <copy todir="${build.lib}" quiet="true">
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip"/>
-- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip"/>
-+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip"/>
- </copy>
- <copy todir="${build.lib}/sigar-bin/" quiet="true">
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
-@@ -243,4 +243,4 @@
- <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
- </copy>
- </target>
--</project>
-\ No newline at end of file
-+</project>
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 @@
<property file="build.properties" />
@@ -34,6 +34,15 @@
</exec>
<exec executable="cmd" osfamily="dos" dir="${doc.dir}">
<arg value="/c"/>
+@@ -704,7 +707,7 @@
+ <target name="build" depends="resolver-retrieve-build,build-project" description="Compile Cassandra classes"/>
+ <target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
+
+- <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
++ <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
+ name="build-project">
+ <echo message="${ant.project.name}: ${ant.file}"/>
+ <!-- Order matters! -->
@@ -894,6 +897,88 @@
</jar>
</target>
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