CVS commit: pkgsrc/games/arx-libertatis

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Mon Jun  1 10:30:03 UTC 2020

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

Log Message:
Fix games/arx-libertatis build on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/arx-libertatis/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/arx-libertatis/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.4 pkgsrc/games/arx-libertatis/Makefile:1.5
--- pkgsrc/games/arx-libertatis/Makefile:1.4    Sun Jan 26 17:31:13 2020
+++ pkgsrc/games/arx-libertatis/Makefile        Mon Jun  1 10:30:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/26 17:31:13 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/06/01 10:30:03 js Exp $
 
 DISTNAME=      arx-libertatis-1.1.2
 PKGREVISION=   1
@@ -26,6 +26,9 @@ PLIST_VARS+=  NotDarwin
 PLIST.NotDarwin=       yes
 .endif
 
+post-patch:
+       ${MV} ${WRKSRC}/VERSION ${WRKSRC}/ARX_VERSION
+
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"

Index: pkgsrc/games/arx-libertatis/distinfo
diff -u pkgsrc/games/arx-libertatis/distinfo:1.2 pkgsrc/games/arx-libertatis/distinfo:1.3
--- pkgsrc/games/arx-libertatis/distinfo:1.2    Sun Oct 30 10:25:30 2016
+++ pkgsrc/games/arx-libertatis/distinfo        Mon Jun  1 10:30:03 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2016/10/30 10:25:30 maya Exp $
+$NetBSD: distinfo,v 1.3 2020/06/01 10:30:03 js Exp $
 
 SHA1 (arx-libertatis-1.1.2.tar.xz) = 3b14a55553c564fd33caafb3a5bdb2d328e1fde8
 RMD160 (arx-libertatis-1.1.2.tar.xz) = 94145d36664d8d747c0abc3ced9c9055fd642690
 SHA512 (arx-libertatis-1.1.2.tar.xz) = d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8
 Size (arx-libertatis-1.1.2.tar.xz) = 970608 bytes
-SHA1 (patch-CMakeLists.txt) = 37a9c12a831ed6127a9c0a2e28bec2c3d7b6075d
+SHA1 (patch-CMakeLists.txt) = f905b3b51e39dff8bf2e24d4de76b677495fad00
 SHA1 (patch-cmake_CompileCheck.cmake) = b954b0115666741ffbd5686e997d24bae72a3196
 SHA1 (patch-cmake_VersionString.cmake) = afff2ae36425f3ffe0e1679d28e48ff4b6fc3d6f
 SHA1 (patch-src_graphics_opengl_OpenGLRenderer.cpp) = 410769fea6b911dcb283b1da85bebd2861de8d94

Index: pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt
diff -u pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt:1.1 pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt:1.1        Fri Sep  2 16:46:04 2016
+++ pkgsrc/games/arx-libertatis/patches/patch-CMakeLists.txt    Mon Jun  1 10:30:03 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2016/09/02 16:46:04 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2020/06/01 10:30:03 js Exp $
 
 Fix use of CMAKE_MODULE_PATH (see also patch-cmake_VersionString.cmake)
 
@@ -7,6 +7,11 @@ Resolve "Attempt at a recursive or neste
 
 and
 
+Rename VERSION to ARX_VERSION so that __has_include(<version>) does not
+pick it up on a case-insensitive file system on Darwin.
+
+and
+
 commit 60e43c3cbf3fb0aa10cc3092b2512ccebb60b80d
 Author: Daniel Scharrer <daniel%constexpr.org@localhost>
 Date:   Tue Feb 23 07:04:11 2016 +0100
@@ -73,3 +78,12 @@ Date:   Tue Feb 23 07:04:11 2016 +0100
        
        check_symbol_exists(nanosleep "time.h" ARX_HAVE_NANOSLEEP)
        
+@@ -951,7 +958,7 @@ configure_file("${SRC_DIR}/${PLATFORM_CO
+ 
+ set(VERSION_TEMPLATE "${SRC_DIR}/core/Version.cpp.in")
+ set(VERSION_FILE     "${CMAKE_BINARY_DIR}/core/Version.cpp")
+-set(VERSION_SOURCES  VERSION "VERSION" AUTHORS "AUTHORS")
++set(VERSION_SOURCES  VERSION "ARX_VERSION" AUTHORS "AUTHORS")
+ file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/core")
+ version_file("${VERSION_TEMPLATE}" "${VERSION_FILE}" "${VERSION_SOURCES}" ".git")
+ list(APPEND ARX_SOURCES "${VERSION_FILE}")