Attachment #237924 for bug #267624

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




PORTNAME=	cassandra
DISTVERSION=	3.11.14
PORTREVISION=	1
CATEGORIES=	databases java
#MASTER_SITES=	LOCAL/nc:repo
PKGNAMESUFFIX=	3
DISTFILES=	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo



USE_GITHUB=	yes
GH_ACCOUNT=	polo-language
GH_TAGNAME=	c29ba30

TEST_TARGET=	test



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} -Dlocal.repository=${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} -Dlocal.repository=${REPO_DIR} freebsd-stage

post-build:
.for f in ${SCRIPT_FILES}

Lines 1-5 Link Here

(-)b/databases/cassandra3/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1650466481	1	TIMESTAMP = 1667648919
2	SHA256 (apache-cassandra-3.11.11-repo.tar.gz) = 0501ab9fa4d5baecaa29153a78044ef2341feda5ab748b8adb72a6efda2a240b	2	SHA256 (apache-cassandra-3.11.14-repo.tar.gz) = 6390ad0eb91156c37d738f5fe96695c5b3d5c3603ab24c8e65e443cbd916b1d2
3	SIZE (apache-cassandra-3.11.11-repo.tar.gz) = 57546653	3	SIZE (apache-cassandra-3.11.14-repo.tar.gz) = 59360725
4	SHA256 (polo-language-cassandra-3.11.11-0150ddc_GH0.tar.gz) = ff3e305bbe317af11674862487753875bb9f26e7550cb796cb995e640a2a9511	4	SHA256 (polo-language-cassandra-3.11.14-c29ba30_GH0.tar.gz) = 03c501b62952256e28ef19c85c73fe371cd1a6c40cc7f84dae076152ab3130ef
5	SIZE (polo-language-cassandra-3.11.11-0150ddc_GH0.tar.gz) = 12427444	5	SIZE (polo-language-cassandra-3.11.14-c29ba30_GH0.tar.gz) = 16297535




--- build.xml.orig	2022-10-28 19:54:09 UTC
+++ build.xml
@@ -31,6 +31,8 @@
     <property file="build.properties" />
     <property file="build.properties.default" />
     <property name="debuglevel" value="source,lines,vars"/>

+    <property name="rat.skip" value="true"/>
 
     <!-- default version and SCM information -->
     <property name="base.version" value="3.11.14"/>
@@ -85,7 +87,7 @@
     <condition property="version" value="${base.version}">
       <isset property="release"/>
     </condition>

     <property name="version.properties.dir"
               value="${build.src.resources}/org/apache/cassandra/config/" />
     <property name="final.name" value="${ant.project.name}-${version}"/>
@@ -272,6 +274,7 @@
     <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
     <property name="maven-ant-tasks.version" value="2.1.3" />
-    <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
+    <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
     <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 -->
@@ -253,6 +255,7 @@
     <target name="gen-doc" description="Generate documentation" depends="jar" unless="ant.gen-doc.skip">
         <exec executable="make" osfamily="unix" dir="${doc.dir}">
             <arg value="html"/>
+            <arg value="PYTHON_CMD=${pycmd}"/>
         </exec>
     </target>
             <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"/>
 
@@ -924,6 +927,88 @@
+    <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>
 

+    </target>
+    
     <!-- creates release tarballs -->
     <target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar"
             description="Create Cassandra release artifacts">

Lines 1-4 Link Here

