devel/youcompleteme: Update to g20210518

Remove REGEX option, this is now built-in

devel/youcompleteme/Makefile

@@ -1,8 +1,7 @@
 # Created by: Richard Gallamore <ultima@freebsd.org>
 
 PORTNAME=	YouCompleteMe
-DISTVERSION=	g20191130
-PORTREVISION=	1
+DISTVERSION=	g20210518
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,27 +11,21 @@ COMMENT=	Code-completion engine for Vim
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
+LIB_DEPENDS=	libabsl_strings.so:devel/abseil
+
 RUN_DEPENDS=	vim:editors/vim \
-		${LOCALBASE}/lib/libboost_thread.so:devel/boost-libs \
-		${LOCALBASE}/lib/${PY_BOOST} \
 		${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}frozendict>0:devel/py-frozendict@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}regex>0:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests-futures>0:www/py-requests-futures@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}watchdog>0:devel/py-watchdog@${PY_FLAVOR}
 
 USES=		cmake compiler:c++11-lang python:3.6+
 USE_PYTHON=	flavors
 USE_GITHUB=	yes
 GH_ACCOUNT=	ycm-core
-GH_TAGNAME=	1386c6b
-GH_TUPLE=	ycm-core:ycmd:a374320:ycm/third_party/ycmd \
-		ycm-core:regex:cc538bb:ycmd5/third_party/ycmd/third_party/cregex
-
-LLVM_VER=		90
+GH_TAGNAME=	ab73ca2
+GH_TUPLE=	ycm-core:ycmd:df3d7eb:ycm/third_party/ycmd
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/third_party/ycmd/cpp
 
@@ -44,23 +37,22 @@ SUB_FILES=		pkg-message pkg-install pkg-deinstall
 SUB_LIST=		VIMFILESDIR="${VIMFILESDIR}" \
 			FIND="${FIND}"
 
-OPTIONS_DEFINE=		C REGEX
-OPTIONS_DEFAULT=	C REGEX
+OPTIONS_DEFINE=		C
+OPTIONS_DEFAULT=	C
 OPTIONS_SUB=		yes
 
 C_DESC=			C-family Semantic Completion Support
 
-C_CMAKE_ON=		-DPATH_TO_LLVM_ROOT=${LOCALBASE}/llvm${LLVM_VER}
-C_LIB_DEPENDS=		libclang.so:devel/llvm${LLVM_VER}
+C_CMAKE_ON=		-DPATH_TO_LLVM_ROOT=${LOCALBASE}/llvm${LLVM_DEFAULT}
+C_LIB_DEPENDS=		libclang.so:devel/llvm${LLVM_DEFAULT}
 
 VIMFILESDIR=		${PREFIX}/share/vim/vimfiles
 
-CMAKE_ARGS_PY3=		-DUSE_PYTHON2:BOOL=OFF
-CMAKE_ARGS=		${CMAKE_ARGS_PY${PYTHON_MAJOR_VER}}
+CMAKE_ARGS=		${CMAKE_ARGS_PY${PYTHON_MAJOR_VER}} -DUSE_SYSTEM_ABSEIL:BOOL=ON
 
-post-patch-REGEX-on:
-		${PRINTF} "add_subdirectory(../third_party/cregex ${WRKDIR}/.build-regex)" \
-			>>${WRKSRC}/third_party/ycmd/cpp/CMakeLists.txt
+post-patch:
+		${REINPLACE_CMD} "s/'python3'/'${PYTHON_VERSION}'/" \
+			${WRKSRC}/python/ycm/paths.py
 
 do-install:
 		${MKDIR} ${STAGEDIR}${VIMFILESDIR}/third_party/ycmd/third_party
@@ -70,17 +62,11 @@ do-install:
 			"ycmd CORE_VERSION cpp" \
 			"${STAGEDIR}${VIMFILESDIR}/third_party/ycmd")
 		(cd ${WRKSRC}/third_party/ycmd/third_party && ${COPYTREE_SHARE} \
-			"clang cregex tern_runtime" \
+			"clang generic_server tern_runtime tsserver" \
 			"${STAGEDIR}${VIMFILESDIR}/third_party/ycmd/third_party")
 		${RM} -rf ${STAGEDIR}${VIMFILESDIR}/third_party/ycmd/cpp/ycm/tests \
 			${STAGEDIR}${VIMFILESDIR}/third_party/ycmd/ycmd/tests
-		${INSTALL_LIB} ${WRKSRC}/third_party/ycmd/ycm_core.so \
+		${INSTALL_LIB} ${WRKSRC}/third_party/ycmd/ycm_core.cpython-${PYTHON_SUFFIX}.so \
 			${STAGEDIR}${VIMFILESDIR}/third_party/ycmd
 
-do-install-REGEX-on:
-		(cd ${WRKSRC}/third_party/ycmd/third_party && ${COPYTREE_SHARE} \
-			"cregex" "${STAGEDIR}${VIMFILESDIR}/third_party/ycmd/third_party")
-		${INSTALL_LIB} ${WRKSRC}/third_party/ycmd/third_party/cregex/regex_${PYTHON_MAJOR_VER}/_regex.so \
-			${STAGEDIR}${VIMFILESDIR}/third_party/ycmd/third_party/cregex/regex_${PYTHON_MAJOR_VER}
-
 .include <bsd.port.mk>

devel/youcompleteme/distinfo

@@ -1,7 +1,5 @@
-TIMESTAMP = 1576048624
-SHA256 (ycm-core-YouCompleteMe-g20191130-1386c6b_GH0.tar.gz) = d5d9a2a63b4c17337c20b1879bebf90041743afab59cfb52cf934ed047291dc4
-SIZE (ycm-core-YouCompleteMe-g20191130-1386c6b_GH0.tar.gz) = 315502
-SHA256 (ycm-core-ycmd-a374320_GH0.tar.gz) = 7b8fc941162b20b1e15b4d7807a69967b26632865bbee7407f213e78f3e9744f
-SIZE (ycm-core-ycmd-a374320_GH0.tar.gz) = 4510540
-SHA256 (ycm-core-regex-cc538bb_GH0.tar.gz) = b26ee13605dae6a30a3b65e224e3dd4f4942acefc419e9109b3f6c5ad0a44ae8
-SIZE (ycm-core-regex-cc538bb_GH0.tar.gz) = 684593
+TIMESTAMP = 1621803852
+SHA256 (ycm-core-YouCompleteMe-g20210518-ab73ca2_GH0.tar.gz) = cd466762c509e67ac96f649b090a5a1fd5bc13fe0b6535ff2dacf95ca424904a
+SIZE (ycm-core-YouCompleteMe-g20210518-ab73ca2_GH0.tar.gz) = 298400
+SHA256 (ycm-core-ycmd-df3d7eb_GH0.tar.gz) = f999e89eef82a71280b0ab3c3318411d0787a13e1946f6d410eda77cc8a2b876
+SIZE (ycm-core-ycmd-df3d7eb_GH0.tar.gz) = 2898578