Index: head/net-im/signal-cli/Makefile =================================================================== --- head/net-im/signal-cli/Makefile +++ head/net-im/signal-cli/Makefile @@ -2,12 +2,12 @@ PORTNAME= signal-cli DISTVERSIONPREFIX= v -DISTVERSION= 0.6.12 +DISTVERSION= 0.7.1 CATEGORIES= net-im java MASTER_SITES= 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/hypfvieh/dbus-java/3.2.3/:_dbus_java \ + https://repo.maven.apache.org/maven2/com/github/hypfvieh/dbus-java/3.2.4/:_dbus_java \ https://repo.maven.apache.org/maven2/com/github/hypfvieh/java-utils/1.0.6/:_java_utils \ https://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.23/:_jffi \ https://repo.maven.apache.org/maven2/com/github/jnr/jnr-a64asm/1.0.0/:_jnr_a64asm \ @@ -48,7 +48,7 @@ asm-util-7.1.jar:_asm_util \ bcprov-jdk15on-1.67.jar:_bcprov_jdk15on \ curve25519-java-0.5.0.jar:_curve25519_java \ - dbus-java-3.2.3.jar:_dbus_java \ + dbus-java-3.2.4.jar:_dbus_java \ 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 \ @@ -89,8 +89,10 @@ BROKEN_FreeBSD_11_amd64= fails to build: Gradle build daemon disappeared unexpectedly -BUILD_DEPENDS= asciidoc>0:textproc/asciidoc \ - gradle>0:devel/gradle +EXTRACT_DEPENDS= zip:archivers/zip +BUILD_DEPENDS= asciidoc>0:textproc/asciidoc \ + gradle>0:devel/gradle +LIB_DEPENDS= libzkgroup.so:net-im/zkgroup USES= gmake USE_GITHUB= yes @@ -132,6 +134,10 @@ -e 's|%%ORIGINAL_BUILD_GRADLE%%|${_ORIGINAL_BUILD_GRADLE}|g' \ ${FILESDIR}/build.gradle.in \ > ${WRKSRC}/build.gradle + +# Delete the bundled library from the JAR. Otherwise, it is going to +# conflict with the library installed by net-im/zkgroup. + zip -d ${_GRADLE_DEPS_DIR}/zkgroup-java-*.jar libzkgroup.so do-build: (cd ${WRKSRC} && \ Index: head/net-im/signal-cli/distinfo =================================================================== --- head/net-im/signal-cli/distinfo +++ head/net-im/signal-cli/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1606072566 +TIMESTAMP = 1608612955 SHA256 (annotations-13.0.jar) = ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 SIZE (annotations-13.0.jar) = 17536 SHA256 (argparse4j-0.8.1.jar) = 98cb5468cac609f3bc07856f2e34088f50dc114181237c48d20ca69c3265d044 @@ -17,8 +17,8 @@ SIZE (bcprov-jdk15on-1.67.jar) = 5961136 SHA256 (curve25519-java-0.5.0.jar) = 0aadd43cf01d11e9b58f867b3c4f25c3194e8b0623d1953d32dfbfbee009e38d SIZE (curve25519-java-0.5.0.jar) = 124921 -SHA256 (dbus-java-3.2.3.jar) = b8bc0a5b884b01bd59f40675cadaaa33f7a6a93e3879d02ef6891eb0931fc78f -SIZE (dbus-java-3.2.3.jar) = 285491 +SHA256 (dbus-java-3.2.4.jar) = 746154f528eba7c75f00cdd366153a2e29836c033d2b71eace1872efb4f2c4e8 +SIZE (dbus-java-3.2.4.jar) = 285562 SHA256 (jackson-annotations-2.9.0.jar) = 45d32ac61ef8a744b464c54c2b3414be571016dd46bfc2bec226761cf7ae457a SIZE (jackson-annotations-2.9.0.jar) = 66519 SHA256 (jackson-core-2.9.9.jar) = 3083079be6088db2ed0a0c6ff92204e0aa48fa1de9db5b59c468f35acf882c2c @@ -71,5 +71,5 @@ SIZE (zkgroup-java-0.7.0.jar) = 316995 SHA256 (jffi-1.2.23-native.jar) = 38cd5c33c4310d173b9345348e3a09528051b8e67f00e8477140c45062034a25 SIZE (jffi-1.2.23-native.jar) = 795222 -SHA256 (AsamK-signal-cli-v0.6.12_GH0.tar.gz) = 0d2e9548994e95050ea58451a06b240c08ea9c5d2b794eb97e2c8a86c8197aab -SIZE (AsamK-signal-cli-v0.6.12_GH0.tar.gz) = 139436 +SHA256 (AsamK-signal-cli-v0.7.1_GH0.tar.gz) = 5999891f60f2f87244bdf66564b75974a75fbd2b7b4b2bc72851bea8fdf00d0e +SIZE (AsamK-signal-cli-v0.7.1_GH0.tar.gz) = 155514 Index: head/net-im/signal-cli/pkg-plist =================================================================== --- head/net-im/signal-cli/pkg-plist +++ head/net-im/signal-cli/pkg-plist @@ -10,7 +10,7 @@ %%DATADIR%%/lib/asm-util-7.1.jar %%DATADIR%%/lib/bcprov-jdk15on-1.67.jar %%DATADIR%%/lib/curve25519-java-0.5.0.jar -%%DATADIR%%/lib/dbus-java-3.2.3.jar +%%DATADIR%%/lib/dbus-java-3.2.4.jar %%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