(-)b/databases/cassandra3/files/patch-conf_cassandra.yaml (-3 / +3 lines)
1	--- conf/cassandra.yaml.orig 2021-07-01 14:37:50 UTC	1	--- conf/cassandra.yaml.orig 2022-10-28 19:54:09 UTC
2	+++ conf/cassandra.yaml	2	+++ conf/cassandra.yaml
3	@@ -71,7 +71,7 @@ max_hints_delivery_threads: 2	3	@@ -71,7 +71,7 @@ max_hints_delivery_threads: 2
4		4
Lines 64-68 Link Here
64	-# saved_caches_directory: /var/lib/cassandra/saved_caches	64	-# saved_caches_directory: /var/lib/cassandra/saved_caches
65	+saved_caches_directory: /var/db/cassandra/saved_caches	65	+saved_caches_directory: /var/db/cassandra/saved_caches
66		66
67	# commitlog_sync may be either "periodic" or "batch."	67	# Number of seconds the server will wait for each cache (row, key, etc ...) to load while starting
68	#	68	# the Cassandra process. Setting this to a negative value is equivalent to disabling all cache loading on startup

Removed Link Here

(-)a/databases/cassandra3/files/patch-doc_Makefile (-11 lines)
1	--- doc/Makefile.orig 2020-10-27 14:38:56 UTC
2	+++ doc/Makefile
3	@@ -17,7 +17,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s
4	YAML_DOC_INPUT=../conf/cassandra.yaml
5	YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst
6
7	-MAKE_CASSANDRA_YAML = python convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
8	+MAKE_CASSANDRA_YAML = ${PYTHON_CMD} convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
9
10	WEB_SITE_PRESENCE_FILE='source/.build_for_website'
11




%%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.13.2.jar
%%DATADIR%%/lib/jackson-core-2.13.2.jar
%%DATADIR%%/lib/jackson-databind-2.13.2.2.jar
%%DATADIR%%/lib/jamm-0.3.0.jar
%%DATADIR%%/lib/javax.inject-1.jar
%%DATADIR%%/lib/jbcrypt-0.4.jar
%%DATADIR%%/lib/jcl-over-slf4j-1.7.25.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.25.jar
%%DATADIR%%/lib/logback-classic-1.2.9.jar
%%DATADIR%%/lib/logback-core-1.2.9.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/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.25.jar
%%DATADIR%%/lib/snakeyaml-1.26.jar
%%DATADIR%%/lib/snappy-java.jar
%%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
%%DATADIR%%/lib/ST4-4.0.8.jar
- 

Return to bug 267624

Lines 1-8 Link Here

(-)b/databases/cassandra3/Makefile (-7 / +5 lines)
1	PORTNAME= cassandra	1	PORTNAME= cassandra
2	DISTVERSION= 3.11.11	2	DISTVERSION= 3.11.14
3	PORTREVISION= 1
4	CATEGORIES= databases java	3	CATEGORIES= databases java
5	MASTER_SITES= LOCAL/nc:repo	4	#MASTER_SITES= LOCAL/nc:repo
6	PKGNAMESUFFIX= 3	5	PKGNAMESUFFIX= 3
7	DISTFILES= apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo	6	DISTFILES= apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
8		7
Lines 29-35 USE_RC_SUBR= cassandra Link Here
29		28
30	USE_GITHUB= yes	29	USE_GITHUB= yes
31	GH_ACCOUNT= polo-language	30	GH_ACCOUNT= polo-language
32	GH_TAGNAME= 0150ddc	31	GH_TAGNAME= c29ba30
33		32
34	TEST_TARGET= test	33	TEST_TARGET= test
35		34
Lines 82-97 ANT_OPTS_LOCAL= ${ANT_OPTS} -Xmx512m Link Here
82		81
83	post-patch:	82	post-patch:
84	@${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh	83	@${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh
85	@${REINPLACE_CMD} -e 's\|$${user.home}/.m2/repository/\|$${localm2}/\|g' ${WRKSRC}/.build/build-resolver.xml
86		84
87	do-build:	85	do-build:
88	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.	86	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
89		87
90	do-build-DOCS-on:	88	do-build-DOCS-on:
91	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc	89	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
92		90
93	do-build-DOCS-off:	91	do-build-DOCS-off:
94	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} freebsd-stage	92	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} freebsd-stage
95		93
96	post-build:	94	post-build:
97	.for f in ${SCRIPT_FILES}	95	.for f in ${SCRIPT_FILES}

Lines 1-6 Link Here

