irc/soju: Update to 0.1.1

2 files changed, 39 insertions, 30 deletions

diff --git a/irc/soju/Makefile b/irc/soju/Makefile
index d54913779a69..d83de5dd3140 100644
--- a/irc/soju/Makefile
+++ b/irc/soju/Makefile
@@ -1,8 +1,11 @@
 PORTNAME=	soju
-DISTVERSION=	0.0.20201214
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.1
 CATEGORIES=	irc
-MASTER_SITES=	https://git.sr.ht/~emersion/go-scfg/archive/:goscfg
-DISTFILES=	${GO_SCFG_REV}.tar.gz:goscfg
+MASTER_SITES=	https://git.sr.ht/~emersion/go-scfg/archive/:goscfg \
+		https://git.sr.ht/~sircmpwn/go-bare/archive/:gobare
+DISTFILES=	${GO_SCFG_REV}.tar.gz:goscfg \
+		${GO_BARE_REV}.tar.gz:gobare
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	IRC bouncer
@@ -17,18 +20,19 @@ OPTIONS_DEFINE=		DOCS
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emersion
-GH_TAGNAME=	0ddc0de
 GH_TUPLE=	emersion:go-sasl:7bfe0ed36a21:emersion_go_sasl/vendor/github.com/emersion/go-sasl \
-		go-irc:irc:v3.1.3:go_irc_irc/vendor/gopkg.in/irc.v3 \
-		golang:crypto:9e8e0b390897:golang_crypto/vendor/golang.org/x/crypto \
-		golang:sys:9f70ab9862d5:golang_sys/vendor/golang.org/x/sys \
+		go-irc:irc:v3.1.4:go_irc_irc/vendor/gopkg.in/irc.v3 \
+		golang:crypto:0c34fe9e7dc2:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sys:4fbd30eecc44:golang_sys/vendor/golang.org/x/sys \
+		golang:term:de623e64d2a6:golang_term/vendor/golang.org/x/term \
 		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
-		klauspost:compress:v1.11.1:klauspost_compress/vendor/github.com/klauspost/compress \
-		mattn:go-sqlite3:v1.14.4:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
-		pires:go-proxyproto:v0.2.0:pires_go_proxyproto/vendor/github.com/pires/go-proxyproto \
-		nhooyr:websocket:v1.8.6:nhooyr_websocket/vendor/nhooyr.io/websocket
-GO_SCFG_REV=	142a8aa629fc
+		klauspost:compress:v1.11.13:klauspost_compress/vendor/github.com/klauspost/compress \
+		mattn:go-sqlite3:v1.14.6:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
+		nhooyr:websocket:v1.8.6:nhooyr_websocket/vendor/nhooyr.io/websocket \
+		pires:go-proxyproto:v0.5.0:pires_go_proxyproto/vendor/github.com/pires/go-proxyproto
 
+GO_BARE_REV=	46f9b5e5bcf9
+GO_SCFG_REV=	142a8aa629fc
 GO_PKGNAME=	./cmd/soju ./cmd/sojuctl
 PLIST_FILES=	bin/soju \
 		bin/sojuctl
@@ -37,8 +41,9 @@ DOCS_BUILD_DEPENDS=	scdoc:textproc/scdoc
 DOCS_PLIST_FILES=	man/man1/soju.1.gz
 
 post-extract:
-	${MKDIR} ${WRKSRC}/vendor/git.sr.ht/~emersion
+	${MKDIR} ${WRKSRC}/vendor/git.sr.ht/~emersion ${WRKSRC}/vendor/git.sr.ht/~sircmpwn
 	${MV} ${WRKDIR}/go-scfg-${GO_SCFG_REV} ${WRKSRC}/vendor/git.sr.ht/~emersion/go-scfg
+	${MV} ${WRKDIR}/go-bare-${GO_BARE_REV} ${WRKSRC}/vendor/git.sr.ht/~sircmpwn/go-bare
 
 post-build-DOCS-on:
 	${LOCALBASE}/bin/scdoc <${WRKSRC}/doc/${PORTNAME}.1.scd >${WRKSRC}/doc/${PORTNAME}.1
diff --git a/irc/soju/distinfo b/irc/soju/distinfo
index 4b8aa7450166..6e24ae61d035 100644
--- a/irc/soju/distinfo
+++ b/irc/soju/distinfo
@@ -1,23 +1,27 @@
-TIMESTAMP = 1608214453
-SHA256 (142a8aa629fc.tar.gz) = 20ce2e87df7c3d55486b7be98694c8cf3b9ca626b2785f470e723f291d880fa1
-SIZE (142a8aa629fc.tar.gz) = 3118
-SHA256 (emersion-soju-0.0.20201214-0ddc0de_GH0.tar.gz) = 8466d19f82f26c9deb58912692885964d16b46d0aea3ea7c68f7aa381bbb9e0a
-SIZE (emersion-soju-0.0.20201214-0ddc0de_GH0.tar.gz) = 69092
+TIMESTAMP = 1619255176
+SHA256 (142a8aa629fc.tar.gz) = e4207bf970ca3bee03c7e71759af7dbe8f937fcf7a34a541af10ea2c7109a216
+SIZE (142a8aa629fc.tar.gz) = 3112
+SHA256 (46f9b5e5bcf9.tar.gz) = 01aa61b23e1e4e01443ccfaf94b3dded8b3e6b9f5d05aee9a25854968a675489
+SIZE (46f9b5e5bcf9.tar.gz) = 24957
+SHA256 (emersion-soju-v0.1.1_GH0.tar.gz) = 0bfc766b54d67bdfa29a7ce5f99503a5c5d539e8a1e59b36ed5568728bcd1ab5
+SIZE (emersion-soju-v0.1.1_GH0.tar.gz) = 76055
 SHA256 (emersion-go-sasl-7bfe0ed36a21_GH0.tar.gz) = 81a37103a797ba674f0d023c98165ec84a45799971d8834e345077d084abbbb7
 SIZE (emersion-go-sasl-7bfe0ed36a21_GH0.tar.gz) = 7106
