git: c4ef440636d0 - main - net-im/dendrite: Update to 0.12.2

From: Ashish SHUKLA <ashish_at_FreeBSD.org>
Date: Sun, 30 Apr 2023 20:05:00 UTC
The branch main has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c4ef440636d02c698950e72bbfdcc48691044e2f

commit c4ef440636d02c698950e72bbfdcc48691044e2f
Author:     Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2023-04-30 20:01:45 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2023-04-30 20:04:29 +0000

    net-im/dendrite: Update to 0.12.2
    
    - Remove polylith support
    - Switch to different tag name
    
    Reported by:    Sven Lellesch <sven at lellesch dot de>
---
 net-im/dendrite/Makefile          | 37 +++++++++++++-------------
 net-im/dendrite/distinfo          | 56 +++++++++++++++++++--------------------
 net-im/dendrite/files/dendrite.in |  4 +--
 net-im/dendrite/pkg-plist         |  3 +--
 4 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/net-im/dendrite/Makefile b/net-im/dendrite/Makefile
index a3faae5e369f..f27ab56637dc 100644
--- a/net-im/dendrite/Makefile
+++ b/net-im/dendrite/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	dendrite
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.11.1
-PORTREVISION=	3
+DISTVERSION=	0.12.2
 CATEGORIES=	net-im
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -19,9 +18,9 @@ USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
 DENDRITE_BINS=	create-account dendrite-demo-pinecone			\
-		dendrite-demo-yggdrasil dendrite-monolith-server	\
-		dendrite-polylith-multi dendrite-upgrade-tests		\
-		furl generate-config generate-keys resolve-state
+		dendrite-demo-yggdrasil dendrite			\
+		dendrite-upgrade-tests furl generate-config 		\
+		generate-keys resolve-state
 
 .for f in ${DENDRITE_BINS}
 GO_TARGET+=	./cmd/$f:${PREFIX}/dendrite/bin/$f
@@ -30,6 +29,7 @@ GO_TARGET+=	./cmd/$f:${PREFIX}/dendrite/bin/$f
 USE_GITHUB=	yes
 USE_GITLAB=	nodefault
 GH_ACCOUNT=	matrix-org
+GH_TAGNAME=	helm-dendrite-${DISTVERSION}
 GH_TUPLE=	Arceliar:ironwood:45b4281814c2:arceliar_ironwood/vendor/github.com/Arceliar/ironwood \
 		Arceliar:phony:dde1a8dca979:arceliar_phony/vendor/github.com/Arceliar/phony \
 		DATA-DOG:go-sqlmock:v1.5.0:data_dog_go_sqlmock/vendor/github.com/DATA-DOG/go-sqlmock \
@@ -71,21 +71,21 @@ GH_TUPLE=	Arceliar:ironwood:45b4281814c2:arceliar_ironwood/vendor/github.com/Arc
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:crypto:v0.5.0:golang_crypto/vendor/golang.org/x/crypto \
+		golang:crypto:v0.6.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:exp:47842c84f3db:golang_exp/vendor/golang.org/x/exp \
 		golang:geo:740aa86cb551:golang_geo/vendor/github.com/golang/geo \
 		golang:glog:v1.0.0:golang_glog/vendor/github.com/golang/glog \
-		golang:image:v0.1.0:golang_image/vendor/golang.org/x/image \
+		golang:image:v0.5.0:golang_image/vendor/golang.org/x/image \
 		golang:mobile:b36e6246172e:golang_mobile/vendor/golang.org/x/mobile \
 		golang:mock:v1.6.0:golang_mock/vendor/github.com/golang/mock \
 		golang:mod:v0.6.0:golang_mod/vendor/golang.org/x/mod \
-		golang:net:v0.5.0:golang_net/vendor/golang.org/x/net \
+		golang:net:v0.7.0:golang_net/vendor/golang.org/x/net \
 		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.4:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sys:v0.4.0:golang_sys/vendor/golang.org/x/sys \
