sysutils/apache-mesos: Update to 1.11.0

PR:		254294
Submitted by:	James Wright <james.wright@digital-chaos.com> (maintainer)

5 files changed, 16 insertions, 69 deletions

diff --git a/sysutils/apache-mesos/Makefile b/sysutils/apache-mesos/Makefile
index f1642c1de99e..40a88c3bd3f1 100644
--- a/sysutils/apache-mesos/Makefile
+++ b/sysutils/apache-mesos/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mesos
-PORTVERSION=	1.10.0
-PORTREVISION=	6
+PORTVERSION=	1.11.0
 CATEGORIES=	sysutils
 MASTER_SITES=	APACHE/mesos/${PORTVERSION}:mesos
 PKGNAMEPREFIX=	apache-
@@ -82,7 +81,7 @@ JAVA_MAKE_ENV=		MAVEN_OPTS="${MAVEN_OPTS}"
 JAVA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_java_mesos.pom.in
 
 # REVIEW: Can we figure out the current Protobuf version in ports instead of hardcoding???
-PROTOBUF_VERSION=	3.12.2
+PROTOBUF_VERSION=	3.14.0
 
 MAVEN_CMD=		mvn
 MAVEN_REPO=		${WRKDIR}/mesos-maven-deps-${PORTVERSION}
diff --git a/sysutils/apache-mesos/distinfo b/sysutils/apache-mesos/distinfo
index 7c570228003b..81c8c97caed9 100644
--- a/sysutils/apache-mesos/distinfo
+++ b/sysutils/apache-mesos/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1593259602
-SHA256 (apache-mesos/mesos-1.10.0.tar.gz) = f4b9e8a1e9f905334adf4d349a2ed33a4cfa43278381cd34fb4fc7e9df9e12a1
-SIZE (apache-mesos/mesos-1.10.0.tar.gz) = 71760072
-SHA256 (apache-mesos/mesos-maven-deps-1.10.0.tar.gz) = b119a72e99499b67e1455a32bbbba80a15ae5ef21315eab76119f941f96f3d36
-SIZE (apache-mesos/mesos-maven-deps-1.10.0.tar.gz) = 36000010
+TIMESTAMP = 1615762466
+SHA256 (apache-mesos/mesos-1.11.0.tar.gz) = ce08cb648a21502a4a0c45d240a596d9ac860fcaf717f9a3dc986da9d406fe34
+SIZE (apache-mesos/mesos-1.11.0.tar.gz) = 72210031
+SHA256 (apache-mesos/mesos-maven-deps-1.11.0.tar.gz) = 98acd50b2d22018f5c79127ea14245e863c4c1bd0092c65c85ef9a147d488def
+SIZE (apache-mesos/mesos-maven-deps-1.11.0.tar.gz) = 36003620
diff --git a/sysutils/apache-mesos/files/maven-deps.pom b/sysutils/apache-mesos/files/maven-deps.pom
index 31a1db2e4e99..eba73b330d63 100644
--- a/sysutils/apache-mesos/files/maven-deps.pom
+++ b/sysutils/apache-mesos/files/maven-deps.pom
@@ -3,7 +3,7 @@
   <groupId>org.apache.mesos</groupId>
   <artifactId>mesos</artifactId>
   <name>mesos</name>
-  <version>1.10.0</version>
+  <version>1.11.0</version>
   <description>The Apache Mesos Java API jar.</description>
   <url>http://mesos.apache.org</url>
   <parent>
