diff --git a/databases/cassandra4/Makefile b/databases/cassandra4/Makefile index 2bd5d5a1e243..a4a6e126de90 100644 --- a/databases/cassandra4/Makefile +++ b/databases/cassandra4/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cassandra -DISTVERSION= 4.0-beta1 +DISTVERSION= 4.0-beta2 CATEGORIES= databases java MASTER_SITES= APACHE/cassandra/${DISTVERSION}:apache \ https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.5-4/:maven \ diff --git a/databases/cassandra4/distinfo b/databases/cassandra4/distinfo index af4950aa71e2..82d3b4cbe97c 100644 --- a/databases/cassandra4/distinfo +++ b/databases/cassandra4/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1595420655 -SHA256 (apache-cassandra-4.0-beta1-src.tar.gz) = 341bcd561e68c569ba1083d7595476a09c10ac491df0051e7b5e4cc99590a865 -SIZE (apache-cassandra-4.0-beta1-src.tar.gz) = 46454540 +TIMESTAMP = 1601573969 +SHA256 (apache-cassandra-4.0-beta2-src.tar.gz) = 02347ce3d55fd7d68f90c112ee01d82902dfd959cf03c107a51d15bcaabb48c5 +SIZE (apache-cassandra-4.0-beta2-src.tar.gz) = 46741277 SHA256 (zstd-jni-1.4.5-4-freebsd_amd64.jar) = cdfcacd3d0b405869fc71c7c73ff861fa5421045f53a6168a0d0b4e8ae7ebfbc SIZE (zstd-jni-1.4.5-4-freebsd_amd64.jar) = 512671 SHA256 (zstd-jni-1.4.5-4-freebsd_i386.jar) = bb3e6e4081ffbe28648983d3c2f47cd488a29b6bb09b1e9f1219cdf82b3ed648 SIZE (zstd-jni-1.4.5-4-freebsd_i386.jar) = 418462 -SHA256 (apache-cassandra-4.0-beta1-repo.tar.gz) = ef9efcff62f4ea567eed01e4f70185068a11f9cb766129ccce0f0f86d45506b1 -SIZE (apache-cassandra-4.0-beta1-repo.tar.gz) = 77747125 +SHA256 (apache-cassandra-4.0-beta2-repo.tar.gz) = 9a0d3ad05f535158dd65761a16f3a9fb0362cbe365d6e08ef6d9896bbf3a022f +SIZE (apache-cassandra-4.0-beta2-repo.tar.gz) = 77730955 diff --git a/databases/cassandra4/files/patch-build.xml b/databases/cassandra4/files/patch-build.xml index d93b8fb720c1..762fffca3ec4 100644 --- a/databases/cassandra4/files/patch-build.xml +++ b/databases/cassandra4/files/patch-build.xml @@ -1,4 +1,4 @@ ---- build.xml.orig 2020-07-17 21:24:30 UTC +--- build.xml.orig 2020-08-28 13:55:55 UTC +++ build.xml @@ -23,6 +23,7 @@ @@ -7,7 +7,7 @@ + - + @@ -74,14 +75,14 @@ @@ -25,7 +25,7 @@ -@@ -246,7 +247,7 @@ +@@ -271,7 +272,7 @@ @@ -34,7 +34,7 @@ -@@ -391,8 +392,7 @@ +@@ -416,8 +417,7 @@ @@ -44,7 +44,7 @@ -@@ -405,6 +405,8 @@ +@@ -430,6 +430,8 @@ @@ -53,7 +53,7 @@ -@@ -447,10 +449,6 @@ +@@ -472,10 +474,6 @@ description="Initialize Maven ANT Tasks"> @@ -64,7 +64,7 @@ -@@ -865,16 +863,14 @@ +@@ -889,16 +887,14 @@ filesetId="build-dependency-jars" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/build-dependencies.xml"> @@ -83,7 +83,7 @@ -@@ -887,7 +883,7 @@ +@@ -911,7 +907,7 @@ @@ -92,7 +92,7 @@ -@@ -916,8 +912,7 @@ +@@ -940,8 +936,7 @@ sourcesFilesetId="test-dependency-sources" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/test-dependencies.xml"> @@ -102,7 +102,7 @@ -@@ -1227,6 +1222,87 @@ +@@ -1251,6 +1246,87 @@ @@ -190,7 +190,7 @@ -@@ -1347,6 +1423,7 @@ +@@ -1371,6 +1447,7 @@ @@ -209,7 +209,7 @@ -@@ -1959,6 +2036,11 @@ +@@ -1981,6 +2058,11 @@ diff --git a/databases/cassandra4/files/patch-doc_gen-nodetool-docs.py b/databases/cassandra4/files/patch-doc_gen-nodetool-docs.py deleted file mode 100644 index 4a07e5d17672..000000000000 --- a/databases/cassandra4/files/patch-doc_gen-nodetool-docs.py +++ /dev/null @@ -1,20 +0,0 @@ ---- doc/gen-nodetool-docs.py.orig 2020-04-10 22:29:25 UTC -+++ doc/gen-nodetool-docs.py -@@ -57,7 +57,7 @@ def create_rst(command): - cmdName = command.group(0).strip() - cmdFilename = outdir + "/" + cmdName + ".txt" - rstFilename = outdir + "/" + cmdName + ".rst" -- with open(cmdFilename, "w+") as cmdFile: -+ with open(cmdFilename, "w+b") as cmdFile: - proc = Popen([nodetool, "help", cmdName], stdin=PIPE, stdout=PIPE) - (out, err) = proc.communicate() - cmdFile.write(out) -@@ -76,7 +76,7 @@ with open(outdir + "/nodetool.rst", "w+") as output: - output.write(command) - - # create the command usage pages --with open(helpfilename, "rw+") as helpfile: -+with open(helpfilename, "r+") as helpfile: - for commandLine in helpfile: - command = command_re.match(commandLine) - create_rst(command) diff --git a/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html b/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html new file mode 100644 index 000000000000..98f93b30a521 --- /dev/null +++ b/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html @@ -0,0 +1,17 @@ +--- doc/source/_templates/indexcontent.html.orig 2020-08-28 13:55:55 UTC ++++ doc/source/_templates/indexcontent.html +@@ -1,5 +1,12 @@ +-{% extends "defindex.html" %} +-{% block tables %} ++{% extends "layout.html" %} ++{%- block htmltitle -%} ++{{ html_title }} ++{%- endblock -%} ++{% block body %} ++

