diff --git a/devel/alire/Makefile b/devel/alire/Makefile
index 6f9df7e1ec24..0d9b42d3fddb 100644
--- a/devel/alire/Makefile
+++ b/devel/alire/Makefile
@@ -1,60 +1,77 @@
 PORTNAME=	alire
-DISTVERSION=	1.2.2
-PORTREVISION=	1
+DISTVERSION=	2.1.0
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/alire-project/${PORTNAME}/releases/download/v${DISTVERSION}/
+MASTER_SITES=	https://github.com/${PORTNAME}-project/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	alr-${DISTVERSION}-full-sources
 
-MAINTAINER=	agh@riseup.net
+MAINTAINER=	william.franck@sterna.dev.
 COMMENT=	Ada LIbrary REpository (ALIRE) management tool, alr
 WWW=		https://alire.ada.dev/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_i386=	segfault: raised STORAGE_ERROR : s-intman.adb:136 explicit raise
 
 BUILD_DEPENDS=	gprbuild>0:devel/gprbuild
+RUN_DEPENDS=	git>0:devel/git
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}e3_testsuite>0:devel/py-e3-testsuite@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
+		git>0:devel/git
 
-USES=		ada:12,run desktop-file-utils zip
-USE_GCC=	yes:build
+USES=		ada:run python shebangfix zip
 
-_GPR_ARGS=	-j${MAKE_JOBS_NUMBER} -p -XALIRE_OS=freebsd
+SHEBANG_FILES=	testsuite/run.py
 
-WRKSRC=		${WRKDIR}/alr-${DISTVERSION}
+MAKE_CMD=	gprbuild
 
-OPTIONS_DEFINE=	DEBUG DOCS
+BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
+
+WRKSRC=		${WRKDIR}/alr-${PORTVERSION}
+
+PLIST_FILES=	bin/alr \
+		etc/bash_completion.d/alr-completion.bash \
+		share/applications/alr.desktop \
+		share/pixmaps/alr.png
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_DESC=	Install Design and Development documentation
 
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MDEBUG)
-_GPR_ARGS+=	-XALIRE_BUILD_MODE=release
-.endif
+_GPR_ARGS=	-j${MAKE_JOBS_NUMBER} -p -vh -vP2 \
+		-XALIRE_BUILD_MODE=${WITH_DEBUG:Urelease:Ddebug} \
+		-XALIRE_OS=freebsd
+_TESTSUITE_ENV=	ALIRE_TESTSUITE_DISABLE_DOCKER= GH_USERNAME=${PORTNAME}-project
 
 do-build:
 	(cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} gprbuild ${_GPR_ARGS} -P alr_env)
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_GPR_ARGS} -P alr_env)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/alr \
 		${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/scripts/alr-completion.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/resources/alr.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/resources/alr.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
+do-test:
+	(cd ${WRKSRC}/testsuite && \
+		${SETENV} ${_TESTSUITE_ENV} PATH=${PATH}:${_ADAPATH} \
+		${PYTHON_CMD} ./run.py)
+
 .include <bsd.port.mk>
diff --git a/devel/alire/distinfo b/devel/alire/distinfo
index aa0ad93172dc..c8a37675e272 100644
--- a/devel/alire/distinfo
+++ b/devel/alire/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691804403
-SHA256 (alr-1.2.2-full-sources.zip) = 8a9efd65a3da4e22ffaf5b146dba8dc125cf4ea26d482a25bcaac85d0d2764d1
-SIZE (alr-1.2.2-full-sources.zip) = 2267709
+TIMESTAMP = 1772286770
+SHA256 (alr-2.1.0-full-sources.zip) = 654bad4830f7861a45ecadcb1de74f2a0dde410d90e284248218c7b6e6bedc0e
+SIZE (alr-2.1.0-full-sources.zip) = 3342243
diff --git a/devel/alire/pkg-plist b/devel/alire/pkg-plist
deleted file mode 100644
index 5e6b9951cd10..000000000000
--- a/devel/alire/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-bin/alr
-etc/bash_completion.d/alr-completion.bash
-share/applications/alr.desktop
-%%DOCS%%%%DOCSDIR%%/2018-03.alr-draft.pdf
-%%DOCS%%%%DOCSDIR%%/AEPs/aep-0001.md
-%%DOCS%%%%DOCSDIR%%/AEPs/aep-0002.md
-%%DOCS%%%%DOCSDIR%%/alr-logo-black-white.svg
-%%DOCS%%%%DOCSDIR%%/alr-logo-sq.png
-%%DOCS%%%%DOCSDIR%%/alr-logo-white.svg
-%%DOCS%%%%DOCSDIR%%/alr-logo.svg
-%%DOCS%%%%DOCSDIR%%/alr-logo.svg.png
-%%DOCS%%%%DOCSDIR%%/catalog-format-spec.md
-%%DOCS%%%%DOCSDIR%%/classes.graphml
-%%DOCS%%%%DOCSDIR%%/configuration.md
-%%DOCS%%%%DOCSDIR%%/getting-started.md
-%%DOCS%%%%DOCSDIR%%/introduction.md
-%%DOCS%%%%DOCSDIR%%/policies.md
-%%DOCS%%%%DOCSDIR%%/publishing.md
-%%DOCS%%%%DOCSDIR%%/toolchains.md
-%%DOCS%%%%DOCSDIR%%/user-changes.md
-share/pixmaps/alr.png