CVS commit: pkgsrc/lang

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul  2 21:42:23 UTC 2020

Modified Files:
        pkgsrc/lang/lua: luaversion.mk
        pkgsrc/lang/lua51: buildlink3.mk
        pkgsrc/lang/lua52: buildlink3.mk
        pkgsrc/lang/lua53: buildlink3.mk
        pkgsrc/lang/lua54: buildlink3.mk

Log Message:
lua: move cmake bits to per-interpreter buildlink3s


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/lua/luaversion.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/lua51/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/lua52/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/lua53/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/lua54/buildlink3.mk

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

Modified files:

Index: pkgsrc/lang/lua/luaversion.mk
diff -u pkgsrc/lang/lua/luaversion.mk:1.13 pkgsrc/lang/lua/luaversion.mk:1.14
--- pkgsrc/lang/lua/luaversion.mk:1.13  Thu Jul  2 20:43:26 2020
+++ pkgsrc/lang/lua/luaversion.mk       Thu Jul  2 21:42:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: luaversion.mk,v 1.13 2020/07/02 20:43:26 nia Exp $
+# $NetBSD: luaversion.mk,v 1.14 2020/07/02 21:42:23 nia Exp $
 
 # This file determins which Lua version is used as a dependency for
 # a package.
@@ -164,12 +164,4 @@ LUA_INCDIR=                include/lua-${_LUA_DOT_VERS
 LUA_INTERPRETER=       ${LOCALBASE}/bin/lua${_LUA_DOT_VERSION}
 LUA_COMPILER=          ${LOCALBASE}/bin/luac${_LUA_DOT_VERSION}
 
-.if defined(USE_CMAKE)
-# used by FindLua.cmake
-CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
-CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
-CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=${LUA_VERSION_MAJOR}
-CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=${LUA_VERSION_MINOR}
-.endif
-
 .endif  # LUA_LUAVERSION_MK

Index: pkgsrc/lang/lua51/buildlink3.mk
diff -u pkgsrc/lang/lua51/buildlink3.mk:1.4 pkgsrc/lang/lua51/buildlink3.mk:1.5
--- pkgsrc/lang/lua51/buildlink3.mk:1.4 Mon Jul 20 11:30:54 2015
+++ pkgsrc/lang/lua51/buildlink3.mk     Thu Jul  2 21:42:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/07/02 21:42:23 nia Exp $
 
 BUILDLINK_TREE+=       lua51
 
@@ -16,6 +16,14 @@ BUILDLINK_DEPMETHOD.lua51?=  ${BUILDLINK_
 BUILDLINK_TRANSFORM+=          l:lua:lua5.1
 BUILDLINK_INCDIRS.lua51+=      include/lua-5.1
 
+.if defined(USE_CMAKE)
+# used by FindLua.cmake
+CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
+CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=5
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=1
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 .endif # LUA51_BUILDLINK3_MK
 

Index: pkgsrc/lang/lua52/buildlink3.mk
diff -u pkgsrc/lang/lua52/buildlink3.mk:1.4 pkgsrc/lang/lua52/buildlink3.mk:1.5
--- pkgsrc/lang/lua52/buildlink3.mk:1.4 Mon Jul 20 11:30:54 2015
+++ pkgsrc/lang/lua52/buildlink3.mk     Thu Jul  2 21:42:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/07/02 21:42:23 nia Exp $
 
 BUILDLINK_TREE+=       lua52
 
@@ -16,6 +16,14 @@ BUILDLINK_DEPMETHOD.lua52?=  ${BUILDLINK_
 BUILDLINK_TRANSFORM+=          l:lua:lua5.2
 BUILDLINK_INCDIRS.lua52+=      include/lua-5.2
 
+.if defined(USE_CMAKE)
+# used by FindLua.cmake
+CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
+CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=5
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=2
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 .endif # LUA52_BUILDLINK3_MK
 

Index: pkgsrc/lang/lua53/buildlink3.mk
diff -u pkgsrc/lang/lua53/buildlink3.mk:1.2 pkgsrc/lang/lua53/buildlink3.mk:1.3
--- pkgsrc/lang/lua53/buildlink3.mk:1.2 Mon Jul 20 11:30:54 2015
+++ pkgsrc/lang/lua53/buildlink3.mk     Thu Jul  2 21:42:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/07/20 11:30:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/07/02 21:42:23 nia Exp $
 
 BUILDLINK_TREE+=       lua53
 
@@ -16,6 +16,14 @@ BUILDLINK_DEPMETHOD.lua53?=  ${BUILDLINK_
 BUILDLINK_TRANSFORM+=          l:lua:lua5.3
 BUILDLINK_INCDIRS.lua53+=      include/lua-5.3
 
+.if defined(USE_CMAKE)
+# used by FindLua.cmake
+CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
+CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=5
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=3
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 .endif # LUA53_BUILDLINK3_MK
 

Index: pkgsrc/lang/lua54/buildlink3.mk
diff -u pkgsrc/lang/lua54/buildlink3.mk:1.2 pkgsrc/lang/lua54/buildlink3.mk:1.3
--- pkgsrc/lang/lua54/buildlink3.mk:1.2 Tue Jun 30 13:48:59 2020
+++ pkgsrc/lang/lua54/buildlink3.mk     Thu Jul  2 21:42:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/06/30 13:48:59 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/07/02 21:42:23 nia Exp $
 
 BUILDLINK_TREE+=       lua54
 
@@ -16,6 +16,14 @@ BUILDLINK_DEPMETHOD.lua54?=  ${BUILDLINK_
 BUILDLINK_TRANSFORM+=          l:lua:lua5.4
 BUILDLINK_INCDIRS.lua54+=      include/lua-5.4
 
+.if defined(USE_CMAKE)
+# used by FindLua.cmake
+CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
+CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=5
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=4
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 .endif # LUA54_BUILDLINK3_MK