Date: Mon, 20 May 2024 12:54:29 -0400 From: Adam Weinberger <adamw@adamw.org> To: Kurt Jaeger <pi@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 61971843fd48 - main - editors/neovim: update 0.9.5 -> 0.10.0 Message-ID: <BE2F550C-CC0C-4760-9CC9-702A7C45A453@adamw.org> In-Reply-To: <202405201454.44KEsnJN081962@gitrepo.freebsd.org> References: <202405201454.44KEsnJN081962@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is amazing work! =E2=80=94 Adam Weinberger adamw@adamw.org https://www.adamw.org > On May 20, 2024, at 10:54, Kurt Jaeger <pi@freebsd.org> wrote: >=20 > =EF=BB=BFThe branch main has been updated by pi: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D61971843fd48f9b59b3e71696= 43064453607c586 >=20 > commit 61971843fd48f9b59b3e7169643064453607c586 > Author: Laurant Chardon <laurent.chardon@gmail.com> > AuthorDate: 2024-05-20 14:51:01 +0000 > Commit: Kurt Jaeger <pi@FreeBSD.org> > CommitDate: 2024-05-20 14:51:01 +0000 >=20 > editors/neovim: update 0.9.5 -> 0.10.0 >=20 > Author: Laurant Chardon <laurent.chardon@gmail.com> > Changes: https://gpanders.com/blog/whats-new-in-neovim-0.10/ > https://neovim.io/doc/user/news-0.10.html > Approved: adamw (implicit) > PR: 279175 > --- > editors/neovim/Makefile | 32 ++++++++++++---------------= ---- > editors/neovim/distinfo | 10 +++++----- > editors/neovim/files/patch-CMakeLists.txt | 14 -------------- > 3 files changed, 17 insertions(+), 39 deletions(-) >=20 > diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile > index c48981a236a5..843c2e89a278 100644 > --- a/editors/neovim/Makefile > +++ b/editors/neovim/Makefile > @@ -1,7 +1,6 @@ > PORTNAME=3D neovim > DISTVERSIONPREFIX=3D v > -DISTVERSION=3D 0.9.5 > -PORTREVISION=3D 1 > +DISTVERSION=3D 0.10.0 > CATEGORIES=3D editors >=20 > MAINTAINER=3D adamw@FreeBSD.org > @@ -11,8 +10,8 @@ WWW=3D https://neovim.io/ > LICENSE=3D APACHE20 >=20 > BUILD_DEPENDS=3D gperf:devel/gperf \ > - ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ > - ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} > + ${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ > + ${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} > LIB_DEPENDS=3D libluv.so:devel/luv \ > libmsgpack-c.so:devel/msgpack-c \ > libtermkey.so:devel/libtermkey \ > @@ -20,19 +19,23 @@ LIB_DEPENDS=3D libluv.so:devel/luv \ > libunibilium.so:devel/unibilium \ > libuv.so:devel/libuv \ > libvterm.so:devel/libvterm > +RUN_DEPENDS=3D ${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR= } \ > + ${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} >=20 > -USES=3D cmake cpe gettext iconv lua:52,build luajit pathfix pkgcon= fig > +USES=3D cmake cpe gettext iconv lua:51,build luajit \ > + desktop-file-utils pathfix pkgconfig > USE_GITHUB=3D yes > GH_TUPLE=3D libmpack:libmpack:1.0.5:libmpack \ > - libmpack:libmpack-lua:1.0.9:libmpack_lua > -PORTSCOUT=3D limit:^[0-9\.v]+$$ > + libmpack:libmpack-lua:1.0.12:libmpack_lua >=20 > CMAKE_ARGS=3D -DLUA_PRG:FILEPATH=3D"${LUA_CMD}" \ > -DCMAKE_INSTALL_MANDIR:PATH=3D"${PREFIX}/share/man" \ > - -DDEPS_PREFIX:PATH=3D"${LOCALBASE}" > + -DDEPS_PREFIX:PATH=3D"${LOCALBASE}" \ > + -DCMAKE_LIBRARY_PATH:PATH=3D"${LOCALBASE}/lib/lua/${LUA_VER}" > CFLAGS+=3D -I${LOCALBASE}/include >=20 > DATADIR=3D ${PREFIX}/share/nvim > +PORTSCOUT=3D limit:^[0-9\.v]+$$ > PORTDATA=3D runtime >=20 > OPTIONS_DEFINE=3D NLS PYNVIM > @@ -41,19 +44,8 @@ OPTIONS_SUB=3D yes > PYNVIM_DESC=3D Enable support for plugins written in python >=20 > NLS_CMAKE_BOOL=3D ENABLE_LIBINTL > + > PYNVIM_RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}pynvim>=3D0.3.0:editors/py= -pynvim@${PY_FLAVOR} > PYNVIM_USES=3D python:run >=20 > -post-patch-NLS-off: > - ${REINPLACE_CMD} -e '/add_subdirectory(po)/d' ${WRKSRC}/src/nvim/CMak= eLists.txt > - > -pre-build: > - ${LN} -s ${WRKSRC_libmpack} ${WRKSRC_libmpack_lua}/mpack-src > - ${MKDIR} ${BUILD_WRKSRC}/src/nvim > - (cd ${WRKSRC_libmpack_lua} && ${CC} ${CFLAGS} -fPIC \ > - -I${LUA_INCDIR} -shared lmpack.c -o \ > - ${BUILD_WRKSRC}/src/nvim/mpack.so \ > - ${LUA_LIBDIR}/liblua-${LUA_VER}.so) > - ${LN} -s ${BUILD_WRKSRC}/src/nvim/mpack.so ${BUILD_WRKSRC}/runtime/mp= ack.so > - > .include <bsd.port.mk> > diff --git a/editors/neovim/distinfo b/editors/neovim/distinfo > index afddae974869..b420957ace97 100644 > --- a/editors/neovim/distinfo > +++ b/editors/neovim/distinfo > @@ -1,7 +1,7 @@ > -TIMESTAMP =3D 1703948840 > -SHA256 (neovim-neovim-v0.9.5_GH0.tar.gz) =3D fe74369fc30a32ec7a086b1013ac= d0eacd674e7570eb1acc520a66180c9e9719 > -SIZE (neovim-neovim-v0.9.5_GH0.tar.gz) =3D 11590180 > +TIMESTAMP =3D 1716160663 > +SHA256 (neovim-neovim-v0.10.0_GH0.tar.gz) =3D 372ea2584b0ea2a5a765844d952= 06bda9e4a57eaa1a2412a9a0726bab750f828 > +SIZE (neovim-neovim-v0.10.0_GH0.tar.gz) =3D 12792034 > SHA256 (libmpack-libmpack-1.0.5_GH0.tar.gz) =3D 4ce91395d81ccea97d3ad4cb96= 2f8540d166e59d3e2ddce8a22979b49f108956 > SIZE (libmpack-libmpack-1.0.5_GH0.tar.gz) =3D 32966 > -SHA256 (libmpack-libmpack-lua-1.0.9_GH0.tar.gz) =3D e94d5cf95d7479dca00ff= 23755fe05a440f11f9d203635e862ad8842de95f40a > -SIZE (libmpack-libmpack-lua-1.0.9_GH0.tar.gz) =3D 16087 > +SHA256 (libmpack-libmpack-lua-1.0.12_GH0.tar.gz) =3D 7c3f0a5fcd0d7c169fd7= bc95978412628d8f59eb9da1d32cf3e8a864b741ec92 > +SIZE (libmpack-libmpack-lua-1.0.12_GH0.tar.gz) =3D 16524 > diff --git a/editors/neovim/files/patch-CMakeLists.txt b/editors/neovim/fi= les/patch-CMakeLists.txt > deleted file mode 100644 > index 564ac85f400b..000000000000 > --- a/editors/neovim/files/patch-CMakeLists.txt > +++ /dev/null > @@ -1,14 +0,0 @@ > ---- CMakeLists.txt.orig 2023-04-07 16:52:01 UTC > -+++ CMakeLists.txt > -@@ -163,9 +163,9 @@ foreach(CFGNAME ${CMAKE_CONFIGURATION_TYPES}) > - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFGNAME} ${CMAKE_BINARY_DIR}/lib)= > - endforeach() > - > --set(LUA_DEPENDENCIES lpeg mpack bit) > -+set(LUA_DEPENDENCIES lpeg bit) > - if(NOT LUA_PRG) > -- foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua) > -+ foreach(CURRENT_LUA_PRG luajit) > - unset(_CHECK_LUA_PRG CACHE) > - unset(LUA_PRG_WORKS) > - find_program(_CHECK_LUA_PRG ${CURRENT_LUA_PRG})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BE2F550C-CC0C-4760-9CC9-702A7C45A453>