-		golang:term:v0.4.0:golang_term/vendor/golang.org/x/term \
-		golang:text:v0.6.0:golang_text/vendor/golang.org/x/text \
-		golang:time:v0.1.0:golang_time/vendor/golang.org/x/time \
+		golang:sys:v0.5.0:golang_sys/vendor/golang.org/x/sys \
+		golang:term:v0.5.0:golang_term/vendor/golang.org/x/term \
+		golang:text:v0.7.0:golang_text/vendor/golang.org/x/text \
+		golang:time:v0.3.0:golang_time/vendor/golang.org/x/time \
 		golang:tools:v0.2.0:golang_tools/vendor/golang.org/x/tools \
 		gologme:log:v1.3.0:gologme_log/vendor/github.com/gologme/log \
 		google:go-cmp:v0.5.9:google_go_cmp/vendor/github.com/google/go-cmp \
@@ -100,18 +100,18 @@ GH_TUPLE=	Arceliar:ironwood:45b4281814c2:arceliar_ironwood/vendor/github.com/Arc
 		juju:errors:v1.0.0:juju_errors/vendor/github.com/juju/errors \
 		kardianos:minwinsvc:v1.0.2:kardianos_minwinsvc/vendor/github.com/kardianos/minwinsvc \
 		kballard:go-shellquote:95032a82bc51:kballard_go_shellquote/vendor/github.com/kballard/go-shellquote \
-		klauspost:compress:v1.15.11:klauspost_compress/vendor/github.com/klauspost/compress \
+		klauspost:compress:v1.16.0:klauspost_compress/vendor/github.com/klauspost/compress \
 		kr:pretty:v0.3.1:kr_pretty/vendor/github.com/kr/pretty \
 		lib:pq:v1.10.7:lib_pq/vendor/github.com/lib/pq \
 		lukechampine:uint128:v1.2.0:lukechampine_uint128/vendor/lukechampine.com/uint128 \
 		matrix-org:dugong:66e6b1c67e2e:matrix_org_dugong/vendor/github.com/matrix-org/dugong \
 		matrix-org:go-sqlite3-js:28aa791a1c91:matrix_org_go_sqlite3_js/vendor/github.com/matrix-org/go-sqlite3-js \
 		matrix-org:gomatrix:ceba4d9f7530:matrix_org_gomatrix/vendor/github.com/matrix-org/gomatrix \
-		matrix-org:gomatrixserverlib:122f1e0e3fa1:matrix_org_gomatrixserverlib/vendor/github.com/matrix-org/gomatrixserverlib \
+		matrix-org:gomatrixserverlib:4dd7ff2f0e3a:matrix_org_gomatrixserverlib/vendor/github.com/matrix-org/gomatrixserverlib \
 		matrix-org:pinecone:8c3b24f2649a:matrix_org_pinecone/vendor/github.com/matrix-org/pinecone \
 		matrix-org:util:399730281e66:matrix_org_util/vendor/github.com/matrix-org/util \
 		mattn:go-isatty:v0.0.16:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		mattn:go-sqlite3:v1.14.15:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
+		mattn:go-sqlite3:v1.14.16:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
 		matttproud:golang_protobuf_extensions:c182affec369:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
 		minio:highwayhash:v1.0.2:minio_highwayhash/vendor/github.com/minio/highwayhash \
 		moby:moby:v20.10.19:moby_moby/vendor/github.com/docker/docker \
@@ -121,13 +121,12 @@ GH_TUPLE=	Arceliar:ironwood:45b4281814c2:arceliar_ironwood/vendor/github.com/Arc
 		morikuni:aec:v1.0.0:morikuni_aec/vendor/github.com/morikuni/aec \
 		mschoch:smat:v0.2.0:mschoch_smat/vendor/github.com/mschoch/smat \
 		nats-io:jwt:v2.3.0:nats_io_jwt_v2/vendor/github.com/nats-io/jwt \
