diff --git a/textproc/castxml/Makefile b/textproc/castxml/Makefile
index b779d0b2d044..ddd043521085 100644
--- a/textproc/castxml/Makefile
+++ b/textproc/castxml/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	castxml
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C-family Abstract Syntax Tree XML Output
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 RUN_DEPENDS=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 TEST_DEPENDS=	${LOCALBASE}/lib/libxml2.so:textproc/libxml2
 
 USES=		cmake:testing compiler:c++11-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CastXML
 GH_PROJECT=	CastXML
 
 CMAKE_ARGS=	-DLLVM_DIR:STRING=${LOCALBASE}/llvm${LLVM_VERSION}/lib/cmake/llvm
 
+LLVM_VERSIONS=	15 14 13 12 11 10 90 80 70
+
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	DOCS LLVM_${LLVM_DEFAULT}
 OPTIONS_SUB=		yes
 
 LLVM_DESC=		LLVM Version
 OPTIONS_SINGLE=		LLVM
-OPTIONS_SINGLE_LLVM=	LLVM_DEVEL LLVM_90 LLVM_80 LLVM_70
+OPTIONS_SINGLE_LLVM=	LLVM_DEVEL
 
 LLVM_DEVEL_DESC=	llvm-devel
 LLVM_DEVEL_VARS=	LLVM_VERSION=-devel
 
-LLVM_90_DESC=		LLVM 9
-LLVM_90_VARS=		LLVM_VERSION=90
-
-LLVM_80_DESC=		LLVM 8
-LLVM_80_VARS=		LLVM_VERSION=80
-
-LLVM_70_DESC=		LLVM 7
-LLVM_70_VARS=		LLVM_VERSION=70
+.for v in ${LLVM_VERSIONS}
+OPTIONS_SINGLE_LLVM+=	LLVM_${v}
+LLVM_${v}_DESC=		LLVM ${v}
+LLVM_${v}_VARS=		LLVM_VERSION=${v}
+.endfor
 
 DOCS_CMAKE_BOOL=	SPHINX_MAN
 DOCS_CMAKE_ON=		-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx
 
 post-stage: # autoplist: plist changes with llvm versions
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} * -type f -or -type l | ${SED} 's|castxml\.1|castxml.1.gz|' > ${TMPPLIST}
 
 do-test: # tests fail: https://github.com/CastXML/CastXML/issues/130
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>