diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile index 0a5ef015f4ab..67a03878de90 100644 --- a/databases/cassandra3/Makefile +++ b/databases/cassandra3/Makefile @@ -1,145 +1,145 @@ PORTNAME= cassandra DISTVERSION= 3.11.11 PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= LOCAL/nc:repo PKGNAMESUFFIX= 3 DISTFILES= apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo MAINTAINER= language.devel@gmail.com COMMENT= Highly scalable distributed database LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt 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= cpe python:3.6+ USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.8 JAVA_VENDOR= openjdk CPE_VENDOR= apache USE_RC_SUBR= cassandra USE_GITHUB= yes GH_ACCOUNT= polo-language -GH_TAGNAME= 84496b0 +GH_TAGNAME= 0150ddc TEST_TARGET= test CONFLICTS= cassandra4 DATADIR= ${JAVASHAREDIR}/${PORTNAME} REINPLACE_ARGS= -i '' SUB_LIST= JAVA_HOME=${JAVA_HOME} USERS= cassandra GROUPS= cassandra 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= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${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 \ cassandra-topology.properties \ cassandra.yaml \ commitlog_archiving.properties \ hotspot_compiler \ jvm.options \ logback-tools.xml \ logback.xml DIST_DIR= ${WRKSRC}/build/dist REPO_DIR= ${WRKDIR}/repository SCRIPT_FILES= cassandra \ cqlsh \ nodetool \ sstableloader \ sstablescrub \ sstableupgrade \ sstableutil \ sstableverify ANT_OPTS_LOCAL= ${ANT_OPTS} -Xmx512m post-patch: @${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh @${REINPLACE_CMD} -e 's|$${user.home}/.m2/repository/|$${localm2}/|g' ${WRKSRC}/.build/build-resolver.xml do-build: @${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target. do-build-DOCS-on: @cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc do-build-DOCS-off: @cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} freebsd-stage post-build: .for f in ${SCRIPT_FILES} @${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${DIST_DIR}/bin/${f} .endfor @${REINPLACE_CMD} -e 's|`dirname "$$0"`/..|${DATADIR}|' ${DIST_DIR}/bin/cassandra.in.sh @${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 .for f in ${CONFIG_FILES} @${MV} ${DIST_DIR}/conf/${f} ${DIST_DIR}/conf/${f}.sample .endfor @${RM} ${DIST_DIR}/lib/licenses/sigar* @${RMDIR} ${DIST_DIR}/lib/sigar-bin do-install: ${MKDIR} ${STAGEDIR}${DATADIR} .for f in CHANGES LICENSE NEWS NOTICE cd ${DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/ .endfor .for d in interface lib pylib tools cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ "! -path '*/bin/*'" .endfor ${MKDIR} ${STAGEDIR}${ETCDIR} cd ${DIST_DIR}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/ cd ${DIST_DIR} && ${COPYTREE_BIN} bin ${STAGEDIR}${DATADIR} cd ${DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/ cd ${DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/ cd ${DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/ .for f in ${SCRIPT_FILES} ${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} .endfor ${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for d in doc javadoc cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/ .endfor 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} && ANT_OPTS="${ANT_OPTS_LOCAL}" ANT_CMD="${ANT}" pylib/cassandra-cqlsh-tests.sh ${WRKSRC} ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD} ${REPO_DIR} @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 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,125 +1,134 @@ ---- 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 @@ + + @@ -74,14 +76,14 @@ - + - + @@ -253,6 +255,7 @@ + +@@ -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 @@ -1,145 +1,146 @@ %%DATADIR%%/bin/cassandra %%DATADIR%%/bin/cassandra.in.sh %%DATADIR%%/bin/cqlsh %%DATADIR%%/bin/cqlsh.py %%DATADIR%%/bin/debug-cql %%DATADIR%%/bin/nodetool %%DATADIR%%/bin/sstableloader %%DATADIR%%/bin/sstablescrub %%DATADIR%%/bin/sstableupgrade %%DATADIR%%/bin/sstableutil %%DATADIR%%/bin/sstableverify %%DATADIR%%/bin/stop-server %%DATADIR%%/CHANGES.txt %%DATADIR%%/interface/cassandra.thrift %%DATADIR%%/lib/airline-0.6.jar %%DATADIR%%/lib/antlr-runtime-3.5.2.jar %%DATADIR%%/lib/apache-cassandra-%%PORTVERSION%%.jar %%DATADIR%%/lib/apache-cassandra-thrift-%%PORTVERSION%%.jar %%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.11.0-bb96859b.zip %%DATADIR%%/lib/commons-cli-1.1.jar %%DATADIR%%/lib/commons-codec-1.9.jar %%DATADIR%%/lib/commons-lang3-3.1.jar %%DATADIR%%/lib/commons-math3-3.2.jar %%DATADIR%%/lib/compress-lzf-0.8.4.jar %%DATADIR%%/lib/concurrent-trees-2.4.0.jar %%DATADIR%%/lib/concurrentlinkedhashmap-lru-1.4.jar %%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-annotations-2.9.10.jar %%DATADIR%%/lib/jackson-core-2.9.10.jar %%DATADIR%%/lib/jackson-databind-2.9.10.8.jar %%DATADIR%%/lib/jamm-0.3.0.jar %%DATADIR%%/lib/javax.inject-1.jar %%DATADIR%%/lib/jbcrypt-0.3m.jar %%DATADIR%%/lib/jcl-over-slf4j-1.7.7.jar %%DATADIR%%/lib/jctools-core-1.2.1.jar %%DATADIR%%/lib/jflex-1.6.0.jar %%DATADIR%%/lib/jna-4.2.2.jar %%DATADIR%%/lib/joda-time-2.4.jar %%DATADIR%%/lib/json-simple-1.1.jar %%DATADIR%%/lib/libthrift-0.9.2.jar %%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar %%DATADIR%%/lib/logback-classic-1.1.3.jar %%DATADIR%%/lib/logback-core-1.1.3.jar %%DATADIR%%/lib/lz4-1.3.0.jar %%DATADIR%%/lib/metrics-core-3.1.5.jar %%DATADIR%%/lib/metrics-jvm-3.1.5.jar %%DATADIR%%/lib/metrics-logback-3.1.5.jar %%DATADIR%%/lib/netty-all-4.0.44.Final.jar %%DATADIR%%/lib/ohc-core-0.4.4.jar %%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.16.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 %%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar %%DATADIR%%/lib/ST4-4.0.8.jar %%DATADIR%%/lib/stream-2.5.2.jar %%DATADIR%%/lib/thrift-server-0.3.7.jar %%DATADIR%%/LICENSE.txt %%DATADIR%%/NEWS.txt %%DATADIR%%/NOTICE.txt %%DATADIR%%/pylib/cassandra-cqlsh-tests.sh %%DATADIR%%/pylib/cqlshlib/__init__.py %%DATADIR%%/pylib/cqlshlib/copyutil.py %%DATADIR%%/pylib/cqlshlib/cql3handling.py %%DATADIR%%/pylib/cqlshlib/cqlhandling.py %%DATADIR%%/pylib/cqlshlib/cqlshhandling.py %%DATADIR%%/pylib/cqlshlib/displaying.py %%DATADIR%%/pylib/cqlshlib/formatting.py %%DATADIR%%/pylib/cqlshlib/helptopics.py %%DATADIR%%/pylib/cqlshlib/pylexotron.py %%DATADIR%%/pylib/cqlshlib/saferscanner.py %%DATADIR%%/pylib/cqlshlib/setup.cfg %%DATADIR%%/pylib/cqlshlib/sslhandling.py %%DATADIR%%/pylib/cqlshlib/test/__init__.py %%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py %%DATADIR%%/pylib/cqlshlib/test/basecase.py %%DATADIR%%/pylib/cqlshlib/test/cassconnect.py %%DATADIR%%/pylib/cqlshlib/test/config/sslhandling.config %%DATADIR%%/pylib/cqlshlib/test/config/sslhandling_invalid.config %%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py %%DATADIR%%/pylib/cqlshlib/test/test_constants.py %%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.py %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_parsing.py %%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql %%DATADIR%%/pylib/cqlshlib/test/test_sslhandling.py %%DATADIR%%/pylib/cqlshlib/test/winpty.py %%DATADIR%%/pylib/cqlshlib/tracing.py %%DATADIR%%/pylib/cqlshlib/util.py %%DATADIR%%/pylib/cqlshlib/wcwidth.py %%DATADIR%%/pylib/requirements.txt %%DATADIR%%/pylib/setup.py %%DATADIR%%/tools/bin/cassandra-stress %%DATADIR%%/tools/bin/cassandra-stressd %%DATADIR%%/tools/bin/cassandra.in.sh %%DATADIR%%/tools/bin/compaction-stress %%DATADIR%%/tools/bin/sstabledump %%DATADIR%%/tools/bin/sstableexpiredblockers %%DATADIR%%/tools/bin/sstablelevelreset %%DATADIR%%/tools/bin/sstablemetadata %%DATADIR%%/tools/bin/sstableofflinerelevel %%DATADIR%%/tools/bin/sstablerepairedset %%DATADIR%%/tools/bin/sstablesplit %%DATADIR%%/tools/cqlstress-counter-example.yaml %%DATADIR%%/tools/cqlstress-example.yaml %%DATADIR%%/tools/cqlstress-insanity-example.yaml %%DATADIR%%/tools/lib/stress.jar %%ETCDIR%%/metrics-reporter-config-sample.yaml %%ETCDIR%%/README.txt %%ETCDIR%%/triggers/README.txt %%SIGAR%%%%DATADIR%%/lib/sigar.jar @sample %%ETCDIR%%/cassandra-env.sh.sample @sample %%ETCDIR%%/cassandra-jaas.config.sample @sample %%ETCDIR%%/cassandra-rackdc.properties.sample @sample %%ETCDIR%%/cassandra-topology.properties.sample @sample %%ETCDIR%%/cassandra.yaml.sample @sample %%ETCDIR%%/commitlog_archiving.properties.sample @sample %%ETCDIR%%/cqlshrc.sample @sample %%ETCDIR%%/hotspot_compiler.sample @sample %%ETCDIR%%/jvm.options.sample @sample %%ETCDIR%%/logback-tools.xml.sample @sample %%ETCDIR%%/logback.xml.sample bin/cassandra bin/cqlsh bin/nodetool bin/sstableloader bin/sstablescrub bin/sstableupgrade bin/sstableutil bin/sstableverify