Index: Makefile =================================================================== --- Makefile (revision 554450) +++ Makefile (working copy) @@ -1,15 +1,11 @@ # $FreeBSD$ PORTNAME= cassandra -DISTVERSION= 3.11.6 -PORTREVISION= 1 +DISTVERSION= 3.11.9 CATEGORIES= databases java -MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \ - LOCAL/yuri:repo +MASTER_SITES= LOCAL/yuri:repo PKGNAMESUFFIX= 3 -DISTNAME= apache-${PORTNAME}-${PORTVERSION}-src -DISTFILES= ${DISTNAME}.tar.gz:apache \ - apache-${PORTNAME}-3.11.4-repo.tar.gz:repo +DISTFILES= apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo MAINTAINER= language.devel@gmail.com COMMENT= Highly scalable distributed database @@ -17,20 +13,29 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - RUN_DEPENDS= snappyjava>=0:archivers/snappy-java +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ + bash>0:shells/bash \ + git>0:devel/git -USES= python:2.7 +USES= python:3.6+ +USE_ANT= yes USE_JAVA= yes -USE_ANT= yes +JAVA_VERSION= 1.8 +JAVA_VENDOR= openjdk + USE_RC_SUBR= cassandra +USE_GITHUB= yes +GH_ACCOUNT= polo-language +GH_PROJECT= cassandra +GH_TAGNAME= c6f6387 + +TEST_TARGET= test + CONFLICTS= cassandra4 -JAVA_VERSION= 1.8 -JAVA_VENDOR= openjdk +DATADIR= ${JAVASHAREDIR}/${PORTNAME} REINPLACE_ARGS= -i '' SUB_LIST= JAVA_HOME=${JAVA_HOME} @@ -38,10 +43,18 @@ USERS= cassandra GROUPS= cassandra -DATADIR= ${JAVASHAREDIR}/${PORTNAME} -DIST_DIR= ${WRKSRC}/build/dist -REPO_DIR= ${WRKDIR}/repository +PLIST_SUB= PORTVERSION=${PORTVERSION} +PORTDOCS= * +OPTIONS_DEFINE= SIGAR DOCS +OPTIONS_DEFAULT= SIGAR +OPTIONS_SUB= yes + +SIGAR_DESC= Use SIGAR to collect system information +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} +SIGAR_RUN_DEPENDS= java-sigar>=1.6.4:java/sigar + CONFIG_FILES= cassandra-env.sh \ cassandra-jaas.config \ cassandra-rackdc.properties \ @@ -53,6 +66,9 @@ logback-tools.xml \ logback.xml +DIST_DIR= ${WRKSRC}/build/dist +REPO_DIR= ${WRKDIR}/repository + SCRIPT_FILES= cassandra \ cqlsh \ nodetool \ @@ -62,20 +78,9 @@ sstableutil \ sstableverify -PLIST_SUB= PORTVERSION=${PORTVERSION} +post-patch: + @${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh -OPTIONS_DEFINE= SIGAR DOCS -OPTIONS_DEFAULT= SIGAR -OPTIONS_SUB= yes - -SIGAR_DESC= Use SIGAR to collect system information -SIGAR_RUN_DEPENDS= java-sigar>=1.6.4:java/sigar - -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} - -PORTDOCS= * - do-build: @${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target. @@ -93,7 +98,6 @@ @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/bin/cassandra.in.sh @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/conf/cassandra-env.sh @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/conf|${ETCDIR}|' ${DIST_DIR}/bin/cassandra.in.sh - @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/conf|${ETCDIR}|' ${DIST_DIR}/conf/cassandra-env.sh .for f in ${CONFIG_FILES} @${MV} ${DIST_DIR}/conf/${f} ${DIST_DIR}/conf/${f}.sample .endfor @@ -128,4 +132,12 @@ post-install-SIGAR-on: ${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar +do-test: + # A bare 'python' must be on PATH for test to succeed. + @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.patched + @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.orig bin/cassandra.in.sh + @cd ${WRKSRC} && pylib/cassandra-cqlsh-tests.sh ${WRKSRC} python3 ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD} + @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.orig + @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.patched bin/cassandra.in.sh + .include Index: distinfo =================================================================== --- distinfo (revision 554450) +++ distinfo (working copy) @@ -1,5 +1,5 @@ -TIMESTAMP = 1582025236 -SHA256 (apache-cassandra-3.11.6-src.tar.gz) = 9d2b976c942f8d845a621183c83b15ce06308c76942986aa7216b6e1c2f3480c -SIZE (apache-cassandra-3.11.6-src.tar.gz) = 35097130 -SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44 -SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889 +TIMESTAMP = 1604733047 +SHA256 (apache-cassandra-3.11.9-repo.tar.gz) = 52182f64422f139db63337d25e3225e4d619f5063849968584d307e63bbada39 +SIZE (apache-cassandra-3.11.9-repo.tar.gz) = 52444450 +SHA256 (polo-language-cassandra-3.11.9-c6f6387_GH0.tar.gz) = 261336776a2be1b40d170fee4e77991922a8bfcb87b90aa42e60f6b7b8bc7e9c +SIZE (polo-language-cassandra-3.11.9-c6f6387_GH0.tar.gz) = 35605838 Index: files/patch-bin_cassandra =================================================================== --- files/patch-bin_cassandra (revision 554450) +++ files/patch-bin_cassandra (working copy) @@ -1,6 +1,6 @@ ---- bin/cassandra.orig 2019-12-13 12:50:29 UTC +--- bin/cassandra.orig 2020-07-14 21:00:51 UTC +++ bin/cassandra -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ # JVM_OPTS -- Additional arguments to the JVM for heap size, etc # JVM_ON_OUT_OF_MEMORY_ERROR_OPT -- The OnOutOfMemoryError JVM option if specified # CASSANDRA_CONF -- Directory containing Cassandra configuration files. @@ -9,7 +9,7 @@ # # As a convenience, a fragment of shell is sourced in order to set one or # more of these variables. This so-called `include' can be placed in a -@@ -127,7 +127,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then +@@ -128,7 +128,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then fi if [ -z "$CASSANDRA_LOG_DIR" ]; then Index: files/patch-build.xml =================================================================== --- files/patch-build.xml (revision 554450) +++ files/patch-build.xml (working copy) @@ -1,4 +1,4 @@ ---- build.xml.orig 2020-02-10 22:55:14 UTC +--- build.xml.orig 2020-10-20 17:07:48 UTC +++ build.xml @@ -23,6 +23,7 @@ @@ -7,7 +7,7 @@ + - + @@ -80,14 +81,14 @@ @@ -25,7 +25,7 @@ -@@ -246,8 +247,7 @@ +@@ -247,8 +248,7 @@ @@ -35,7 +35,7 @@ -@@ -260,6 +260,7 @@ +@@ -261,6 +261,7 @@ @@ -43,7 +43,7 @@ -@@ -302,10 +303,6 @@ +@@ -303,10 +304,6 @@ description="Initialize Maven ANT Tasks"> @@ -54,7 +54,7 @@ -@@ -695,16 +692,14 @@ +@@ -706,16 +703,14 @@ filesetId="build-dependency-jars" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/build-dependencies.xml"> @@ -73,7 +73,7 @@ -@@ -717,7 +712,7 @@ +@@ -728,7 +723,7 @@ @@ -82,7 +82,7 @@ -@@ -738,8 +733,7 @@ +@@ -749,8 +744,7 @@ sourcesFilesetId="test-dependency-sources" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/test-dependencies.xml"> @@ -92,7 +92,7 @@ -@@ -1034,6 +1028,88 @@ +@@ -1045,6 +1039,88 @@ @@ -181,7 +181,17 @@ -@@ -1776,8 +1852,8 @@ +@@ -1644,8 +1720,7 @@ + + + +- +- ++ + + + +@@ -1794,8 +1869,8 @@ @@ -192,7 +202,7 @@ -@@ -1797,6 +1873,11 @@ +@@ -1815,6 +1890,11 @@ Index: files/patch-doc_Makefile =================================================================== --- files/patch-doc_Makefile (revision 554450) +++ files/patch-doc_Makefile (working copy) @@ -1,14 +1,5 @@ ---- doc/Makefile.orig 2019-02-02 22:06:43 UTC +--- doc/Makefile.orig 2020-10-27 14:38:56 UTC +++ doc/Makefile -@@ -3,7 +3,7 @@ - - # You can set these variables from the command line. - SPHINXOPTS = --SPHINXBUILD = sphinx-build -+SPHINXBUILD = sphinx-build-2.7 - PAPER = - BUILDDIR = build - @@ -17,7 +17,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s YAML_DOC_INPUT=../conf/cassandra.yaml YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst Index: files/patch-doc_source___templates_indexcontent.html =================================================================== --- files/patch-doc_source___templates_indexcontent.html (nonexistent) +++ files/patch-doc_source___templates_indexcontent.html (working copy) @@ -0,0 +1,17 @@ +--- doc/source/_templates/indexcontent.html.orig 2020-10-28 18:46:34 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 currently a work-in-progress and contains a number of TODO sections. + Contributions are welcome.
+ Property changes on: files/patch-doc_source___templates_indexcontent.html ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-doc_source___util_cql.py =================================================================== --- files/patch-doc_source___util_cql.py (nonexistent) +++ files/patch-doc_source___util_cql.py (working copy) @@ -0,0 +1,10 @@ +--- doc/source/_util/cql.py.orig 2020-10-28 18:48:05 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' ] + Property changes on: files/patch-doc_source___util_cql.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-pylib_cassandra-cqlsh-tests.sh =================================================================== --- files/patch-pylib_cassandra-cqlsh-tests.sh (nonexistent) +++ files/patch-pylib_cassandra-cqlsh-tests.sh (working copy) @@ -0,0 +1,44 @@ +--- pylib/cassandra-cqlsh-tests.sh.orig 2020-10-20 17:07:48 UTC ++++ pylib/cassandra-cqlsh-tests.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash -x ++#!/usr/local/bin/bash -x + + ################################ + # +@@ -9,6 +9,8 @@ + WORKSPACE=$1 + PYTHON_VERSION=$2 + JAVA_HOME=$3 ++REPO_DIR=$4 ++PYTHON_CMD=$5 + + if [ "${WORKSPACE}" = "" ]; then + echo "Specify Cassandra source directory" +@@ -48,7 +50,7 @@ fi + + # Loop to prevent failure due to maven-ant-tasks not downloading a jar.. + for x in $(seq 1 3); do +- ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar ++ ant -buildfile ${CASSANDRA_DIR}/build.xml -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} realclean jar + RETURN="$?" + if [ "${RETURN}" -eq "0" ]; then + break +@@ -62,7 +64,7 @@ fi + + # Set up venv with dtest dependencies + set -e # enable immediate exit if venv setup fails +-virtualenv --python=$PYTHON_VERSION venv ++virtualenv --python=${PYTHON_CMD} venv + source venv/bin/activate + pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt + pip freeze +@@ -103,7 +105,7 @@ case "${pre_or_post_cdc}" in + ;; + esac + +-ccm start --wait-for-binary-proto ++ccm start --wait-for-binary-proto --root + + cd ${CASSANDRA_DIR}/pylib/cqlshlib/ + Property changes on: files/patch-pylib_cassandra-cqlsh-tests.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 554450) +++ pkg-plist (working copy) @@ -19,8 +19,7 @@ %%DATADIR%%/lib/asm-5.0.4.jar %%DATADIR%%/lib/caffeine-2.2.6.jar %%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar -%%DATADIR%%/lib/cassandra-driver-internal-only-3.10.zip -%%DATADIR%%/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip +%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip %%DATADIR%%/lib/commons-cli-1.1.jar %%DATADIR%%/lib/commons-codec-1.9.jar %%DATADIR%%/lib/commons-lang3-3.1.jar @@ -31,12 +30,14 @@ %%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 %%DATADIR%%/lib/hppc-0.5.4.jar -%%DATADIR%%/lib/jackson-core-asl-1.9.13.jar -%%DATADIR%%/lib/jackson-mapper-asl-1.9.13.jar +%%DATADIR%%/lib/jackson-annotations-2.9.10.jar +%%DATADIR%%/lib/jackson-core-2.9.10.jar +%%DATADIR%%/lib/jackson-databind-2.9.10.4.jar %%DATADIR%%/lib/jamm-0.3.0.jar %%DATADIR%%/lib/javax.inject.jar %%DATADIR%%/lib/jbcrypt-0.3m.jar @@ -110,7 +111,7 @@ %%DATADIR%%/lib/ohc-core-j8-0.4.4.jar %%DATADIR%%/lib/reporter-config-base-3.0.3.jar %%DATADIR%%/lib/reporter-config3-3.0.3.jar -%%DATADIR%%/lib/six-1.7.3-py2.py3-none-any.zip +%%DATADIR%%/lib/six-1.12.0-py2.py3-none-any.zip %%DATADIR%%/lib/slf4j-api-1.7.7.jar %%DATADIR%%/lib/snakeyaml-1.11.jar %%DATADIR%%/lib/snappy-java.jar