Update to version 2.10.7.

PR:		233468
Approved by:	maintainer timeout

5 files changed, 39 insertions, 7 deletions

diff --git a/databases/libcouchbase/Makefile b/databases/libcouchbase/Makefile
index 572f70827d34..bcd27291c270 100644
--- a/databases/libcouchbase/Makefile
+++ b/databases/libcouchbase/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libcouchbase
-DISTVERSION=	2.8.0
-PORTREVISION=	1
+PORTVERSION=	2.10.7
 CATEGORIES=	databases
 MASTER_SITES=	http://packages.couchbase.com/clients/c/
 
diff --git a/databases/libcouchbase/distinfo b/databases/libcouchbase/distinfo
index 727ca5fb8d9a..5c7d9fd1700e 100644
--- a/databases/libcouchbase/distinfo
+++ b/databases/libcouchbase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504181517
-SHA256 (libcouchbase-2.8.0.tar.gz) = 862ed3fd01938d872782f1a96b318d517c3015ef1b1183cdcf5b2098a1d4705b
-SIZE (libcouchbase-2.8.0.tar.gz) = 1185885
+TIMESTAMP = 1592402966
+SHA256 (libcouchbase-2.10.7.tar.gz) = bbee97ef2394f275b8cd4b9b940010566a2d34d4754ba3532a7fca3d94029b75
+SIZE (libcouchbase-2.10.7.tar.gz) = 1345574
diff --git a/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc b/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc
new file mode 100644
index 000000000000..dc48546eb71c
--- /dev/null
+++ b/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc
@@ -0,0 +1,10 @@
+--- src/lcbio/ioutils.cc.orig	2020-06-17 13:30:27 UTC
++++ src/lcbio/ioutils.cc
+@@ -25,6 +25,7 @@
+ #include "manager.h"
+ #include "iotable.h"
+ #include <stdio.h>
++#include <netinet/in.h>
+ #include "ssl.h"
+ 
+ lcbio_CSERR
diff --git a/databases/libcouchbase/files/patch-tools_cbc-proxy.cc b/databases/libcouchbase/files/patch-tools_cbc-proxy.cc
new file mode 100644
index 000000000000..58f053571a60
--- /dev/null
+++ b/databases/libcouchbase/files/patch-tools_cbc-proxy.cc
@@ -0,0 +1,10 @@
+--- tools/cbc-proxy.cc.orig	2020-06-17 13:30:27 UTC
++++ tools/cbc-proxy.cc
+@@ -18,6 +18,7 @@
+ 
+ #include "config.h"
+ #include <sys/types.h>
++#include <netinet/in.h>
+ #include <libcouchbase/couchbase.h>
+ #include <libcouchbase/vbucket.h>
+ #include <libcouchbase/api3.h>
diff --git a/databases/libcouchbase/pkg-plist b/databases/libcouchbase/pkg-plist
index f3b2df0859a3..275ff95d6e58 100644
--- a/databases/libcouchbase/pkg-plist
+++ b/databases/libcouchbase/pkg-plist
@@ -9,14 +9,17 @@ bin/cbc-create
 bin/cbc-decr
 bin/cbc-hash
 bin/cbc-incr
+bin/cbc-keygen
 bin/cbc-lock
 bin/cbc-mcflush
+bin/cbc-mcversion
 bin/cbc-n1ql
 bin/cbc-n1qlback
 bin/cbc-observe
 bin/cbc-observe-seqno
 bin/cbc-pillowfight
 bin/cbc-ping
+bin/cbc-proxy
 bin/cbc-rm
 bin/cbc-role-list
 bin/cbc-stats
@@ -30,8 +33,10 @@ bin/cbc-user-upsert
 bin/cbc-verbosity
 bin/cbc-version
 bin/cbc-view
+bin/cbc-watch
 bin/cbc-write-config
 include/libcouchbase/_cxxwrap.h
+include/libcouchbase/analytics.h
 include/libcouchbase/api-legacy.h
 include/libcouchbase/api3.h
 include/libcouchbase/assert.h
@@ -41,6 +46,7 @@ include/libcouchbase/cntl-private.h
 include/libcouchbase/cntl.h
 include/libcouchbase/configuration.h
 include/libcouchbase/couchbase.h
+include/libcouchbase/crypto.h
 include/libcouchbase/deprecated.h
 include/libcouchbase/error.h
 include/libcouchbase/http.h
@@ -50,6 +56,7 @@ include/libcouchbase/kvbuf.h
 include/libcouchbase/libev_io_opts.h
 include/libcouchbase/libevent_io_opts.h
 include/libcouchbase/libuv_io_opts.h
+include/libcouchbase/metrics.h
 include/libcouchbase/n1ql.h
 include/libcouchbase/pktfwd.h
 include/libcouchbase/plugins/io/bsdio-inl.c
@@ -61,12 +68,13 @@ include/libcouchbase/plugins/io/wsaerr.h
 include/libcouchbase/select_io_opts.h
 include/libcouchbase/subdoc.h
 include/libcouchbase/sysdefs.h
+include/libcouchbase/tracing.h
 include/libcouchbase/vbucket.h
 include/libcouchbase/views.h
 include/libcouchbase/visibility.h
 lib/libcouchbase.so
 lib/libcouchbase.so.2
-lib/libcouchbase.so.2.0.48
+lib/libcouchbase.so.2.0.69
 lib/libcouchbase_libev.so
 lib/libcouchbase_libevent.so
 lib/libcouchbase_libuv.so
@@ -78,10 +86,14 @@ man/man1/cbc-cat.1.gz
 man/man1/cbc-connstr.1.gz
 man/man1/cbc-cp.1.gz
 man/man1/cbc-create.1.gz
-man/man1/cbc-dsn.1.gz
+man/man1/cbc-decr.1.gz
 man/man1/cbc-flush.1.gz
 man/man1/cbc-hash.1.gz
+man/man1/cbc-incr.1.gz
 man/man1/cbc-lock.1.gz
+man/man1/cbc-mcflush.1.gz
+man/man1/cbc-mcversion.1.gz
+man/man1/cbc-n1ql.1.gz
 man/man1/cbc-n1qlback.1.gz
 man/man1/cbc-observe.1.gz
 man/man1/cbc-pillowfight.1.gz
@@ -97,5 +109,6 @@ man/man1/cbc-user-upsert.1.gz
 man/man1/cbc-verbosity.1.gz
 man/man1/cbc-version.1.gz
 man/man1/cbc-view.1.gz
+man/man1/cbc-watch.1.gz
 man/man1/cbc.1.gz
 man/man4/cbcrc.4.gz