diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-03-11 02:20:32 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-03-11 02:20:32 +0000 |
| commit | 15c2e56100312d9febed71a53cf7548ec14aefab (patch) | |
| tree | 504f1b14c77ef5638331e2eac05faf20dfd91b87 /databases/cockroach | |
| parent | 6d43dcc1087505386a275cdd00a2d7cc5f47501f (diff) | |
| download | ports-15c2e56100312d9febed71a53cf7548ec14aefab.tar.gz ports-15c2e56100312d9febed71a53cf7548ec14aefab.zip | |
- Update to 19.1.11
- Reset the maintainer due to 4 consequentional maintainer timeouts
PR: 222907
Submitted by: pfg, kirill@varnakov.com
Approved by: maintainer timeout (freebsd@jen20.com, 21 months)
Notes
Notes:
svn path=/head/; revision=568064
Diffstat (limited to 'databases/cockroach')
| -rw-r--r-- | databases/cockroach/Makefile | 10 | ||||
| -rw-r--r-- | databases/cockroach/distinfo | 6 | ||||
| -rw-r--r-- | databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go | 29 | ||||
| -rw-r--r-- | databases/cockroach/pkg-descr | 2 |
4 files changed, 10 insertions, 37 deletions
diff --git a/databases/cockroach/Makefile b/databases/cockroach/Makefile index 22e2fc983fe1..7db7f2b5805e 100644 --- a/databases/cockroach/Makefile +++ b/databases/cockroach/Makefile @@ -2,19 +2,19 @@ PORTNAME= cockroach DISTVERSIONPREFIX= v -DISTVERSION= 2.0.7 +DISTVERSION= 19.1.11 CATEGORIES= databases MASTER_SITES= https://binaries.cockroachdb.com/ EXTRACT_SUFX= .src.tgz -MAINTAINER= freebsd@jen20.com +MAINTAINER= ports@FreeBSD.org COMMENT= Cloud-native SQL database that survive disasters LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= "Only supported on amd64" +ONLY_FOR_ARCHS_REASON= "A 64-bit system is strongly recommended" BUILD_DEPENDS= autoconf:devel/autoconf \ bash:shells/bash \ @@ -22,9 +22,11 @@ BUILD_DEPENDS= autoconf:devel/autoconf \ USES= gmake go libedit +USE_GCC= yes # RocksDB is broken with clang - See PR 236213 USE_RC_SUBR= cockroach NO_CCACHE= yes +ALL_TARGET= build PLIST_FILES= bin/cockroach @@ -43,6 +45,6 @@ do-build: ${MAKE_CMD} -C ${WRKSRC} buildoss do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/cockroachdb/cockroach/cockroach ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/cockroachdb/cockroach/cockroachoss ${STAGEDIR}${PREFIX}/bin/cockroach .include <bsd.port.mk> diff --git a/databases/cockroach/distinfo b/databases/cockroach/distinfo index f22a06bc36bf..74bffd930456 100644 --- a/databases/cockroach/distinfo +++ b/databases/cockroach/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552343259 -SHA256 (cockroach-v2.0.7.src.tgz) = 0aa42e8a87d0b915d6e7a9df39e3bb32eac250c1afc25e37cc36585f3afa081a -SIZE (cockroach-v2.0.7.src.tgz) = 45565811 +TIMESTAMP = 1614623246 +SHA256 (cockroach-v19.1.11.src.tgz) = 9c6d93b0560ad53d2c8699b523849f30ddd5250807fdfa2def09442542ec624d +SIZE (cockroach-v19.1.11.src.tgz) = 103214436 diff --git a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go deleted file mode 100644 index 08151bbb4ffa..000000000000 --- a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go +++ /dev/null @@ -1,29 +0,0 @@ ---- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2018-12-10 15:51:01 UTC -+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go -@@ -1986,22 +1986,22 @@ func (r *rocksDBIterator) Valid() (bool, error) { - - func (r *rocksDBIterator) Next() { - r.checkEngineOpen() -- r.setState(C.DBIterNext(r.iter, false /* skip_current_key_versions */)) -+ r.setState(C.DBIterNext(r.iter, C.bool(false) /* skip_current_key_versions */)) - } - - func (r *rocksDBIterator) Prev() { - r.checkEngineOpen() -- r.setState(C.DBIterPrev(r.iter, false /* skip_current_key_versions */)) -+ r.setState(C.DBIterPrev(r.iter, C.bool(false) /* skip_current_key_versions */)) - } - - func (r *rocksDBIterator) NextKey() { - r.checkEngineOpen() -- r.setState(C.DBIterNext(r.iter, true /* skip_current_key_versions */)) -+ r.setState(C.DBIterNext(r.iter, C.bool(true) /* skip_current_key_versions */)) - } - - func (r *rocksDBIterator) PrevKey() { - r.checkEngineOpen() -- r.setState(C.DBIterPrev(r.iter, true /* skip_current_key_versions */)) -+ r.setState(C.DBIterPrev(r.iter, C.bool(true) /* skip_current_key_versions */)) - } - - func (r *rocksDBIterator) Key() MVCCKey { diff --git a/databases/cockroach/pkg-descr b/databases/cockroach/pkg-descr index 0df50b0da726..ae9643d6b04a 100644 --- a/databases/cockroach/pkg-descr +++ b/databases/cockroach/pkg-descr @@ -8,4 +8,4 @@ API for structuring, manipulating, and querying data. CockroachDB is inspired by Google's Spanner and F1 technologies, and it's completely open source. -WWW: https://cockroachlabs.io/ +WWW: https://www.cockroachlabs.com/ |