-		nats-io:nats-server:v2.9.8:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \
-		nats-io:nats.go:v1.20.0:nats_io_nats_go/vendor/github.com/nats-io/nats.go \
+		nats-io:nats-server:v2.9.15:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \
+		nats-io:nats.go:v1.24.0:nats_io_nats_go/vendor/github.com/nats-io/nats.go \
 		nats-io:nkeys:v0.3.0:nats_io_nkeys/vendor/github.com/nats-io/nkeys \
 		nats-io:nuid:v1.0.1:nats_io_nuid/vendor/github.com/nats-io/nuid \
 		neilalexander:utp:54ae7b1cd5f9:neilalexander_utp/vendor/github.com/neilalexander/utp \
 		nfnt:resize:83c6a9932646:nfnt_resize/vendor/github.com/nfnt/resize \
-		ngrok:sqlmw:97c9c04efc79:ngrok_sqlmw/vendor/github.com/ngrok/sqlmw \
 		nhooyr:websocket:v1.8.7:nhooyr_websocket/vendor/nhooyr.io/websocket \
 		onsi:ginkgo:v2.3.0:onsi_ginkgo_v2/vendor/github.com/onsi/ginkgo/v2 \
 		onsi:gomega:v1.22.1:onsi_gomega/vendor/github.com/onsi/gomega \
@@ -170,7 +169,7 @@ GL_TUPLE=	cznic:cc:03159e8e41eec8d08c1e502bfc46868b9a03aa57:cznic_cc/vendor/mode
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/dendrite-sample.monolith.yaml ${STAGEDIR}${ETCDIR}/${PORTNAME}.yaml.sample
+	${INSTALL_DATA} ${WRKSRC}/dendrite-sample.yaml ${STAGEDIR}${ETCDIR}/${PORTNAME}.yaml.sample
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
diff --git a/net-im/dendrite/distinfo b/net-im/dendrite/distinfo
index 887c7d0b58bd..6bc3f66f4ebf 100644
--- a/net-im/dendrite/distinfo
+++ b/net-im/dendrite/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1676065311
-SHA256 (matrix-org-dendrite-v0.11.1_GH0.tar.gz) = ca7b19e5285b634747052aaa22a9adcb010d0d3f041fccce11c9cc77d7f66fba
-SIZE (matrix-org-dendrite-v0.11.1_GH0.tar.gz) = 1100709
+TIMESTAMP = 1682876057
+SHA256 (matrix-org-dendrite-v0.12.2-helm-dendrite-0.12.2_GH0.tar.gz) = 88a520ec8a4b08c44240f0339510355bb116c962c079a040ba4d349fb78d3a95
+SIZE (matrix-org-dendrite-v0.12.2-helm-dendrite-0.12.2_GH0.tar.gz) = 1216444
 SHA256 (Arceliar-ironwood-45b4281814c2_GH0.tar.gz) = c94ea93f6b155781a9ad57be2cfac6e72b86a0f54a0e8e0d082164a6bc4e685f
 SIZE (Arceliar-ironwood-45b4281814c2_GH0.tar.gz) = 42065
 SHA256 (Arceliar-phony-dde1a8dca979_GH0.tar.gz) = bcc79621c9da979c1d357a29f1924d73c86c57c0e901652312d742cbc39e5962