-SHA256 (go-irc-irc-v3.1.3_GH0.tar.gz) = 21766600f5dbbc63b31c84e9d044f310fdc5058145a2bc4fbe2df7a75c8e77e5
-SIZE (go-irc-irc-v3.1.3_GH0.tar.gz) = 47548
-SHA256 (golang-crypto-9e8e0b390897_GH0.tar.gz) = 79bd9db71da6ec75f3df7b7e43aeb90983227058ce9b8d0f08405a141768b3c3
-SIZE (golang-crypto-9e8e0b390897_GH0.tar.gz) = 1732662
-SHA256 (golang-sys-9f70ab9862d5_GH0.tar.gz) = d97abbad76f3cbacc96d49d0a5da45f3193dad52aad86bb5c6f2024fbce457fc
-SIZE (golang-sys-9f70ab9862d5_GH0.tar.gz) = 1072169
+SHA256 (go-irc-irc-v3.1.4_GH0.tar.gz) = 80d869495bbc0e732cb33760833a7d3c35a25e0dbd3a720f57bfbf86884d2f87
+SIZE (go-irc-irc-v3.1.4_GH0.tar.gz) = 47871
+SHA256 (golang-crypto-0c34fe9e7dc2_GH0.tar.gz) = deab6194c4b5d5ceefa40e8c7fc82a4288ff6e8577cdbde406e781c62624f491
+SIZE (golang-crypto-0c34fe9e7dc2_GH0.tar.gz) = 1726075
+SHA256 (golang-sys-4fbd30eecc44_GH0.tar.gz) = 96855d444f699c91ec2e45a88440e6fdc79ee90a11f71d4845e0ee162769f4b0
+SIZE (golang-sys-4fbd30eecc44_GH0.tar.gz) = 1218721
+SHA256 (golang-term-de623e64d2a6_GH0.tar.gz) = 7431f7be907f0bd2a877e3a139cd3a10da7cac5a9bd34fb3a2eaf2cfccbf2bf2
+SIZE (golang-term-de623e64d2a6_GH0.tar.gz) = 15348
 SHA256 (google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca
 SIZE (google-shlex-e7afc7fbc510_GH0.tar.gz) = 7342
-SHA256 (klauspost-compress-v1.11.1_GH0.tar.gz) = be25acec4ef0d88f4996a5b35855c9958a8fec3430f9303c1e96fbbbbd3a8400
-SIZE (klauspost-compress-v1.11.1_GH0.tar.gz) = 17324257
-SHA256 (mattn-go-sqlite3-v1.14.4_GH0.tar.gz) = 0caea07682570b32882701e33e2425382ff61edb5986a8892842d305b9025cb3
-SIZE (mattn-go-sqlite3-v1.14.4_GH0.tar.gz) = 2353947
-SHA256 (pires-go-proxyproto-v0.2.0_GH0.tar.gz) = ca428bfb1edd3f1ef99897039d51da2b09ca2a1dfb00663faec49b3d9d2cfa2a
-SIZE (pires-go-proxyproto-v0.2.0_GH0.tar.gz) = 28409
+SHA256 (klauspost-compress-v1.11.13_GH0.tar.gz) = 8fd1068d5f748178b7e71d26f50e38f66a0ee8c98fd57af4bdfac0e153f865e4
+SIZE (klauspost-compress-v1.11.13_GH0.tar.gz) = 17455939
+SHA256 (mattn-go-sqlite3-v1.14.6_GH0.tar.gz) = c92f80d9d5c16e305955cb5a6885a8d931926e9b489857560364148fd225b690
+SIZE (mattn-go-sqlite3-v1.14.6_GH0.tar.gz) = 2367133
 SHA256 (nhooyr-websocket-v1.8.6_GH0.tar.gz) = 9b095877cf79792b6d788d1d2b9f2ee31bd2be81f45981a3e6a4bc4498d84e83
 SIZE (nhooyr-websocket-v1.8.6_GH0.tar.gz) = 51231
+SHA256 (pires-go-proxyproto-v0.5.0_GH0.tar.gz) = d23df3a6b9eeed9c35b85ba558cdcd57a6867de37f481b2a6df727bebd9aa909
+SIZE (pires-go-proxyproto-v0.5.0_GH0.tar.gz) = 34787