[pkgsrc/trunk]: pkgsrc/games/flightgear Don't conflict with C++17 <version>

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/65b6f07c085a
branches:  trunk
changeset: 432863:65b6f07c085a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue May 26 11:30:06 2020 +0000

description:
Don't conflict with C++17 <version>

diffstat:

 games/flightgear/Makefile                     |   5 ++++-
 games/flightgear/distinfo                     |   3 ++-
 games/flightgear/patches/patch-CMakeLists.txt |  13 +++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r 22db1f1e1a84 -r 65b6f07c085a games/flightgear/Makefile
--- a/games/flightgear/Makefile Tue May 26 11:29:17 2020 +0000
+++ b/games/flightgear/Makefile Tue May 26 11:30:06 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2020/05/22 10:56:08 adam Exp $
+# $NetBSD: Makefile,v 1.110 2020/05/26 11:30:06 joerg Exp $
 
 DISTNAME=      flightgear-2019.1.1
 PKGREVISION=   10
@@ -23,6 +23,9 @@
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=           -DFG_BUILD_TYPE=Release
 
+post-extract:
+       ${MV} ${WRKSRC}/version ${WRKSRC}/myversion
+
 # The cmake script warns against building in the source directory.
 pre-configure:
        cd ${WRKSRC} && ${MKDIR} fgbuild
diff -r 22db1f1e1a84 -r 65b6f07c085a games/flightgear/distinfo
--- a/games/flightgear/distinfo Tue May 26 11:29:17 2020 +0000
+++ b/games/flightgear/distinfo Tue May 26 11:30:06 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2019/11/26 22:40:07 nia Exp $
+$NetBSD: distinfo,v 1.12 2020/05/26 11:30:06 joerg Exp $
 
 SHA1 (flightgear-2019.1.1.tar.bz2) = 3ea81afd23701ea3c08515acd0ef84efdace0ba3
 RMD160 (flightgear-2019.1.1.tar.bz2) = ff8c00d498f2a529bede7a4fe12e9cfdf29c70e1
@@ -7,3 +7,4 @@
 SHA1 (patch-3rdparty_hts__engine__API_lib_HTS__misc.c) = 78de7201192e73f6f032ffcadd5ec2f63423390f
 SHA1 (patch-3rdparty_iaxclient_lib_libiax2_src_iax.c) = d6ae7b47253c1ba8f79e42cde27189d32e603eea
 SHA1 (patch-3rdparty_joystick_jsNone.cxx) = 4a662c71f97dd2d5093f09d4631d672e5278f082
+SHA1 (patch-CMakeLists.txt) = d540a64ce208a2380fe69d0d27146f5834b02152
diff -r 22db1f1e1a84 -r 65b6f07c085a games/flightgear/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/flightgear/patches/patch-CMakeLists.txt     Tue May 26 11:30:06 2020 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2020/05/26 11:30:06 joerg Exp $
+
+--- CMakeLists.txt.orig        2020-05-26 01:02:04.550372381 +0000
++++ CMakeLists.txt
+@@ -80,7 +80,7 @@ set(CMAKE_RELWITHDEBINFO_POSTFIX ""  CAC
+ set(CMAKE_MINSIZEREL_POSTFIX     ""  CACHE STRING "add a postfix, usually empty on windows")
+ 
+ # read 'version' file into a variable (stripping any newlines or spaces)
+-file(READ version versionFile)
++file(READ myversion versionFile)
+ if (NOT versionFile)
+     message(FATAL_ERROR "Unable to determine FlightGear version. Version file is missing.")
+ endif()