diff --git a/sysutils/apache-mesos/files/patch-3rdparty_stout_include_stout_os_freebsd.hpp b/sysutils/apache-mesos/files/patch-3rdparty_stout_include_stout_os_freebsd.hpp
deleted file mode 100644
index 381337499dd9..000000000000
--- a/sysutils/apache-mesos/files/patch-3rdparty_stout_include_stout_os_freebsd.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
---- 3rdparty/stout/include/stout/os/freebsd.hpp.orig	2020-05-22 20:48:06 UTC
-+++ 3rdparty/stout/include/stout/os/freebsd.hpp
-@@ -88,18 +88,29 @@ inline Try<Memory> memory()
-   const size_t pageSize = os::pagesize();
- 
-   unsigned int freeCount;
--  size_t length = sizeof(freeCount);
--
-+  size_t freeCountLength = sizeof(freeCount);
-   if (sysctlbyname(
--      "vm.stats.v_free_count",
-+      "vm.stats.vm.v_free_count",
-       &freeCount,
--      &length,
-+      &freeCountLength,
-       nullptr,
-       0) != 0) {
-     return ErrnoError();
-   }
--  memory.free = Bytes(freeCount * pageSize);
- 
-+  unsigned int inactiveCount;
-+  size_t inactiveCountLength = sizeof(inactiveCount);
-+  if (sysctlbyname(
-+      "vm.stats.vm.v_inactive_count",
-+      &inactiveCount,
-+      &inactiveCountLength,
-+      nullptr,
-+      0) != 0) {
-+    return ErrnoError();
-+  }
-+
-+  memory.free = Bytes((freeCount + inactiveCount) * pageSize);
-+
-   int totalBlocks = 0;
-   int usedBlocks = 0;
- 
-@@ -112,8 +123,9 @@ inline Try<Memory> memory()
-   // FreeBSD supports multiple swap devices. Here we sum across all of them.
-   struct xswdev xswd;
-   size_t xswdSize = sizeof(xswd);
--  int* mibDevice = &(mib[mibSize + 1]);
--  for (*mibDevice = 0; ; (*mibDevice)++) {
-+  for (int ndev = 0; ; ndev++) {
-+      mib[mibSize] = ndev;
-+
-       if (::sysctl(mib, 3, &xswd, &xswdSize, nullptr, 0) != 0) {
-           if (errno == ENOENT) {
-               break;
diff --git a/sysutils/apache-mesos/pkg-plist b/sysutils/apache-mesos/pkg-plist
index d2ea212cd1be..f9d1a88a96bb 100644
--- a/sysutils/apache-mesos/pkg-plist
+++ b/sysutils/apache-mesos/pkg-plist
@@ -52,9 +52,6 @@ include/mesos/authorizer/acls.proto
 include/mesos/authorizer/authorizer.hpp
 include/mesos/authorizer/authorizer.pb.h
 include/mesos/authorizer/authorizer.proto
-include/mesos/csi/types.hpp
-include/mesos/csi/types.pb.h
-include/mesos/csi/types.proto
 include/mesos/csi/v0.hpp
 include/mesos/csi/v1.hpp
 include/mesos/docker/spec.hpp
@@ -494,21 +491,21 @@ include/stout/windows/ip.hpp
 include/stout/windows/mac.hpp
 include/stout/windows/net.hpp
 include/stout/windows/os.hpp
-lib/libfixed_resource_estimator-1.10.0.so
+lib/libfixed_resource_estimator-1.11.0.so
 lib/libfixed_resource_estimator.so
-lib/libload_qos_controller-1.10.0.so
+lib/libload_qos_controller-1.11.0.so
 lib/libload_qos_controller.so
-lib/liblogrotate_container_logger-1.10.0.so
+lib/liblogrotate_container_logger-1.11.0.so
 lib/liblogrotate_container_logger.so
-lib/libmesos-1.10.0.so
+lib/libmesos-1.11.0.so
 lib/libmesos.so
-lib/mesos/modules/libfixed_resource_estimator-1.10.0.so
+lib/mesos/modules/libfixed_resource_estimator-1.11.0.so
 lib/mesos/modules/libfixed_resource_estimator.so
-lib/mesos/modules/libload_qos_controller-1.10.0.so
+lib/mesos/modules/libload_qos_controller-1.11.0.so
 lib/mesos/modules/libload_qos_controller.so
-lib/mesos/modules/liblogrotate_container_logger-1.10.0.so
+lib/mesos/modules/liblogrotate_container_logger-1.11.0.so
 lib/mesos/modules/liblogrotate_container_logger.so
-lib/mesos/modules/liburi_disk_profile_adaptor-1.10.0.so
+lib/mesos/modules/liburi_disk_profile_adaptor-1.11.0.so
 lib/mesos/modules/liburi_disk_profile_adaptor.so
 libdata/pkgconfig/mesos.pc
 libexec/mesos/mesos-containerizer