Index: head/devel/universal-ctags/Makefile
===================================================================
--- head/devel/universal-ctags/Makefile	(revision 534388)
+++ head/devel/universal-ctags/Makefile	(revision 534389)
@@ -1,68 +1,56 @@
 # Created by: Derek Schrock <dereks@lifeofadishwasher.com>
 # $FreeBSD$
 
 PORTNAME=	universal-ctags
-PORTVERSION=	g20200403
+PORTVERSION=	g20200502
 CATEGORIES=	devel
 
 MAINTAINER=	dereks@lifeofadishwasher.com
 COMMENT=	Fork of Exuberant Ctags to generate index/tag files
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf pkgconfig
 
 GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 GH_PROJECT=	ctags
-GH_TAGNAME=	6dd6c735
+GH_TAGNAME=	3671ad72
 
-OPTIONS_DEFINE=			ASPELL DEBUG ICONV JSON LIBXML2 MANPAGES YAML
+OPTIONS_DEFINE=			DEBUG ICONV JSON LIBXML2 MANPAGES YAML
 OPTIONS_DEFAULT=		ICONV JSON LIBXML2 MANPAGES YAML
 
 CONFIGURE_ARGS=	--program-prefix=u
 
 JSON_DESC=			JSON output support
 
-ASPELL_CONFIGURE_ENABLE=	aspell
-# textproc/aspell does not install a aspell.pc file
-ASPELL_CONFIGURE_ENV=		ASPELL_LIBS="-L${LOCALBASE}/lib -laspell" \
-				ASPELL_CFLAGS="-I${LOCALBASE}/include"
-ASPELL_LIB_DEPENDS=		libaspell.so:textproc/aspell
-ASPELL_VARS=	TEST_DEPENDS+=${LOCALBASE}/share/aspell/en_US.multi:textproc/en-aspell
-
 DEBUG_CONFIGURE_ENABLE=		debugging
 
 ICONV_CONFIGURE_ENABLE=		iconv
 ICONV_USES=			iconv
 
 TEST_TARGET=	check
 
 # Extra support for YAML and XML based languages
 LIBXML2_CONFIGURE_ENABLE=	xml
 LIBXML2_LIB_DEPENDS=		libxml2.so:textproc/libxml2
 
 JSON_CONFIGURE_ENABLE=		json
 JSON_LIB_DEPENDS=		libjansson.so:devel/jansson
 
 MANPAGES_BUILD_DEPENDS=		rst2man:textproc/py-docutils
 MANPAGES_PLIST_FILES=		man/man1/uctags.1.gz \
 				man/man5/utags.5.gz \
 				man/man7/uctags-client-tools.7.gz \
 				man/man7/uctags-incompatibilities.7.gz \
 				man/man7/uctags-optlib.7.gz
 
 YAML_CONFIGURE_ENABLE=		yaml
 YAML_LIB_DEPENDS=		libyaml.so:textproc/libyaml
 
 PLIST_FILES=			bin/uctags \
 				bin/ureadtags
-
-pre-configure:
-	# test-case.mak is generated by autogen.sh disable it for building
-	@${REINPLACE_CMD} -e '/^m4_include(\[Tmain\/dist.m4])$$/s/^/#/' ${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e '/^m4_include(\[Units\/dist.m4])$$/s/^/#/' ${WRKSRC}/configure.ac
 
 .include <bsd.port.mk>
Index: head/devel/universal-ctags/distinfo
===================================================================
--- head/devel/universal-ctags/distinfo	(revision 534388)
+++ head/devel/universal-ctags/distinfo	(revision 534389)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585938160
-SHA256 (universal-ctags-ctags-g20200403-6dd6c735_GH0.tar.gz) = 9b441bdc0991e6b62eef0c872027f9d7ffce1d42cebd9c3fe01184e923252d17
-SIZE (universal-ctags-ctags-g20200403-6dd6c735_GH0.tar.gz) = 1817742
+TIMESTAMP = 1588893398
+SHA256 (universal-ctags-ctags-g20200502-3671ad72_GH0.tar.gz) = 8c4a8bada7c7c888da81a99420b663986633945d8b76cfe2f1cfaced736980d3
+SIZE (universal-ctags-ctags-g20200502-3671ad72_GH0.tar.gz) = 1851441