CVS commit: pkgsrc/games/arx-libertatis

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

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed Aug 20 19:45:10 UTC 2025

Modified Files:
        pkgsrc/games/arx-libertatis: Makefile PLIST distinfo
        pkgsrc/games/arx-libertatis/patches: patch-CMakeLists.txt

Log Message:
arx-libertatis: Fix installation on Darwin

pkgsrc changes:
---------------
  * Remove a part of CMakeLists.txt patch that seems to be useless.
  * Install .icns file for Darwin instead of .png files because this format is
    set as default type in CMakeLists.txt.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/games/arx-libertatis/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/arx-libertatis/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/arx-libertatis/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/games/arx-libertatis/patches/patch-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/arx-libertatis/Makefile
diff -u pkgsrc/games/arx-libertatis/Makefile:1.18 pkgsrc/games/arx-libertatis/Makefile:1.19
--- pkgsrc/games/arx-libertatis/Makefile:1.18   Wed Feb 12 06:44:49 2025
+++ pkgsrc/games/arx-libertatis/Makefile        Wed Aug 20 19:45:10 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2025/02/12 06:44:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2025/08/20 19:45:10 triaxx Exp $
 
-DISTNAME=      arx-libertatis-1.2
-PKGREVISION=   11
+DISTNAME=      arx-libertatis-1.2.1
+PKGREVISION=   1
 CATEGORIES=    games
 MASTER_SITES=  https://arx-libertatis.org/files/
 EXTRACT_SUFX=  .tar.xz
@@ -11,7 +11,6 @@ HOMEPAGE=     https://arx-libertatis.org/
 COMMENT=       Cross-platform, open source port of the Arx Fatalis RPG
 LICENSE=       gnu-gpl-v3
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
 CMAKE_CONFIGURE_ARGS+= -D CMAKE_INSTALL_MANDIR:STRING:=${PKGMANDIR}
@@ -31,6 +30,7 @@ post-patch:
 
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"

Index: pkgsrc/games/arx-libertatis/PLIST
diff -u pkgsrc/games/arx-libertatis/PLIST:1.2 pkgsrc/games/arx-libertatis/PLIST:1.3
--- pkgsrc/games/arx-libertatis/PLIST:1.2       Wed Jul 21 12:53:20 2021
+++ pkgsrc/games/arx-libertatis/PLIST   Wed Aug 20 19:45:10 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/07/21 12:53:20 yhardy Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/08/20 19:45:10 triaxx Exp $
 bin/arx
 bin/arx-install-data
 bin/arxsavetool
@@ -53,14 +53,14 @@ share/games/arx/localisation/xtext_russi
 share/games/arx/localisation/xtext_spanish_001_arxlibertatis.ini
 share/games/arx/misc/dejavusansmono.ttf
 share/games/arx/misc/icons.ttf
-share/icons/hicolor/128x128/apps/arx-libertatis.png
-share/icons/hicolor/16x16/apps/arx-libertatis.png
-share/icons/hicolor/192x192/apps/arx-libertatis.png
-share/icons/hicolor/22x22/apps/arx-libertatis.png
-share/icons/hicolor/24x24/apps/arx-libertatis.png
-share/icons/hicolor/256x256/apps/arx-libertatis.png
-share/icons/hicolor/32x32/apps/arx-libertatis.png
-share/icons/hicolor/48x48/apps/arx-libertatis.png
-share/icons/hicolor/512x512/apps/arx-libertatis.png
-share/icons/hicolor/64x64/apps/arx-libertatis.png
-share/icons/hicolor/96x96/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/128x128/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/16x16/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/192x192/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/22x22/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/24x24/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/256x256/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/32x32/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/48x48/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/512x512/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/64x64/apps/arx-libertatis.png
+${PLIST.NotDarwin}share/icons/hicolor/96x96/apps/arx-libertatis.png

Index: pkgsrc/games/arx-libertatis/distinfo
diff -u pkgsrc/games/arx-libertatis/distinfo:1.6 pkgsrc/games/arx-libertatis/distinfo:1.7
--- pkgsrc/games/arx-libertatis/distinfo:1.6    Tue Oct 26 10:43:46 2021
+++ pkgsrc/games/arx-libertatis/distinfo        Wed Aug 20 19:45:10 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:43:46 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/08/20 19:45:10 triaxx Exp $
 
