pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

*: remove two versions of lua-luv, use pkgsrc/devel/lua-luv instead



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Jan 6 23:08:27 2026 +0100
Changeset:	62c0828df5c022d7a720c1c10fb64ce330e47d76

Modified Files:
	Makefile
Removed Files:
	lua-luv/DESCR
	lua-luv/Makefile
	lua-luv/PLIST
	lua-luv/buildlink3.mk
	lua-luv/distinfo
	luv/DESCR
	luv/Makefile
	luv/PLIST
	luv/buildlink3.mk
	luv/distinfo
	luv/options.mk
	luv/patches/patch-CMakeLists.txt

Log Message:
*: remove two versions of lua-luv, use pkgsrc/devel/lua-luv instead

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=62c0828df5c022d7a720c1c10fb64ce330e47d76

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

diffstat:
 Makefile                         |  2 --
 lua-luv/DESCR                    |  2 --
 lua-luv/Makefile                 | 36 ------------------------------------
 lua-luv/PLIST                    | 10 ----------
 lua-luv/buildlink3.mk            | 15 ---------------
 lua-luv/distinfo                 |  5 -----
 luv/DESCR                        |  2 --
 luv/Makefile                     | 31 -------------------------------
 luv/PLIST                        |  9 ---------
 luv/buildlink3.mk                | 14 --------------
 luv/distinfo                     |  6 ------
 luv/options.mk                   | 25 -------------------------
 luv/patches/patch-CMakeLists.txt | 14 --------------
 13 files changed, 171 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 33b103edfe..b305fe34a8 100644
--- a/Makefile
+++ b/Makefile
@@ -2302,13 +2302,11 @@ SUBDIR+=	lua-htmlparser
 SUBDIR+=	lua-lbn
 SUBDIR+=	lua-ldoc
 SUBDIR+=	lua-luacheck
-SUBDIR+=	lua-luv
 SUBDIR+=	luabind
 SUBDIR+=	luakit-git
 SUBDIR+=	lucene
 SUBDIR+=	lumina
 SUBDIR+=	lumina-desktop
-SUBDIR+=	luv
 SUBDIR+=	lvm2
 SUBDIR+=	lwc
 SUBDIR+=	lwtools
