Index: head/net-im/mtxclient/Makefile
===================================================================
--- head/net-im/mtxclient/Makefile	(revision 503939)
+++ head/net-im/mtxclient/Makefile	(revision 503940)
@@ -1,40 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=		mtxclient
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.2.1
+PORTREVISION=		1
 CATEGORIES=		net-im
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Client API library for the Matrix protocol
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nlohmann-json>=3:devel/nlohmann-json \
 		spdlog>=1.3:devel/spdlog \
 		gtest-config:devel/googletest
 LIB_DEPENDS=	libsodium.so:security/libsodium \
 		libboost_date_time.so:devel/boost-libs \
 		libboost_chrono.so:devel/boost-libs \
 		libboost_iostreams.so:devel/boost-libs \
 		libboost_random.so:devel/boost-libs \
 		libboost_regex.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs \
 		libolm.so:security/olm
 
 USES=		cmake compiler:c++11-lang pkgconfig \
 		localbase:ldflags tar:xz
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Nheko-Reborn
 
 # 71 files use #include <json.hpp>, which needs to be
 # elsewhere; an alternative would be to bung in -I${LOCALBASE}/include/nlohmann
 post-patch:
 	${FIND} ${WRKSRC} -type f -print0 | \
 	${XARGS} -0 ${REINPLACE_CMD} \
 		's+include <json.hpp>+include <nlohmann/json.hpp>+'
 
 .include <bsd.port.mk>
Index: head/net-im/nheko/Makefile
===================================================================
--- head/net-im/nheko/Makefile	(revision 503939)
+++ head/net-im/nheko/Makefile	(revision 503940)
@@ -1,51 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	nheko
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.6.4
+PORTREVISION=		1
 CATEGORIES=	net-im
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Matrix IM client based on Qt technologies
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	mtxclient>=0.2.1:net-im/mtxclient \
 		nlohmann-json>=3:devel/nlohmann-json \
 		spdlog>=1.3:devel/spdlog
 LIB_DEPENDS=	liblmdb.so:databases/lmdb \
 		libsodium.so:security/libsodium \
 		libolm.so:security/olm \
 		libcmark.so:textproc/cmark
 
 USES=		cmake compiler:c++17-lang pkgconfig \
 		localbase:ldflags qt:5 tar:xz
 USE_QT=		concurrent core dbus declarative gui multimedia network svg widgets \
 		buildtools_build linguist_build qmake_build
 
 # There are two external dependencies: lmdb++ and tweeny.
 #  - lmdb++ is a single header file, it just needs to be included
 #  - tweeny is a library, but only one header is needed; it is normally
 #    installed into a tweeny/ subdirectory, but its sources place it
 #    in include/. Add one more symlink to the build for that.
 CMAKE_ARGS=	-DLMDBXX_INCLUDE_DIR=${WRKSRC}/deps/lmdb \
 		-DTWEENY_INCLUDE_DIR=${WRKSRC}/deps/tweeny
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Nheko-Reborn
 GH_TUPLE=	drycpp:lmdbxx:0b43ca87d8cfabba392dfe884eb1edb83874de02:lmdb/deps/lmdb \
 		mobius3:tweeny:v3:tweeny/deps/tweeny
 
 post-extract:
 	cd ${WRKSRC}/deps/tweeny && ${LN} -s include tweeny
 
 # Includes <json.hpp> without referencing where it's installed,
 # so hackishly correct all the broken paths.
 post-patch:
 	${FIND} ${WRKSRC} -type f -print0 | \
 	${XARGS} -0 ${REINPLACE_CMD} \
 		-e 's+include <json.hpp>+include <nlohmann/json.hpp>+' \
 		-e 's+include "json.hpp"+include <nlohmann/json.hpp>+'
 
 .include <bsd.port.mk>
Index: head/security/olm/Makefile
===================================================================
--- head/security/olm/Makefile	(revision 503939)
+++ head/security/olm/Makefile	(revision 503940)
@@ -1,18 +1,18 @@
 # $FreeBSD$
 
 PORTNAME=	olm
 DISTVERSIONPREFIX=
-DISTVERSION=	3.0.0
+DISTVERSION=	3.1.2
 CATEGORIES=	security
-MASTER_SITES=	https://git.matrix.org/git/olm/snapshot/
+MASTER_SITES=	https://gitlab.matrix.org/matrix-org/olm/-/archive/${DISTVERSION}/
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Double Ratchet cryptographic ratchet in C++
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c++11-lang \
 		localbase:ldflags tar:bz2
 
 .include <bsd.port.mk>
Index: head/security/olm/distinfo
===================================================================
--- head/security/olm/distinfo	(revision 503939)
+++ head/security/olm/distinfo	(revision 503940)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553454378
-SHA256 (olm-3.0.0.tar.bz2) = 8ecbe3756eebe79aafc5331bd0b25d0a853792a774f7dbdf681d30363aed148d
-SIZE (olm-3.0.0.tar.bz2) = 444358
+TIMESTAMP = 1558431062
+SHA256 (olm-3.1.2.tar.bz2) = d09f9082cdbaf4d95b0a372affdf6129a6b451913831c5915e799877acab6d49
+SIZE (olm-3.1.2.tar.bz2) = 460046
Index: head/security/olm/pkg-descr
===================================================================
--- head/security/olm/pkg-descr	(revision 503939)
+++ head/security/olm/pkg-descr	(revision 503940)
@@ -1,5 +1,5 @@
 An implementation of the Double Ratchet cryptographic ratchet described by
 https://whispersystems.org/docs/specifications/doubleratchet/, written in C and
 C++11 and exposed as a C API.
 
-WWW: https://git.matrix.org/git/olm/about/
+WWW: https://gitlab.matrix.org/matrix-org/olm
Index: head/security/olm/pkg-plist
===================================================================
--- head/security/olm/pkg-plist	(revision 503939)
+++ head/security/olm/pkg-plist	(revision 503940)
@@ -1,11 +1,12 @@
 include/olm/inbound_group_session.h
 include/olm/olm.h
 include/olm/outbound_group_session.h
 include/olm/pk.h
+include/olm/sas.h
 lib/cmake/Olm/OlmConfig.cmake
 lib/cmake/Olm/OlmConfigVersion.cmake
 lib/cmake/Olm/OlmTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Olm/OlmTargets.cmake
 lib/libolm.so
 lib/libolm.so.3
-lib/libolm.so.3.0.0
+lib/libolm.so.3.1.2