Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1650471301267890"
MIME-Version: 1.0
Date: Wed, 20 Apr 2022 16:15:01 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/devel/lua-luv
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20220420161501.EE5EEFB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1650471301267890
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Wed Apr 20 16:15:01 UTC 2022

Modified Files:
	pkgsrc/devel/lua-luv: Makefile PLIST
Added Files:
	pkgsrc/devel/lua-luv: buildlink3.mk

Log Message:
lua-luv: Install headers and other files required by neovim.

Unfortnately this requires we add a self-conflict.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/lua-luv/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/lua-luv/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/lua-luv/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1650471301267890
Content-Disposition: inline
Content-Length: 2388
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/lua-luv/Makefile
diff -u pkgsrc/devel/lua-luv/Makefile:1.7 pkgsrc/devel/lua-luv/Makefile:1.8
--- pkgsrc/devel/lua-luv/Makefile:1.7	Sat Feb 19 08:18:22 2022
+++ pkgsrc/devel/lua-luv/Makefile	Wed Apr 20 16:15:01 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/02/19 08:18:22 nia Exp $
+# $NetBSD: Makefile,v 1.8 2022/04/20 16:15:01 nia Exp $
 
 DISTNAME=	luv-1.43.0-0
 PKGNAME=	${LUA_PKGPREFIX}-${DISTNAME:S/-0$/.0/1}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=luvit/}
 GITHUB_PROJECT=	luv
@@ -12,6 +13,8 @@ HOMEPAGE=	https://github.com/luvit/luv
 COMMENT=	Bare libuv bindings for Lua
 LICENSE=	apache-2.0
 
+LUA_SELF_CONFLICT=	yes
+
 .include "../../lang/lua/luaversion.mk"
 
 .if ${_LUA_VERSION} == "51" || ${_LUA_VERSION} == "52"
@@ -22,9 +25,12 @@ USE_CMAKE=	yes
 
 CMAKE_ARGS+=	-DWITH_SHARED_LIBUV=ON
 CMAKE_ARGS+=	-DBUILD_MODULE=ON
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
 CMAKE_ARGS+=	-DLUA_BUILD_TYPE=System
 CMAKE_ARGS+=	-DWITH_LUA_ENGINE=Lua
 
+PKGCONFIG_OVERRIDE+=	libluv.pc.in
+
 pre-configure:
 .if ${_LUA_VERSION} == "51" || ${_LUA_VERSION} == "52"
 	${CP} ${PREFIX}/${LUA_INCDIR}/compat-5.3.* ${WRKSRC}/src

Index: pkgsrc/devel/lua-luv/PLIST
diff -u pkgsrc/devel/lua-luv/PLIST:1.1 pkgsrc/devel/lua-luv/PLIST:1.2
--- pkgsrc/devel/lua-luv/PLIST:1.1	Thu Jul  2 20:48:09 2020
+++ pkgsrc/devel/lua-luv/PLIST	Wed Apr 20 16:15:01 2022
@@ -1,2 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2020/07/02 20:48:09 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/04/20 16:15:01 nia Exp $
+include/luv/lhandle.h
+include/luv/lreq.h
+include/luv/luv.h
+include/luv/util.h
+lib/libluv.so
+lib/libluv.so.1
+lib/libluv.so.1.43.0
 ${LUA_CDIR}/luv.so
+lib/pkgconfig/libluv.pc

Added files:

Index: pkgsrc/devel/lua-luv/buildlink3.mk
diff -u /dev/null pkgsrc/devel/lua-luv/buildlink3.mk:1.1
--- /dev/null	Wed Apr 20 16:15:01 2022
+++ pkgsrc/devel/lua-luv/buildlink3.mk	Wed Apr 20 16:15:01 2022
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2022/04/20 16:15:01 nia Exp $
+
+BUILDLINK_TREE+=	lua-luv
+
+.if !defined(LUA_LUV_BUILDLINK3_MK)
+LUA_LUV_BUILDLINK3_MK:=
+
+.include "../../lang/lua/luaversion.mk"
+
+BUILDLINK_API_DEPENDS.lua-luv+=	${LUA_PKGPREFIX}-luv>=1.43.0.0nb1
+BUILDLINK_PKGSRCDIR.lua-luv?=	../../devel/lua-luv
+
+.include "../../devel/libuv/buildlink3.mk"
+.endif	# LUA_LUV_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-lua-luv


--_----------=_1650471301267890--