CVS commit: pkgsrc/games/corsix-th

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/corsix-th
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Sat, 27 Sep 2025 09:16:12 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sat Sep 27 09:16:12 UTC 2025

Modified Files:
        pkgsrc/games/corsix-th: Makefile distinfo
        pkgsrc/games/corsix-th/patches: patch-CorsixTH_CMakeLists.txt
Added Files:
        pkgsrc/games/corsix-th/patches: patch-CorsixTH_CorsixTH.lua

Log Message:
corsix-th: Update to 0.69.1

pkgsrc changes:
---------------
  * Use macOS bundle instead of maintaining patch that bypass it.

upstream changes:
-----------------
CorsixTH 0.69.1

Notice 16/08/2025 - Replaced Windows installer as it incorrectly reported 0.69.0 (Windows SmartScreen will currently trigger - Fixed)

Bug Fixes

  * Fixed a crash when placing staff in a room while a patient is being treated.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/games/corsix-th/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/corsix-th/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/corsix-th/patches/patch-CorsixTH_CorsixTH.lua

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

Modified files:

Index: pkgsrc/games/corsix-th/Makefile
diff -u pkgsrc/games/corsix-th/Makefile:1.30 pkgsrc/games/corsix-th/Makefile:1.31
--- pkgsrc/games/corsix-th/Makefile:1.30        Tue Jul 29 08:36:56 2025
+++ pkgsrc/games/corsix-th/Makefile     Sat Sep 27 09:16:12 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2025/07/29 08:36:56 triaxx Exp $
+# $NetBSD: Makefile,v 1.31 2025/09/27 09:16:12 triaxx Exp $
 
-DISTNAME=      corsix-th-0.69.0
+DISTNAME=      corsix-th-0.69.1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=CorsixTH/}
 GITHUB_PROJECT=        CorsixTH
@@ -16,7 +16,6 @@ LUA_VERSIONS_ACCEPTED=        54 53 52 51
 .include "../../lang/lua/luaversion.mk"
 
 DEPENDS+=      ${LUA_PKGPREFIX}-filesystem-[0-9]*:../../devel/lua-filesystem
