CVS commit: pkgsrc/games/simgear

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat May 16 02:12:46 UTC 2020

Modified Files:
        pkgsrc/games/simgear: Makefile distinfo
Added Files:
        pkgsrc/games/simgear/patches: patch-CMakeLists.txt

Log Message:
Resolve conflict with C++17 <version>


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/games/simgear/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/simgear/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/simgear/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/simgear/Makefile
diff -u pkgsrc/games/simgear/Makefile:1.104 pkgsrc/games/simgear/Makefile:1.105
--- pkgsrc/games/simgear/Makefile:1.104 Wed May  6 14:04:09 2020
+++ pkgsrc/games/simgear/Makefile       Sat May 16 02:12:45 2020
@@ -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 @@ CMAKE_ARGS+=          -DCMAKE_BUILD_TYPE=Release
 
 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

Index: pkgsrc/games/simgear/distinfo
diff -u pkgsrc/games/simgear/distinfo:1.10 pkgsrc/games/simgear/distinfo:1.11
--- pkgsrc/games/simgear/distinfo:1.10  Tue Nov 26 22:40:07 2019
+++ pkgsrc/games/simgear/distinfo       Sat May 16 02:12:45 2020
@@ -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

Added files:

Index: pkgsrc/games/simgear/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/games/simgear/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat May 16 02:12:46 2020
+++ pkgsrc/games/simgear/patches/patch-CMakeLists.txt   Sat May 16 02:12:45 2020
@@ -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)