net-p2p/bitmark: update to 0.15.0

Reviewed By: dmgk, arrowd

Differential Revision: https://reviews.freebsd.org/D37877

8 files changed, 40 insertions, 120 deletions

diff --git a/net-p2p/bitmark-cli/Makefile b/net-p2p/bitmark-cli/Makefile
index b559b609aba4..7aea218cd4a8 100644
--- a/net-p2p/bitmark-cli/Makefile
+++ b/net-p2p/bitmark-cli/Makefile
@@ -1,13 +1,14 @@
-MASTERDIR=	${.CURDIR}/../bitmark
 PKGNAMESUFFIX=	-cli
 
 COMMENT=	Bitmark distributed property system cli
 
-CONFLICTS?=	bitmark
+CONFLICTS=	bitmark
 
-OPTIONS_EXCLUDE=	DAEMON DUMPER RECORDER
-OPTIONS_DEFAULT=	CLI
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
-_SLAVE_PORT=	yes
+OPTIONS_SLAVE=		CLI
+OPTIONE_EXCLUDE=	DAEMON DUMPER RECORDER
+
+MASTERDIR=	${.CURDIR}/../../net-p2p/bitmark
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/bitmark-cli/distinfo b/net-p2p/bitmark-cli/distinfo
new file mode 100644
index 000000000000..40bc5aa6464d
--- /dev/null
+++ b/net-p2p/bitmark-cli/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1672288705
+SHA256 (go/net-p2p_bitmark-cli/bitmark-v0.15.1/v0.15.1.mod) = e2de7eef5cd2cf24c8e9aaf8ce36765a0c5ad37411d259a75f2af4d06b3f70e2
+SIZE (go/net-p2p_bitmark-cli/bitmark-v0.15.1/v0.15.1.mod) = 1913
+SHA256 (go/net-p2p_bitmark-cli/bitmark-v0.15.1/v0.15.1.zip) = a592dc136291c61e79b250ebf70deda3663e45fed308ce0393711bf2c2673ac3
+SIZE (go/net-p2p_bitmark-cli/bitmark-v0.15.1/v0.15.1.zip) = 740110
diff --git a/net-p2p/bitmark-daemon/Makefile b/net-p2p/bitmark-daemon/Makefile
index 42ff9551e154..35e903ca909c 100644
--- a/net-p2p/bitmark-daemon/Makefile
+++ b/net-p2p/bitmark-daemon/Makefile
@@ -1,13 +1,14 @@
-MASTERDIR=	${.CURDIR}/../bitmark
 PKGNAMESUFFIX=	-daemon
 
 COMMENT=	Bitmark distributed property system daemon
 
-CONFLICTS?=	bitmark
+CONFLICTS=	bitmark
 
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
+OPTIONS_SLAVE=		DAEMON
 OPTIONS_EXCLUDE=	CLI DUMPER RECORDER
-OPTIONS_DEFAULT=	DAEMON
 
-_SLAVE_PORT=	yes
+MASTERDIR=	${.CURDIR}/../../net-p2p/bitmark
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/bitmark-daemon/distinfo b/net-p2p/bitmark-daemon/distinfo
new file mode 100644
index 000000000000..685f66ec44bb
--- /dev/null
+++ b/net-p2p/bitmark-daemon/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1672289721
+SHA256 (go/net-p2p_bitmark-daemon/bitmark-v0.15.1/v0.15.1.mod) = e2de7eef5cd2cf24c8e9aaf8ce36765a0c5ad37411d259a75f2af4d06b3f70e2
+SIZE (go/net-p2p_bitmark-daemon/bitmark-v0.15.1/v0.15.1.mod) = 1913
+SHA256 (go/net-p2p_bitmark-daemon/bitmark-v0.15.1/v0.15.1.zip) = a592dc136291c61e79b250ebf70deda3663e45fed308ce0393711bf2c2673ac3
+SIZE (go/net-p2p_bitmark-daemon/bitmark-v0.15.1/v0.15.1.zip) = 740110
diff --git a/net-p2p/bitmark-recorder/Makefile b/net-p2p/bitmark-recorder/Makefile
index ccb7fc32296a..65197d924dfe 100644
--- a/net-p2p/bitmark-recorder/Makefile
+++ b/net-p2p/bitmark-recorder/Makefile
@@ -1,13 +1,14 @@
-MASTERDIR=	${.CURDIR}/../bitmark
 PKGNAMESUFFIX=	-recorder
 
 COMMENT=	Bitmark distributed property system recorder
 