-DEPENDS+=      ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
 
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
@@ -28,9 +27,39 @@ CMAKE_CONFIGURE_ARGS+=       -D${module}_INCLU
 CMAKE_CONFIGURE_ARGS+= -D${module}_LIBRARIES=${PREFIX}/lib/ffmpeg7/lib${module:tl}.${SHLIB_EXT}
 .endfor
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+CHECK_SHLIBS_SUPPORTED=        no
+
+MACOS_BUNDLE_DIR=      Applications
+MACOS_BUNDLE_PREFIX=   ${PREFIX}/${MACOS_BUNDLE_DIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${MACOS_BUNDLE_PREFIX}
+
+# for CMake fixup_bundle() command
+CMAKE_INSTALLED_BUNDLE_APP=    ${DESTDIR}${MACOS_BUNDLE_PREFIX}/CorsixTH.app
+
+SUBST_CLASSES+=                app
+SUBST_STAGE.app=       pre-configure
+SUBST_MESSAGE.app=     Fixing macOS app installation path.
+SUBST_FILES.app=       CorsixTH/CMakeLists.txt
+SUBST_VARS.app=                CMAKE_INSTALLED_BUNDLE_APP MACOS_BUNDLE_DIR
+
+.include "../../lang/lua/module.mk"
+PKGSRC_LUA_CPATH=      ${PREFIX}/${LUA_CDIR}
+
+SUBST_CLASSES+=                cpath
+SUBST_STAGE.cpath=     pre-configure
+SUBST_MESSAGE.cpath=   Fixing lpeg.dylib in package.cpatch.
+SUBST_FILES.cpath=     CorsixTH/CorsixTH.lua
+SUBST_VARS.cpath=      PKGSRC_LUA_CPATH
+
+PLIST_SRC=             PLIST.bundle
+.endif
+
 .include "../../devel/cmake/build.mk"
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/lua-lpeg/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"

Index: pkgsrc/games/corsix-th/distinfo
diff -u pkgsrc/games/corsix-th/distinfo:1.8 pkgsrc/games/corsix-th/distinfo:1.9
--- pkgsrc/games/corsix-th/distinfo:1.8 Tue Jul 29 08:36:56 2025
+++ pkgsrc/games/corsix-th/distinfo     Sat Sep 27 09:16:12 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2025/07/29 08:36:56 triaxx Exp $
+$NetBSD: distinfo,v 1.9 2025/09/27 09:16:12 triaxx Exp $
 
-BLAKE2s (corsix-th-0.69.0.tar.gz) = ec2c3d4a575f3c7ccb4da43c9bba9929866f0131aa008ae384b4122e6e37d39b
-SHA512 (corsix-th-0.69.0.tar.gz) = 6e200fe1c7e35bc9cbab71fac0fa52feca6558acf8c683e93443d0a1dba780d0c28e52a35345f16116fe031bbc86d98a42e46913e724a8739fa4e8d5a6d6b3f3
-Size (corsix-th-0.69.0.tar.gz) = 4323298 bytes
-SHA1 (patch-CorsixTH_CMakeLists.txt) = 5c01889cd8089e5883f9631bb372c04fe779ebbc
+BLAKE2s (corsix-th-0.69.1.tar.gz) = d7ebfbbd66a435b2626aa52677cf6d9911b5fb7bd8d212548b2269cc8a9c8a9a
+SHA512 (corsix-th-0.69.1.tar.gz) = 9e03a0df2b5dc7def3535274c3f9253346a6cf47dc961e123aa0558c5f285a72a9a4d5a2c603c988c72d31c547d7a8331ff77e2a2273a3688df8195fa41820ae
+Size (corsix-th-0.69.1.tar.gz) = 4323450 bytes
+SHA1 (patch-CorsixTH_CMakeLists.txt) = 74670d965b7a21f7d4dd87dd31db351b337b7565
+SHA1 (patch-CorsixTH_CorsixTH.lua) = 269600641f05f8ac8a739022b301882ca18169f3

Index: pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt
diff -u pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt:1.3 pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt:1.4
--- pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt:1.3    Tue Jul 29 08:36:56 2025
+++ pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt        Sat Sep 27 09:16:12 2025
@@ -1,83 +1,33 @@
-$NetBSD: patch-CorsixTH_CMakeLists.txt,v 1.3 2025/07/29 08:36:56 triaxx Exp $
+$NetBSD: patch-CorsixTH_CMakeLists.txt,v 1.4 2025/09/27 09:16:12 triaxx Exp $
 
-Disable macOS bundle.
+Fix <app> argument to prepare the bundle installed in ${DESTDIR}.
 
---- CorsixTH/CMakeLists.txt.orig       2024-10-06 14:58:17.000000000 +0000
+--- CorsixTH/CMakeLists.txt.orig       2025-08-08 19:15:08.000000000 +0000
 +++ CorsixTH/CMakeLists.txt
-@@ -23,9 +23,6 @@ if(USE_SOURCE_DATADIRS)
- elseif(MSVC)
+@@ -24,7 +24,7 @@ elseif(MSVC)
    set(CORSIX_TH_DATADIR CorsixTH)
    set(CORSIX_TH_INTERPRETER_PATH ${CORSIX_TH_INTERPRETER_NAME})
--elseif(APPLE)
+ elseif(APPLE)
 -  set(CORSIX_TH_DATADIR CorsixTH.app/Contents/Resources/)
--  set(CORSIX_TH_INTERPRETER_PATH ${CMAKE_INSTALL_PREFIX}/${CORSIX_TH_DATADIR}/${CORSIX_TH_INTERPRETER_NAME})
++  set(CORSIX_TH_DATADIR @MACOS_BUNDLE_DIR@/CorsixTH.app/Contents/Resources/)
+   set(CORSIX_TH_INTERPRETER_PATH ${CMAKE_INSTALL_PREFIX}/${CORSIX_TH_DATADIR}/${CORSIX_TH_INTERPRETER_NAME})
  else()
    set(CORSIX_TH_DATADIR ${CMAKE_INSTALL_DATADIR}/corsix-th)
-   set(CORSIX_TH_INTERPRETER_PATH ${CMAKE_INSTALL_FULL_DATADIR}/corsix-th/${CORSIX_TH_INTERPRETER_NAME})
-@@ -33,16 +30,7 @@ endif()
- 
- # Declaration of the executable
- if(APPLE)
--  set(corsixth_icon_file ${CMAKE_SOURCE_DIR}/CorsixTH/Icon.icns)
--  set_source_files_properties(
--    ${corsixth_icon_file}
--    PROPERTIES
--    MACOSX_PACKAGE_LOCATION Resources
--  )
--  set(MACOSX_BUNDLE_ICON_FILE Icon.icns)
--
--  add_executable(CorsixTH MACOSX_BUNDLE ${corsixth_icon_file})
--
-+  add_executable(CorsixTH "")
-   set_target_properties(CorsixTH PROPERTIES LINK_FLAGS_MINSIZEREL "-dead_strip")
-   set_target_properties(CorsixTH PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks")
- elseif(MSVC)
-@@ -85,7 +73,7 @@ if(SEARCH_LOCAL_DATADIRS)
- endif()
- target_link_libraries(CorsixTH PRIVATE CorsixTH_lib)
- 
--if(UNIX AND NOT APPLE)
-+if(UNIX)
-   set_target_properties(CorsixTH PROPERTIES OUTPUT_NAME corsix-th)
- endif()
- 
-@@ -271,10 +259,7 @@ endif()
- 
- # Declaration of the install process
+@@ -273,7 +273,7 @@ endif()
  if(NOT USE_SOURCE_DATADIRS)
--  if(APPLE)
--    # Just use the prefix as it's sufficient to just set the prefix to /Applications on Mac.
+   if(APPLE)
+     # Just use the prefix as it's sufficient to just set the prefix to /Applications on Mac.
 -    install(TARGETS CorsixTH BUNDLE DESTINATION .)
--  elseif(MSVC)
-+  if(MSVC)
++    install(TARGETS CorsixTH BUNDLE DESTINATION @MACOS_BUNDLE_DIR@)
+   elseif(MSVC)
      install(TARGETS CorsixTH
        RUNTIME DESTINATION ${CORSIX_TH_DATADIR}
-       LIBRARY DESTINATION ${CORSIX_TH_DATADIR}
-@@ -307,26 +292,12 @@ if(NOT USE_SOURCE_DATADIRS)
-   )
-   install(FILES CorsixTH.lua ../LICENSE.txt DESTINATION ${CORSIX_TH_DATADIR})
- 
--  if(UNIX AND NOT APPLE)
-+  if(UNIX)
-     install(FILES corsix-th.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
-     install(FILES com.corsixth.corsixth.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
-     install(FILES com.corsixth.corsixth.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-     install(FILES Original_Logo.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME corsix-th.svg)
-   endif()
--
--  if(APPLE)
--    # Fix the macOS bundle to include required libraries (create a redistributable app)
--    install(CODE "
--      INCLUDE(BundleUtilities)
--      SET(BU_CHMOD_BUNDLE_ITEMS ON)
+@@ -319,7 +319,7 @@ if(NOT USE_SOURCE_DATADIRS)
+     install(CODE "
+       INCLUDE(BundleUtilities)
+       SET(BU_CHMOD_BUNDLE_ITEMS ON)
 -      FIXUP_BUNDLE(\"${CMAKE_INSTALL_PREFIX}/CorsixTH.app\" \"\" \"\")
--      ")
--    if(WITH_LUAROCKS)
--      install(CODE "execute_process(
--        COMMAND bash \"${CMAKE_SOURCE_DIR}/scripts/macos_luarocks\" \"${CMAKE_INSTALL_PREFIX}\")
--      ")
--    endif()
--  endif()
- endif()
- 
- set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT CorsixTH)
++      FIXUP_BUNDLE(\"@CMAKE_INSTALLED_BUNDLE_APP@\" \"\" \"\")
+       ")
+     if(WITH_LUAROCKS)
+       install(CODE "execute_process(

Added files:

Index: pkgsrc/games/corsix-th/patches/patch-CorsixTH_CorsixTH.lua
diff -u /dev/null pkgsrc/games/corsix-th/patches/patch-CorsixTH_CorsixTH.lua:1.1
--- /dev/null   Sat Sep 27 09:16:12 2025
+++ pkgsrc/games/corsix-th/patches/patch-CorsixTH_CorsixTH.lua  Sat Sep 27 09:16:12 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-CorsixTH_CorsixTH.lua,v 1.1 2025/09/27 09:16:12 triaxx Exp $
+
+Explicitly add search path for .dylib library because only .lua and .so files
+are searched.
+
+--- CorsixTH/CorsixTH.lua.orig 2025-08-08 19:15:08.000000000 +0000
++++ CorsixTH/CorsixTH.lua
+@@ -20,7 +20,7 @@ end
+ local pathsep = package.config:sub(1, 1)
+ local base_dir = debug.getinfo(1, "S").source:sub(2, -13)
+ local code_dir = base_dir .. "Lua" .. pathsep
+-package.cpath = base_dir .. '?.so;' .. package.cpath
++package.cpath = base_dir .. '?.so;' .. '@PKGSRC_LUA_CPATH@/?.dylib;' .. package.cpath
+ for _, arg in ipairs{...} do
+   local dir = arg:match"^%-%-lua%-dir=(.*)$"
+   if dir then

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/games/corsix-th
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/games/corsix-th
Indexes:

Home | Main Index | Thread Index | Old Index