Date: Thu, 26 Mar 2020 09:02:18 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529170 - head/net-im/signal-cli Message-ID: <202003260902.02Q92IQq006263@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: 0mp Date: Thu Mar 26 09:02:17 2020 New Revision: 529170 URL: https://svnweb.freebsd.org/changeset/ports/529170 Log: Chase devel/libmatthew plist changes Also: - Bring back vendored libmatthew JARs. It turns out that the build script is not picking up the ports version of libmatthew when generating the signal-cli script (share/signal-cli/bin/signal-cli). Use the vendored version for now. - Remove an unnecessary comment. Modified: head/net-im/signal-cli/Makefile head/net-im/signal-cli/distinfo Modified: head/net-im/signal-cli/Makefile ============================================================================== --- head/net-im/signal-cli/Makefile Thu Mar 26 08:55:42 2020 (r529169) +++ head/net-im/signal-cli/Makefile Thu Mar 26 09:02:17 2020 (r529170) @@ -3,6 +3,7 @@ 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 \ @@ -14,6 +15,9 @@ MASTER_SITES= https://raw.github.com/AsamK/maven/maste 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 \ @@ -23,6 +27,8 @@ 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 \ @@ -33,7 +39,8 @@ DISTFILES= argparse4j-0.8.1.jar:_argparse4j \ 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 @@ -41,10 +48,9 @@ COMMENT= Command-line and D-Bus interface for Signal a 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 @@ -92,7 +98,6 @@ do-install: --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 \ @@ -108,9 +113,6 @@ post-install-DBUS-on: # 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} \ Modified: head/net-im/signal-cli/distinfo ============================================================================== --- head/net-im/signal-cli/distinfo Thu Mar 26 08:55:42 2020 (r529169) +++ head/net-im/signal-cli/distinfo Thu Mar 26 09:02:17 2020 (r529170) @@ -1,4 +1,4 @@ -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 @@ -7,6 +7,10 @@ SHA256 (curve25519-java-0.5.0.jar) = 0aadd43cf01d11e9b 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 @@ -29,5 +33,7 @@ SHA256 (signal-service-java-2.13.9_unofficial_1.jar) = 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003260902.02Q92IQq006263>