Attachment #219455 for bug #249595

View | Details | Raw Unified | Return to bug 249595
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	cassandra
DISTVERSION=	3.11.9
PORTREVISION=	1
CATEGORIES=	databases java
MASTER_SITES=	LOCAL/yuri:repo
		LOCAL/yuri:repo
PKGNAMESUFFIX=	3
DISTFILES=	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
DISTFILES=	${DISTNAME}.tar.gz:apache \
		apache-${PORTNAME}-3.11.4-repo.tar.gz:repo

MAINTAINER=	language.devel@gmail.com
COMMENT=	Highly scalable distributed database

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:3.6+
USE_ANT=	yes
USE_JAVA=	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

DATADIR=	${JAVASHAREDIR}/${PORTNAME}
JAVA_VENDOR=	openjdk

REINPLACE_ARGS=	-i ''
SUB_LIST=	JAVA_HOME=${JAVA_HOME}

USERS=		cassandra
GROUPS=		cassandra

PLIST_SUB=	PORTVERSION=${PORTVERSION}
PORTDOCS=		*
REPO_DIR=	${WRKDIR}/repository

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 \

		logback-tools.xml \
		logback.xml

DIST_DIR=	${WRKSRC}/build/dist
REPO_DIR=	${WRKDIR}/repository

SCRIPT_FILES=	cassandra \
		cqlsh \
		nodetool \

		sstableutil \
		sstableverify

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.


	@${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

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 <bsd.port.mk>

Lines 1-5 Link Here

(-)distinfo (-5 / +5 lines)
1	TIMESTAMP = 1582025236	1	TIMESTAMP = 1604733047
2	SHA256 (apache-cassandra-3.11.6-src.tar.gz) = 9d2b976c942f8d845a621183c83b15ce06308c76942986aa7216b6e1c2f3480c	2	SHA256 (apache-cassandra-3.11.9-repo.tar.gz) = 52182f64422f139db63337d25e3225e4d619f5063849968584d307e63bbada39
3	SIZE (apache-cassandra-3.11.6-src.tar.gz) = 35097130	3	SIZE (apache-cassandra-3.11.9-repo.tar.gz) = 52444450
4	SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44	4	SHA256 (polo-language-cassandra-3.11.9-c6f6387_GH0.tar.gz) = 261336776a2be1b40d170fee4e77991922a8bfcb87b90aa42e60f6b7b8bc7e9c
5	SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889	5	SIZE (polo-language-cassandra-3.11.9-c6f6387_GH0.tar.gz) = 35605838

Lines 1-6 Link Here

(-)files/patch-bin_cassandra (-3 / +3 lines)
1	--- bin/cassandra.orig 2019-12-13 12:50:29 UTC	1	--- bin/cassandra.orig 2020-07-14 21:00:51 UTC
2	+++ bin/cassandra	2	+++ bin/cassandra
3	@@ -30,7 +30,7 @@	3	@@ -31,7 +31,7 @@
4	# JVM_OPTS -- Additional arguments to the JVM for heap size, etc	4	# JVM_OPTS -- Additional arguments to the JVM for heap size, etc
5	# JVM_ON_OUT_OF_MEMORY_ERROR_OPT -- The OnOutOfMemoryError JVM option if specified	5	# JVM_ON_OUT_OF_MEMORY_ERROR_OPT -- The OnOutOfMemoryError JVM option if specified
6	# CASSANDRA_CONF -- Directory containing Cassandra configuration files.	6	# CASSANDRA_CONF -- Directory containing Cassandra configuration files.
Lines 9-15 Link Here
9	#	9	#
10	# As a convenience, a fragment of shell is sourced in order to set one or	10	# As a convenience, a fragment of shell is sourced in order to set one or
11	# more of these variables. This so-called `include' can be placed in a	11	# more of these variables. This so-called `include' can be placed in a
12	@@ -127,7 +127,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then	12	@@ -128,7 +128,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
13	fi	13	fi
14		14
15	if [ -z "$CASSANDRA_LOG_DIR" ]; then	15	if [ -z "$CASSANDRA_LOG_DIR" ]; then




--- build.xml.orig	2020-10-20 17:07:48 UTC
+++ build.xml
@@ -23,6 +23,7 @@
     <property file="build.properties" />

+    <property name="pycmd" value="python"/>
 
     <!-- default version and SCM information -->
     <property name="base.version" value="3.11.9"/>
@@ -80,14 +81,14 @@
     <condition property="version" value="${base.version}">
       <isset property="release"/>

     <property name="maven-ant-tasks.url"
               value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
     <!-- details of how and which Maven repository we publish to -->
@@ -247,8 +248,7 @@
         <artifact:dependencies pathId="wikitext.classpath">
             <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
             <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>

         </artifact:dependencies>
         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
         <wikitext-to-html markupLanguage="Textile">
@@ -261,6 +261,7 @@
     <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
         <exec executable="make" osfamily="unix" dir="${doc.dir}">
             <arg value="html"/>

         </exec>
         <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
             <arg value="/c"/>
@@ -303,10 +304,6 @@
             description="Initialize Maven ANT Tasks">
       <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
 

       <macrodef name="install">
         <attribute name="pomFile"/>
         <attribute name="file"/>
@@ -706,16 +703,14 @@
                              filesetId="build-dependency-jars"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">

       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="build-dependency-jars"/>
@@ -728,7 +723,7 @@
       <!-- code coverage tools -->
       <artifact:dependencies pomRefId="coverage-deps-pom"
                              filesetId="coverage-dependency-jars">

       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="coverage-dependency-jars"/>
@@ -749,8 +744,7 @@
                              sourcesFilesetId="test-dependency-sources"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">

       </artifact:dependencies>
       <copy todir="${test.lib}/jars">
         <fileset refid="test-dependency-jars"/>
@@ -1045,6 +1039,88 @@
       </jar>
     </target>
 

     <!-- creates release tarballs -->
     <target name="artifacts" depends="jar,javadoc,gen-doc"
             description="Create Cassandra release artifacts">
@@ -1644,8 +1720,7 @@
   <target name="rat-init" depends="maven-ant-tasks-init">
     <artifact:dependencies pathId="rat.classpath">
       <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
-      <remoteRepository refid="central"/>
-      <remoteRepository refid="apache"/>
+      <localRepository path="${localm2}"/>
     </artifact:dependencies>
     <typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
   </target>
@@ -1794,8 +1869,8 @@
     <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
       <arg value="--all"/>
     </exec>

       <arg value="-n"/>
       <arg value="hw.ncpu"/>
     </exec>
@@ -1815,6 +1890,11 @@
     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
       <arg value="-n"/>
       <arg value="hw.memsize"/>




--- 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




--- 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 -%}
+<title>{{ html_title }}</title>
+{%- endblock -%}
+{% block body %}
+  <h1>{{ docstitle|e }}</h1>
+  <p>
+  {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %}
+  </p>
 <div id="wipwarning">This documentation is currently a work-in-progress and contains a number of TODO sections.
     <a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>
 