(-)b/databases/cassandra3/files/patch-build.xml (-26 / +9 lines)
1	--- build.xml.orig 2022-01-15 09:03:19 UTC	1	--- build.xml.orig 2022-10-28 19:54:09 UTC
2	+++ build.xml	2	+++ build.xml
3	@@ -20,6 +20,8 @@	3	@@ -31,6 +31,8 @@
4	<property file="build.properties" />	4	<property file="build.properties" />
5	<property file="build.properties.default" />	5	<property file="build.properties.default" />
6	<property name="debuglevel" value="source,lines,vars"/>	6	<property name="debuglevel" value="source,lines,vars"/>
Lines 8-15 Link Here
8	+ <property name="rat.skip" value="true"/>	8	+ <property name="rat.skip" value="true"/>
9		9
10	<!-- default version and SCM information -->	10	<!-- default version and SCM information -->
11	<property name="base.version" value="3.11.11"/>	11	<property name="base.version" value="3.11.14"/>
12	@@ -74,14 +76,14 @@	12	@@ -85,7 +87,7 @@
13	<condition property="version" value="${base.version}">	13	<condition property="version" value="${base.version}">
14	<isset property="release"/>	14	<isset property="release"/>
15	</condition>	15	</condition>
Lines 18-49 Link Here
18	<property name="version.properties.dir"	18	<property name="version.properties.dir"
19	value="${build.src.resources}/org/apache/cassandra/config/" />	19	value="${build.src.resources}/org/apache/cassandra/config/" />
20	<property name="final.name" value="${ant.project.name}-${version}"/>	20	<property name="final.name" value="${ant.project.name}-${version}"/>
21		21	@@ -272,6 +274,7 @@
22	<!-- details of what version of Maven ANT Tasks to fetch -->	22	<target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
23	<property name="maven-ant-tasks.version" value="2.1.3" />
24	- <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
25	+ <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
26	<property name="maven-ant-tasks.url"
27	value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
28	<!-- details of how and which Maven repository we publish to -->
29	@@ -253,6 +255,7 @@
30	<target name="gen-doc" description="Generate documentation" depends="jar" unless="ant.gen-doc.skip">
31	<exec executable="make" osfamily="unix" dir="${doc.dir}">	23	<exec executable="make" osfamily="unix" dir="${doc.dir}">
32	<arg value="html"/>	24	<arg value="html"/>
33	+ <arg value="PYTHON_CMD=${pycmd}"/>	25	+ <arg value="PYTHON_CMD=${pycmd}"/>
34	</exec>	26	</exec>
35	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">	27	</target>
36	<arg value="/c"/>
37	@@ -704,7 +707,7 @@
38	<target name="build" depends="resolver-retrieve-build,build-project" description="Compile Cassandra classes"/>
39	<target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
40		28
41	- <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"	29	@@ -924,6 +927,88 @@
42	+ <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
43	name="build-project">
44	<echo message="${ant.project.name}: ${ant.file}"/>
45	<!-- Order matters! -->
46	@@ -894,6 +897,88 @@
47	</jar>	30	</jar>
48	</target>	31	</target>
49		32
Lines 130-134 Link Here
130	+ </target>	113	+ </target>
131	+	114	+
132	<!-- creates release tarballs -->	115	<!-- creates release tarballs -->
133	<target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar,javadoc-jar"	116	<target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar"
134	description="Create Cassandra release artifacts">	117	description="Create Cassandra release artifacts">

Lines 30-56 Link Here

