View | Details | Raw Unified | Return to bug 248465 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-23 / +21 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	cassandra
3
PORTNAME=	cassandra
4
DISTVERSION=	3.11.6
4
DISTVERSION=	3.11.7
5
PORTREVISION=	1
6
CATEGORIES=	databases java
5
CATEGORIES=	databases java
7
MASTER_SITES=	APACHE/cassandra/${PORTVERSION}:apache \
6
MASTER_SITES=	APACHE/cassandra/${PORTVERSION}:apache \
8
		LOCAL/yuri:repo
7
		LOCAL/yuri:repo
Lines 9-15 Link Here
9
PKGNAMESUFFIX=	3
8
PKGNAMESUFFIX=	3
10
DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-src
9
DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-src
11
DISTFILES=	${DISTNAME}.tar.gz:apache \
10
DISTFILES=	${DISTNAME}.tar.gz:apache \
12
		apache-${PORTNAME}-3.11.4-repo.tar.gz:repo
11
		apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
13
12
14
MAINTAINER=	language.devel@gmail.com
13
MAINTAINER=	language.devel@gmail.com
15
COMMENT=	Highly scalable distributed database
14
COMMENT=	Highly scalable distributed database
Lines 23-36 Link Here
23
RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java
22
RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java
24
23
25
USES=		python:2.7
24
USES=		python:2.7
25
USE_ANT=	yes
26
USE_JAVA=	yes
26
USE_JAVA=	yes
27
USE_ANT=	yes
27
JAVA_VERSION=	1.8
28
JAVA_VENDOR=	openjdk
29
28
USE_RC_SUBR=	cassandra
30
USE_RC_SUBR=	cassandra
29
31
30
CONFLICTS=	cassandra4
32
CONFLICTS=	cassandra4
31
33
32
JAVA_VERSION=	1.8
34
DATADIR=	${JAVASHAREDIR}/${PORTNAME}
33
JAVA_VENDOR=	openjdk
34
35
35
REINPLACE_ARGS=	-i ''
36
REINPLACE_ARGS=	-i ''
36
SUB_LIST=	JAVA_HOME=${JAVA_HOME}
37
SUB_LIST=	JAVA_HOME=${JAVA_HOME}
Lines 38-47 Link Here
38
USERS=		cassandra
39
USERS=		cassandra
39
GROUPS=		cassandra
40
GROUPS=		cassandra
40
41
41
DATADIR=	${JAVASHAREDIR}/${PORTNAME}
42
PLIST_SUB=	PORTVERSION=${PORTVERSION}
42
DIST_DIR=	${WRKSRC}/build/dist
43
PORTDOCS=		*
43
REPO_DIR=	${WRKDIR}/repository
44
44
45
OPTIONS_DEFINE=		SIGAR DOCS
46
OPTIONS_DEFAULT=	SIGAR
47
OPTIONS_SUB=		yes
48
49
SIGAR_DESC=		Use SIGAR to collect system information
50
DOCS_BUILD_DEPENDS=	${PY_SPHINX} \
51
			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
52
SIGAR_RUN_DEPENDS=	java-sigar>=1.6.4:java/sigar
53
45
CONFIG_FILES=	cassandra-env.sh \
54
CONFIG_FILES=	cassandra-env.sh \
46
		cassandra-jaas.config \
55
		cassandra-jaas.config \
47
		cassandra-rackdc.properties \
56
		cassandra-rackdc.properties \
Lines 53-58 Link Here
53
		logback-tools.xml \
62
		logback-tools.xml \
54
		logback.xml
63
		logback.xml
55
64
65
DIST_DIR=	${WRKSRC}/build/dist
66
REPO_DIR=	${WRKDIR}/repository
67
56
SCRIPT_FILES=	cassandra \
68
SCRIPT_FILES=	cassandra \
57
		cqlsh \
69
		cqlsh \
58
		nodetool \
70
		nodetool \
Lines 62-81 Link Here
62
		sstableutil \
74
		sstableutil \
63
		sstableverify
75
		sstableverify
64
76
65
PLIST_SUB=	PORTVERSION=${PORTVERSION}
66
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:
77
do-build:
80
	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
78
	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
81
79
(-)distinfo (-5 / +5 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1582025236
1
TIMESTAMP = 1596452874
2
SHA256 (apache-cassandra-3.11.6-src.tar.gz) = 9d2b976c942f8d845a621183c83b15ce06308c76942986aa7216b6e1c2f3480c
2
SHA256 (apache-cassandra-3.11.7-src.tar.gz) = 57cad3202263671a91c47cf4c015786ccd8d47d686216921c6a5feb402a64c9c
3
SIZE (apache-cassandra-3.11.6-src.tar.gz) = 35097130
3
SIZE (apache-cassandra-3.11.7-src.tar.gz) = 35773405
4
SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44
4
SHA256 (apache-cassandra-3.11.7-repo.tar.gz) = c7d493ad8cf877684f6f98f686630f4dbe47622646dc80741ce7a62c13bfb06e
5
SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889
5
SIZE (apache-cassandra-3.11.7-repo.tar.gz) = 50192442
(-)files/patch-bin_cassandra (-3 / +3 lines)
Lines 1-6 Link Here
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
(-)files/patch-build.xml (-11 / +11 lines)
Lines 1-4 Link Here
1
--- build.xml.orig	2020-02-10 22:55:14 UTC
1
--- build.xml.orig	2020-07-14 21:00:51 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.7"/>
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
@@ -1786,8 +1862,8 @@
185
     <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
185
     <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
186
       <arg value="--all"/>
186
       <arg value="--all"/>
187
     </exec>
187
     </exec>
Lines 192-198 Link Here
192
       <arg value="-n"/>
192
       <arg value="-n"/>
193
       <arg value="hw.ncpu"/>
193
       <arg value="hw.ncpu"/>
194
     </exec>
194
     </exec>
195
@@ -1797,6 +1873,11 @@
195
@@ -1807,6 +1883,11 @@
196
     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
196
     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
197
       <arg value="-n"/>
197
       <arg value="-n"/>
198
       <arg value="hw.memsize"/>
198
       <arg value="hw.memsize"/>
(-)pkg-plist (-2 / +3 lines)
Lines 35-42 Link Here
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

Return to bug 248465