-CONFLICTS?=	bitmark
+CONFLICTS=	bitmark
 
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
+OPTIONS_SLAVE=		RECORDER
 OPTIONS_EXCLUDE=	CLI DAEMON DUMPER
-OPTIONS_DEFAULT=	RECORDER
 
-_SLAVE_PORT=	yes
+MASTERDIR=	${.CURDIR}/../../net-p2p/bitmark
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/bitmark-recorder/distinfo b/net-p2p/bitmark-recorder/distinfo
new file mode 100644
index 000000000000..e0c3b664aac5
--- /dev/null
+++ b/net-p2p/bitmark-recorder/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1672289736
+SHA256 (go/net-p2p_bitmark-recorder/bitmark-v0.15.1/v0.15.1.mod) = e2de7eef5cd2cf24c8e9aaf8ce36765a0c5ad37411d259a75f2af4d06b3f70e2
+SIZE (go/net-p2p_bitmark-recorder/bitmark-v0.15.1/v0.15.1.mod) = 1913
+SHA256 (go/net-p2p_bitmark-recorder/bitmark-v0.15.1/v0.15.1.zip) = a592dc136291c61e79b250ebf70deda3663e45fed308ce0393711bf2c2673ac3
+SIZE (go/net-p2p_bitmark-recorder/bitmark-v0.15.1/v0.15.1.zip) = 740110
diff --git a/net-p2p/bitmark/Makefile b/net-p2p/bitmark/Makefile
index ca815d8ccd97..6891f3cc2397 100644
--- a/net-p2p/bitmark/Makefile
+++ b/net-p2p/bitmark/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	bitmark
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.13.3
-PORTREVISION=	7
+DISTVERSION=	0.15.1
 CATEGORIES=	net-p2p
 
 MAINTAINER=	hsw@bitmark.com
@@ -18,44 +17,11 @@ LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libzmq.so:net/libzmq4
 
 USES=		go:modules pkgconfig
-USE_GITHUB=	yes
-GH_ACCOUNT=	bitmark-inc:DEFAULT
-GH_PROJECT=	bitmarkd
-GH_TUPLE=	bitmark-inc:certgen:v0.1.1:bitmark_inc_certgen/vendor/github.com/bitmark-inc/certgen \
-		bitmark-inc:exitwithstatus:v0.1.2:bitmark_inc_exitwithstatus/vendor/github.com/bitmark-inc/exitwithstatus \
-		bitmark-inc:getoptions:v0.1.1:bitmark_inc_getoptions/vendor/github.com/bitmark-inc/getoptions \
-		bitmark-inc:go-argon2:v0.1.5:bitmark_inc_go_argon2/vendor/github.com/bitmark-inc/go-argon2 \
-		bitmark-inc:logger:v0.3.5:bitmark_inc_logger/vendor/github.com/bitmark-inc/logger \
-		bitmark-inc:btcd:16c0ce95d92a:btcsuite_btcd/vendor/github.com/btcsuite/btcd \
-		btcsuite:btclog:84c8d2346e9f:btcsuite_btclog/vendor/github.com/btcsuite/btclog \
-		btcsuite:btcutil:v1.0.2:btcsuite_btcutil/vendor/github.com/btcsuite/btcutil \
-		btcsuite:go-socks:4720035b7bfd:btcsuite_go_socks/vendor/github.com/btcsuite/go-socks \
-		cihub:seelog:f561c5e57575:cihub_seelog/vendor/github.com/cihub/seelog \
-		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
-		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \
-		golang:mock:v1.5.0:golang_mock/vendor/github.com/golang/mock \
-		golang:net:abc453219eb5:golang_net/vendor/golang.org/x/net \
-		golang:snappy:v0.0.3:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:35b2ab0089ea:golang_sys/vendor/golang.org/x/sys \
-		golang:term:a79de5458b56:golang_term/vendor/golang.org/x/term \
-		golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \
-		miekg:dns:v1.1.42:miekg_dns/vendor/github.com/miekg/dns \
-		mitchellh:mapstructure:v1.4.1:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
-		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
-		pebbe:zmq4:v1.2.7:pebbe_zmq4/vendor/github.com/pebbe/zmq4 \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		russross:blackfriday:v2.1.0:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
-		syndtr:goleveldb:v1.0.0:syndtr_goleveldb/vendor/github.com/syndtr/goleveldb \
-		urfave:cli:v1.22.5:urfave_cli/vendor/github.com/urfave/cli \
-		yuin:gluamapper:d836955830e7:yuin_gluamapper/vendor/github.com/yuin/gluamapper \
-		yuin:gopher-lua:f4c35e4016d9:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
+
+GO_MODULE=	github.com/bitmark-inc/bitmarkd
 GO_BUILDFLAGS+=	-ldflags="-X main.version=${DISTVERSION}"
 