(-)b/databases/cassandra3/pkg-plist (-12 / +10 lines)
30	%%DATADIR%%/lib/disruptor-3.0.1.jar	30	%%DATADIR%%/lib/disruptor-3.0.1.jar
31	%%DATADIR%%/lib/ecj-4.4.2.jar	31	%%DATADIR%%/lib/ecj-4.4.2.jar
32	%%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	33	%%DATADIR%%/lib/guava-18.0.jar
35	%%DATADIR%%/lib/HdrHistogram-2.1.9.jar	34	%%DATADIR%%/lib/HdrHistogram-2.1.9.jar
36	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar	35	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar
37	%%DATADIR%%/lib/hppc-0.5.4.jar	36	%%DATADIR%%/lib/hppc-0.5.4.jar
38	%%DATADIR%%/lib/jackson-annotations-2.9.10.jar	37	%%DATADIR%%/lib/jackson-annotations-2.13.2.jar
39	%%DATADIR%%/lib/jackson-core-2.9.10.jar	38	%%DATADIR%%/lib/jackson-core-2.13.2.jar
40	%%DATADIR%%/lib/jackson-databind-2.9.10.8.jar	39	%%DATADIR%%/lib/jackson-databind-2.13.2.2.jar
41	%%DATADIR%%/lib/jamm-0.3.0.jar	40	%%DATADIR%%/lib/jamm-0.3.0.jar
42	%%DATADIR%%/lib/javax.inject-1.jar	41	%%DATADIR%%/lib/javax.inject-1.jar
43	%%DATADIR%%/lib/jbcrypt-0.3m.jar	42	%%DATADIR%%/lib/jbcrypt-0.4.jar
44	%%DATADIR%%/lib/jcl-over-slf4j-1.7.7.jar	43	%%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
45	%%DATADIR%%/lib/jctools-core-1.2.1.jar	44	%%DATADIR%%/lib/jctools-core-1.2.1.jar
46	%%DATADIR%%/lib/jflex-1.6.0.jar	45	%%DATADIR%%/lib/jflex-1.6.0.jar
47	%%DATADIR%%/lib/jna-4.2.2.jar	46	%%DATADIR%%/lib/jna-4.2.2.jar
48	%%DATADIR%%/lib/joda-time-2.4.jar	47	%%DATADIR%%/lib/joda-time-2.4.jar
49	%%DATADIR%%/lib/json-simple-1.1.jar	48	%%DATADIR%%/lib/json-simple-1.1.jar
50	%%DATADIR%%/lib/libthrift-0.9.2.jar	49	%%DATADIR%%/lib/libthrift-0.9.2.jar
51	%%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar	50	%%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar
52	%%DATADIR%%/lib/logback-classic-1.1.3.jar	51	%%DATADIR%%/lib/logback-classic-1.2.9.jar
53	%%DATADIR%%/lib/logback-core-1.1.3.jar	52	%%DATADIR%%/lib/logback-core-1.2.9.jar
54	%%DATADIR%%/lib/lz4-1.3.0.jar	53	%%DATADIR%%/lib/lz4-1.3.0.jar
55	%%DATADIR%%/lib/metrics-core-3.1.5.jar	54	%%DATADIR%%/lib/metrics-core-3.1.5.jar
56	%%DATADIR%%/lib/metrics-jvm-3.1.5.jar	55	%%DATADIR%%/lib/metrics-jvm-3.1.5.jar
Lines 61-68 Link Here
61	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar	60	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
62	%%DATADIR%%/lib/reporter-config3-3.0.3.jar	61	%%DATADIR%%/lib/reporter-config3-3.0.3.jar
63	%%DATADIR%%/lib/six-1.16.0-py2.py3-none-any.zip	62	%%DATADIR%%/lib/six-1.16.0-py2.py3-none-any.zip
64	%%DATADIR%%/lib/slf4j-api-1.7.7.jar	63	%%DATADIR%%/lib/slf4j-api-1.7.25.jar
65	%%DATADIR%%/lib/snakeyaml-1.11.jar	64	%%DATADIR%%/lib/snakeyaml-1.26.jar
66	%%DATADIR%%/lib/snappy-java.jar	65	%%DATADIR%%/lib/snappy-java.jar
67	%%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar	66	%%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
68	%%DATADIR%%/lib/ST4-4.0.8.jar	67	%%DATADIR%%/lib/ST4-4.0.8.jar
69	-