Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/games/etlegacy etlegacy: Avoid using unversioned NetBS...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbc0866726dd
branches:  trunk
changeset: 435146:bbc0866726dd
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Jul 01 10:06:42 2020 +0000

description:
etlegacy: Avoid using unversioned NetBSD lua

diffstat:

 games/etlegacy/distinfo                          |   3 +-
 games/etlegacy/patches/patch-cmake_FindLua.cmake |  25 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)

diffs (44 lines):

diff -r cdfe1edeced8 -r bbc0866726dd games/etlegacy/distinfo
--- a/games/etlegacy/distinfo   Wed Jul 01 10:03:19 2020 +0000
+++ b/games/etlegacy/distinfo   Wed Jul 01 10:06:42 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2019/06/23 13:28:04 nia Exp $
+$NetBSD: distinfo,v 1.4 2020/07/01 10:06:42 nia Exp $
 
 SHA1 (etlegacy-2.76/etlegacy-libs.tar.gz) = 27da78b9c118be2bb931543ee217f95246e26658
 RMD160 (etlegacy-2.76/etlegacy-libs.tar.gz) = 3052bd1c8f3164016d5402452e76f4ed66e3571f
@@ -10,4 +10,5 @@
 Size (etlegacy-2.76/etlegacy.tar.gz) = 10381173 bytes
 SHA1 (patch-cmake_ETLInstall.cmake) = f89a99b5c280227f520fbd6f2eec06139cec503f
 SHA1 (patch-cmake_ETLPlatform.cmake) = d73dd745cf2d70f0f0fe6385364d54ac2cdbe0e8
+SHA1 (patch-cmake_FindLua.cmake) = b25e7deef2f03f40dfbe577e94717b1bfc0aca59
 SHA1 (patch-src_qcommon_q__platform.h) = b377ad5033c4f47a2c6659837e2a0b72082dd570
diff -r cdfe1edeced8 -r bbc0866726dd games/etlegacy/patches/patch-cmake_FindLua.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/etlegacy/patches/patch-cmake_FindLua.cmake  Wed Jul 01 10:06:42 2020 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-cmake_FindLua.cmake,v 1.1 2020/07/01 10:06:42 nia Exp $
+
+Avoid finding unversioned Lua in NetBSD.
+
+--- cmake/FindLua.cmake.orig   2019-01-05 19:54:35.000000000 +0000
++++ cmake/FindLua.cmake
+@@ -31,16 +31,11 @@
+ # standard syntax, e.g. FIND_PACKAGE(Lua 5.1)
+ # Otherwise the module will search for any available Lua implementation
+ 
+-# Always search for non-versioned lua first (recommended)
+-SET(_POSSIBLE_LUA_INCLUDE include include/lua)
+-SET(_POSSIBLE_LUA_EXECUTABLE lua)
+-SET(_POSSIBLE_LUA_LIBRARY lua)
+-
+ # Determine possible naming suffixes (there is no standard for this)
+ IF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
+-      SET(_POSSIBLE_SUFFIXES "${Lua_FIND_VERSION_MAJOR}${Lua_FIND_VERSION_MINOR}" "${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}" "-${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}")
++      SET(_POSSIBLE_SUFFIXES "${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}" "-${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}")
+ ELSE(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
+-      SET(_POSSIBLE_SUFFIXES "53" "5.3" "-5.3")
++      SET(_POSSIBLE_SUFFIXES "5.3" "-5.3")
+ ENDIF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR)
+ 
+ # Set up possible search names and locations



Home | Main Index | Thread Index | Old Index