arxlibertatis: update patches for newer versions of cmake

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Thu Jul 28 22:43:42 2016 +0200
Changeset:	1a58ec049e626e7f4bba7ba0b4ca725f111afffc

Modified Files:
	arxlibertatis/distinfo
	arxlibertatis/patches/patch-CMakeLists.txt
	arxlibertatis/patches/patch-cmake_VersionString.cmake

Log Message:
arxlibertatis: update patches for newer versions of cmake

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a58ec049e626e7f4bba7ba0b4ca725f111afffc

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

diffstat:
 arxlibertatis/distinfo                             |  4 +--
 arxlibertatis/patches/patch-CMakeLists.txt         | 35 +++++++++++++++---
 .../patches/patch-cmake_VersionString.cmake        | 42 +++++++++++++++++++---
 3 files changed, 70 insertions(+), 11 deletions(-)

diffs:
diff --git a/arxlibertatis/distinfo b/arxlibertatis/distinfo
index 85d9241..e40f542 100644
--- a/arxlibertatis/distinfo
+++ b/arxlibertatis/distinfo
@@ -3,9 +3,9 @@ $NetBSD: distinfo,v 1.1 2015/08/18 20:14:58 yhardy Exp $
 SHA1 (arx-libertatis-1.1.2.tar.xz) = 3b14a55553c564fd33caafb3a5bdb2d328e1fde8
 RMD160 (arx-libertatis-1.1.2.tar.xz) = 94145d36664d8d747c0abc3ced9c9055fd642690
 Size (arx-libertatis-1.1.2.tar.xz) = 970608 bytes
-SHA1 (patch-CMakeLists.txt) = 32fe067f5c39840a1e5f6232c8fa0381a448cdf1
+SHA1 (patch-CMakeLists.txt) = e396411bfd530905f3144e3d584158702f502e4f
 SHA1 (patch-cmake_CompileCheck.cmake) = b954b0115666741ffbd5686e997d24bae72a3196
-SHA1 (patch-cmake_VersionString.cmake) = 7617a1d0cd204b35025b09a192433ec6ad429fe7
+SHA1 (patch-cmake_VersionString.cmake) = afff2ae36425f3ffe0e1679d28e48ff4b6fc3d6f
 SHA1 (patch-src_graphics_opengl_OpenGLRenderer.cpp) = 410769fea6b911dcb283b1da85bebd2861de8d94
 SHA1 (patch-src_io_fs_FilesystemPOSIX.cpp) = 96f1938038c667997350f51a2bb201de0c9843e3
 SHA1 (patch-src_platform_Thread.cpp) = 38e31c77c9e6e795cb37842da82b5ed6681f6aea
diff --git a/arxlibertatis/patches/patch-CMakeLists.txt b/arxlibertatis/patches/patch-CMakeLists.txt
index 39e4ada..e2d46b7 100644
--- a/arxlibertatis/patches/patch-CMakeLists.txt
+++ b/arxlibertatis/patches/patch-CMakeLists.txt
@@ -5,9 +5,36 @@ Fix use of CMAKE_MODULE_PATH (see also patch-cmake_VersionString.cmake)
 Resolve "Attempt at a recursive or nested TRY_COMPILE in directory"
 (see also patch-cmake_CompileCheck.cmake)
 
---- CMakeLists.txt.orig	2013-07-15 19:52:41.000000000 +0200
-+++ CMakeLists.txt	2013-07-15 19:53:24.000000000 +0200
-@@ -177,7 +177,8 @@
+and
+
+commit 60e43c3cbf3fb0aa10cc3092b2512ccebb60b80d
+Author: Daniel Scharrer <daniel%constexpr.org@localhost>
+Date:   Tue Feb 23 07:04:11 2016 +0100
+
+    CMake: Bump policy version to 3.4
+    
+    Amongst other things, this makes the build system more rubust against
+    stray variables coming from included CMake scripts provided by the
+    system by disabling variable expansion for quoted strings in if().
+    
+    Fixes build with CMake 3.5 (tested with 3.5.0-rc3).
+
+
+--- CMakeLists.txt.orig	2013-10-17 17:25:04.000000000 +0000
++++ CMakeLists.txt
+@@ -13,6 +13,11 @@ else()
+ 	cmake_minimum_required(VERSION 2.8)
+ endif()
+ 
++if(CMAKE_VERSION VERSION_GREATER 3.4)
++	cmake_policy(VERSION 3.4)
++else()
++	cmake_policy(VERSION ${CMAKE_VERSION})
++endif()
+ 
+ # Define configuration options
+ 
+@@ -177,7 +182,8 @@ include(CheckCXXSourceCompiles)
  include(CheckSymbolExists)
  include(CheckTypeSize)
  
