Attachment #250825 for bug #279175




PORTNAME=	neovim
DISTVERSIONPREFIX=	v
DISTVERSION=	0.10.0
PORTREVISION=	1
CATEGORIES=	editors

MAINTAINER=	adamw@FreeBSD.org

LICENSE=	APACHE20

BUILD_DEPENDS=	gperf:devel/gperf \
		${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
		${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
LIB_DEPENDS=	libluv.so:devel/luv \
		libmsgpack-c.so:devel/msgpack-c \
		libtermkey.so:devel/libtermkey \

		libuv.so:devel/libuv \
		libvterm.so:devel/libvterm

USES=		cmake cpe gettext iconv lua:51,build luajit \
		desktop-file-utils pathfix pkgconfig
USE_GITHUB=	yes
GH_TUPLE=	libmpack:libmpack:1.0.5:libmpack \
		libmpack:libmpack-lua:1.0.12:libmpack_lua
PORTSCOUT=	limit:^[0-9\.v]+$$

CMAKE_ARGS=	-DLUA_PRG:FILEPATH="${LUA_CMD}" \
 		-DCMAKE_INSTALL_MANDIR:PATH="${PREFIX}/share/man" \
 		-DDEPS_PREFIX:PATH="${LOCALBASE}" \
		-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib/lua/${LUA_VER}"
CFLAGS+=	-I${LOCALBASE}/include

DATADIR=	${PREFIX}/share/nvim

PYNVIM_DESC=	Enable support for plugins written in python

NLS_CMAKE_BOOL=		ENABLE_LIBINTL

PYNVIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
PYNVIM_USES=		python:run

post-patch-NLS-off:
	${REINPLACE_CMD} -e '/add_subdirectory(po)/d' ${WRKSRC}/src/nvim/CMakeLists.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/mpack.so

.include <bsd.port.mk>

Lines 1-7 Link Here

(-)b/editors/neovim/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1703948840	1	TIMESTAMP = 1716160663
2	SHA256 (neovim-neovim-v0.9.5_GH0.tar.gz) = fe74369fc30a32ec7a086b1013acd0eacd674e7570eb1acc520a66180c9e9719	2	SHA256 (neovim-neovim-v0.10.0_GH0.tar.gz) = 372ea2584b0ea2a5a765844d95206bda9e4a57eaa1a2412a9a0726bab750f828
3	SIZE (neovim-neovim-v0.9.5_GH0.tar.gz) = 11590180	3	SIZE (neovim-neovim-v0.10.0_GH0.tar.gz) = 12792034
4	SHA256 (libmpack-libmpack-1.0.5_GH0.tar.gz) = 4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956	4	SHA256 (libmpack-libmpack-1.0.5_GH0.tar.gz) = 4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956
5	SIZE (libmpack-libmpack-1.0.5_GH0.tar.gz) = 32966	5	SIZE (libmpack-libmpack-1.0.5_GH0.tar.gz) = 32966
6	SHA256 (libmpack-libmpack-lua-1.0.9_GH0.tar.gz) = e94d5cf95d7479dca00ff23755fe05a440f11f9d203635e862ad8842de95f40a	6	SHA256 (libmpack-libmpack-lua-1.0.12_GH0.tar.gz) = 7c3f0a5fcd0d7c169fd7bc95978412628d8f59eb9da1d32cf3e8a864b741ec92
7	SIZE (libmpack-libmpack-lua-1.0.9_GH0.tar.gz) = 16087	7	SIZE (libmpack-libmpack-lua-1.0.12_GH0.tar.gz) = 16524




--- 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})
- 

Return to bug 279175

Lines 1-7 Link Here