Line 0 Link Here

(-)files/patch-doc_source___util_cql.py (+10 lines)
	1	--- doc/source/_util/cql.py.orig 2020-10-28 18:48:05 UTC
	2	+++ doc/source/_util/cql.py
	3	@@ -26,7 +26,6 @@ from pygments.lexer import Lexer, RegexLexer, do_inser
	4	from pygments.token import Punctuation, Whitespace, Error, \
	5	Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal
	6	from pygments.lexers import get_lexer_by_name, ClassNotFound
	7	-from pygments.util import iteritems
	8
	9	__all__ = [ 'CQLLexer' ]
	10




--- 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/
 




%%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.23.0.post0-1a184b99.zip
%%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/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.4.jar
%%DATADIR%%/lib/jamm-0.3.0.jar
%%DATADIR%%/lib/javax.inject.jar
%%DATADIR%%/lib/jbcrypt-0.3m.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.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

Return to bug 249595

Lines 1-15 Link Here

(-)Makefile (-31 / +43 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cassandra	3	PORTNAME= cassandra
4	DISTVERSION= 3.11.6	4	DISTVERSION= 3.11.9
5	PORTREVISION= 1
6	CATEGORIES= databases java	5	CATEGORIES= databases java
7	MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \	6	MASTER_SITES= LOCAL/yuri:repo
8	LOCAL/yuri:repo
9	PKGNAMESUFFIX= 3	7	PKGNAMESUFFIX= 3
10	DISTNAME= apache-${PORTNAME}-${PORTVERSION}-src	8	DISTFILES= apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
11	DISTFILES= ${DISTNAME}.tar.gz:apache \
12	apache-${PORTNAME}-3.11.4-repo.tar.gz:repo
13		9
14	MAINTAINER= language.devel@gmail.com	10	MAINTAINER= language.devel@gmail.com
15	COMMENT= Highly scalable distributed database	11	COMMENT= Highly scalable distributed database
Lines 17-36 Link Here
17	LICENSE= APACHE20	13	LICENSE= APACHE20
18	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	14	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
19		15
20	DEPRECATED= Uses deprecated version of python
21	EXPIRATION_DATE= 2020-09-15
22
23	RUN_DEPENDS= snappyjava>=0:archivers/snappy-java	16	RUN_DEPENDS= snappyjava>=0:archivers/snappy-java
		17	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
		18	bash>0:shells/bash \
		19	git>0:devel/git
24		20
25	USES= python:2.7	21	USES= python:3.6+
		22	USE_ANT= yes
26	USE_JAVA= yes	23	USE_JAVA= yes
27	USE_ANT= yes	24	JAVA_VERSION= 1.8
		25	JAVA_VENDOR= openjdk
		26
28	USE_RC_SUBR= cassandra	27	USE_RC_SUBR= cassandra
29		28
		29	USE_GITHUB= yes
		30	GH_ACCOUNT= polo-language
		31	GH_PROJECT= cassandra
		32	GH_TAGNAME= c6f6387
		33
		34	TEST_TARGET= test
		35
30	CONFLICTS= cassandra4	36	CONFLICTS= cassandra4
31		37
32	JAVA_VERSION= 1.8	38	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
33	JAVA_VENDOR= openjdk
34		39
35	REINPLACE_ARGS= -i ''	40	REINPLACE_ARGS= -i ''
36	SUB_LIST= JAVA_HOME=${JAVA_HOME}	41	SUB_LIST= JAVA_HOME=${JAVA_HOME}
Lines 38-47 Link Here
38	USERS= cassandra	43	USERS= cassandra
39	GROUPS= cassandra	44	GROUPS= cassandra
40		45
41	DATADIR= ${JAVASHAREDIR}/${PORTNAME}	46	PLIST_SUB= PORTVERSION=${PORTVERSION}
42	DIST_DIR= ${WRKSRC}/build/dist	47	PORTDOCS= *
43	REPO_DIR= ${WRKDIR}/repository
44		48
		49	OPTIONS_DEFINE= SIGAR DOCS
		50	OPTIONS_DEFAULT= SIGAR
		51	OPTIONS_SUB= yes
		52
		53	SIGAR_DESC= Use SIGAR to collect system information
		54	DOCS_BUILD_DEPENDS= ${PY_SPHINX} \
		55	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
		56	SIGAR_RUN_DEPENDS= java-sigar>=1.6.4:java/sigar
		57
45	CONFIG_FILES= cassandra-env.sh \	58	CONFIG_FILES= cassandra-env.sh \
46	cassandra-jaas.config \	59	cassandra-jaas.config \
47	cassandra-rackdc.properties \	60	cassandra-rackdc.properties \
Lines 53-58 Link Here
53	logback-tools.xml \	66	logback-tools.xml \
54	logback.xml	67	logback.xml
55		68
		69	DIST_DIR= ${WRKSRC}/build/dist
		70	REPO_DIR= ${WRKDIR}/repository
		71
56	SCRIPT_FILES= cassandra \	72	SCRIPT_FILES= cassandra \
57	cqlsh \	73	cqlsh \
58	nodetool \	74	nodetool \
Lines 62-81 Link Here
62	sstableutil \	78	sstableutil \
63	sstableverify	79	sstableverify
64		80
65	PLIST_SUB= PORTVERSION=${PORTVERSION}	81	post-patch:
		82	@${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh
66		83
67	OPTIONS_DEFINE= SIGAR DOCS
68	OPTIONS_DEFAULT= SIGAR
69	OPTIONS_SUB= yes
70
71	SIGAR_DESC= Use SIGAR to collect system information
72	SIGAR_RUN_DEPENDS= java-sigar>=1.6.4:java/sigar
73
74	DOCS_BUILD_DEPENDS= ${PY_SPHINX} \
75	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
76
77	PORTDOCS= *
78
79	do-build:	84	do-build:
80	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.	85	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
81		86
Lines 93-99 Link Here
93	@${REINPLACE_CMD} -e 's\|$$CASSANDRA_HOME/lib/sigar-bin\|${JAVAJARDIR}\|' ${DIST_DIR}/bin/cassandra.in.sh	98	@${REINPLACE_CMD} -e 's\|$$CASSANDRA_HOME/lib/sigar-bin\|${JAVAJARDIR}\|' ${DIST_DIR}/bin/cassandra.in.sh
94	@${REINPLACE_CMD} -e 's\|$$CASSANDRA_HOME/lib/sigar-bin\|${JAVAJARDIR}\|' ${DIST_DIR}/conf/cassandra-env.sh	99	@${REINPLACE_CMD} -e 's\|$$CASSANDRA_HOME/lib/sigar-bin\|${JAVAJARDIR}\|' ${DIST_DIR}/conf/cassandra-env.sh
95	@${REINPLACE_CMD} -e 's\|$$CASSANDRA_HOME/conf\|${ETCDIR}\|' ${DIST_DIR}/bin/cassandra.in.sh	100	@${REINPLACE_CMD} -e 's\|$$CASSANDRA_HOME/conf\|${ETCDIR}\|' ${DIST_DIR}/bin/cassandra.in.sh
96	@${REINPLACE_CMD} -e 's\|$$CASSANDRA_HOME/conf\|${ETCDIR}\|' ${DIST_DIR}/conf/cassandra-env.sh
97	.for f in ${CONFIG_FILES}	101	.for f in ${CONFIG_FILES}
98	@${MV} ${DIST_DIR}/conf/${f} ${DIST_DIR}/conf/${f}.sample	102	@${MV} ${DIST_DIR}/conf/${f} ${DIST_DIR}/conf/${f}.sample
99	.endfor	103	.endfor
Lines 128-131 Link Here
128	post-install-SIGAR-on:	132	post-install-SIGAR-on:
129	${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar	133	${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar
130		134
		135	do-test:
		136	# A bare 'python' must be on PATH for test to succeed.
		137	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.patched
		138	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.orig bin/cassandra.in.sh
		139	@cd ${WRKSRC} && pylib/cassandra-cqlsh-tests.sh ${WRKSRC} python3 ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD}
		140	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.orig
		141	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.patched bin/cassandra.in.sh
		142
131	.include <bsd.port.mk>	143	.include <bsd.port.mk>

Lines 1-4 Link Here

(-)files/patch-build.xml (-11 / +21 lines)
1	--- build.xml.orig 2020-02-10 22:55:14 UTC	1	--- build.xml.orig 2020-10-20 17:07:48 UTC
2	+++ build.xml	2	+++ build.xml
3	@@ -23,6 +23,7 @@	3	@@ -23,6 +23,7 @@
4	<property file="build.properties" />	4	<property file="build.properties" />
Lines 7-13 Link Here
7	+ <property name="pycmd" value="python"/>	7	+ <property name="pycmd" value="python"/>
8		8
9	<!-- default version and SCM information -->	9	<!-- default version and SCM information -->
10	<property name="base.version" value="3.11.6"/>	10	<property name="base.version" value="3.11.9"/>
11	@@ -80,14 +81,14 @@	11	@@ -80,14 +81,14 @@
12	<condition property="version" value="${base.version}">	12	<condition property="version" value="${base.version}">
13	<isset property="release"/>	13	<isset property="release"/>
Lines 25-31 Link Here
25	<property name="maven-ant-tasks.url"	25	<property name="maven-ant-tasks.url"
26	value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />	26	value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
27	<!-- details of how and which Maven repository we publish to -->	27	<!-- details of how and which Maven repository we publish to -->
28	@@ -246,8 +247,7 @@	28	@@ -247,8 +248,7 @@
29	<artifact:dependencies pathId="wikitext.classpath">	29	<artifact:dependencies pathId="wikitext.classpath">
30	<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>	30	<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
31	<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>	31	<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
Lines 35-41 Link Here
35	</artifact:dependencies>	35	</artifact:dependencies>
36	<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />	36	<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
37	<wikitext-to-html markupLanguage="Textile">	37	<wikitext-to-html markupLanguage="Textile">
38	@@ -260,6 +260,7 @@	38	@@ -261,6 +261,7 @@
39	<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">	39	<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
40	<exec executable="make" osfamily="unix" dir="${doc.dir}">	40	<exec executable="make" osfamily="unix" dir="${doc.dir}">
41	<arg value="html"/>	41	<arg value="html"/>
Lines 43-49 Link Here
43	</exec>	43	</exec>
44	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">	44	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">
45	<arg value="/c"/>	45	<arg value="/c"/>
46	@@ -302,10 +303,6 @@	46	@@ -303,10 +304,6 @@
47	description="Initialize Maven ANT Tasks">	47	description="Initialize Maven ANT Tasks">
48	<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />	48	<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
49		49
Lines 54-60 Link Here
54	<macrodef name="install">	54	<macrodef name="install">
55	<attribute name="pomFile"/>	55	<attribute name="pomFile"/>
56	<attribute name="file"/>	56	<attribute name="file"/>
57	@@ -695,16 +692,14 @@	57	@@ -706,16 +703,14 @@
58	filesetId="build-dependency-jars"	58	filesetId="build-dependency-jars"
59	cacheDependencyRefs="true"	59	cacheDependencyRefs="true"
60	dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">	60	dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
Lines 73-79 Link Here
73	</artifact:dependencies>	73	</artifact:dependencies>
74	<copy todir="${build.dir.lib}/jars">	74	<copy todir="${build.dir.lib}/jars">
75	<fileset refid="build-dependency-jars"/>	75	<fileset refid="build-dependency-jars"/>
76	@@ -717,7 +712,7 @@	76	@@ -728,7 +723,7 @@
77	<!-- code coverage tools -->	77	<!-- code coverage tools -->
78	<artifact:dependencies pomRefId="coverage-deps-pom"	78	<artifact:dependencies pomRefId="coverage-deps-pom"
79	filesetId="coverage-dependency-jars">	79	filesetId="coverage-dependency-jars">
Lines 82-88 Link Here
82	</artifact:dependencies>	82	</artifact:dependencies>
83	<copy todir="${build.dir.lib}/jars">	83	<copy todir="${build.dir.lib}/jars">
84	<fileset refid="coverage-dependency-jars"/>	84	<fileset refid="coverage-dependency-jars"/>
85	@@ -738,8 +733,7 @@	85	@@ -749,8 +744,7 @@
86	sourcesFilesetId="test-dependency-sources"	86	sourcesFilesetId="test-dependency-sources"
87	cacheDependencyRefs="true"	87	cacheDependencyRefs="true"
88	dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">	88	dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
Lines 92-98 Link Here
92	</artifact:dependencies>	92	</artifact:dependencies>
93	<copy todir="${test.lib}/jars">	93	<copy todir="${test.lib}/jars">
94	<fileset refid="test-dependency-jars"/>	94	<fileset refid="test-dependency-jars"/>
95	@@ -1034,6 +1028,88 @@	95	@@ -1045,6 +1039,88 @@
96	</jar>	96	</jar>
97	</target>	97	</target>
98		98
Lines 181-187 Link Here
181	<!-- creates release tarballs -->	181	<!-- creates release tarballs -->
182	<target name="artifacts" depends="jar,javadoc,gen-doc"	182	<target name="artifacts" depends="jar,javadoc,gen-doc"
183	description="Create Cassandra release artifacts">	183	description="Create Cassandra release artifacts">
184	@@ -1776,8 +1852,8 @@	184	@@ -1644,8 +1720,7 @@
		185	<target name="rat-init" depends="maven-ant-tasks-init">
		186	<artifact:dependencies pathId="rat.classpath">
		187	<dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
		188	- <remoteRepository refid="central"/>
		189	- <remoteRepository refid="apache"/>
		190	+ <localRepository path="${localm2}"/>
		191	</artifact:dependencies>
		192	<typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
		193	</target>
		194	@@ -1794,8 +1869,8 @@
185	<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">	195	<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
186	<arg value="--all"/>	196	<arg value="--all"/>
187	</exec>	197	</exec>
Lines 192-198 Link Here
192	<arg value="-n"/>	202	<arg value="-n"/>
193	<arg value="hw.ncpu"/>	203	<arg value="hw.ncpu"/>
194	</exec>	204	</exec>
195	@@ -1797,6 +1873,11 @@	205	@@ -1815,6 +1890,11 @@
196	<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">	206	<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
197	<arg value="-n"/>	207	<arg value="-n"/>
198	<arg value="hw.memsize"/>	208	<arg value="hw.memsize"/>

Lines 1-14 Link Here

(-)files/patch-doc_Makefile (-10 / +1 lines)
1	--- doc/Makefile.orig 2019-02-02 22:06:43 UTC	1	--- doc/Makefile.orig 2020-10-27 14:38:56 UTC
2	+++ doc/Makefile	2	+++ doc/Makefile
3	@@ -3,7 +3,7 @@
4
5	# You can set these variables from the command line.
6	SPHINXOPTS =
7	-SPHINXBUILD = sphinx-build
8	+SPHINXBUILD = sphinx-build-2.7
9	PAPER =
10	BUILDDIR = build
11
12	@@ -17,7 +17,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s	3	@@ -17,7 +17,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s
13	YAML_DOC_INPUT=../conf/cassandra.yaml	4	YAML_DOC_INPUT=../conf/cassandra.yaml
14	YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst	5	YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst

Line 0 Link Here

(-)files/patch-doc_source___templates_indexcontent.html (+17 lines)
	1	--- doc/source/_templates/indexcontent.html.orig 2020-10-28 18:46:34 UTC
	2	+++ doc/source/_templates/indexcontent.html
	3	@@ -1,5 +1,12 @@
	4	-{% extends "defindex.html" %}
	5	-{% block tables %}
	6	+{% extends "layout.html" %}
	7	+{%- block htmltitle -%}
	8	+<title>{{ html_title }}</title>
	9	+{%- endblock -%}
	10	+{% block body %}
	11	+ <h1>{{ docstitle\|e }}</h1>
	12	+ <p>
	13	+ {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %}
	14	+ </p>
	15	<div id="wipwarning">This documentation is currently a work-in-progress and contains a number of TODO sections.
	16	<a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>
	17

Line 0 Link Here

(-)files/patch-pylib_cassandra-cqlsh-tests.sh (+44 lines)
	1	--- pylib/cassandra-cqlsh-tests.sh.orig 2020-10-20 17:07:48 UTC
	2	+++ pylib/cassandra-cqlsh-tests.sh
	3	@@ -1,4 +1,4 @@
	4	-#!/bin/bash -x
	5	+#!/usr/local/bin/bash -x
	6
	7	################################
	8	#
	9	@@ -9,6 +9,8 @@
	10	WORKSPACE=$1
	11	PYTHON_VERSION=$2
	12	JAVA_HOME=$3
	13	+REPO_DIR=$4
	14	+PYTHON_CMD=$5
	15
	16	if [ "${WORKSPACE}" = "" ]; then
	17	echo "Specify Cassandra source directory"
	18	@@ -48,7 +50,7 @@ fi
	19
	20	# Loop to prevent failure due to maven-ant-tasks not downloading a jar..
	21	for x in $(seq 1 3); do
	22	- ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar
	23	+ ant -buildfile ${CASSANDRA_DIR}/build.xml -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} realclean jar
	24	RETURN="$?"
	25	if [ "${RETURN}" -eq "0" ]; then
	26	break
	27	@@ -62,7 +64,7 @@ fi
	28
	29	# Set up venv with dtest dependencies
	30	set -e # enable immediate exit if venv setup fails
	31	-virtualenv --python=$PYTHON_VERSION venv
	32	+virtualenv --python=${PYTHON_CMD} venv
	33	source venv/bin/activate
	34	pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt
	35	pip freeze
	36	@@ -103,7 +105,7 @@ case "${pre_or_post_cdc}" in
	37	;;
	38	esac
	39
	40	-ccm start --wait-for-binary-proto
	41	+ccm start --wait-for-binary-proto --root
	42
	43	cd ${CASSANDRA_DIR}/pylib/cqlshlib/
	44

Lines 19-26 Link Here

(-)pkg-plist (-5 / +6 lines)
19	%%DATADIR%%/lib/asm-5.0.4.jar	19	%%DATADIR%%/lib/asm-5.0.4.jar
20	%%DATADIR%%/lib/caffeine-2.2.6.jar	20	%%DATADIR%%/lib/caffeine-2.2.6.jar
21	%%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar	21	%%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar
22	%%DATADIR%%/lib/cassandra-driver-internal-only-3.10.zip	22	%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip
23	%%DATADIR%%/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip
24	%%DATADIR%%/lib/commons-cli-1.1.jar	23	%%DATADIR%%/lib/commons-cli-1.1.jar
25	%%DATADIR%%/lib/commons-codec-1.9.jar	24	%%DATADIR%%/lib/commons-codec-1.9.jar
26	%%DATADIR%%/lib/commons-lang3-3.1.jar	25	%%DATADIR%%/lib/commons-lang3-3.1.jar
Lines 31-42 Link Here
31	%%DATADIR%%/lib/disruptor-3.0.1.jar	30	%%DATADIR%%/lib/disruptor-3.0.1.jar
32	%%DATADIR%%/lib/ecj-4.4.2.jar	31	%%DATADIR%%/lib/ecj-4.4.2.jar
33	%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip	32	%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
		33	%%DATADIR%%/lib/geomet-0.1.0.zip
34	%%DATADIR%%/lib/guava-18.0.jar	34	%%DATADIR%%/lib/guava-18.0.jar
35	%%DATADIR%%/lib/HdrHistogram-2.1.9.jar	35	%%DATADIR%%/lib/HdrHistogram-2.1.9.jar
36	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar	36	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar
37	%%DATADIR%%/lib/hppc-0.5.4.jar	37	%%DATADIR%%/lib/hppc-0.5.4.jar
38	%%DATADIR%%/lib/jackson-core-asl-1.9.13.jar	38	%%DATADIR%%/lib/jackson-annotations-2.9.10.jar
39	%%DATADIR%%/lib/jackson-mapper-asl-1.9.13.jar	39	%%DATADIR%%/lib/jackson-core-2.9.10.jar
		40	%%DATADIR%%/lib/jackson-databind-2.9.10.4.jar
40	%%DATADIR%%/lib/jamm-0.3.0.jar	41	%%DATADIR%%/lib/jamm-0.3.0.jar
41	%%DATADIR%%/lib/javax.inject.jar	42	%%DATADIR%%/lib/javax.inject.jar
42	%%DATADIR%%/lib/jbcrypt-0.3m.jar	43	%%DATADIR%%/lib/jbcrypt-0.3m.jar
Lines 110-116 Link Here
110	%%DATADIR%%/lib/ohc-core-j8-0.4.4.jar	111	%%DATADIR%%/lib/ohc-core-j8-0.4.4.jar
111	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar	112	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
112	%%DATADIR%%/lib/reporter-config3-3.0.3.jar	113	%%DATADIR%%/lib/reporter-config3-3.0.3.jar
113	%%DATADIR%%/lib/six-1.7.3-py2.py3-none-any.zip	114	%%DATADIR%%/lib/six-1.12.0-py2.py3-none-any.zip
114	%%DATADIR%%/lib/slf4j-api-1.7.7.jar	115	%%DATADIR%%/lib/slf4j-api-1.7.7.jar
115	%%DATADIR%%/lib/snakeyaml-1.11.jar	116	%%DATADIR%%/lib/snakeyaml-1.11.jar
116	%%DATADIR%%/lib/snappy-java.jar	117	%%DATADIR%%/lib/snappy-java.jar