@@ -17,7 +44,7 @@ Resolve "Attempt at a recursive or nested TRY_COMPILE in directory"
  include(BuildSystem)
  include(BuildType)
  include(CompileCheck)
-@@ -407,15 +408,15 @@
+@@ -406,15 +412,15 @@ if(NOT MSVC)
  	endif()
  	
  	# Not a symbol, so we can't use check_symbol_exists
diff --git a/arxlibertatis/patches/patch-cmake_VersionString.cmake b/arxlibertatis/patches/patch-cmake_VersionString.cmake
index 4d03770..7b3e5ca 100644
--- a/arxlibertatis/patches/patch-cmake_VersionString.cmake
+++ b/arxlibertatis/patches/patch-cmake_VersionString.cmake
@@ -2,10 +2,30 @@ $NetBSD: patch-cmake_VersionString.cmake,v 1.1 2015/08/18 20:14:58 yhardy Exp $
 
 Fix use of CMAKE_MODULE_PATH (see also patch-CMakeLists.txt)
 
---- cmake/VersionString.cmake.orig	2013-07-15 19:54:22.000000000 +0200
-+++ cmake/VersionString.cmake	2013-07-15 19:54:52.000000000 +0200
-@@ -29,7 +29,7 @@
- 	set(mode "variable")
+and
+
+commit afca1491d7114066c016149b421bae4c797663a2
+Author: Daniel Scharrer <daniel%constexpr.org@localhost>
+Date:   Tue Feb 23 07:08:48 2016 +0100
+
+    VersionString.cmake: Guard against defined variables
+    
+    Previously this would fail under CMake older than 3.1 if "file" or
+    "variable" were variables.
+    
+    For CMake 3.1+ this was fixed in commit 60e43c.
+
+--- cmake/VersionString.cmake.orig	2013-10-17 17:25:04.000000000 +0000
++++ cmake/VersionString.cmake
+@@ -26,19 +26,22 @@
+ # The version file is regenerated whenever VERSION_FILE or the current commit changes.
+ function(version_file SRC DST VERSION_SOURCES GIT_DIR)
+ 	
+-	set(mode "variable")
++	set(MODE_VARIABLE 0)
++	set(MODE_FILE 1)
++
++	set(mode ${MODE_VARIABLE})
  	
  	set(args)
 -	set(dependencies "${CMAKE_MODULE_PATH}/VersionScript.cmake")
@@ -13,7 +33,19 @@ Fix use of CMAKE_MODULE_PATH (see also patch-CMakeLists.txt)
  	
  	foreach(arg IN LISTS VERSION_SOURCES)
  		
-@@ -72,7 +72,7 @@
+-		if(mode STREQUAL "variable")
+-			set(mode "file")
++		if(mode EQUAL MODE_VARIABLE)
++			set(mode ${MODE_FILE})
+ 		else()
+ 			get_filename_component(arg "${arg}" ABSOLUTE)
+ 			list(APPEND dependencies ${arg})
+-			set(mode "variable")
++			set(mode ${MODE_VARIABLE})
+ 		endif()
+ 		
+ 		list(APPEND args ${arg})
+@@ -72,7 +75,7 @@ function(version_file SRC DST VERSION_SO
  			"-DVERSION_SOURCES=${args}"
  			"-DGIT_DIR=${abs_git_dir}"
  			${defines}