(-)b/editors/neovim/Makefile (-20 / +10 lines)
1	PORTNAME= neovim	1	PORTNAME= neovim
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.9.5	3	DISTVERSION= 0.10.0
4	PORTREVISION= 1
5	CATEGORIES= editors	4	CATEGORIES= editors
6		5
7	MAINTAINER= adamw@FreeBSD.org	6	MAINTAINER= adamw@FreeBSD.org
Lines 11-18 WWW= https://neovim.io/ Link Here
11	LICENSE= APACHE20	10	LICENSE= APACHE20
12		11
13	BUILD_DEPENDS= gperf:devel/gperf \	12	BUILD_DEPENDS= gperf:devel/gperf \
14	${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \	13	${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
15	${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}	14	${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
16	LIB_DEPENDS= libluv.so:devel/luv \	15	LIB_DEPENDS= libluv.so:devel/luv \
17	libmsgpack-c.so:devel/msgpack-c \	16	libmsgpack-c.so:devel/msgpack-c \
18	libtermkey.so:devel/libtermkey \	17	libtermkey.so:devel/libtermkey \
Lines 21-35 LIB_DEPENDS= libluv.so:devel/luv \ Link Here
21	libuv.so:devel/libuv \	20	libuv.so:devel/libuv \
22	libvterm.so:devel/libvterm	21	libvterm.so:devel/libvterm
23		22
24	USES= cmake cpe gettext iconv lua:52,build luajit pathfix pkgconfig	23	USES= cmake cpe gettext iconv lua:51,build luajit \
		24	desktop-file-utils pathfix pkgconfig
25	USE_GITHUB= yes	25	USE_GITHUB= yes
26	GH_TUPLE= libmpack:libmpack:1.0.5:libmpack \	26	GH_TUPLE= libmpack:libmpack:1.0.5:libmpack \
27	libmpack:libmpack-lua:1.0.9:libmpack_lua	27	libmpack:libmpack-lua:1.0.12:libmpack_lua
28	PORTSCOUT= limit:^[0-9\.v]+$$	28	PORTSCOUT= limit:^[0-9\.v]+$$
29		29
30	CMAKE_ARGS= -DLUA_PRG:FILEPATH="${LUA_CMD}" \	30	CMAKE_ARGS= -DLUA_PRG:FILEPATH="${LUA_CMD}" \
31	-DCMAKE_INSTALL_MANDIR:PATH="${PREFIX}/share/man" \	31	-DCMAKE_INSTALL_MANDIR:PATH="${PREFIX}/share/man" \
32	-DDEPS_PREFIX:PATH="${LOCALBASE}"	32	-DDEPS_PREFIX:PATH="${LOCALBASE}" \
		33	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib/lua/${LUA_VER}"
33	CFLAGS+= -I${LOCALBASE}/include	34	CFLAGS+= -I${LOCALBASE}/include
34		35
35	DATADIR= ${PREFIX}/share/nvim	36	DATADIR= ${PREFIX}/share/nvim
Lines 41-59 OPTIONS_SUB= yes Link Here
41	PYNVIM_DESC= Enable support for plugins written in python	42	PYNVIM_DESC= Enable support for plugins written in python
42		43
43	NLS_CMAKE_BOOL= ENABLE_LIBINTL	44	NLS_CMAKE_BOOL= ENABLE_LIBINTL
		45
44	PYNVIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}	46	PYNVIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
45	PYNVIM_USES= python:run	47	PYNVIM_USES= python:run
46		48
47	post-patch-NLS-off:
48	${REINPLACE_CMD} -e '/add_subdirectory(po)/d' ${WRKSRC}/src/nvim/CMakeLists.txt
49
50	pre-build:
51	${LN} -s ${WRKSRC_libmpack} ${WRKSRC_libmpack_lua}/mpack-src
52	${MKDIR} ${BUILD_WRKSRC}/src/nvim
53	(cd ${WRKSRC_libmpack_lua} && ${CC} ${CFLAGS} -fPIC \
54	-I${LUA_INCDIR} -shared lmpack.c -o \
55	${BUILD_WRKSRC}/src/nvim/mpack.so \
56	${LUA_LIBDIR}/liblua-${LUA_VER}.so)
57	${LN} -s ${BUILD_WRKSRC}/src/nvim/mpack.so ${BUILD_WRKSRC}/runtime/mpack.so
58
59	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Removed Link Here

(-)a/editors/neovim/files/patch-CMakeLists.txt (-15 lines)
1	--- CMakeLists.txt.orig 2023-04-07 16:52:01 UTC
2	+++ CMakeLists.txt
3	@@ -163,9 +163,9 @@ foreach(CFGNAME ${CMAKE_CONFIGURATION_TYPES})
4	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFGNAME} ${CMAKE_BINARY_DIR}/lib)
5	endforeach()
6
7	-set(LUA_DEPENDENCIES lpeg mpack bit)
8	+set(LUA_DEPENDENCIES lpeg bit)
9	if(NOT LUA_PRG)
10	- foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua)
11	+ foreach(CURRENT_LUA_PRG luajit)
12	unset(_CHECK_LUA_PRG CACHE)
13	unset(LUA_PRG_WORKS)
14	find_program(_CHECK_LUA_PRG ${CURRENT_LUA_PRG})
15	-