Date: Sat, 24 Dec 2022 02:40:19 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9160a0e0193e - main - databases/libcouchbase: Update version 2.10.7=>3.3.2 Message-ID: <202212240240.2BO2eJlF077982@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9160a0e0193e1a922bd4bdedef5fb0849929b742 commit 9160a0e0193e1a922bd4bdedef5fb0849929b742 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-12-24 02:30:15 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2022-12-24 02:40:13 +0000 databases/libcouchbase: Update version 2.10.7=>3.3.2 - Update MASTER_SITES - Update WWW - Pet portfmt PR: 268275 Approved by: sergey@couchbase.com (maintainer-timeout) --- databases/libcouchbase/Makefile | 14 +++++------ databases/libcouchbase/distinfo | 6 ++--- databases/libcouchbase/files/patch-CMakeLists.txt | 20 ++++++++-------- .../libcouchbase/files/patch-src_lcbio_ioutils.cc | 14 ++++++----- .../libcouchbase/files/patch-tools_cbc-proxy.cc | 17 +++++++------ databases/libcouchbase/pkg-plist | 28 +++++++++------------- 6 files changed, 49 insertions(+), 50 deletions(-) diff --git a/databases/libcouchbase/Makefile b/databases/libcouchbase/Makefile index 150848184744..5ff07f519333 100644 --- a/databases/libcouchbase/Makefile +++ b/databases/libcouchbase/Makefile @@ -1,18 +1,18 @@ PORTNAME= libcouchbase -PORTVERSION= 2.10.7 +PORTVERSION= 3.3.2 CATEGORIES= databases -MASTER_SITES= http://packages.couchbase.com/clients/c/ +MASTER_SITES= https://github.com/couchbase/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER= sergey@couchbase.com COMMENT= Multithreaded noSQL database (client and library) -WWW= https://developer.couchbase.com/documentation/server/current/sdk/c/start-using-sdk.html +WWW= https://docs.couchbase.com/c-sdk/current/hello-world/start-using-sdk.html LICENSE= APACHE20 -BROKEN_mips64= fails to link: ld: failed to merge target specific data +BROKEN_mips64= fails to link: ld: failed to merge target specific data -LIB_DEPENDS= libevent.so:devel/libevent \ - libev.so:devel/libev \ +LIB_DEPENDS= libev.so:devel/libev \ + libevent.so:devel/libevent \ libuv.so:devel/libuv USES= cmake perl5 ssl @@ -21,7 +21,7 @@ USE_PERL5= build run CMAKE_ARGS= -DLCB_NO_TESTS=1 -CONFLICTS_INSTALL= coin-or-cbc +CONFLICTS_INSTALL= coin-or-cbc .include <bsd.port.pre.mk> diff --git a/databases/libcouchbase/distinfo b/databases/libcouchbase/distinfo index 5c7d9fd1700e..ef12cb785832 100644 --- a/databases/libcouchbase/distinfo +++ b/databases/libcouchbase/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592402966 -SHA256 (libcouchbase-2.10.7.tar.gz) = bbee97ef2394f275b8cd4b9b940010566a2d34d4754ba3532a7fca3d94029b75 -SIZE (libcouchbase-2.10.7.tar.gz) = 1345574 +TIMESTAMP = 1670594749 +SHA256 (libcouchbase-3.3.2.tar.gz) = d99ef7ae4e129f839255569a530b8fb5377e265033e5cec056576bdbd9846884 +SIZE (libcouchbase-3.3.2.tar.gz) = 1481737 diff --git a/databases/libcouchbase/files/patch-CMakeLists.txt b/databases/libcouchbase/files/patch-CMakeLists.txt index da30e2e7b71d..12c7f77d2c77 100644 --- a/databases/libcouchbase/files/patch-CMakeLists.txt +++ b/databases/libcouchbase/files/patch-CMakeLists.txt @@ -1,16 +1,16 @@ ---- CMakeLists.txt.orig 2015-08-27 15:51:35 UTC +--- CMakeLists.txt.orig 2022-08-29 12:04:45 UTC +++ CMakeLists.txt -@@ -371,6 +371,7 @@ INSTALL(DIRECTORY include/libcouchbase $ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING PATTERN *.h PATTERN *.c) - -+set(CMAKE_INSTALL_MANDIR "man") - INSTALL(DIRECTORY doc/man/ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 FILES_MATCHING PATTERN *.1) - INSTALL(DIRECTORY doc/man/ DESTINATION ${CMAKE_INSTALL_MANDIR}/man4 FILES_MATCHING PATTERN *.4) +@@ -483,6 +483,7 @@ IF(NOT LCB_NO_TOOLS) + ENDIF() -@@ -382,7 +383,7 @@ SET(_lcb_manifest "${LCB_GENINFODIR}/MAN + IF(NOT LCB_NO_TOOLS) ++ set(CMAKE_INSTALL_MANDIR "man") + INSTALL(DIRECTORY doc/man/ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 FILES_MATCHING PATTERN *.1) + INSTALL(DIRECTORY doc/man/ DESTINATION ${CMAKE_INSTALL_MANDIR}/man4 FILES_MATCHING PATTERN *.4) + ENDIF() +@@ -502,7 +503,7 @@ IF(NOT WIN32 AND LCB_INSTALL_PKGCONFIG) # pkg-config stuff goes with installation - IF(NOT WIN32) + IF(NOT WIN32 AND LCB_INSTALL_PKGCONFIG) CONFIGURE_FILE(packaging/libcouchbase.pc.in packaging/libcouchbase.pc @ONLY) - INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/libcouchbase.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/libcouchbase.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}data/pkgconfig) diff --git a/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc b/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc index dc48546eb71c..57093aa31465 100644 --- a/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc +++ b/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc @@ -1,10 +1,12 @@ ---- src/lcbio/ioutils.cc.orig 2020-06-17 13:30:27 UTC +--- src/lcbio/ioutils.cc.orig 2022-12-09 14:14:27 UTC +++ src/lcbio/ioutils.cc -@@ -25,6 +25,7 @@ - #include "manager.h" +@@ -24,6 +24,9 @@ + #include "hostlist.h" #include "iotable.h" - #include <stdio.h> -+#include <netinet/in.h> #include "ssl.h" ++#ifdef __FreeBSD__ ++#include <netinet/in.h> ++#endif - lcbio_CSERR + lcbio_CSERR lcbio_mkcserr(int syserr) + { diff --git a/databases/libcouchbase/files/patch-tools_cbc-proxy.cc b/databases/libcouchbase/files/patch-tools_cbc-proxy.cc index 58f053571a60..39945c572511 100644 --- a/databases/libcouchbase/files/patch-tools_cbc-proxy.cc +++ b/databases/libcouchbase/files/patch-tools_cbc-proxy.cc @@ -1,10 +1,13 @@ ---- tools/cbc-proxy.cc.orig 2020-06-17 13:30:27 UTC +--- tools/cbc-proxy.cc.orig 2022-12-09 14:19:12 UTC +++ tools/cbc-proxy.cc -@@ -18,6 +18,7 @@ +@@ -35,6 +35,10 @@ + #include <event2/bufferevent.h> + #include <event2/buffer.h> - #include "config.h" - #include <sys/types.h> ++#ifdef __FreeBSD__ +#include <netinet/in.h> - #include <libcouchbase/couchbase.h> - #include <libcouchbase/vbucket.h> - #include <libcouchbase/api3.h> ++#endif ++ + using namespace cbc; + using namespace cliopts; + diff --git a/databases/libcouchbase/pkg-plist b/databases/libcouchbase/pkg-plist index 275ff95d6e58..7588642e70e7 100644 --- a/databases/libcouchbase/pkg-plist +++ b/databases/libcouchbase/pkg-plist @@ -4,14 +4,16 @@ bin/cbc-bucket-create bin/cbc-bucket-delete bin/cbc-bucket-flush bin/cbc-cat +bin/cbc-collection-id +bin/cbc-collection-manifest bin/cbc-connstr bin/cbc-create bin/cbc-decr +bin/cbc-gen bin/cbc-hash bin/cbc-incr bin/cbc-keygen bin/cbc-lock -bin/cbc-mcflush bin/cbc-mcversion bin/cbc-n1ql bin/cbc-n1qlback @@ -35,29 +37,23 @@ 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 include/libcouchbase/auth.h -include/libcouchbase/cbft.h 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 +include/libcouchbase/iometrics.h include/libcouchbase/iops.h include/libcouchbase/ixmgmt.h include/libcouchbase/kvbuf.h include/libcouchbase/libev_io_opts.h include/libcouchbase/libevent_io_opts.h include/libcouchbase/libuv_io_opts.h +include/libcouchbase/logger.h include/libcouchbase/metrics.h -include/libcouchbase/n1ql.h include/libcouchbase/pktfwd.h include/libcouchbase/plugins/io/bsdio-inl.c include/libcouchbase/plugins/io/libuv/libuv_compat.h @@ -66,18 +62,17 @@ include/libcouchbase/plugins/io/libuv/plugin-libuv.c include/libcouchbase/plugins/io/wsaerr-inl.c 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/utils.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.69 -lib/libcouchbase_libev.so -lib/libcouchbase_libevent.so -lib/libcouchbase_libuv.so +lib/libcouchbase.so.8 +lib/libcouchbase.so.8.0.10 +lib/libcouchbase/libcouchbase_libev.so +lib/libcouchbase/libcouchbase_libevent.so +lib/libcouchbase/libcouchbase_libuv.so libdata/pkgconfig/libcouchbase.pc man/man1/cbc-admin.1.gz man/man1/cbc-bucket-create.1.gz @@ -91,7 +86,6 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212240240.2BO2eJlF077982>