Index: head/databases/cockroach/Makefile
===================================================================
--- head/databases/cockroach/Makefile	(revision 568063)
+++ head/databases/cockroach/Makefile	(revision 568064)
@@ -1,48 +1,50 @@
 # $FreeBSD$
 
 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 \
 		cmake:devel/cmake
 
 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
 
 USERS=		cockroach
 GROUPS=		cockroach
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|LDFLAGS: -ledit|LDFLAGS: -L${LOCALBASE}/lib -ledit|g' \
 			  -e 's|CPPFLAGS: -Ishim|CPPFLAGS: -I${LOCALBASE}/include -Ishim|g' \
 		${WRKSRC}/src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go
 	@${REINPLACE_CMD} -e 's|build -i -o|build -o|g' \
 		${WRKSRC}/src/github.com/cockroachdb/cockroach/Makefile
 
 do-build:
 	@${SETENV} -i ${MAKE_ENV} ${GO_ENV} \
 		${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>
Index: head/databases/cockroach/distinfo
===================================================================
--- head/databases/cockroach/distinfo	(revision 568063)
+++ head/databases/cockroach/distinfo	(revision 568064)
@@ -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
Index: head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go
===================================================================
--- head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go	(revision 568063)
+++ head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go	(nonexistent)
@@ -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 {

Property changes on: head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/databases/cockroach/pkg-descr
===================================================================
--- head/databases/cockroach/pkg-descr	(revision 568063)
+++ head/databases/cockroach/pkg-descr	(revision 568064)
@@ -1,11 +1,11 @@
 CockroachDB is a distributed SQL database built on a transactional
 and strongly-consistent key-value store. It scales horizontally;
 survives disk, machine, rack, and even datacenter failures with
 minimal latency disruption and no manual intervention; supports
 strongly-consistent ACID transactions; and provides a familiar SQL
 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/