Index: devel/py-python-gitlab/Makefile
===================================================================
--- devel/py-python-gitlab/Makefile
+++ devel/py-python-gitlab/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-gitlab
-PORTVERSION=	2.5.0
+PORTVERSION=	2.6.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,35 +12,37 @@
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1:www/py-requests-toolbelt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httmock>0:www/py-httmock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
 
 USES=		python:3.6+
+USE_PYTHON=	autoplist concurrent distutils
 
+NO_ARCH=	yes
+SUB_FILES=	pkg-message
+
+OPTIONS_DEFINE=		AUTOCOMPLETE DOCS YAML
 OPTIONS_DEFAULT=	AUTOCOMPLETE YAML
-OPTIONS_DEFINE=	AUTOCOMPLETE DOCS YAML
 
-AUTOCOMPLETE_DESC=	Autocompletion via argcomplete
+AUTOCOMPLETE_DESC=		Autocompletion via argcomplete
+YAML_DESC=		YAML output
+
 AUTOCOMPLETE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=1.10.0<2:devel/py-argcomplete@${PY_FLAVOR}
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.7.6,1:textproc/py-sphinx@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
-DOCS_PORTDOCS=	*
-DOCS_VARS=	PYDISTUTILS_BUILD_TARGET=build_sphinx \
-		PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1:www/py-requests-toolbelt@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinx>=3.2.1,1:textproc/py-sphinx@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-autoprogram>0:textproc/py-sphinxcontrib-autoprogram@${PY_FLAVOR}
+DOCS_PORTDOCS=		*
+DOCS_VARS=		PYDISTUTILS_BUILD_TARGET=build_sphinx \
+			PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
 
-YAML_DESC=	YAML output
 YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR}
 
-NO_ARCH=	yes
-USE_PYTHON=	distutils autoplist concurrent
-
-SUB_FILES=	pkg-message
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g' ${WRKSRC}/gitlab/config.py
 
Index: devel/py-python-gitlab/distinfo
===================================================================
--- devel/py-python-gitlab/distinfo
+++ devel/py-python-gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599059372
-SHA256 (python-gitlab-2.5.0.tar.gz) = 68b42aafd4b620ab2534ff78a52584c7f799e4e55d5ac297eab4263066e6f74b
-SIZE (python-gitlab-2.5.0.tar.gz) = 148916
+TIMESTAMP = 1612736602
+SHA256 (python-gitlab-2.6.0.tar.gz) = a862c6874524ab585b725a17b2cd2950fc09d6d74205f40a11be2a4e8f2dcaa1
+SIZE (python-gitlab-2.6.0.tar.gz) = 153577
Index: textproc/Makefile
===================================================================
--- textproc/Makefile
+++ textproc/Makefile
@@ -1407,6 +1407,7 @@
     SUBDIR += py-sphinx_wikipedia
     SUBDIR += py-sphinxcontrib-adadomain
     SUBDIR += py-sphinxcontrib-applehelp
+    SUBDIR += py-sphinxcontrib-autoprogram
     SUBDIR += py-sphinxcontrib-bitbucket
     SUBDIR += py-sphinxcontrib-devhelp
     SUBDIR += py-sphinxcontrib-fulltoc
Index: textproc/py-sphinxcontrib-autoprogram/Makefile
===================================================================
--- /dev/null
+++ textproc/py-sphinxcontrib-autoprogram/Makefile
@@ -0,0 +1,41 @@
+# Created by: John Marino <marino@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	sphinxcontrib-autoprogram
+PORTVERSION=	0.1.5
+CATEGORIES=	textproc
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dereks@lifeofadishwasher.com
+COMMENT=	Sphinx Autoprogram Extension
+
+LICENSE=	BSD2CLAUSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2,1:textproc/py-sphinx@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+USE_GITHUB=	yes
+GH_ACCOUNT=	sphinx-contrib
+GH_PROJECT=	autoprogram
+
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFAULT=	DOCS
+
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.2,1:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_PORTDOCS=		*
+DOCS_VARS=		PYDISTUTILS_BUILD_TARGET=build_sphinx \
+			PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/build/sphinx/html && \
+	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")
+
+do-test:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+
+.include <bsd.port.mk>
Index: textproc/py-sphinxcontrib-autoprogram/distinfo
===================================================================
--- /dev/null
+++ textproc/py-sphinxcontrib-autoprogram/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1612833893
+SHA256 (sphinx-contrib-autoprogram-0.1.5_GH0.tar.gz) = 7bf0135cf7400e29982d61caf3b0a750e63c8b9e31ffb682a28a2e370e092951
+SIZE (sphinx-contrib-autoprogram-0.1.5_GH0.tar.gz) = 16091
Index: textproc/py-sphinxcontrib-autoprogram/pkg-descr
===================================================================
--- /dev/null
+++ textproc/py-sphinxcontrib-autoprogram/pkg-descr
@@ -0,0 +1,3 @@
+This extension provides an automated way to document CLI programs.
+
+WWW: https://github.com/sphinx-contrib/autoprogram