CVS commit: pkgsrc/games/corsix-th

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Oct 15 20:53:58 UTC 2023

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

Log Message:
corsix-th: Update to 0.67

pkgsrc changes:
---------------
  * Fix build on Darwin.

upstream changes:
-----------------
  * https://github.com/CorsixTH/CorsixTH/releases/tag/v0.67


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/games/corsix-th/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/corsix-th/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt

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.17 pkgsrc/games/corsix-th/Makefile:1.18
--- pkgsrc/games/corsix-th/Makefile:1.17        Tue Jul 18 18:13:43 2023
+++ pkgsrc/games/corsix-th/Makefile     Sun Oct 15 20:53:58 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2023/07/18 18:13:43 nia Exp $
+# $NetBSD: Makefile,v 1.18 2023/10/15 20:53:58 triaxx Exp $
 
-DISTNAME=      corsix-th-0.65.1
-PKGREVISION=   9
+DISTNAME=      corsix-th-0.67
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=CorsixTH/}
 GITHUB_PROJECT=        CorsixTH

Index: pkgsrc/games/corsix-th/distinfo
diff -u pkgsrc/games/corsix-th/distinfo:1.5 pkgsrc/games/corsix-th/distinfo:1.6
--- pkgsrc/games/corsix-th/distinfo:1.5 Tue Oct 26 10:43:51 2021
+++ pkgsrc/games/corsix-th/distinfo     Sun Oct 15 20:53:58 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:43:51 nia Exp $
+$NetBSD: distinfo,v 1.6 2023/10/15 20:53:58 triaxx Exp $
 
-BLAKE2s (corsix-th-0.65.1.tar.gz) = 7cf02f6ab1271708e27eac0959756a182edff82b20b67e8794b416420465db2b
-SHA512 (corsix-th-0.65.1.tar.gz) = b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577
-Size (corsix-th-0.65.1.tar.gz) = 4163922 bytes
+BLAKE2s (corsix-th-0.67.tar.gz) = aec2ff241dcba7165975b936a79f1da23bb0b8fef4c46aecbdd029b322044963
+SHA512 (corsix-th-0.67.tar.gz) = b0e245a8aed9ad36e1040f88bbf8bf031bddf8dead0c59bc99a3c7f19cd6957c52e8185b2b737e78d57c73a58e460360428c81d5df1f6660aa17c7ec91ac62ba
+Size (corsix-th-0.67.tar.gz) = 4127698 bytes
+SHA1 (patch-CorsixTH_CMakeLists.txt) = e05c7d35e268a86a3c2bcc97343992c53277b9b9

Added files:

Index: pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt
diff -u /dev/null pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt:1.1
--- /dev/null   Sun Oct 15 20:53:58 2023
+++ pkgsrc/games/corsix-th/patches/patch-CorsixTH_CMakeLists.txt        Sun Oct 15 20:53:58 2023
@@ -0,0 +1,83 @@
+$NetBSD: patch-CorsixTH_CMakeLists.txt,v 1.1 2023/10/15 20:53:58 triaxx Exp $
+
+Disable macOS bundle.
+
+--- CorsixTH/CMakeLists.txt.orig       2023-08-06 03:02:29.000000000 +0000
++++ CorsixTH/CMakeLists.txt
+@@ -23,9 +23,6 @@ if(USE_SOURCE_DATADIRS)
+ elseif(MSVC)
+   set(CORSIX_TH_DATADIR CorsixTH)
+   set(CORSIX_TH_INTERPRETER_PATH ${CORSIX_TH_INTERPRETER_NAME})
+-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})
+ 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)
+@@ -80,7 +68,7 @@ if(SEARCH_LOCAL_DATADIRS)
+ endif()
+ target_link_libraries(CorsixTH CorsixTH_lib)
+ 
+-if(UNIX AND NOT APPLE)
++if(UNIX)
+   set_target_properties(CorsixTH PROPERTIES OUTPUT_NAME corsix-th)
+ endif()
+ 
+@@ -249,10 +237,7 @@ endif()
+ 
+ # Declaration of the install process
+ if(NOT USE_SOURCE_DATADIRS)
+-  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
+       RUNTIME DESTINATION ${CORSIX_TH_DATADIR}
+       LIBRARY DESTINATION ${CORSIX_TH_DATADIR}
+@@ -281,26 +266,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)
+-      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)