diff --git a/textproc/castxml/Makefile b/textproc/castxml/Makefile
index 662ef8a2c9f9..b779d0b2d044 100644
--- a/textproc/castxml/Makefile
+++ b/textproc/castxml/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	castxml
-PORTVERSION=	g20181115
-PORTREVISION=	3
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.4.5
 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 compiler:c++11-lang
+USES=		cmake:testing compiler:c++11-lang
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	CastXML
 GH_PROJECT=	CastXML
-GH_TAGNAME=	c3a239d
 
 CMAKE_ARGS=	-DLLVM_DIR:STRING=${LOCALBASE}/llvm${LLVM_VERSION}/lib/cmake/llvm
 
 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
 
 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
 
 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>
diff --git a/textproc/castxml/distinfo b/textproc/castxml/distinfo
index fa322803db80..fe3218a57f90 100644
--- a/textproc/castxml/distinfo
+++ b/textproc/castxml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543133898
-SHA256 (CastXML-CastXML-g20181115-c3a239d_GH0.tar.gz) = 9d1af12037eefa7ed73c0d916c483f8eb46b9c5a669357fef64a5da22562f040
-SIZE (CastXML-CastXML-g20181115-c3a239d_GH0.tar.gz) = 93002
+TIMESTAMP = 1659285803
+SHA256 (CastXML-CastXML-v0.4.5_GH0.tar.gz) = 007f6d073165e150df0e40e1ec331f6f94304684af9eed3b0e5dabaebcfb1197
+SIZE (CastXML-CastXML-v0.4.5_GH0.tar.gz) = 104158
diff --git a/textproc/castxml/files/patch-doc_conf.py.in b/textproc/castxml/files/patch-doc_conf.py.in
deleted file mode 100644
index 095153b6b598..000000000000
--- a/textproc/castxml/files/patch-doc_conf.py.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/conf.py.in.orig	2018-11-15 20:05:42 UTC
-+++ doc/conf.py.in
-@@ -52,7 +52,7 @@ for fpath in castxml_manuals:
-                               name, desc, [], int(sec)))
-         else:
-             sys.stderr.write("ERROR: No castxml-manual-description in '%s'\n" % fpath)
--    except Exception, e:
-+    except Exception as e:
-         sys.stderr.write("ERROR: %s\n" % str(e))
- man_show_urls = False
-