Update to 0.6.6

While here:
- Add D-Bus as a runtime dependency.
- Simplify do-install.

Reported by:	Repology

3 files changed, 40 insertions, 34 deletions

diff --git a/net-im/signal-cli/Makefile b/net-im/signal-cli/Makefile
index edaa128b5f7e..ba6306be580a 100644
--- a/net-im/signal-cli/Makefile
+++ b/net-im/signal-cli/Makefile
@@ -2,16 +2,17 @@
 
 PORTNAME=	signal-cli
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.5
+DISTVERSION=	0.6.6
 PORTREVISION=	2
 CATEGORIES=	net-im java
 MASTER_SITES=	https://raw.github.com/AsamK/maven/master/releases/org/freedesktop/dbus/dbus-java/2.7.0/:_dbus_java \
 		https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.9.0/:_jackson_annotations \
 		https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.9.9/:_jackson_core \
 		https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.9.9.2/:_jackson_databind \
-		https://repo.maven.apache.org/maven2/com/github/turasa/signal-service-java/2.13.9_unofficial_1/:_signal_service_java \
-		https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/2.5.0/:_protobuf_java \
-		https://repo.maven.apache.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.10.7/:_libphonenumber \
+		https://repo.maven.apache.org/maven2/com/github/turasa/signal-service-java/2.15.3_unofficial_5/:_signal_service_java \
+		https://repo.maven.apache.org/maven2/com/github/turasa/zkgroups/2.15.3_unofficial_5/:_zkgroups \
+		https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.10.0/:_protobuf_javalite \
+		https://repo.maven.apache.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.11.0/:_libphonenumber \
 		https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/:_okhttp \
 		https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/:_okio \
 		https://repo.maven.apache.org/maven2/net/sourceforge/argparse4j/argparse4j/0.8.1/:_argparse4j \
@@ -19,10 +20,10 @@ MASTER_SITES=	https://raw.github.com/AsamK/maven/master/releases/org/freedesktop
 		https://repo.maven.apache.org/maven2/org/abstractj/libmatthew/hexdump/0.2.1/:_hexdump \
 		https://repo.maven.apache.org/maven2/org/abstractj/libmatthew/unix/0.5.1/:_unix \
 		https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.64/:_bcprov_jdk15on \
-		https://repo.maven.apache.org/maven2/org/signal/signal-metadata-java/0.0.3/:_signal_metadata_java \
+		https://repo.maven.apache.org/maven2/org/signal/signal-metadata-java/0.1.0/:_signal_metadata_java \
 		https://repo.maven.apache.org/maven2/org/threeten/threetenbp/1.3.6/:_threetenbp \
 		https://repo.maven.apache.org/maven2/org/whispersystems/curve25519-java/0.5.0/:_curve25519_java \
-		https://repo.maven.apache.org/maven2/org/whispersystems/signal-protocol-java/2.7.1/:_signal_protocol_java
+		https://repo.maven.apache.org/maven2/org/whispersystems/signal-protocol-java/2.8.1/:_signal_protocol_java
 DISTFILES=	argparse4j-0.8.1.jar:_argparse4j \
 		bcprov-jdk15on-1.64.jar:_bcprov_jdk15on \
 		curve25519-java-0.5.0.jar:_curve25519_java \
@@ -32,15 +33,16 @@ DISTFILES=	argparse4j-0.8.1.jar:_argparse4j \
 		jackson-annotations-2.9.0.jar:_jackson_annotations \
 		jackson-core-2.9.9.jar:_jackson_core \
 		jackson-databind-2.9.9.2.jar:_jackson_databind \
-		libphonenumber-8.10.7.jar:_libphonenumber \
+		libphonenumber-8.11.0.jar:_libphonenumber \
 		okhttp-3.12.1.jar:_okhttp \
 		okio-1.15.0.jar:_okio \
-		protobuf-java-2.5.0.jar:_protobuf_java \
-		signal-metadata-java-0.0.3.jar:_signal_metadata_java \
-		signal-protocol-java-2.7.1.jar:_signal_protocol_java \
-		signal-service-java-2.13.9_unofficial_1.jar:_signal_service_java \
+		protobuf-javalite-3.10.0.jar:_protobuf_javalite \
+		signal-metadata-java-0.1.0.jar:_signal_metadata_java \
+		signal-protocol-java-2.8.1.jar:_signal_protocol_java \
+		signal-service-java-2.15.3_unofficial_5.jar:_signal_service_java \
 		threetenbp-1.3.6.jar:_threetenbp \
