diff --git a/net-im/toot/Makefile b/net-im/toot/Makefile
index d4b4f1e29078..73e43d3a3100 100644
--- a/net-im/toot/Makefile
+++ b/net-im/toot/Makefile
@@ -1,65 +1,71 @@
 PORTNAME=	toot
-DISTVERSION=	0.48.1
+DISTVERSION=	0.50.0
 CATEGORIES=	net-im python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nxjoseph@protonmail.com
 COMMENT=	Interact with the Mastodon social network from the command line
 WWW=		https://github.com/ihabunek/toot \
 		https://pypi.org/project/toot
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0<5.0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=8.1<9:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.1<3.0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.13<3.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomlkit>=0.10.0<1.0:textproc/py-tomlkit@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}urwid>=2.0.0<3.0:devel/py-urwid@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.7:devel/py-wcwidth@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+# missing test depends ports are: vermin, types-beautifulsoup4
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}build>=0:devel/py-build@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mypy>=0:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=9.5.0:graphics/py-pillow@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pudb>=2025.1:devel/py-pudb@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyright>=0:devel/py-pyright@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twine>=0:devel/py-twine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	flavors pytest
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes
 
-SUB_FILES=	toot
+SUB_FILES=	${PORTNAME}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 OPTIONS_DEFAULT=	IMAGES RICHTEXT
 OPTIONS_GROUP=		SUPPORT
 OPTIONS_GROUP_SUPPORT=	IMAGES RICHTEXT
 
 IMAGES_DESC=	Required to display images in the TUI
 RICHTEXT_DESC=	Required to display rich text in the TUI
 
 IMAGES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=9.5.0:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}term-image>=0.7.2:graphics/py-term-image@${PY_FLAVOR}
 RICHTEXT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwidgets>=0.2<0.3:devel/py-urwidgets@${PY_FLAVOR}
 
 post-patch:
-	${REINPLACE_CMD} -e 's,{__version__},${DISTVERSION},g' \
-		${WRKSRC}/toot/cli/diag.py
-	${REINPLACE_CMD} -e '174s,__version__,"${DISTVERSION}",g' \
-		${WRKSRC}/toot/cli/__init__.py
+	@${REINPLACE_CMD} -e 's,{__version__},${DISTVERSION},g' \
+		${WRKSRC}/${PORTNAME}/cli/diag.py
+	@${REINPLACE_CMD} -e '175s,__version__,"${DISTVERSION}",g' \
+		${WRKSRC}/${PORTNAME}/cli/__init__.py
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/toot \
-		${STAGEDIR}${PREFIX}/bin/toot
-	(cd ${WRKSRC}/${PORTNAME} && \
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@(cd ${WRKSRC}/${PORTNAME} && \
 		${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/{} \
 		\; && \
-		${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/{} \
-		\;)
+		${FIND} . -type f -not -name "*.bak" -exec ${INSTALL_DATA} \
+		{} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/{} \;)
 
 .include <bsd.port.mk>
diff --git a/net-im/toot/distinfo b/net-im/toot/distinfo
index c13e689249d0..a57508c0de0e 100644
--- a/net-im/toot/distinfo
+++ b/net-im/toot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751288273
-SHA256 (toot-0.48.1.tar.gz) = 99629e24bc4ef3fb22162b7742f4053648279f5e7e34b5ad53224b5d3e05a66c
-SIZE (toot-0.48.1.tar.gz) = 1328964
+TIMESTAMP = 1755287725
+SHA256 (toot-0.50.0.tar.gz) = e5e66b92f214308d8d909fe9388fa2c8b9a263d14c315188fe8463c0a4fd7983
+SIZE (toot-0.50.0.tar.gz) = 1317704
diff --git a/net-im/toot/pkg-plist b/net-im/toot/pkg-plist
index a5d3f304b236..17c95ae54cbe 100644
--- a/net-im/toot/pkg-plist
+++ b/net-im/toot/pkg-plist
@@ -1,45 +1,46 @@
 bin/toot
 %%PYTHON_SITELIBDIR%%/toot/__init__.py
 %%PYTHON_SITELIBDIR%%/toot/__main__.py
 %%PYTHON_SITELIBDIR%%/toot/api.py
 %%PYTHON_SITELIBDIR%%/toot/auth.py
 %%PYTHON_SITELIBDIR%%/toot/cache.py
 %%PYTHON_SITELIBDIR%%/toot/cli/__init__.py
 %%PYTHON_SITELIBDIR%%/toot/cli/accounts.py
 %%PYTHON_SITELIBDIR%%/toot/cli/auth.py
 %%PYTHON_SITELIBDIR%%/toot/cli/diag.py
 %%PYTHON_SITELIBDIR%%/toot/cli/lists.py
+%%PYTHON_SITELIBDIR%%/toot/cli/polls.py
 %%PYTHON_SITELIBDIR%%/toot/cli/post.py
 %%PYTHON_SITELIBDIR%%/toot/cli/read.py
 %%PYTHON_SITELIBDIR%%/toot/cli/statuses.py
 %%PYTHON_SITELIBDIR%%/toot/cli/tags.py
 %%PYTHON_SITELIBDIR%%/toot/cli/timelines.py
 %%PYTHON_SITELIBDIR%%/toot/cli/timelines_v2.py
 %%PYTHON_SITELIBDIR%%/toot/cli/tui.py
 %%PYTHON_SITELIBDIR%%/toot/cli/validators.py
 %%PYTHON_SITELIBDIR%%/toot/config.py
 %%PYTHON_SITELIBDIR%%/toot/entities.py
 %%PYTHON_SITELIBDIR%%/toot/exceptions.py
 %%PYTHON_SITELIBDIR%%/toot/http.py
 %%PYTHON_SITELIBDIR%%/toot/logging.py
 %%PYTHON_SITELIBDIR%%/toot/output.py
 %%PYTHON_SITELIBDIR%%/toot/settings.py
 %%PYTHON_SITELIBDIR%%/toot/tui/NOTES.md
 %%PYTHON_SITELIBDIR%%/toot/tui/__init__.py
 %%PYTHON_SITELIBDIR%%/toot/tui/app.py
 %%PYTHON_SITELIBDIR%%/toot/tui/compose.py
 %%PYTHON_SITELIBDIR%%/toot/tui/constants.py
 %%PYTHON_SITELIBDIR%%/toot/tui/entities.py
 %%PYTHON_SITELIBDIR%%/toot/tui/images.py
 %%PYTHON_SITELIBDIR%%/toot/tui/overlays.py
 %%PYTHON_SITELIBDIR%%/toot/tui/poll.py
 %%PYTHON_SITELIBDIR%%/toot/tui/richtext/__init__.py
 %%PYTHON_SITELIBDIR%%/toot/tui/richtext/richtext.py
 %%PYTHON_SITELIBDIR%%/toot/tui/scroll.py
 %%PYTHON_SITELIBDIR%%/toot/tui/timeline.py
 %%PYTHON_SITELIBDIR%%/toot/tui/utils.py
 %%PYTHON_SITELIBDIR%%/toot/tui/widgets.py
 %%PYTHON_SITELIBDIR%%/toot/utils/__init__.py
 %%PYTHON_SITELIBDIR%%/toot/utils/datetime.py
 %%PYTHON_SITELIBDIR%%/toot/utils/language.py
 %%PYTHON_SITELIBDIR%%/toot/wcstring.py