py-cmake-language-server: updated to 0.1.6

0.1.6
Unknown changes

5 files changed, 16 insertions, 37 deletions

diff --git a/lang/py-cmake-language-server/ALTERNATIVES b/lang/py-cmake-language-server/ALTERNATIVES
index 96a02a12201..593b287636c 100644
--- a/lang/py-cmake-language-server/ALTERNATIVES
+++ b/lang/py-cmake-language-server/ALTERNATIVES
@@ -1,2 +1 @@
-bin/cmake-format @PREFIX@/bin/cmake-format-@PYVERSSUFFIX@
 bin/cmake-language-server @PREFIX@/bin/cmake-language-server-@PYVERSSUFFIX@
diff --git a/lang/py-cmake-language-server/Makefile b/lang/py-cmake-language-server/Makefile
index 072c81c6199..60f8ab4f8a3 100644
--- a/lang/py-cmake-language-server/Makefile
+++ b/lang/py-cmake-language-server/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/01/05 15:41:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/08/10 11:42:58 adam Exp $
 
-DISTNAME=	cmake-language-server-0.1.2
+DISTNAME=	cmake-language-server-0.1.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	lang python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cmake-language-server/}
 
@@ -11,16 +10,20 @@ HOMEPAGE=	https://github.com/regen100/cmake-language-server
 COMMENT=	CMake Language Server Protocol Implementation
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-pygls-[0-9]*:../../lang/py-pygls
-DEPENDS+=	${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
+DEPENDS+=	${PYPKGPREFIX}-pygls>=0.12:../../lang/py-pygls
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-pygls
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+.include "../../lang/python/pyversion.mk"
+.if ${_PYTHON_VERSION} < 38
+DEPENDS+=	${PYPKGPREFIX}-importlib-metadata>=4.8:../../devel/py-importlib-metadata
+.endif
 
 USE_PKG_RESOURCES=	yes
 
 post-install:
-	cd ${DESTDIR}${PREFIX}/bin && ${MV} cmake-format cmake-format-${PYVERSSUFFIX}
-	cd ${DESTDIR}${PREFIX}/bin && ${MV} cmake-language-server cmake-language-server-${PYVERSSUFFIX}
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} cmake-language-server cmake-language-server-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py-cmake-language-server/PLIST b/lang/py-cmake-language-server/PLIST
index ac59a827640..7bbdab3ece6 100644
--- a/lang/py-cmake-language-server/PLIST
+++ b/lang/py-cmake-language-server/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/18 15:19:01 wiz Exp $
-bin/cmake-format-${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.2 2022/08/10 11:42:58 adam Exp $
 bin/cmake-language-server-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -13,12 +12,6 @@ ${PYSITELIB}/cmake_language_server/__init__.pyo
 ${PYSITELIB}/cmake_language_server/api.py
 ${PYSITELIB}/cmake_language_server/api.pyc
 ${PYSITELIB}/cmake_language_server/api.pyo
-${PYSITELIB}/cmake_language_server/formatter.py
-${PYSITELIB}/cmake_language_server/formatter.pyc
-${PYSITELIB}/cmake_language_server/formatter.pyo
-${PYSITELIB}/cmake_language_server/parser.py
-${PYSITELIB}/cmake_language_server/parser.pyc
-${PYSITELIB}/cmake_language_server/parser.pyo
 ${PYSITELIB}/cmake_language_server/server.py
 ${PYSITELIB}/cmake_language_server/server.pyc
 ${PYSITELIB}/cmake_language_server/server.pyo
diff --git a/lang/py-cmake-language-server/distinfo b/lang/py-cmake-language-server/distinfo
index 4c5722e377a..20aa8019a0e 100644
--- a/lang/py-cmake-language-server/distinfo
+++ b/lang/py-cmake-language-server/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:51:49 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/08/10 11:42:58 adam Exp $
 
-BLAKE2s (cmake-language-server-0.1.2.tar.gz) = 388bb7b5ecf8d05e9dc3adf642349f39307431a21c621b55de2bc3d83cc7d490
-SHA512 (cmake-language-server-0.1.2.tar.gz) = 31e62f81c17463284336d6e9fd5417e282806335e4fc079581e092432d0f31c8548f6b498767f9dbc06bbf67e3debd7cd24344c0d62e9413c9ac40cf98825add
-Size (cmake-language-server-0.1.2.tar.gz) = 10536 bytes
-SHA1 (patch-setup.py) = ddac0a36f315456fed69c8a4cfb9d3ac65c6b20c
+BLAKE2s (cmake-language-server-0.1.6.tar.gz) = bb3607847f58d9f65af3001ccb729b6e273a7b40342d6b4af8002eedbc5c9604
+SHA512 (cmake-language-server-0.1.6.tar.gz) = 082646e9fa54efad5b3c80528f3d98a59157abb61b24bc7c3af1d7b976feae8505294606013acc6de612d8961378af0589b7a013ab9a78ddcfe2e7672f57fda3
+Size (cmake-language-server-0.1.6.tar.gz) = 9487 bytes
diff --git a/lang/py-cmake-language-server/patches/patch-setup.py b/lang/py-cmake-language-server/patches/patch-setup.py
deleted file mode 100644
index b683a116bb5..00000000000
--- a/lang/py-cmake-language-server/patches/patch-setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2020/05/18 15:19:01 wiz Exp $
-
-Don't hardcode version numbers.
-
---- setup.py.orig	2020-03-01 07:51:19.388557700 +0000
-+++ setup.py
-@@ -11,7 +11,7 @@ package_data = \
- {'': ['*']}
- 
- install_requires = \
--['pygls>=0.8.1,<0.9.0', 'pyparsing>=2.4,<3.0']
-+['pygls', 'pyparsing']
- 
- entry_points = \
- {'console_scripts': ['cmake-format = cmake_language_server.formatter:main',