Index: head/databases/cassandra3/Makefile
===================================================================
--- head/databases/cassandra3/Makefile	(revision 520355)
+++ head/databases/cassandra3/Makefile	(revision 520356)
@@ -1,126 +1,125 @@
 # $FreeBSD$
 
 PORTNAME=	cassandra
-DISTVERSION=	3.11.4
-PORTREVISION=	1
+DISTVERSION=	3.11.5
 CATEGORIES=	databases java
 MASTER_SITES=	APACHE/cassandra/${PORTVERSION}:apache \
 		LOCAL/yuri:repo
 PKGNAMESUFFIX=	3
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz:apache \
-		apache-${PORTNAME}-${PORTVERSION}-repo.tar.gz:repo
+		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
 
 RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java
 
 USES=		python:2.7
 USE_JAVA=	yes
 USE_ANT=	yes
 USE_RC_SUBR=	cassandra
 
 JAVA_VERSION=	1.8
 JAVA_VENDOR=	openjdk
 
 REINPLACE_ARGS=	-i ''
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 USERS=		cassandra
 GROUPS=		cassandra
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 DIST_DIR=	${WRKSRC}/build/dist
 REPO_DIR=	${WRKDIR}/repository
 
 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
 
 SCRIPT_FILES=	cassandra \
 		cqlsh \
 		nodetool \
 		sstableloader \
 		sstablescrub \
 		sstableupgrade \
 		sstableutil \
 		sstableverify
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 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=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
 			${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.
 
 do-build-DOCS-on:
 	@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
 
 do-build-DOCS-off:
 	@cd ${WRKSRC} && ${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
 	@${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
 	@${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
 
 .include <bsd.port.mk>
Index: head/databases/cassandra3/distinfo
===================================================================
--- head/databases/cassandra3/distinfo	(revision 520355)
+++ head/databases/cassandra3/distinfo	(revision 520356)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1551608918
-SHA256 (apache-cassandra-3.11.4-src.tar.gz) = b01fea1b0a987adcc6078eef1f7e7fc43aacc3b4b0bfa3f29bc8a1cc9ba02cc6
-SIZE (apache-cassandra-3.11.4-src.tar.gz) = 39719274
+TIMESTAMP = 1576515047
+SHA256 (apache-cassandra-3.11.5-src.tar.gz) = d5363386b6ddbee59cf7dbbb2564a5f23ca236e728eebce12daf83b5ccdd50d8
+SIZE (apache-cassandra-3.11.5-src.tar.gz) = 39798994
 SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44
 SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889
Index: head/databases/cassandra3/files/patch-bin_cassandra
===================================================================
--- head/databases/cassandra3/files/patch-bin_cassandra	(revision 520355)
+++ head/databases/cassandra3/files/patch-bin_cassandra	(revision 520356)
@@ -1,11 +1,20 @@
---- bin/cassandra.orig	2018-09-07 13:43:49 UTC
+--- bin/cassandra.orig	2019-12-13 12:50:29 UTC
 +++ bin/cassandra
-@@ -189,7 +189,7 @@ launch_service()
-     props="$3"
-     class="$4"
-     cassandra_parms="-Dlogback.configurationFile=logback.xml"
--    cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"
-+    cassandra_parms="$cassandra_parms -Dcassandra.logdir=/var/log/cassandra"
-     cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
+@@ -30,7 +30,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.
+-#   CASSANDRA_LOG_DIR -- Directory containing logs(default: $CASSANDRA_HOME/logs).
++#   CASSANDRA_LOG_DIR -- Directory containing logs(default: /var/log/cassandra).
+ #
+ # 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
+ fi
  
-     if [ "x$pidpath" != "x" ]; then
+ if [ -z "$CASSANDRA_LOG_DIR" ]; then
+-  CASSANDRA_LOG_DIR=$CASSANDRA_HOME/logs
++  CASSANDRA_LOG_DIR=/var/log/cassandra
+ fi
+ 
+ # Special-case path variables.
Index: head/databases/cassandra3/files/patch-build.xml
===================================================================
--- head/databases/cassandra3/files/patch-build.xml	(revision 520355)
+++ head/databases/cassandra3/files/patch-build.xml	(revision 520356)
@@ -1,206 +1,206 @@
---- build.xml.orig	2019-02-02 22:06:43 UTC
+--- build.xml.orig	2019-10-24 16:42:10 UTC
 +++ build.xml
 @@ -23,6 +23,7 @@
      <property file="build.properties" />
      <property file="build.properties.default" />
      <property name="debuglevel" value="source,lines,vars"/>
 +    <property name="pycmd" value="python"/>
  
      <!-- default version and SCM information -->
-     <property name="base.version" value="3.11.4"/>
-@@ -77,14 +78,14 @@
+     <property name="base.version" value="3.11.5"/>
+@@ -78,14 +79,14 @@
      <condition property="version" value="${base.version}">
        <isset property="release"/>
      </condition>
 -    <property name="version" value="${base.version}-SNAPSHOT"/>
 +    <property name="version" value="${base.version}"/>
      <property name="version.properties.dir"
                value="${build.src.resources}/org/apache/cassandra/config/" />
      <property name="final.name" value="${ant.project.name}-${version}"/>
  
      <!-- details of what version of Maven ANT Tasks to fetch -->
      <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="http://repo2.maven.org/maven2/org/apache/maven/maven-ant-tasks" />
+               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 @@
+@@ -244,8 +245,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"/>
 -            <remoteRepository refid="central"/>
 -            <remoteRepository refid="apache"/>
 +            <localRepository path="${localm2}"/>
          </artifact:dependencies>
          <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
          <wikitext-to-html markupLanguage="Textile">
-@@ -261,6 +261,7 @@
+@@ -258,6 +258,7 @@
      <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
          <exec executable="make" osfamily="unix" dir="${doc.dir}">
              <arg value="html"/>
 +            <arg value="PYTHON_CMD=${pycmd}"/>
          </exec>
          <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
              <arg value="/c"/>
-@@ -303,10 +304,6 @@
+@@ -300,10 +301,6 @@
              description="Initialize Maven ANT Tasks">
        <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
  
 -      <!-- define the remote repositories we use -->
 -      <artifact:remoteRepository id="central"   url="${artifact.remoteRepository.central}"/>
 -      <artifact:remoteRepository id="apache"    url="${artifact.remoteRepository.apache}"/>
 -
        <macrodef name="install">
          <attribute name="pomFile"/>
          <attribute name="file"/>
-@@ -685,16 +682,14 @@
+@@ -682,16 +679,14 @@
                               filesetId="build-dependency-jars"
                               cacheDependencyRefs="true"
                               dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
 -          <remoteRepository refid="central"/>
 -          <remoteRepository refid="apache"/>
 +          <localRepository path="${localm2}"/>
        </artifact:dependencies>
        <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
        <artifact:dependencies pomRefId="build-deps-pom-sources"
                               sourcesFilesetId="build-dependency-sources"
                               cacheDependencyRefs="true"
                               dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
 -          <remoteRepository refid="central"/>
 -          <remoteRepository refid="apache"/>
 +          <localRepository path="${localm2}"/>
        </artifact:dependencies>
        <copy todir="${build.dir.lib}/jars">
            <fileset refid="build-dependency-jars"/>
-@@ -707,7 +702,7 @@
+@@ -704,7 +699,7 @@
        <!-- code coverage tools -->
        <artifact:dependencies pomRefId="coverage-deps-pom"
                               filesetId="coverage-dependency-jars">
 -          <remoteRepository refid="central"/>
 +          <localRepository path="${localm2}"/>
        </artifact:dependencies>
        <copy todir="${build.dir.lib}/jars">
            <fileset refid="coverage-dependency-jars"/>
-@@ -728,8 +723,7 @@
+@@ -725,8 +720,7 @@
                               sourcesFilesetId="test-dependency-sources"
                               cacheDependencyRefs="true"
                               dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
 -        <remoteRepository refid="apache"/>
 -        <remoteRepository refid="central"/>
 +        <localRepository path="${localm2}"/>
        </artifact:dependencies>
        <copy todir="${test.lib}/jars">
          <fileset refid="test-dependency-jars"/>
-@@ -1024,6 +1018,88 @@
+@@ -1021,6 +1015,88 @@
        </jar>
      </target>
  
 +    <!-- FreeBSD for staging -->
 +    <target name="freebsd-stage" depends="jar"
 +            description="Create Cassandra directory structure for staging">
 +      <mkdir dir="${dist.dir}"/>
 +      <copy todir="${dist.dir}/lib">
 +        <fileset dir="${build.lib}">
 +          <exclude name="sigar*.jar"/>
 +          <exclude name="sigar-bin/*"/>
 +          <exclude name="snappy*.jar"/>
 +          <exclude name="licenses/snappy*.txt"/>
 +        </fileset>
 +        <fileset dir="${build.dir}">
 +          <include name="${final.name}.jar" />
 +          <include name="${ant.project.name}-thrift-${version}.jar" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/bin">
 +        <fileset dir="bin">
 +	  <exclude name="*.bat" />
 +	  <exclude name="*.ps1" />
 +	  <exclude name="*.orig" />
 +	</fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/conf">
 +        <fileset dir="conf">
 +          <exclude name="*.ps1" />
 +	  <exclude name="*.orig" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/interface">
 +        <fileset dir="interface">
 +          <include name="**/*.thrift" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/pylib">
 +        <fileset dir="pylib">
 +          <include name="**" />
 +          <exclude name="**/*.pyc" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/">
 +        <fileset dir="${basedir}">
 +          <include name="*.txt" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/tools/bin">
 +        <fileset dir="${basedir}/tools/bin">
 +          <exclude name="*.bat" />
 +          <exclude name="*.ps1" />
 +	  <exclude name="*.orig" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/tools/">
 +        <fileset dir="${basedir}/tools/">
 +            <include name="*.yaml"/>
 +	</fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/tools/lib">
 +        <fileset dir="${build.dir}/tools/lib/">
 +            <include name="*.jar" />
 +        </fileset>
 +      </copy>
 +    </target>
 +
 +    <target name="freebsd-stage-doc" depends="freebsd-stage,javadoc,gen-doc"
 +            description="Create Cassandra directory structure for staging, including docs">
 +      <copy todir="${dist.dir}/javadoc">
 +        <fileset dir="${javadoc.dir}"/>
 +      </copy>
 +      <copy todir="${dist.dir}/doc">
 +        <fileset dir="doc">
 +          <include name="cql3/CQL.html" />
 +          <include name="cql3/CQL.css" />
 +          <include name="SASI.md" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/doc/html">
 +        <fileset dir="doc" />
 +        <globmapper from="build/html/*" to="*"/>
 +      </copy>
 +    </target>
 +    
      <!-- creates release tarballs -->
      <target name="artifacts" depends="jar,javadoc,gen-doc"
              description="Create Cassandra release artifacts">
-@@ -1767,8 +1843,8 @@
+@@ -1771,8 +1847,8 @@
      <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
        <arg value="--all"/>
      </exec>
 -    <!-- support for Mac OS X -->
 -    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
 +    <!-- support for Mac OS X and FreeBSD -->
 +    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
        <arg value="-n"/>
        <arg value="hw.ncpu"/>
      </exec>
-@@ -1788,6 +1864,11 @@
+@@ -1792,6 +1868,11 @@
      <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
        <arg value="-n"/>
        <arg value="hw.memsize"/>
 +    </exec>
 +    <!-- support for FreeBSD -->
 +    <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
 +      <arg value="-n"/>
 +      <arg value="hw.physmem"/>
      </exec>
      <echo message="Mem size : ${mem.size}"/>
    </target>
Index: head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java
===================================================================
--- head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java	(revision 520355)
+++ head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java	(revision 520356)
@@ -1,11 +1,11 @@
---- src/java/org/apache/cassandra/config/Config.java.orig	2018-03-06 21:16:18 UTC
+--- src/java/org/apache/cassandra/config/Config.java.orig	2019-10-24 16:42:10 UTC
 +++ src/java/org/apache/cassandra/config/Config.java
-@@ -252,7 +252,7 @@ public class Config
+@@ -260,7 +260,7 @@ public class Config
      public volatile int key_cache_save_period = 14400;
      public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;
  
 -    public String row_cache_class_name = "org.apache.cassandra.cache.OHCProvider";
 +    public String row_cache_class_name = "org.apache.cassandra.cache.SerializingCacheProvider";
      public long row_cache_size_in_mb = 0;
      public volatile int row_cache_save_period = 0;
      public volatile int row_cache_keys_to_save = Integer.MAX_VALUE;