irc/soju: Update to 0.2.0

- Install a contrib program to migrate from ZNC
- Install Getting started documentation
- Add a patch to update documentation for the ZNC migration program

Reported by:	portscout

3 files changed, 51 insertions, 32 deletions

diff --git a/irc/soju/Makefile b/irc/soju/Makefile
index 42f52d70501e..c6cb66b2ca10 100644
--- a/irc/soju/Makefile
+++ b/irc/soju/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	soju
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.2.20210709
+DISTVERSION=	0.2.0
 CATEGORIES=	irc
 MASTER_SITES=	https://git.sr.ht/~emersion/go-scfg/archive/:goscfg \
 		https://git.sr.ht/~sircmpwn/go-bare/archive/:gobare
@@ -20,26 +20,27 @@ OPTIONS_DEFINE=		DOCS
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emersion
-GH_TAGNAME=	c5d52592
 GH_TUPLE=	emersion:go-sasl:7bfe0ed36a21:emersion_go_sasl/vendor/github.com/emersion/go-sasl \
 		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 \
+		golang:crypto:32db794688a5:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sys:751e447fb3d0:golang_sys/vendor/golang.org/x/sys \
+		golang:term:6886f2dfbf5b:golang_term/vendor/golang.org/x/term \
 		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
-		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
+		klauspost:compress:v1.13.5:klauspost_compress/vendor/github.com/klauspost/compress \
+		mattn:go-sqlite3:v1.14.8:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
+		nhooyr:websocket:v1.8.7:nhooyr_websocket/vendor/nhooyr.io/websocket \
+		pires:go-proxyproto:v0.6.1:pires_go_proxyproto/vendor/github.com/pires/go-proxyproto
 
-GO_BARE_REV=	46f9b5e5bcf9
+GO_BARE_REV=	ab86bc2846d9
 GO_SCFG_REV=	142a8aa629fc
-GO_PKGNAME=	./cmd/soju ./cmd/sojuctl
+GO_PKGNAME=	./cmd/soju ./cmd/sojuctl ./contrib/znc-import.go
 PLIST_FILES=	bin/soju \
-		bin/sojuctl
+		bin/sojuctl \
+		bin/soju-znc-import \
+		${DOCSDIR_REL}/getting-started.md
 
 DOCS_BUILD_DEPENDS=	scdoc:textproc/scdoc
-DOCS_PLIST_FILES=	man/man1/soju.1.gz
+DOCS_PLIST_FILES=	man/man1/soju.1.gz \
 
 post-extract:
 	${MKDIR} ${WRKSRC}/vendor/git.sr.ht/~emersion ${WRKSRC}/vendor/git.sr.ht/~sircmpwn
@@ -49,6 +50,11 @@ post-extract:
 post-build-DOCS-on:
 	${LOCALBASE}/bin/scdoc <${WRKSRC}/doc/${PORTNAME}.1.scd >${WRKSRC}/doc/${PORTNAME}.1
 
+post-install:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${STAGEDIR}${PREFIX}/bin/znc-import.go ${STAGEDIR}${PREFIX}/bin/soju-znc-import
+	${INSTALL_MAN} ${WRKSRC}/doc/getting-started.md ${STAGEDIR}${DOCSDIR}
+
 post-install-DOCS-on:
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
 
diff --git a/irc/soju/distinfo b/irc/soju/distinfo
index 53eddedcfcbc..c59b42216f73 100644
--- a/irc/soju/distinfo
+++ b/irc/soju/distinfo
@@ -1,27 +1,27 @@
-TIMESTAMP = 1629439976
+TIMESTAMP = 1631871991
 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.2.20210709-c5d52592_GH0.tar.gz) = 836a8ecefc39a2605b05e60d47334b08343c23af93997b0ebfc99444f5c2dc41
-SIZE (emersion-soju-v0.1.2.20210709-c5d52592_GH0.tar.gz) = 86810
+SHA256 (ab86bc2846d9.tar.gz) = 97243a3ef98a3038a04ca8fb61af72d8323057312a67a8a3336772c11871f9a9
+SIZE (ab86bc2846d9.tar.gz) = 24974
+SHA256 (emersion-soju-v0.2.0_GH0.tar.gz) = 58186fc2e51633d17f09ae8d9dd28c5e01360b272fca61a775493ce8f6c876fc
+SIZE (emersion-soju-v0.2.0_GH0.tar.gz) = 87141
 SHA256 (emersion-go-sasl-7bfe0ed36a21_GH0.tar.gz) = 81a37103a797ba674f0d023c98165ec84a45799971d8834e345077d084abbbb7
 SIZE (emersion-go-sasl-7bfe0ed36a21_GH0.tar.gz) = 7106
 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 (golang-crypto-32db794688a5_GH0.tar.gz) = c971927593630ecfa6531da54a579bf04186c354e365975cd86ea0e4c2c82fb7
+SIZE (golang-crypto-32db794688a5_GH0.tar.gz) = 1732714
+SHA256 (golang-sys-751e447fb3d0_GH0.tar.gz) = d75e6c18ec9433e8ca5105b586709030b4f8a3eb67f9fdedcac74bc0c36d8d56
+SIZE (golang-sys-751e447fb3d0_GH0.tar.gz) = 1211377
+SHA256 (golang-term-6886f2dfbf5b_GH0.tar.gz) = e2e151fcf388487e6d70ce589408f9848a78843a790e3bae5409c86b10493bf9
+SIZE (golang-term-6886f2dfbf5b_GH0.tar.gz) = 14933
 SHA256 (google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca
 SIZE (google-shlex-e7afc7fbc510_GH0.tar.gz) = 7342
-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
+SHA256 (klauspost-compress-v1.13.5_GH0.tar.gz) = c8ee72f93437c4ecaf4d44115672afa9b331bd7a2ef8820ef6d78d1e81ca916b
+SIZE (klauspost-compress-v1.13.5_GH0.tar.gz) = 15466618
+SHA256 (mattn-go-sqlite3-v1.14.8_GH0.tar.gz) = 522a8f673690f99144f4e460eddc0fd5284c2e39676ac0687b5f575f19812cf6
+SIZE (mattn-go-sqlite3-v1.14.8_GH0.tar.gz) = 2404082
+SHA256 (nhooyr-websocket-v1.8.7_GH0.tar.gz) = b2417df7fe0e6068b751fd3ede8d5f2b86658cf34c52438827ac1802f34a4e82
+SIZE (nhooyr-websocket-v1.8.7_GH0.tar.gz) = 51286
+SHA256 (pires-go-proxyproto-v0.6.1_GH0.tar.gz) = caf9e8b59181ecd166e2c08b9f9350887775eabf0ad30078974ca9882a69b79d
+SIZE (pires-go-proxyproto-v0.6.1_GH0.tar.gz) = 37504
diff --git a/irc/soju/files/patch-doc_getting-started.md b/irc/soju/files/patch-doc_getting-started.md
new file mode 100644
index 000000000000..0f3db775d41b
--- /dev/null
+++ b/irc/soju/files/patch-doc_getting-started.md
@@ -0,0 +1,13 @@
+--- doc/getting-started.md.orig	2021-09-17 09:56:56 UTC
++++ doc/getting-started.md
+@@ -12,6 +12,10 @@ channels from a ZNC config file:
+ 
+     go run ./contrib/znc-import.go <znc config file>
+ 
++For FreeBSD port users:
++
++    soju-znc-import <znc config file>
++
+ ## Client side
+ 
+ soju can operate in two different modes: multi upstream and single upstream.