Index: head/net-im/signal-cli/Makefile
===================================================================
--- head/net-im/signal-cli/Makefile	(revision 529169)
+++ head/net-im/signal-cli/Makefile	(revision 529170)
@@ -1,121 +1,123 @@
 # $FreeBSD$
 
 PORTNAME=	signal-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.5
+PORTREVISION=	1
 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/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 \
+		https://repo.maven.apache.org/maven2/org/abstractj/libmatthew/debug/1.1.1/:_debug \
+		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/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
 DISTFILES=	argparse4j-0.8.1.jar:_argparse4j \
 		bcprov-jdk15on-1.64.jar:_bcprov_jdk15on \
 		curve25519-java-0.5.0.jar:_curve25519_java \
 		dbus-java-2.7.0.jar:_dbus_java \
+		debug-1.1.1.jar:_debug \
+		hexdump-0.2.1.jar:_hexdump \
 		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 \
 		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 \
-		threetenbp-1.3.6.jar:_threetenbp
+		threetenbp-1.3.6.jar:_threetenbp \
+		unix-0.5.1.jar:_unix
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Command-line and D-Bus interface for Signal and libsignal-service-java
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/jni/libunix-java.so:devel/libmatthew \
-		asciidoc>0:textproc/asciidoc \
+BUILD_DEPENDS=	asciidoc>0:textproc/asciidoc \
 		gradle>0:devel/gradle
-RUN_DEPENDS=	${LOCALBASE}/lib/jni/libunix-java.so:devel/libmatthew
+LIB_DEPENDS=	libunix-java.so:devel/libmatthew
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	AsamK
 USE_JAVA=	yes
 JAVA_VERSION=	7+
 
 NO_ARCH=	yes
 
 SUB_FILES=	${PORTNAME}
 
 USERS=		signal-cli
 GROUPS=		signal-cli
 
 OPTIONS_DEFINE=		DBUS
 OPTIONS_DEFAULT=	DBUS
 
 DBUS_PLIST_FILES=	etc/dbus-1/system.d/org.asamk.Signal.conf \
 			share/dbus-1/services/org.asamk.Signal.service
 
 _GRADLE_CMD=		${LOCALBASE}/bin/gradle
 _GRADLE_ARGS=		--no-daemon --offline --quiet
 _GRADLE_DEPS_DIR=	${WRKDIR}/gradle-deps
 
 post-extract:
 	@${MKDIR} ${_GRADLE_DEPS_DIR}
 .for distfile in ${DISTFILES:N${DISTNAME}:C/:_[0-9A-Za-z_]*$//}
 	@${CP} ${DISTDIR}/${distfile} ${_GRADLE_DEPS_DIR}/
 .endfor
 	@${MV} ${WRKSRC}/build.gradle ${WRKSRC}/original-build.gradle
 	@${SED} -e 's|%%GRADLE_DEPS_DIR%%|${_GRADLE_DEPS_DIR}|g' \
 		${FILESDIR}/build.gradle.in \
 		> ${WRKSRC}/build.gradle
 
 do-build:
 	(cd ${WRKSRC} && \
 		${SETENV} GRADLE_USER_HOME=${WRKDIR} \
 		${_GRADLE_CMD} ${_GRADLE_ARGS} build installDist distTar)
 	${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/gmake -C ${WRKSRC}/man
 
 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' \
 		${STAGEDIR}${DATADIR}/bin/${PORTNAME}
-# ${RLN} ${STAGEDIR}${DATADIR}/bin/${PORTNAME} #         ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/man/signal-cli.1 \
 		${STAGEDIR}${MAN1PREFIX}/share/man/man1
 
 post-install-DBUS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/services
 	${INSTALL_DATA} ${WRKSRC}/data/org.asamk.Signal.service \
 		${STAGEDIR}${PREFIX}/share/dbus-1/services
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d
 	${INSTALL_DATA} ${WRKSRC}/data/org.asamk.Signal.conf \
 		${STAGEDIR}${PREFIX}/etc/dbus-1/system.d
 
 # This target can be used by the maintainer to regenerate MASTER_SITES and
 # DISTFILES from project's build.gradle.
-#
-# Make sure not to add the following JARs from the vendored libmatthew:
-# debug-*.jar, hexdump-*.jar, and unix-*.jar.
 _get-links: extract
 	@(cd ${WRKSRC} && \
 		${_GRADLE_CMD} \
 		--build-file ${WRKSRC}/build.gradle \
 		getURLofDependencyArtifact | \
 		${AWK} '/^MASTER_SITES/,/^$$/{print}' | ${SORT})
 
 .include <bsd.port.mk>
Index: head/net-im/signal-cli/distinfo
===================================================================
--- head/net-im/signal-cli/distinfo	(revision 529169)
+++ head/net-im/signal-cli/distinfo	(revision 529170)
@@ -1,33 +1,39 @@
-TIMESTAMP = 1585172926
+TIMESTAMP = 1585213120
 SHA256 (argparse4j-0.8.1.jar) = 98cb5468cac609f3bc07856f2e34088f50dc114181237c48d20ca69c3265d044
 SIZE (argparse4j-0.8.1.jar) = 110140
 SHA256 (bcprov-jdk15on-1.64.jar) = a4f463ce552b908a722fa198ef4892a226b3225e453f8df10d5c0a5bfe5db6b6
 SIZE (bcprov-jdk15on-1.64.jar) = 4771726
 SHA256 (curve25519-java-0.5.0.jar) = 0aadd43cf01d11e9b58f867b3c4f25c3194e8b0623d1953d32dfbfbee009e38d
 SIZE (curve25519-java-0.5.0.jar) = 124921
 SHA256 (dbus-java-2.7.0.jar) = 83db0cc9e7c72ff68cc5790fba76af1b3289fbdd10897609cec85c662207cc38
 SIZE (dbus-java-2.7.0.jar) = 151953
+SHA256 (debug-1.1.1.jar) = 866458f4a8ce216ca4bb8685c5bf7c7d3403267f8841dd5eae89ff4312397e11
+SIZE (debug-1.1.1.jar) = 5481
+SHA256 (hexdump-0.2.1.jar) = 9c8c798b2be389fb9bf6413d231e5ca36816339f0aafeedc976b41972000e49d
+SIZE (hexdump-0.2.1.jar) = 3478
 SHA256 (jackson-annotations-2.9.0.jar) = 45d32ac61ef8a744b464c54c2b3414be571016dd46bfc2bec226761cf7ae457a
 SIZE (jackson-annotations-2.9.0.jar) = 66519
 SHA256 (jackson-core-2.9.9.jar) = 3083079be6088db2ed0a0c6ff92204e0aa48fa1de9db5b59c468f35acf882c2c
 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 (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 (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