--- databases/cockroach/Makefile	(revision 503646)
+++ databases/cockroach/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	cockroach
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.7
+DISTVERSION=	19.1.1
 CATEGORIES=	databases
 MASTER_SITES=	https://binaries.cockroachdb.com/
 EXTRACT_SUFX=	.src.tgz
@@ -14,7 +14,7 @@ 
 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 \
@@ -23,9 +23,11 @@ 
 
 USES=		gmake 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
 
@@ -44,6 +46,6 @@ 
 		${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>
--- databases/cockroach/distinfo	(revision 503646)
+++ databases/cockroach/distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1552343259
-SHA256 (cockroach-v2.0.7.src.tgz) = 0aa42e8a87d0b915d6e7a9df39e3bb32eac250c1afc25e37cc36585f3afa081a
-SIZE (cockroach-v2.0.7.src.tgz) = 45565811
+TIMESTAMP = 1559940144
+SHA256 (cockroach-v19.1.1.src.tgz) = cc05d2f0a4310d23007985a91a2e3ac4ab17b9cd853934536228e6e4812c7fed
+SIZE (cockroach-v19.1.1.src.tgz) = 103054418
--- databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go	(revision 503646)
+++ 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 {
--- databases/cockroach/pkg-descr	(revision 503646)
+++ databases/cockroach/pkg-descr	(working copy)
@@ -8,4 +8,4 @@ 
 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/