{{ docstitle|e }}

++

++ {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %} ++

+
This documentation is a work-in-progress. + Contributions are welcome.
+ diff --git a/databases/cassandra4/files/patch-doc_source___util_cql.py b/databases/cassandra4/files/patch-doc_source___util_cql.py new file mode 100644 index 000000000000..33bb6108a90a --- /dev/null +++ b/databases/cassandra4/files/patch-doc_source___util_cql.py @@ -0,0 +1,10 @@ +--- doc/source/_util/cql.py.orig 2020-10-03 15:05:17 UTC ++++ doc/source/_util/cql.py +@@ -26,7 +26,6 @@ from pygments.lexer import Lexer, RegexLexer, do_inser + from pygments.token import Punctuation, Whitespace, Error, \ + Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal + from pygments.lexers import get_lexer_by_name, ClassNotFound +-from pygments.util import iteritems + + __all__ = [ 'CQLLexer' ] + diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java index 371b489d73ad..7983231aeb11 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java @@ -1,6 +1,6 @@ ---- src/java/org/apache/cassandra/config/Config.java.orig 2020-01-30 17:34:32 UTC +--- src/java/org/apache/cassandra/config/Config.java.orig 2020-08-28 13:55:55 UTC +++ src/java/org/apache/cassandra/config/Config.java -@@ -289,7 +289,7 @@ public class Config +@@ -290,7 +290,7 @@ public class Config public volatile int key_cache_save_period = 14400; public volatile int key_cache_keys_to_save = Integer.MAX_VALUE; diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java index d0913d5eaac1..c562d9011acd 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java @@ -1,6 +1,6 @@ ---- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-07-17 21:24:30 UTC +--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-08-28 13:55:56 UTC +++ src/java/org/apache/cassandra/service/StartupChecks.java -@@ -276,7 +276,14 @@ public class StartupChecks +@@ -281,7 +281,14 @@ public class StartupChecks { public void execute() { diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java index ae94061399e2..c9ff8e59e786 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java @@ -1,6 +1,6 @@ ---- src/java/org/apache/cassandra/utils/NativeLibrary.java.orig 2020-01-30 17:34:32 UTC +--- src/java/org/apache/cassandra/utils/NativeLibrary.java.orig 2020-08-28 13:55:56 UTC +++ src/java/org/apache/cassandra/utils/NativeLibrary.java -@@ -141,7 +141,10 @@ public final class NativeLibrary +@@ -143,7 +143,10 @@ public final class NativeLibrary else if (osName.contains("windows")) return WINDOWS; diff --git a/databases/cassandra4/pkg-descr b/databases/cassandra4/pkg-descr index b2767ece8c58..84cd178dbc3f 100644 --- a/databases/cassandra4/pkg-descr +++ b/databases/cassandra4/pkg-descr @@ -11,6 +11,6 @@ Apache project. The CQL query language offers SQL-like data access and management. Drivers are available for a number of languages. -This is an ALPHA version! It is not intended for production use. +This is a BETA version! WWW: https://cassandra.apache.org/ diff --git a/databases/cassandra4/pkg-plist b/databases/cassandra4/pkg-plist index cd63b7a03687..017e819e91ca 100644 --- a/databases/cassandra4/pkg-plist +++ b/databases/cassandra4/pkg-plist @@ -25,7 +25,7 @@ %%DATADIR%%/lib/chronicle-wire-1.16.1.jar %%DATADIR%%/lib/commons-cli-1.1.jar %%DATADIR%%/lib/commons-codec-1.9.jar -%%DATADIR%%/lib/commons-lang3-3.1.jar +%%DATADIR%%/lib/commons-lang3-3.11.jar %%DATADIR%%/lib/commons-math3-3.2.jar %%DATADIR%%/lib/concurrent-trees-2.4.0.jar %%DATADIR%%/lib/ecj-4.6.1.jar