-CONFLICTS=	bitmark-cli bitmark-daemon bitmark-recorder
+CONFLICTS?=	bitmark-cli bitmark-daemon bitmark-recorder
 
 OPTIONS_DEFINE=		CLI DAEMON DUMPER RECORDER
 OPTIONS_DEFAULT?=	CLI DAEMON RECORDER
@@ -87,8 +53,6 @@ RECORDER_VARS=		GO_TARGET+=./command/recorderd \
 			RECORDERD_RUN=/var/run/recorderd \
 			USERS+=bitmark-recorder
 
-_SLAVE_PORT?=	no
-
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS)
diff --git a/net-p2p/bitmark/distinfo b/net-p2p/bitmark/distinfo
index 4b6a34462438..df2969adbaaa 100644
--- a/net-p2p/bitmark/distinfo
+++ b/net-p2p/bitmark/distinfo
@@ -1,67 +1,5 @@
-TIMESTAMP = 1626164381
-SHA256 (bitmark-inc-bitmarkd-v0.13.3_GH0.tar.gz) = 516ec30d8f53a91b53592680feaea37f01e4937f4b459e20ee53e80d4e9ff848
-SIZE (bitmark-inc-bitmarkd-v0.13.3_GH0.tar.gz) = 484308
-SHA256 (bitmark-inc-certgen-v0.1.1_GH0.tar.gz) = 8f298113dc155afb0d8991afcc9611f9f6fa213d89c5d35a7fa7a526b1baaf7c
-SIZE (bitmark-inc-certgen-v0.1.1_GH0.tar.gz) = 2349
-SHA256 (bitmark-inc-exitwithstatus-v0.1.2_GH0.tar.gz) = 1c54ae7d58cfc09b252f2f62b295b11ce66dd0a4d17d28a742b49d39a5129073
-SIZE (bitmark-inc-exitwithstatus-v0.1.2_GH0.tar.gz) = 1813
-SHA256 (bitmark-inc-getoptions-v0.1.1_GH0.tar.gz) = 7d817d764b1b7bcec6d8110f906f805bb938904134f300df53330cc5b506dc47
-SIZE (bitmark-inc-getoptions-v0.1.1_GH0.tar.gz) = 4087
-SHA256 (bitmark-inc-go-argon2-v0.1.5_GH0.tar.gz) = d69504d16237caad9c0b24f5c26c54bae6a9d4fbd7a715744267d0083c8aa71a
-SIZE (bitmark-inc-go-argon2-v0.1.5_GH0.tar.gz) = 7339
-SHA256 (bitmark-inc-logger-v0.3.5_GH0.tar.gz) = 87f9e9cea36363b594d1340f4aa499c5800ed2a22d4747005e032b58f7b37d65
-SIZE (bitmark-inc-logger-v0.3.5_GH0.tar.gz) = 7933
-SHA256 (bitmark-inc-btcd-16c0ce95d92a_GH0.tar.gz) = 688439ef9fe9283cfd45a6a451bc6c1f191baff956ba603d79326524cdf5d09e
-SIZE (bitmark-inc-btcd-16c0ce95d92a_GH0.tar.gz) = 2845568
-SHA256 (btcsuite-btclog-84c8d2346e9f_GH0.tar.gz) = f31154671fc11e8731ef563f37a25dedc69819bc7f1c7d2395a58314e6b89ee1
-SIZE (btcsuite-btclog-84c8d2346e9f_GH0.tar.gz) = 7045
-SHA256 (btcsuite-btcutil-v1.0.2_GH0.tar.gz) = 8d28d8a43bf2e4c3492c103b57e27e149441f705eec5d05b811aa81d32299445
-SIZE (btcsuite-btcutil-v1.0.2_GH0.tar.gz) = 152694
-SHA256 (btcsuite-go-socks-4720035b7bfd_GH0.tar.gz) = 22c5444550941cc67c1117d2fcf2dcd3c3f0878c9af0386e7a818a3ac3d8338d
-SIZE (btcsuite-go-socks-4720035b7bfd_GH0.tar.gz) = 3391
-SHA256 (cihub-seelog-f561c5e57575_GH0.tar.gz) = e7fae3b72e1e5c5a3898ae76accd411903996e7ec75d7af3b97bba12dcdf762f
-SIZE (cihub-seelog-f561c5e57575_GH0.tar.gz) = 66529
-SHA256 (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576
-SIZE (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
-SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
-SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
-SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
-SHA256 (golang-crypto-c07d793c2f9a_GH0.tar.gz) = bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4
-SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) = 1732023
-SHA256 (golang-mock-v1.5.0_GH0.tar.gz) = 7a8212b8332072626d1ce440883929a28ab18450926bc5164d926c6e5cae61ff
-SIZE (golang-mock-v1.5.0_GH0.tar.gz) = 66429
-SHA256 (golang-net-abc453219eb5_GH0.tar.gz) = 4be86d74b852b0c8ed2eb9431e21e78b9d914edb611fb976bd98fdcb45b9a888
-SIZE (golang-net-abc453219eb5_GH0.tar.gz) = 1251746
-SHA256 (golang-snappy-v0.0.3_GH0.tar.gz) = c22541bf48b252b55ea0e618a5887e3d4f95c6ec5e46bbd60d1020366ffa2580
-SIZE (golang-snappy-v0.0.3_GH0.tar.gz) = 65976
-SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda
-SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752
-SHA256 (golang-sys-35b2ab0089ea_GH0.tar.gz) = ae3263474cd4232035eca625e6382d0bf27ee2367ff683a9722cf38d40fe44ac
-SIZE (golang-sys-35b2ab0089ea_GH0.tar.gz) = 1197183
-SHA256 (golang-term-a79de5458b56_GH0.tar.gz) = e2456003e6399902c70947a068f3e0f043de033c8ade1713d8d7294a5c6521ab
-SIZE (golang-term-a79de5458b56_GH0.tar.gz) = 14927
-SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb
-SIZE (golang-time-f8bda1e9f3ba_GH0.tar.gz) = 9656
-SHA256 (miekg-dns-v1.1.42_GH0.tar.gz) = 167b2c2c9cb96d07c97db2c46286914fb74d09be5b02d7149f4918782d675ccb
-SIZE (miekg-dns-v1.1.42_GH0.tar.gz) = 200831
-SHA256 (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = d936baa5006f7dda1346aff863745a110981f7583a1184e93b9077fa52cd4048
-SIZE (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = 27826
-SHA256 (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 3ab025f2f580f8818a5357db52596fef1b0ad5945816a022c8b805ba46dc93be
-SIZE (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 13572
-SHA256 (pebbe-zmq4-v1.2.7_GH0.tar.gz) = d7b6ca658d2c4bd8d1812b702024a39c95e851ddeca6697c6fc1879d4ddddb4a
-SIZE (pebbe-zmq4-v1.2.7_GH0.tar.gz) = 121333
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (russross-blackfriday-v2.1.0_GH0.tar.gz) = a13af0fc5305713f5154693feaf654d024689efea76390091a5e8c757335b4f4
-SIZE (russross-blackfriday-v2.1.0_GH0.tar.gz) = 92896
-SHA256 (syndtr-goleveldb-v1.0.0_GH0.tar.gz) = c80191f7f77b41d6cb3d1c6de1d42a9b8177656ee49c256d2df2b95a893cf8b8
-SIZE (syndtr-goleveldb-v1.0.0_GH0.tar.gz) = 142710
-SHA256 (urfave-cli-v1.22.5_GH0.tar.gz) = 57138657dd61c81e21b52cfb1aa5c97ad5c9379197fa7fb550051e59056eb30f
-SIZE (urfave-cli-v1.22.5_GH0.tar.gz) = 78125
-SHA256 (yuin-gluamapper-d836955830e7_GH0.tar.gz) = 966a0062fa11526c7eb3b97a7b47a24be792cc60babaab93a918f15f113fcad4
-SIZE (yuin-gluamapper-d836955830e7_GH0.tar.gz) = 3472
-SHA256 (yuin-gopher-lua-f4c35e4016d9_GH0.tar.gz) = 4694620cb5ae735933bdd5bb7921de0daa0ed930c0e877cb8f2049d9fbeca16b
-SIZE (yuin-gopher-lua-f4c35e4016d9_GH0.tar.gz) = 162941
+TIMESTAMP = 1672288705
+SHA256 (go/net-p2p_bitmark/bitmark-v0.15.1/v0.15.1.mod) = e2de7eef5cd2cf24c8e9aaf8ce36765a0c5ad37411d259a75f2af4d06b3f70e2
+SIZE (go/net-p2p_bitmark/bitmark-v0.15.1/v0.15.1.mod) = 1913
+SHA256 (go/net-p2p_bitmark/bitmark-v0.15.1/v0.15.1.zip) = a592dc136291c61e79b250ebf70deda3663e45fed308ce0393711bf2c2673ac3
+SIZE (go/net-p2p_bitmark/bitmark-v0.15.1/v0.15.1.zip) = 740110