diff --git a/lua-luv/DESCR b/lua-luv/DESCR
deleted file mode 100644
index 590e6327d6..0000000000
--- a/lua-luv/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This library makes libuv available to lua scripts.  It was made for the
-luvit project but should usable from nearly any lua project.
diff --git a/lua-luv/Makefile b/lua-luv/Makefile
deleted file mode 100644
index 1b3ad4d47e..0000000000
--- a/lua-luv/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	luv-1.43.0-0
-PKGNAME=	${LUA_PKGPREFIX}-${DISTNAME:S/-0$//1}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=luvit/}
-GITHUB_PROJECT=	luv
-GITHUB_TAG=	${DISTNAME:S/^luv-//1}
-
-MAINTAINER=	nia%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/luvit/luv
-COMMENT=	Bare libuv bindings for Lua
-LICENSE=	apache-2.0
-
-.include "../../lang/lua/luaversion.mk"
-
-.if ${_LUA_VERSION} == "51" || ${_LUA_VERSION} == "52"
-DEPENDS+=	${LUA_PKGPREFIX}-compat53-[0-9]*:../../devel/lua-compat53
-.endif
-
-USE_CMAKE=	yes
-
-CMAKE_CONFIGURE_ARGS+=	-DWITH_SHARED_LIBUV=ON
-CMAKE_CONFIGURE_ARGS+=	-DBUILD_MODULE=ON
-CMAKE_CONFIGURE_ARGS+=	-DBUILD_SHARED_LIBS=ON
-CMAKE_CONFIGURE_ARGS+=	-DLUA_BUILD_TYPE=System
-CMAKE_CONFIGURE_ARGS+=	-DWITH_LUA_ENGINE=Lua
-
-pre-configure:
-.if ${_LUA_VERSION} == "51" || ${_LUA_VERSION} == "52"
-	${CP} ${PREFIX}/${LUA_INCDIR}/compat-5.3.* ${WRKSRC}/src
-.endif
-
-.include "../../lang/lua/module.mk"
-.include "../../devel/libuv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lua-luv/PLIST b/lua-luv/PLIST
deleted file mode 100644
index 66141c5e67..0000000000
--- a/lua-luv/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-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.${PKGVERSION}
-${LUA_CDIR}/luv.so
-lib/pkgconfig/libluv.pc
diff --git a/lua-luv/buildlink3.mk b/lua-luv/buildlink3.mk
deleted file mode 100644
index ceeccdd575..0000000000
--- a/lua-luv/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	lua51-luv
-
-.if !defined(LUA51_LUV_BUILDLINK3_MK)
-LUA51_LUV_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.lua51-luv+=	lua51-luv>=1.41.0
-BUILDLINK_PKGSRCDIR.lua51-luv?=	../../wip/lua-luv
-
-.include "../../devel/libuv/buildlink3.mk"
-
-.endif	# LUA51_LUV_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-lua51-luv
diff --git a/lua-luv/distinfo b/lua-luv/distinfo
deleted file mode 100644
index 1abc534cac..0000000000
--- a/lua-luv/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-BLAKE2s (luv-1.43.0-0.tar.gz) = 9a7d0247373b79cffec08a44b103b8b0985a2f62ef6d4a7fd31e80ca20a175da
-SHA512 (luv-1.43.0-0.tar.gz) = f51d9b3c733dd5617fca49534fdd77dbb6a3d6f58263f453db8dcde21679f4a471e15d6f5b05bcb22a2552455df8beb238d33b0999306bf2a5ad6755da4044ff
-Size (luv-1.43.0-0.tar.gz) = 122337 bytes
diff --git a/luv/DESCR b/luv/DESCR
deleted file mode 100644
index 590e6327d6..0000000000
--- a/luv/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This library makes libuv available to lua scripts.  It was made for the
-luvit project but should usable from nearly any lua project.
diff --git a/luv/Makefile b/luv/Makefile
deleted file mode 100644
index d8eb93cd3e..0000000000
--- a/luv/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	lua-luv-1.32.0
-PKGNAME=	${DISTNAME:S/lua-//}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=luvit/}
-GITHUB_PROJECT=	luv
-GITHUB_TAG=	${PKGVERSION_NOREV}-0
-
-HOMEPAGE=	https://github.com/luvit/luv/
-COMMENT=	Bare libuv bindings for Lua
-LICENSE=	apache-2.0
-
-USE_CMAKE=	yes
-
-# should follow the LuaJIT API compatibility as those are the 2 options
-LUA_VERSIONS_ACCEPTED=	51
-
-CMAKE_CONFIGURE_ARGS+=	-DWITH_SHARED_LIBUV=ON
-CMAKE_CONFIGURE_ARGS+=	-DBUILD_SHARED_LIBS=ON
-CMAKE_CONFIGURE_ARGS+=	-DBUILD_MODULE=OFF
-CMAKE_CONFIGURE_ARGS+=	-DLUA_BUILD_TYPE=System
-CMAKE_CONFIGURE_ARGS+=	-DLUA_COMPAT53_DIR=${PREFIX}/${LUA_LDIR}/compat53/
-CMAKE_CONFIGURE_ARGS+=	-DCMAKE_C_FLAGS="-I${PREFIX}/${LUA_INCDIR} -I${PREFIX}/${LUA_LDIR}/compat53"
-
-.include "options.mk"
-
-.include "../../wip/lua-compat53/buildlink3.mk"
-.include "../../devel/libuv/buildlink3.mk"
-.include "../../lang/lua/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/luv/PLIST b/luv/PLIST
deleted file mode 100644
index ef74f104a1..0000000000
--- a/luv/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD$
-include/luv/lhandle.h
-include/luv/lreq.h
-include/luv/luv.h
-include/luv/util.h
-lib/libluv.${PKGVERSION}.dylib
-lib/libluv.1.dylib
-lib/libluv.dylib
-lib/pkgconfig/libluv.pc
diff --git a/luv/buildlink3.mk b/luv/buildlink3.mk
deleted file mode 100644
index bd5f6d1718..0000000000
--- a/luv/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	luv
-
-.if !defined(LUV_BUILDLINK3_MK)
-LUV_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.luv+=	luv>=1.32.0
-BUILDLINK_ABI_DEPENDS.luv+=	luv>=1.32.0
-BUILDLINK_PKGSRCDIR.luv?=	../../wip/luv
-
-.endif # LUV_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-luv
diff --git a/luv/distinfo b/luv/distinfo
deleted file mode 100644
index 8d754daca6..0000000000
--- a/luv/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-RMD160 (lua-luv-1.32.0.tar.gz) = 725f6a429dfcd697b6b3d10d431227ada8dc8558
-SHA512 (lua-luv-1.32.0.tar.gz) = 7db52afc1ca79052e349be7a37deb67066ee9005f8d7f7d0dae62bd83a93b4140103ee6dddeca2e02a3fc37b3880a5c18904429886af1d441f8de0cfabf5bd8c
-Size (lua-luv-1.32.0.tar.gz) = 91349 bytes
-SHA1 (patch-CMakeLists.txt) = 8307bdeed66cfd677a847943f3cc5c4403e0c244
diff --git a/luv/options.mk b/luv/options.mk
deleted file mode 100644
index 313d513ff1..0000000000
--- a/luv/options.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD$
-# $NetBSD $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.luv
-PKG_OPTIONS_REQUIRED_GROUPS=	lua
-PKG_OPTIONS_GROUP.lua=		lua luajit
-PKG_SUGGESTED_OPTIONS=		lua
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use lua (add dependency)
-###
-.if !empty(PKG_OPTIONS:Mlua)
-.include "../../lang/lua/buildlink3.mk"
-CMAKE_CONFIGURE_ARGS+=	-DWITH_LUA_ENGINE=Lua
-.endif
-
-###
-### Use luajit (add dependency)
-###
-.if !empty(PKG_OPTIONS:Mluajit)
-.include "../../lang/LuaJIT2/buildlink3.mk"
-CMAKE_CONFIGURE_ARGS+=	-DWITH_LUA_ENGINE=LuaJIT
-.endif
diff --git a/luv/patches/patch-CMakeLists.txt b/luv/patches/patch-CMakeLists.txt
deleted file mode 100644
index 60256b3ad1..0000000000
--- a/luv/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- CMakeLists.txt.orig	2019-12-31 14:38:46.000000000 +0000
-+++ CMakeLists.txt
-@@ -136,6 +136,9 @@ else (BUILD_MODULE)
-   if (BUILD_SHARED_LIBS)
-     set_target_properties(luv
-       PROPERTIES VERSION ${LUV_VERSION} SOVERSION ${LUV_VERSION_MAJOR})
-+    if(APPLE)
-+      target_link_libraries(luv "-undefined dynamic_lookup")
-+    endif()
-   endif (BUILD_SHARED_LIBS)
- endif (BUILD_MODULE)
- 


Home | Main Index | Thread Index | Old Index