--- Makefile	(revision 544784)
+++ Makefile	(working copy)
@@ -1,8 +1,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	cassandra
-DISTVERSION=	3.11.6
-PORTREVISION=	1
+DISTVERSION=	3.11.7
 CATEGORIES=	databases java
 MASTER_SITES=	APACHE/cassandra/${PORTVERSION}:apache \
 		LOCAL/yuri:repo
@@ -9,7 +8,7 @@ 
 PKGNAMESUFFIX=	3
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz:apache \
-		apache-${PORTNAME}-3.11.4-repo.tar.gz:repo
+		apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
 
 MAINTAINER=	language.devel@gmail.com
 COMMENT=	Highly scalable distributed database
@@ -23,14 +22,16 @@ 
 RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java
 
 USES=		python:2.7
+USE_ANT=	yes
 USE_JAVA=	yes
-USE_ANT=	yes
+JAVA_VERSION=	1.8
+JAVA_VENDOR=	openjdk
+
 USE_RC_SUBR=	cassandra
 
 CONFLICTS=	cassandra4
 
-JAVA_VERSION=	1.8
-JAVA_VENDOR=	openjdk
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 REINPLACE_ARGS=	-i ''
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
@@ -38,10 +39,18 @@ 
 USERS=		cassandra
 GROUPS=		cassandra
 
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-DIST_DIR=	${WRKSRC}/build/dist
-REPO_DIR=	${WRKDIR}/repository
+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=	${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 \
@@ -53,6 +62,9 @@ 
 		logback-tools.xml \
 		logback.xml
 
+DIST_DIR=	${WRKSRC}/build/dist
+REPO_DIR=	${WRKDIR}/repository
+
 SCRIPT_FILES=	cassandra \
 		cqlsh \
 		nodetool \
@@ -62,20 +74,6 @@ 
 		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=	${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.
 
--- distinfo	(revision 544784)
+++ distinfo	(working copy)
@@ -1,5 +1,5 @@ 
-TIMESTAMP = 1582025236
-SHA256 (apache-cassandra-3.11.6-src.tar.gz) = 9d2b976c942f8d845a621183c83b15ce06308c76942986aa7216b6e1c2f3480c
-SIZE (apache-cassandra-3.11.6-src.tar.gz) = 35097130
-SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44
-SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889
+TIMESTAMP = 1596452874
+SHA256 (apache-cassandra-3.11.7-src.tar.gz) = 57cad3202263671a91c47cf4c015786ccd8d47d686216921c6a5feb402a64c9c
+SIZE (apache-cassandra-3.11.7-src.tar.gz) = 35773405
+SHA256 (apache-cassandra-3.11.7-repo.tar.gz) = c7d493ad8cf877684f6f98f686630f4dbe47622646dc80741ce7a62c13bfb06e
+SIZE (apache-cassandra-3.11.7-repo.tar.gz) = 50192442
--- files/patch-bin_cassandra	(revision 544784)
+++ files/patch-bin_cassandra	(working copy)
@@ -1,6 +1,6 @@ 
---- bin/cassandra.orig	2019-12-13 12:50:29 UTC
+--- bin/cassandra.orig	2020-07-14 21:00:51 UTC
 +++ bin/cassandra
-@@ -30,7 +30,7 @@
+@@ -31,7 +31,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.
@@ -9,7 +9,7 @@ 
  #
  # 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
+@@ -128,7 +128,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
  fi
  
  if [ -z "$CASSANDRA_LOG_DIR" ]; then
--- files/patch-build.xml	(revision 544784)
+++ files/patch-build.xml	(working copy)
@@ -1,4 +1,4 @@ 
---- build.xml.orig	2020-02-10 22:55:14 UTC
+--- build.xml.orig	2020-07-14 21:00:51 UTC
 +++ build.xml
 @@ -23,6 +23,7 @@
      <property file="build.properties" />
@@ -7,7 +7,7 @@ 
 +    <property name="pycmd" value="python"/>
  
      <!-- default version and SCM information -->
-     <property name="base.version" value="3.11.6"/>
+     <property name="base.version" value="3.11.7"/>
 @@ -80,14 +81,14 @@
      <condition property="version" value="${base.version}">
        <isset property="release"/>
@@ -25,7 +25,7 @@ 
      <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 -->
-@@ -246,8 +247,7 @@
+@@ -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"/>
@@ -35,7 +35,7 @@ 
          </artifact:dependencies>
          <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
          <wikitext-to-html markupLanguage="Textile">
-@@ -260,6 +260,7 @@
+@@ -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"/>
@@ -43,7 +43,7 @@ 
          </exec>
          <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
              <arg value="/c"/>
-@@ -302,10 +303,6 @@
+@@ -303,10 +304,6 @@
              description="Initialize Maven ANT Tasks">
        <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
  
@@ -54,7 +54,7 @@ 
        <macrodef name="install">
          <attribute name="pomFile"/>
          <attribute name="file"/>
-@@ -695,16 +692,14 @@
+@@ -706,16 +703,14 @@
                               filesetId="build-dependency-jars"
                               cacheDependencyRefs="true"
                               dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
@@ -73,7 +73,7 @@ 
        </artifact:dependencies>
        <copy todir="${build.dir.lib}/jars">
            <fileset refid="build-dependency-jars"/>
-@@ -717,7 +712,7 @@
+@@ -728,7 +723,7 @@
        <!-- code coverage tools -->
        <artifact:dependencies pomRefId="coverage-deps-pom"
                               filesetId="coverage-dependency-jars">
@@ -82,7 +82,7 @@ 
        </artifact:dependencies>
        <copy todir="${build.dir.lib}/jars">
            <fileset refid="coverage-dependency-jars"/>
-@@ -738,8 +733,7 @@
+@@ -749,8 +744,7 @@
                               sourcesFilesetId="test-dependency-sources"
                               cacheDependencyRefs="true"
                               dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
@@ -92,7 +92,7 @@ 
        </artifact:dependencies>
        <copy todir="${test.lib}/jars">
          <fileset refid="test-dependency-jars"/>
-@@ -1034,6 +1028,88 @@
+@@ -1045,6 +1039,88 @@
        </jar>
      </target>
  
@@ -181,7 +181,7 @@ 
      <!-- creates release tarballs -->
      <target name="artifacts" depends="jar,javadoc,gen-doc"
              description="Create Cassandra release artifacts">
-@@ -1776,8 +1852,8 @@
+@@ -1786,8 +1862,8 @@
      <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
        <arg value="--all"/>
      </exec>
@@ -192,7 +192,7 @@ 
        <arg value="-n"/>
        <arg value="hw.ncpu"/>
      </exec>
-@@ -1797,6 +1873,11 @@
+@@ -1807,6 +1883,11 @@
      <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
        <arg value="-n"/>
        <arg value="hw.memsize"/>
--- pkg-plist	(revision 544784)
+++ pkg-plist	(working copy)
@@ -35,8 +35,9 @@ 
 %%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-core-asl-1.9.13.jar
-%%DATADIR%%/lib/jackson-mapper-asl-1.9.13.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