@@ -83,36 +83,36 @@ SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedace
 SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173
 SHA256 (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2bb4b13d6e56b3911f09b8e9ddd15708477fbff8823c057cc79dd99c9a452b34
 SIZE (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2038725
-SHA256 (golang-crypto-v0.5.0_GH0.tar.gz) = 8bcfaa35f98b42734c36989ab8f98b51343468ddcd386f4583a585c1f23b33dd
-SIZE (golang-crypto-v0.5.0_GH0.tar.gz) = 1633607
+SHA256 (golang-crypto-v0.6.0_GH0.tar.gz) = abdd55e246751307493aac73d787c38953814668cf13a3dd73b600050e7b5058
+SIZE (golang-crypto-v0.6.0_GH0.tar.gz) = 1633588
 SHA256 (golang-exp-47842c84f3db_GH0.tar.gz) = 5c4f2863414bbb0e811c37e4a445978ee03aeafa5d710bd7658e58426410ddc1
 SIZE (golang-exp-47842c84f3db_GH0.tar.gz) = 1606976
 SHA256 (golang-geo-740aa86cb551_GH0.tar.gz) = d77c97a5c958dcbb180718b841cd691796cb5ef9b151e51df22308453fb4b2ab
 SIZE (golang-geo-740aa86cb551_GH0.tar.gz) = 386957
 SHA256 (golang-glog-v1.0.0_GH0.tar.gz) = 230aceb83b895e9b509b142010b7b2a241f162433177b17d85165917cbe558b5
 SIZE (golang-glog-v1.0.0_GH0.tar.gz) = 19759
-SHA256 (golang-image-v0.1.0_GH0.tar.gz) = 50d8069c455f934fc7fc0902e9065e4b6401f23ae29616de402c19f8497aae59
-SIZE (golang-image-v0.1.0_GH0.tar.gz) = 5039424
+SHA256 (golang-image-v0.5.0_GH0.tar.gz) = ba6a2acdb0ba2e91834ef1259cc59214a144b070f2e261b2ad819ef264714610
+SIZE (golang-image-v0.5.0_GH0.tar.gz) = 5040072
 SHA256 (golang-mobile-b36e6246172e_GH0.tar.gz) = f7b9a156077894181c369ba0e18371f970350cb2cbb3dfd94703f9406cc15bbc
 SIZE (golang-mobile-b36e6246172e_GH0.tar.gz) = 2050217
 SHA256 (golang-mock-v1.6.0_GH0.tar.gz) = 470174971c3a63361149a30f5b2d3a716a198afeb6cc71daa30712faa7293942
 SIZE (golang-mock-v1.6.0_GH0.tar.gz) = 69251
 SHA256 (golang-mod-v0.6.0_GH0.tar.gz) = be621d2c7479670e043045f48e995db4710f8d34260b0248a947220ab5065f20
 SIZE (golang-mod-v0.6.0_GH0.tar.gz) = 120462
-SHA256 (golang-net-v0.5.0_GH0.tar.gz) = 75bd115b29351ceaf0013076f7c03dc6e6456b1adc768e7f8e66a13dd614a72d
-SIZE (golang-net-v0.5.0_GH0.tar.gz) = 1238327
+SHA256 (golang-net-v0.7.0_GH0.tar.gz) = 4949a0dbdd3c200c8681c18bebd65c8e8b620470189361dac05c89c714d9a59b
+SIZE (golang-net-v0.7.0_GH0.tar.gz) = 1241017
 SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
 SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
 SHA256 (golang-snappy-v0.0.4_GH0.tar.gz) = 77df678795596f9dfecb5744deb984633d780460a7e9a59e0c7ecfe2052b644f
 SIZE (golang-snappy-v0.0.4_GH0.tar.gz) = 66129
-SHA256 (golang-sys-v0.4.0_GH0.tar.gz) = 765fb838f213fb11f22b8f5d2f14d221ccd331010730edd4631976be744d3621
-SIZE (golang-sys-v0.4.0_GH0.tar.gz) = 1425141
-SHA256 (golang-term-v0.4.0_GH0.tar.gz) = 0fb1e876db5e69c5515046953c1958a1f88a5fc270e57fda5474d3d282fffaaa
-SIZE (golang-term-v0.4.0_GH0.tar.gz) = 14798
-SHA256 (golang-text-v0.6.0_GH0.tar.gz) = 5e21aa155036d214cde4b5992cd07ac81ecb230e87d2abaa3cf1a606df9b64fe
-SIZE (golang-text-v0.6.0_GH0.tar.gz) = 8361991
-SHA256 (golang-time-v0.1.0_GH0.tar.gz) = 9ac4d7f7da6e4c5074fa1ef1a67a893391332c3f7ccfffe29750e89fb0b9440f
-SIZE (golang-time-v0.1.0_GH0.tar.gz) = 11108
+SHA256 (golang-sys-v0.5.0_GH0.tar.gz) = 810c8f1b7704674971ab6b2b614aba20a5a1765018fd2c639f528dbbcbf88b1f
+SIZE (golang-sys-v0.5.0_GH0.tar.gz) = 1429723
+SHA256 (golang-term-v0.5.0_GH0.tar.gz) = a363183f934f45cb7a0b2fef46105e3e1983cd56bb3070a1a8b227e3276c74d3
+SIZE (golang-term-v0.5.0_GH0.tar.gz) = 14799
+SHA256 (golang-text-v0.7.0_GH0.tar.gz) = a37dfe82c39f84c57a083da9725dd1bdae59cff6a5cbca3ae4443e446b4a70b8
+SIZE (golang-text-v0.7.0_GH0.tar.gz) = 8361947
+SHA256 (golang-time-v0.3.0_GH0.tar.gz) = 2419ace580d977566862f0145991cd63f5db634518ea73f30d7a705a176e86eb
+SIZE (golang-time-v0.3.0_GH0.tar.gz) = 12214
 SHA256 (golang-tools-v0.2.0_GH0.tar.gz) = ca6cde42e29bbf1222bd263b0a0131a4b6e35452a609d47a52e8d8fb8da4e733
 SIZE (golang-tools-v0.2.0_GH0.tar.gz) = 3209824
 SHA256 (gologme-log-v1.3.0_GH0.tar.gz) = bc8749523542f0c649ed5c4df2ccb18d610133f14ccbc4395d7e2723321572a2
@@ -141,8 +141,8 @@ SHA256 (kardianos-minwinsvc-v1.0.2_GH0.tar.gz) = 43f5f3452c8b0f0baa800434b4c947c
 SIZE (kardianos-minwinsvc-v1.0.2_GH0.tar.gz) = 2422
 SHA256 (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = dde336eb697f7f9c26cf6d1467f75b6cf559262c1b0b110d28fff29790f76bc5
 SIZE (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = 4328
-SHA256 (klauspost-compress-v1.15.11_GH0.tar.gz) = e79cfb490113c6983c5ba962f2e61bde4572f1cdcc02bbf9573f479c7eee5773
-SIZE (klauspost-compress-v1.15.11_GH0.tar.gz) = 36199166
+SHA256 (klauspost-compress-v1.16.0_GH0.tar.gz) = eaab846c68be4ffbba76264e2bf5140fd8ca3c6c98cbb4c58c9949e96570839a
+SIZE (klauspost-compress-v1.16.0_GH0.tar.gz) = 37231027
 SHA256 (kr-pretty-v0.3.1_GH0.tar.gz) = e6fa7db2708320e66a1645bf6b234e524e73f4163ca0519b8608616e48f5d206
 SIZE (kr-pretty-v0.3.1_GH0.tar.gz) = 10227
 SHA256 (lib-pq-v1.10.7_GH0.tar.gz) = e7c460fcdf73df7f4d437f49fd1fb6513f9729a8512ff876686ee7564e35847f
@@ -155,16 +155,16 @@ SHA256 (matrix-org-go-sqlite3-js-28aa791a1c91_GH0.tar.gz) = 8562fdc0572e0ab2dcf8
 SIZE (matrix-org-go-sqlite3-js-28aa791a1c91_GH0.tar.gz) = 16617
 SHA256 (matrix-org-gomatrix-ceba4d9f7530_GH0.tar.gz) = 8faf04d7a81bc82ba3ab4d73fa83198635a363a2088217b3d6983b93cbfe110c
 SIZE (matrix-org-gomatrix-ceba4d9f7530_GH0.tar.gz) = 26589
-SHA256 (matrix-org-gomatrixserverlib-122f1e0e3fa1_GH0.tar.gz) = 2043911a02abe93c5c267ef2e62a45cb2f5477af0979bf9f04980500d161164e
-SIZE (matrix-org-gomatrixserverlib-122f1e0e3fa1_GH0.tar.gz) = 147328
+SHA256 (matrix-org-gomatrixserverlib-4dd7ff2f0e3a_GH0.tar.gz) = bcf8a3a13815b1c05254e957d738715cae8b365536d6fec476a133782f44b82b
+SIZE (matrix-org-gomatrixserverlib-4dd7ff2f0e3a_GH0.tar.gz) = 147295
 SHA256 (matrix-org-pinecone-8c3b24f2649a_GH0.tar.gz) = 87b24813ce7a793f27640337e5c7ab2ad324c0d067722cb243f0b21804955f36
 SIZE (matrix-org-pinecone-8c3b24f2649a_GH0.tar.gz) = 343271
 SHA256 (matrix-org-util-399730281e66_GH0.tar.gz) = 924b30f2e811305e939805c01896b239d03a0471a0fefa5e53c6152863dc5d08
 SIZE (matrix-org-util-399730281e66_GH0.tar.gz) = 15349
 SHA256 (mattn-go-isatty-v0.0.16_GH0.tar.gz) = b5c84cc0881a3d67a4b32709a20601a2c8491b17ae0c98aefb138b5424f8eca4
 SIZE (mattn-go-isatty-v0.0.16_GH0.tar.gz) = 4690
-SHA256 (mattn-go-sqlite3-v1.14.15_GH0.tar.gz) = ed9198dd50ea9057ab58744210cdfd7bb1e8e29805a869dd1eae4db614203ae5
-SIZE (mattn-go-sqlite3-v1.14.15_GH0.tar.gz) = 2473843
+SHA256 (mattn-go-sqlite3-v1.14.16_GH0.tar.gz) = 826a8201600e05860b6a580c0b97a75b11fa6ca469696868d23d7c680ed19c54
+SIZE (mattn-go-sqlite3-v1.14.16_GH0.tar.gz) = 2475472
 SHA256 (matttproud-golang_protobuf_extensions-c182affec369_GH0.tar.gz) = 66a6911e621bfd8823078568688b5683d66ce0b8f85da7b1288d3533d2724735
 SIZE (matttproud-golang_protobuf_extensions-c182affec369_GH0.tar.gz) = 37518
 SHA256 (minio-highwayhash-v1.0.2_GH0.tar.gz) = 5a89e6f3e77cb77c818c5ce0316812d544e588456fce2e55e02f48d52fa9c5d2
@@ -183,10 +183,10 @@ SHA256 (mschoch-smat-v0.2.0_GH0.tar.gz) = 9098fa6b3e9fb25afc1d4de143ac106a27a19d
 SIZE (mschoch-smat-v0.2.0_GH0.tar.gz) = 12046
 SHA256 (nats-io-jwt-v2.3.0_GH0.tar.gz) = 3f6d78974c16b44d8dcc5a6e8daa1d38238a69674ae01bfda27123b31a0dc4de
 SIZE (nats-io-jwt-v2.3.0_GH0.tar.gz) = 82968
-SHA256 (nats-io-nats-server-v2.9.8_GH0.tar.gz) = 31ad53e46a3dafdd9dfe52ce751b7fd5eaf838810c42d002b11477ee8d6e3471
-SIZE (nats-io-nats-server-v2.9.8_GH0.tar.gz) = 1630474
-SHA256 (nats-io-nats.go-v1.20.0_GH0.tar.gz) = dfec777a88bef73cc9ef0d22cf5a644c7d804ef84faff0bbfa305f3936a1cef9
-SIZE (nats-io-nats.go-v1.20.0_GH0.tar.gz) = 385253
+SHA256 (nats-io-nats-server-v2.9.15_GH0.tar.gz) = e2f63277776886134683ea08d0f9c39c0e93161b483b295d84180d02454bfc28
+SIZE (nats-io-nats-server-v2.9.15_GH0.tar.gz) = 1663398
+SHA256 (nats-io-nats.go-v1.24.0_GH0.tar.gz) = dae3e4f95ec65cdc44dd893687a86861827c667bd117874d43bba529b5c9cfd9
+SIZE (nats-io-nats.go-v1.24.0_GH0.tar.gz) = 400665
 SHA256 (nats-io-nkeys-v0.3.0_GH0.tar.gz) = ea281df5dc380b84f61c3712b367f02957cff4cb7802e73b2b0b7588e4f6b809
 SIZE (nats-io-nkeys-v0.3.0_GH0.tar.gz) = 19986
 SHA256 (nats-io-nuid-v1.0.1_GH0.tar.gz) = a0b4fe5b40781add2a9fdb5d723313be5f5d11c1a79ea1dd2671278826ef078d
@@ -195,8 +195,6 @@ SHA256 (neilalexander-utp-54ae7b1cd5f9_GH0.tar.gz) = a7203304a6a957313f76b13005c
 SIZE (neilalexander-utp-54ae7b1cd5f9_GH0.tar.gz) = 31389
 SHA256 (nfnt-resize-83c6a9932646_GH0.tar.gz) = d5c440f3d4d431d64f6a4edabbc267d4b6e21d9a5649c35965f954a067dbc81c
 SIZE (nfnt-resize-83c6a9932646_GH0.tar.gz) = 12461
-SHA256 (ngrok-sqlmw-97c9c04efc79_GH0.tar.gz) = 55e3028de1706e8019255794f3558cc7839d4876455329375f32bf9fa93a4f40
-SIZE (ngrok-sqlmw-97c9c04efc79_GH0.tar.gz) = 15501
 SHA256 (nhooyr-websocket-v1.8.7_GH0.tar.gz) = b2417df7fe0e6068b751fd3ede8d5f2b86658cf34c52438827ac1802f34a4e82
 SIZE (nhooyr-websocket-v1.8.7_GH0.tar.gz) = 51286
 SHA256 (onsi-ginkgo-v2.3.0_GH0.tar.gz) = ee155d1bb2bd049d391b0621513f516b8080380dd1307b825f22fe22e1dc1608
diff --git a/net-im/dendrite/files/dendrite.in b/net-im/dendrite/files/dendrite.in
index 12a5c6e2a288..cd56e8311877 100644
--- a/net-im/dendrite/files/dendrite.in
+++ b/net-im/dendrite/files/dendrite.in
@@ -16,7 +16,7 @@
 
 name=dendrite
 rcvar=dendrite_enable
-desc="Dendrite (Monolith Server)"
+desc="Dendrite"
 
 load_rc_config $name
 
@@ -24,7 +24,7 @@ load_rc_config $name
 : ${dendrite_config:="%%PREFIX%%/etc/dendrite/dendrite.yaml"}
 
 command=/usr/sbin/daemon
-procname=%%PREFIX%%/dendrite/bin/dendrite-monolith-server
+procname=%%PREFIX%%/dendrite/bin/dendrite
 pidfile=/var/run/${name}.pid
 
 command_args="-p $pidfile -u dendrite -f $procname -config $dendrite_config"
diff --git a/net-im/dendrite/pkg-plist b/net-im/dendrite/pkg-plist
index bc2e7de44e93..ca50186547f9 100644
--- a/net-im/dendrite/pkg-plist
+++ b/net-im/dendrite/pkg-plist
@@ -1,8 +1,7 @@
 %%PORTNAME%%/bin/create-account
+%%PORTNAME%%/bin/dendrite
 %%PORTNAME%%/bin/dendrite-demo-pinecone
 %%PORTNAME%%/bin/dendrite-demo-yggdrasil
-%%PORTNAME%%/bin/dendrite-monolith-server
-%%PORTNAME%%/bin/dendrite-polylith-multi
 %%PORTNAME%%/bin/dendrite-upgrade-tests
 %%PORTNAME%%/bin/furl
 %%PORTNAME%%/bin/generate-config