Index: branches/2020Q2/net-im/dino/Makefile
===================================================================
--- branches/2020Q2/net-im/dino/Makefile	(revision 531120)
+++ branches/2020Q2/net-im/dino/Makefile	(revision 531121)
@@ -1,66 +1,66 @@
 # $FreeBSD$
 
 PORTNAME=		dino
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.1.0
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		net-im
 
 MAINTAINER=		ashish@FreeBSD.org
 COMMENT=		Modern XMPP Chat Client using GTK+/Vala
 
 LICENSE=		GPLv3
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	vala:lang/vala
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
 		libgee-0.8.so:devel/libgee \
 		libicuuc.so:devel/icu \
 		libsoup-2.4.so:devel/libsoup \
 		libassuan.so:security/libassuan \
 		libgpg-error.so:security/libgpg-error
 
 USES=		cmake desktop-file-utils gettext-tools gnome \
 		ninja pkgconfig
 
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=		OMEMO UPLOAD GNUPG
 OPTIONS_DEFAULT=	OMEMO UPLOAD GNUPG
 OPTIONS_SUB=		yes
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	SHARED_SIGNAL_PROTOCOL=yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 LDFLAGS+=	-Wl,--export-dynamic
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 USE_GNOME=	cairo gdkpixbuf2 glib20 gnomeprefix gtk30 intlhack
 
 OMEMO_DESC=		OMEMO plugin
 UPLOAD_DESC=		HTTP file upload plugin
+OMEMO_GH_TUPLE=	signalapp:libsignal-protocol-c:v2.3.2:signalapp/plugins/signal-protocol/libsignal-protocol-c
 OMEMO_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
-			libqrencode.so:graphics/libqrencode \
-			libsignal-protocol-c.so:net/libsignal
+			libqrencode.so:graphics/libqrencode
 OMEMO_VARS=		ENABLED_PLUGINS+=omemo
+OMEMO_CMAKE_BOOL=	BUILD_LIBSIGNAL_IN_TREE
 OMEMO_VARS_OFF=		DISABLED_PLUGINS+=omemo
 UPLOAD_VARS=		ENABLED_PLUGINS+=http-files
 UPLOAD_VARS_OFF=	DISABLED_PLUGINS+=http-files
 GNUPG_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GNUPG_VARS=		ENABLED_PLUGINS+=openpgp
 GNUPG_VARS_OFF=		DISABLED_PLUGINS+=openpgp
 
 CMAKE_ARGS+=	-DENABLED_PLUGINS="${ENABLED_PLUGINS:S/ /;/gW}"
 CMAKE_ARGS+=	-DDISABLED_PLUGINS="${DISABLED_PLUGINS:S/ /;/gW}"
 
 pre-everything::
 	@if [ -z "${PACKAGE_BUILDING}" ]; then if ! ${PKG_BIN} query \
 			'%o-%Ok-%Od' databases/sqlite3 | \
 			${GREP} -F -wq databases/sqlite3-UNICODE61-on; then \
 		${ECHO_MSG} "/!\ Please make sure databases/sqlite3 is built\
 			       with UNICODE61 option"; \
 	exit 1; \
 	fi; fi
 
 .include <bsd.port.mk>
Index: branches/2020Q2/net-im/dino/distinfo
===================================================================
--- branches/2020Q2/net-im/dino/distinfo	(revision 531120)
+++ branches/2020Q2/net-im/dino/distinfo	(revision 531121)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1581864392
+TIMESTAMP = 1585852332
 SHA256 (dino-dino-v0.1.0_GH0.tar.gz) = 202b7db322d85389b0bebc3c38976e7f7beaceddd1fc46b8123e50c6c7c07b8d
 SIZE (dino-dino-v0.1.0_GH0.tar.gz) = 442456
+SHA256 (signalapp-libsignal-protocol-c-v2.3.2_GH0.tar.gz) = f3826f3045352e14027611c95449bfcfe39bfd3d093d578c70f70eee0c85000d
+SIZE (signalapp-libsignal-protocol-c-v2.3.2_GH0.tar.gz) = 271930
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 531120)
+++ branches/2020Q2	(revision 531121)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r530404