[pkgsrc/trunk]: pkgsrc/games/simgear Resolve conflict with C++17 <version>

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e85b3a44a571
branches:  trunk
changeset: 431684:e85b3a44a571
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat May 16 02:12:45 2020 +0000

description:
Resolve conflict with C++17 <version>

diffstat:

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

diffs (51 lines):

diff -r 33e1b1ee0bb4 -r e85b3a44a571 games/simgear/Makefile
--- a/games/simgear/Makefile    Sat May 16 02:12:23 2020 +0000
+++ b/games/simgear/Makefile    Sat May 16 02:12:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2020/05/06 14:04:09 adam Exp $
+# $NetBSD: Makefile,v 1.105 2020/05/16 02:12:45 joerg Exp $
 
 DISTNAME=      simgear-2019.1.1
 PKGREVISION=   8
@@ -23,6 +23,9 @@
 
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
+post-extract:
+       ${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+
 # The cmake script warns against building in the source directory.
 pre-configure:
        cd ${WRKSRC} && ${MKDIR} sgbuild
diff -r 33e1b1ee0bb4 -r e85b3a44a571 games/simgear/distinfo
--- a/games/simgear/distinfo    Sat May 16 02:12:23 2020 +0000
+++ b/games/simgear/distinfo    Sat May 16 02:12:45 2020 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2019/11/26 22:40:07 nia Exp $
+$NetBSD: distinfo,v 1.11 2020/05/16 02:12:45 joerg Exp $
 
 SHA1 (simgear-2019.1.1.tar.bz2) = 1564d9952ae7b539f59294efbbe826c16dd1582e
 RMD160 (simgear-2019.1.1.tar.bz2) = a2d0e96d008d47ef413f9e1ad71e9d2fa581bc6f
 SHA512 (simgear-2019.1.1.tar.bz2) = 83fe4330cf27b9298719f53f2fccde2af77bacdc6f430cc22c8bdfb475fe9b6e01578c1225af21e4e1433c7d2f2b00427454064f942359ba4c1e9896e7fe05d2
 Size (simgear-2019.1.1.tar.bz2) = 1370523 bytes
+SHA1 (patch-CMakeLists.txt) = cb5de8d3efca9604f3989ccd4988c57ca363415e
 SHA1 (patch-simgear_canvas_ShivaVG_src_shConfig.h) = d9e8befec2e7ecb8c79a1edddf74bea4e759d656
 SHA1 (patch-simgear_canvas_ShivaVG_src_shDefs.h) = 0da1544fecec002fb874fcb7df1155ad2889ba4d
 SHA1 (patch-simgear_io_test__repository.cxx) = 4369ea0b3eab47bed5b2b08ba8a56f86f83f77a0
diff -r 33e1b1ee0bb4 -r e85b3a44a571 games/simgear/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/simgear/patches/patch-CMakeLists.txt        Sat May 16 02:12:45 2020 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2020/05/16 02:12:45 joerg Exp $
+
+--- CMakeLists.txt.orig        2020-05-15 23:15:40.863343005 +0000
++++ CMakeLists.txt
+@@ -40,7 +40,7 @@ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED YES)
+ 
+ # read 'version' file into a variable (stripping any newlines or spaces)
+-file(READ version versionFile)
++file(READ version.txt versionFile)
+ string(STRIP ${versionFile} SIMGEAR_VERSION)
+ 
+ project(SimGear VERSION ${SIMGEAR_VERSION} LANGUAGES C CXX)