CVS commit: pkgsrc/games/flightgear

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue May 26 11:30:06 UTC 2020

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/games/flightgear/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/flightgear/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/flightgear/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/flightgear/Makefile
diff -u pkgsrc/games/flightgear/Makefile:1.109 pkgsrc/games/flightgear/Makefile:1.110
--- pkgsrc/games/flightgear/Makefile:1.109      Fri May 22 10:56:08 2020
+++ pkgsrc/games/flightgear/Makefile    Tue May 26 11:30:06 2020
@@ -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_ARG_PATH=               ..
 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

Index: pkgsrc/games/flightgear/distinfo
diff -u pkgsrc/games/flightgear/distinfo:1.11 pkgsrc/games/flightgear/distinfo:1.12
--- pkgsrc/games/flightgear/distinfo:1.11       Tue Nov 26 22:40:07 2019
+++ pkgsrc/games/flightgear/distinfo    Tue May 26 11:30:06 2020
@@ -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 @@ Size (flightgear-2019.1.1.tar.bz2) = 844
 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

Added files:

Index: pkgsrc/games/flightgear/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/games/flightgear/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue May 26 11:30:06 2020
+++ pkgsrc/games/flightgear/patches/patch-CMakeLists.txt        Tue May 26 11:30:06 2020
@@ -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()