-BLAKE2s (arx-libertatis-1.2.tar.xz) = 07ea55c967bd2b7b637cbac500a01c075f907a14d80fead85626697fd7ec72be
-SHA512 (arx-libertatis-1.2.tar.xz) = faa838469ed65346e660eda5af95626bd140fa589f6d46917cd567782969f47080214bc98e99b3b7c85b5a150d610fb8712f261ac84799d504e4dda75533f67c
-Size (arx-libertatis-1.2.tar.xz) = 2478640 bytes
-SHA1 (patch-CMakeLists.txt) = 61ec31c85ef4b775f9467b343e6b9e1516e146a1
+BLAKE2s (arx-libertatis-1.2.1.tar.xz) = 6fb018623a637bf9bc2b533b81ef2d3ee3e39d9974bc1a70f72f5abd4e1e2a0f
+SHA512 (arx-libertatis-1.2.1.tar.xz) = 1013b18bb695e99145b44afd012a072cb4f376030301fe4432e503190c45d26f2a4ab0b6ff4ba284bfd10e66007ac8de417f07141e686a56314413c2de35feb4
+Size (arx-libertatis-1.2.1.tar.xz) = 2479764 bytes
+SHA1 (patch-CMakeLists.txt) = 434e1b8becacb2592dff35c6b28ccbdf9cc9311d
 SHA1 (patch-cmake_CompileCheck.cmake) = ca205e24c331f84765bf1bc29e0d7db9213250cc
 SHA1 (patch-src_platform_Thread.cpp) = a1ef75e2e9e9c9981aee992ade0713eecdf538b2

Index: pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt
diff -u pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt:1.3 pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt:1.3        Wed Jul 21 12:53:20 2021
+++ pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt    Wed Aug 20 19:45:10 2025
@@ -1,16 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2021/07/21 12:53:20 yhardy Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2025/08/20 19:45:10 triaxx Exp $
 
 Rename VERSION to ARX_VERSION so that __has_include(<version>) does not
 pick it up on a case-insensitive file system on Darwin.
 
---- CMakeLists.txt.orig        2021-07-14 00:04:33.000000000 +0000
+--- CMakeLists.txt.orig        2022-04-10 14:50:13.000000000 +0000
 +++ CMakeLists.txt
-@@ -274,11 +274,11 @@ include(CheckIncludeFiles)
- include(CheckSymbolExists)
- include(CheckTypeSize)
- 
--set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # For custom cmake modules
-+set (CMAKE_MODULE_PATH "/tmp/pkgsrc/games/arx-libertatis/work/.buildlink/cmake-Modules" "/tmp/pkgsrc/games/arx-libertatis/work/.buildlink/cmake-Modules" 
"/tmp/pkgsrc/games/arx-libertatis/work/.buildlink/cmake-Modules" "${PROJECT_SOURCE_DIR}/cmake") # For custom cmake modules
+@@ -280,7 +280,7 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_
  
  include(VersionString)
  set(version_names VERSION ICON_NAME DATA_VERSION IO_LIBRARY_ABI_VERSION)
@@ -19,7 +14,7 @@ pick it up on a case-insensitive file sy
  if(VERSION_ERROR OR DATA_VERSION_ERROR OR IO_LIBRARY_ABI_VERSION_ERROR)
        message(WARNING "Error parsing version file!")
  endif()
-@@ -1481,7 +1481,7 @@ configure_file("src/${PLATFORM_CONFIG_H}
+@@ -1491,7 +1491,7 @@ configure_file("src/${PLATFORM_CONFIG_H}
  
  set(VERSION_TEMPLATE "src/core/Version.cpp.in")
  set(VERSION_FILE     "${PROJECT_BINARY_DIR}/core/Version.cpp")
@@ -28,7 +23,7 @@ pick it up on a case-insensitive file sy
  file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/core")
  version_file("${VERSION_TEMPLATE}" "${VERSION_FILE}" "${VERSION_SOURCES}" ".git")
  list(APPEND ARX_SOURCES ${VERSION_FILE})
-@@ -1490,7 +1490,7 @@ if(WIN32)
+@@ -1500,7 +1500,7 @@ if(WIN32)
        set(VERSION_RC_TEMPLATE "src/core/Version.rc.in")
        function(create_version_resource exe name)
                set(rc_file "${PROJECT_BINARY_DIR}/${exe}-version.rc")
@@ -37,7 +32,7 @@ pick it up on a case-insensitive file sy
                if(ARGC GREATER 2)
                        list(APPEND rc_sources ${ARGV2} "${ARGV2}")
                endif()
-@@ -1502,7 +1502,7 @@ if(WIN32)
+@@ -1512,7 +1512,7 @@ if(WIN32)
        set(APPLICATION_MANIFEST_TEMPLATE "src/core/Version.manifest.in")
        function(create_application_manifest exe)
                set(manifest_file "${PROJECT_BINARY_DIR}/${exe}.manifest")