irc/soju: Update to 0.5.0

- Switch to go:modules

Reported by:	portscout

2 files changed, 9 insertions, 88 deletions

diff --git a/irc/soju/Makefile b/irc/soju/Makefile
index 40c406f4daa7..f3988ab88492 100644
--- a/irc/soju/Makefile
+++ b/irc/soju/Makefile
@@ -1,12 +1,7 @@
 PORTNAME=	soju
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.0
-PORTREVISION=	4
+DISTVERSION=	0.5.0
 CATEGORIES=	irc
-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
@@ -19,35 +14,10 @@ USES=		go:modules sqlite:3
 OPTIONS_DEFAULT=	DOCS
 OPTIONS_DEFINE=		DOCS
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	emersion
-GH_TUPLE=	beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		cespare:xxhash:v2.1.2:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
-		emersion:go-sasl:0b9dcfb154ac: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:86341886e292:golang_crypto/vendor/golang.org/x/crypto \
-		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:4e6760a101f9:golang_sys/vendor/golang.org/x/sys \
-		golang:term:03fcf44c2211:golang_term/vendor/golang.org/x/term \
-		golang:time:0e9765cccd65:golang_time/vendor/golang.org/x/time \
-		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
-		klauspost:compress:v1.14.4:klauspost_compress/vendor/github.com/klauspost/compress \
-		lib:pq:v1.10.4:lib_pq/vendor/github.com/lib/pq \
-		mattn:go-sqlite3:v1.14.12:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		nhooyr:websocket:v1.8.7:nhooyr_websocket/vendor/nhooyr.io/websocket \
-		pires:go-proxyproto:v0.6.2:pires_go_proxyproto/vendor/github.com/pires/go-proxyproto \
-		prometheus:client_golang:v1.12.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
-		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.32.1:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.7.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf
-
-GO_BARE_REV=	ab86bc2846d9
-GO_SCFG_REV=	c2c7a15d6c99
 GO_BUILDFLAGS+=	-tags=libsqlite3
 CGO_LDFLAGS+=	-lsqlite3
-GO_PKGNAME=	./cmd/soju ./cmd/sojuctl ./contrib/znc-import.go
+GO_MODULE=	git.sr.ht/~emersion/soju
+GO_PKGNAME=	./cmd/soju ./cmd/sojuctl ./contrib/znc-import
 PLIST_FILES=	bin/soju \
 		bin/sojuctl \
 		bin/soju-znc-import \
@@ -56,17 +26,12 @@ PLIST_FILES=	bin/soju \
 DOCS_BUILD_DEPENDS=	scdoc:textproc/scdoc
 DOCS_PLIST_FILES=	man/man1/soju.1.gz \
 
-post-extract:
-	${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
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MV} ${STAGEDIR}${PREFIX}/bin/znc-import.go ${STAGEDIR}${PREFIX}/bin/soju-znc-import
+	${MV} ${STAGEDIR}${PREFIX}/bin/znc-import ${STAGEDIR}${PREFIX}/bin/soju-znc-import
 	${INSTALL_MAN} ${WRKSRC}/doc/getting-started.md ${STAGEDIR}${DOCSDIR}
 
 post-install-DOCS-on:
diff --git a/irc/soju/distinfo b/irc/soju/distinfo
index 3ee432f8cef1..b21a2353b41e 100644
--- a/irc/soju/distinfo
+++ b/irc/soju/distinfo
@@ -1,49 +1,5 @@
-TIMESTAMP = 1646742605
-SHA256 (c2c7a15d6c99.tar.gz) = b7785af66fb53d4887c5c09a5130a98b95eca44bb5408bbf8b5319ec8c979eac
-SIZE (c2c7a15d6c99.tar.gz) = 3120
-SHA256 (ab86bc2846d9.tar.gz) = 97243a3ef98a3038a04ca8fb61af72d8323057312a67a8a3336772c11871f9a9
-SIZE (ab86bc2846d9.tar.gz) = 24974
-SHA256 (emersion-soju-v0.4.0_GH0.tar.gz) = 91a78d8f038fb3319042961ff38d9a54a9bf897942804c0a690628dc6c959118
-SIZE (emersion-soju-v0.4.0_GH0.tar.gz) = 125605
-SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
-SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (cespare-xxhash-v2.1.2_GH0.tar.gz) = 471399cfcf0b1bd188add8d34435b91e7011cedbfe76e29687803a9d74320352
-SIZE (cespare-xxhash-v2.1.2_GH0.tar.gz) = 11244
-SHA256 (emersion-go-sasl-0b9dcfb154ac_GH0.tar.gz) = 0be35a5cc866245422998b440736af64368b82b69fc1bdc3bf72a50bb7fe07f0
-SIZE (emersion-go-sasl-0b9dcfb154ac_GH0.tar.gz) = 7264
-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-86341886e292_GH0.tar.gz) = 92b4ef34c44645bf9e6fccc20ca0a4307ef1e4e526f583141c05832182124b6b
-SIZE (golang-crypto-86341886e292_GH0.tar.gz) = 1628070
-SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
-SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-sys-4e6760a101f9_GH0.tar.gz) = 03a0fe05c767ee371318e94f05d0fb59ce1d00d0716e522cd4e31e6424a394a1
-SIZE (golang-sys-4e6760a101f9_GH0.tar.gz) = 1259262
-SHA256 (golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d90072357524ee557d7df106b426def02a8e5f3
-SIZE (golang-term-03fcf44c2211_GH0.tar.gz) = 14972
-SHA256 (golang-time-0e9765cccd65_GH0.tar.gz) = ef4874b5cdfc2d21bb17e38c9a691e9e66c924cea852c8999fea7b08a649aab7
-SIZE (golang-time-0e9765cccd65_GH0.tar.gz) = 10226
-SHA256 (google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca
-SIZE (google-shlex-e7afc7fbc510_GH0.tar.gz) = 7342
-SHA256 (klauspost-compress-v1.14.4_GH0.tar.gz) = 30480619257f7d40fcbfd61b59c34fd36e85220ac2eee400c493b06c37f53740
-SIZE (klauspost-compress-v1.14.4_GH0.tar.gz) = 15502117
-SHA256 (lib-pq-v1.10.4_GH0.tar.gz) = 3d56bb8c6b50d86b6d053053a7da831a07e9da39205ffa23dfbf1487234ab742
-SIZE (lib-pq-v1.10.4_GH0.tar.gz) = 108132
-SHA256 (mattn-go-sqlite3-v1.14.12_GH0.tar.gz) = 7ab1e45fa69b1465eaaf42578b5c6166d07ae1d49f37cccca5303e580e1864ae
-SIZE (mattn-go-sqlite3-v1.14.12_GH0.tar.gz) = 2450412
-SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
-SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-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.2_GH0.tar.gz) = 3de114552eaa76bc8296f6829bacc29c98a39310421e46d825c18142ba7ca024
-SIZE (pires-go-proxyproto-v0.6.2_GH0.tar.gz) = 37548
-SHA256 (prometheus-client_golang-v1.12.1_GH0.tar.gz) = 3f7929ec4837932e68a0e7da9e0f1ff5aa19bc02de7a67823d0533a0d6852014
-SIZE (prometheus-client_golang-v1.12.1_GH0.tar.gz) = 194206
-SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
-SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.32.1_GH0.tar.gz) = de06f354e24dec3bfeba9a3bd43bd3170b4231dfff3cd338b688a6e8c8050af6
-SIZE (prometheus-common-v0.32.1_GH0.tar.gz) = 146585
-SHA256 (prometheus-procfs-v0.7.3_GH0.tar.gz) = 5514e8b18c38b6376a84c623d59735d4eefb61fb3a14eb1f45e0a4c848f14a2b
-SIZE (prometheus-procfs-v0.7.3_GH0.tar.gz) = 178957
-SHA256 (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 3ec41a8324431e72f85e0dc0c2c098cc14c3cb1ee8820996c8f46afca2d65609
-SIZE (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 1278521
+TIMESTAMP = 1658817664
+SHA256 (go/irc_soju/soju-v0.5.0/v0.5.0.mod) = df14df99d21c43fb592a5be28ac8751c8a967b17c53488ad281a00c5b4f3d4bb
+SIZE (go/irc_soju/soju-v0.5.0/v0.5.0.mod) = 883
+SHA256 (go/irc_soju/soju-v0.5.0/v0.5.0.zip) = 70d1a70d66613669e2dd89dadff03e98f21fdf5df11ae2d0ea182f2bb4e92087
+SIZE (go/irc_soju/soju-v0.5.0/v0.5.0.zip) = 165952