-		unix-0.5.1.jar:_unix
+		unix-0.5.1.jar:_unix \
+		zkgroups-2.15.3_unofficial_5.jar:_zkgroups
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	0mp@FreeBSD.org
@@ -70,6 +72,7 @@ OPTIONS_DEFAULT=	DBUS
 
 DBUS_PLIST_FILES=	etc/dbus-1/system.d/org.asamk.Signal.conf \
 			share/dbus-1/services/org.asamk.Signal.service
+DBUS_RUN_DEPENDS=	dbus>0:devel/dbus
 
 _GRADLE_CMD=		${LOCALBASE}/bin/gradle
 _GRADLE_ARGS=		--no-daemon --offline --quiet
@@ -94,9 +97,9 @@ do-build:
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${TAR} -x -f ${WRKSRC}/build/distributions/${PORTNAME}-${DISTVERSION}.tar \
-		-C ${STAGEDIR}${DATADIR} --strip-components 1 \
-		--exclude '*/bin/*.bat'
-	@${REINPLACE_CMD} -e 's|#!/usr/bin/env sh|#!/bin/sh|g' \
+		-C ${STAGEDIR}${DATADIR} --strip-components 1
+	@${RM} ${STAGEDIR}${DATADIR}/bin/*.bat
+	@${REINPLACE_CMD} -i "" -e 's|#!/usr/bin/env sh|#!/bin/sh|g' \
 		${STAGEDIR}${DATADIR}/bin/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/net-im/signal-cli/distinfo b/net-im/signal-cli/distinfo
index 29d264a662e3..7bdb180c3fc5 100644
--- a/net-im/signal-cli/distinfo
+++ b/net-im/signal-cli/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1585213120
+TIMESTAMP = 1585657809
 SHA256 (argparse4j-0.8.1.jar) = 98cb5468cac609f3bc07856f2e34088f50dc114181237c48d20ca69c3265d044
 SIZE (argparse4j-0.8.1.jar) = 110140
 SHA256 (bcprov-jdk15on-1.64.jar) = a4f463ce552b908a722fa198ef4892a226b3225e453f8df10d5c0a5bfe5db6b6
@@ -17,23 +17,25 @@ SHA256 (jackson-core-2.9.9.jar) = 3083079be6088db2ed0a0c6ff92204e0aa48fa1de9db5b
 SIZE (jackson-core-2.9.9.jar) = 325632
 SHA256 (jackson-databind-2.9.9.2.jar) = fb262d42ea2de98044b62d393950a5aa050435fec38bbcadf2325cf7dc41b848
 SIZE (jackson-databind-2.9.9.2.jar) = 1348331
-SHA256 (libphonenumber-8.10.7.jar) = dbf4bf566d17a60044c19e282a619684e4b4abb0f9f9f24f843c55d19826ab5e
-SIZE (libphonenumber-8.10.7.jar) = 338097
+SHA256 (libphonenumber-8.11.0.jar) = 833ec343e55a6910daca392af76f8e09caaab9c4e3f41ded83f4746e7ef389c7
+SIZE (libphonenumber-8.11.0.jar) = 344378
 SHA256 (okhttp-3.12.1.jar) = 07c3d82ca7eaf4722f00b2da807dc7860f6169ae60cfedcf5d40218f90880a46
 SIZE (okhttp-3.12.1.jar) = 422787
 SHA256 (okio-1.15.0.jar) = 693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2
 SIZE (okio-1.15.0.jar) = 88732
-SHA256 (protobuf-java-2.5.0.jar) = e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74
-SIZE (protobuf-java-2.5.0.jar) = 533455
-SHA256 (signal-metadata-java-0.0.3.jar) = 2ce71cc4ec5dacfbaef4a265fceef61b8a09696b541994106a22a946762cbdcc
-SIZE (signal-metadata-java-0.0.3.jar) = 88407
-SHA256 (signal-protocol-java-2.7.1.jar) = 7f6df67a963acbab7716424b01b12fa7279f18a9623a2a7c8ba7b1c285830168
-SIZE (signal-protocol-java-2.7.1.jar) = 379527
-SHA256 (signal-service-java-2.13.9_unofficial_1.jar) = 0f8680dad82826cf156c0878a291f7d8e878c5f11232711d2a2a914d51b058cd
-SIZE (signal-service-java-2.13.9_unofficial_1.jar) = 939644
+SHA256 (protobuf-javalite-3.10.0.jar) = 215a94dbe100130295906b531bb72a26965c7ac8fcd9a75bf8054a8ac2abf4b4
+SIZE (protobuf-javalite-3.10.0.jar) = 690955
+SHA256 (signal-metadata-java-0.1.0.jar) = f3faa23b7d9b5096d12979c35679d1e3b5e007522d8bef167a28e456f2a7c7d9
+SIZE (signal-metadata-java-0.1.0.jar) = 63456
+SHA256 (signal-protocol-java-2.8.1.jar) = b19db36839ab008fdccefc7f8c005f2ea43dc7c7298a209bc424e6f9b6d5617b
+SIZE (signal-protocol-java-2.8.1.jar) = 269033
+SHA256 (signal-service-java-2.15.3_unofficial_5.jar) = 65f09b825b16b4c4def7ad8728c106bd585bc983b8ef4338f175a75e6bf30cf7
+SIZE (signal-service-java-2.15.3_unofficial_5.jar) = 1012745
 SHA256 (threetenbp-1.3.6.jar) = f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7
 SIZE (threetenbp-1.3.6.jar) = 514875
 SHA256 (unix-0.5.1.jar) = 6e4afe48baf01c036a2f11d99aa94410aede15c62636c6516fcecd458c96d123
 SIZE (unix-0.5.1.jar) = 10873
-SHA256 (AsamK-signal-cli-v0.6.5_GH0.tar.gz) = 1b6fda64ff24e7c5d97506b4b01988d1572cc706fd7fcec7b50555b691f31994
-SIZE (AsamK-signal-cli-v0.6.5_GH0.tar.gz) = 116626
+SHA256 (zkgroups-2.15.3_unofficial_5.jar) = 8afce9141d82cecef700e8b24e08e88cac22f44179a737163e3ed68d588d1746
+SIZE (zkgroups-2.15.3_unofficial_5.jar) = 6606
+SHA256 (AsamK-signal-cli-v0.6.6_GH0.tar.gz) = 8b2f49f22593d7eed0a344b737903f73982e89fed7fca54f1706048db0975fca
+SIZE (AsamK-signal-cli-v0.6.6_GH0.tar.gz) = 129146
diff --git a/net-im/signal-cli/pkg-plist b/net-im/signal-cli/pkg-plist
index 14aaca8e8ef1..b2f47db8c616 100644
--- a/net-im/signal-cli/pkg-plist
+++ b/net-im/signal-cli/pkg-plist
@@ -10,13 +10,14 @@ share/man/man1/signal-cli.1.gz
 %%DATADIR%%/lib/jackson-annotations-2.9.0.jar
 %%DATADIR%%/lib/jackson-core-2.9.9.jar
 %%DATADIR%%/lib/jackson-databind-2.9.9.2.jar
-%%DATADIR%%/lib/libphonenumber-8.10.7.jar
+%%DATADIR%%/lib/libphonenumber-8.11.0.jar
 %%DATADIR%%/lib/okhttp-3.12.1.jar
 %%DATADIR%%/lib/okio-1.15.0.jar
-%%DATADIR%%/lib/protobuf-java-2.5.0.jar
-%%DATADIR%%/lib/signal-cli-0.6.5.jar
-%%DATADIR%%/lib/signal-metadata-java-0.0.3.jar
-%%DATADIR%%/lib/signal-protocol-java-2.7.1.jar
-%%DATADIR%%/lib/signal-service-java-2.13.9_unofficial_1.jar
+%%DATADIR%%/lib/protobuf-javalite-3.10.0.jar
+%%DATADIR%%/lib/signal-cli-0.6.6.jar
+%%DATADIR%%/lib/signal-metadata-java-0.1.0.jar
+%%DATADIR%%/lib/signal-protocol-java-2.8.1.jar
+%%DATADIR%%/lib/signal-service-java-2.15.3_unofficial_5.jar
 %%DATADIR%%/lib/threetenbp-1.3.6.jar
 %%DATADIR%%/lib/unix-0.5.1.jar
+%%DATADIR%%/lib/zkgroups-2.15.3_unofficial_5.jar