CVS commit: pkgsrc/games

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 25 Feb 2021 10:22:15 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Feb 25 10:22:15 UTC 2021

Modified Files:
        pkgsrc/games/flightgear: Makefile distinfo
        pkgsrc/games/flightgear/patches:
            patch-3rdparty_hts__engine__API_lib_HTS__misc.c
        pkgsrc/games/simgear: Makefile PLIST distinfo
        pkgsrc/games/simgear/patches:
            patch-simgear_canvas_ShivaVG_src_shConfig.h
            patch-simgear_canvas_ShivaVG_src_shDefs.h
            patch-simgear_misc_strutils.cxx
Removed Files:
        pkgsrc/games/flightgear: hacks.mk
        pkgsrc/games/flightgear/patches: patch-CMakeLists.txt
        pkgsrc/games/simgear/patches: patch-CMakeLists.txt
            patch-simgear_io_test__repository.cxx

Log Message:
simgear, flightgear: Update to 2020.3.6

Release notes:

https://wiki.flightgear.org/Changelog_2020.3


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/games/flightgear/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/flightgear/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/games/flightgear/hacks.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c
cvs rdiff -u -r1.1 -r0 pkgsrc/games/flightgear/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.114 -r1.115 pkgsrc/games/simgear/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/simgear/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/simgear/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/games/simgear/patches/patch-CMakeLists.txt \
    pkgsrc/games/simgear/patches/patch-simgear_io_test__repository.cxx
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs.h \
    pkgsrc/games/simgear/patches/patch-simgear_misc_strutils.cxx

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.117 pkgsrc/games/flightgear/Makefile:1.118
--- pkgsrc/games/flightgear/Makefile:1.117      Sat Jan 16 14:46:38 2021
+++ pkgsrc/games/flightgear/Makefile    Thu Feb 25 10:22:14 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.117 2021/01/16 14:46:38 nia Exp $
+# $NetBSD: Makefile,v 1.118 2021/02/25 10:22:14 nia Exp $
 
-DISTNAME=      flightgear-2019.1.1
-PKGREVISION=   17
+DISTNAME=      flightgear-2020.3.6
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=flightgear/release-${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.bz2
@@ -12,7 +11,6 @@ COMMENT=      The FlightGear Simulator
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 USE_LANGUAGES=         c c++
-USE_PKGLOCALEDIR=      yes
 USE_CMAKE=             yes
 LDFLAGS.NetBSD+=       -lexecinfo
 
@@ -23,15 +21,14 @@ 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
 
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libevent+=       libevent>=2
+.include "../../devel/libevent/buildlink3.mk"
 .include "../../games/plib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.simgear+=        simgear>=2019.1.1
 .include "../../games/simgear/buildlink3.mk"

Index: pkgsrc/games/flightgear/distinfo
diff -u pkgsrc/games/flightgear/distinfo:1.12 pkgsrc/games/flightgear/distinfo:1.13
--- pkgsrc/games/flightgear/distinfo:1.12       Tue May 26 11:30:06 2020
+++ pkgsrc/games/flightgear/distinfo    Thu Feb 25 10:22:14 2021
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2020/05/26 11:30:06 joerg Exp $
+$NetBSD: distinfo,v 1.13 2021/02/25 10:22:14 nia Exp $
 
-SHA1 (flightgear-2019.1.1.tar.bz2) = 3ea81afd23701ea3c08515acd0ef84efdace0ba3
-RMD160 (flightgear-2019.1.1.tar.bz2) = ff8c00d498f2a529bede7a4fe12e9cfdf29c70e1
-SHA512 (flightgear-2019.1.1.tar.bz2) = edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c
-Size (flightgear-2019.1.1.tar.bz2) = 8440986 bytes
-SHA1 (patch-3rdparty_hts__engine__API_lib_HTS__misc.c) = 78de7201192e73f6f032ffcadd5ec2f63423390f
+SHA1 (flightgear-2020.3.6.tar.bz2) = 3f2b1c6dfeca5c09c33afa1b82064ba3ce0a1c9d
+RMD160 (flightgear-2020.3.6.tar.bz2) = aaa210b7af3f6b7cd1deb45266ff9129a5b723d2
+SHA512 (flightgear-2020.3.6.tar.bz2) = b0bfa6e02cf5c2e64aea85fb7433e583141471e15a7dff69dbc12c227835c6e52dcf5b2947a30847c2b291442878eee6265217311e441abb32c5f95bbf7df990
+Size (flightgear-2020.3.6.tar.bz2) = 8837251 bytes
+SHA1 (patch-3rdparty_hts__engine__API_lib_HTS__misc.c) = b6deb149e54dc92cb748fd149a806a016ba76a2e
 SHA1 (patch-3rdparty_iaxclient_lib_libiax2_src_iax.c) = d6ae7b47253c1ba8f79e42cde27189d32e603eea
 SHA1 (patch-3rdparty_joystick_jsNone.cxx) = 4a662c71f97dd2d5093f09d4631d672e5278f082
-SHA1 (patch-CMakeLists.txt) = d540a64ce208a2380fe69d0d27146f5834b02152

Index: pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c
diff -u pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c:1.1 pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c:1.2
--- pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c:1.1 Tue Dec  4 03:56:27 2018
+++ pkgsrc/games/flightgear/patches/patch-3rdparty_hts__engine__API_lib_HTS__misc.c     Thu Feb 25 10:22:14 2021
@@ -1,12 +1,12 @@
-$NetBSD: patch-3rdparty_hts__engine__API_lib_HTS__misc.c,v 1.1 2018/12/04 03:56:27 nia Exp $
+$NetBSD: patch-3rdparty_hts__engine__API_lib_HTS__misc.c,v 1.2 2021/02/25 10:22:14 nia Exp $
 
 Support NetBSD.
 
---- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig        2018-06-03 18:56:53.000000000 +0000
+--- 3rdparty/hts_engine_API/lib/HTS_misc.c.orig        2021-01-23 18:03:03.000000000 +0000
 +++ 3rdparty/hts_engine_API/lib/HTS_misc.c
-@@ -247,6 +247,8 @@ size_t HTS_ftell(HTS_File * fp)
+@@ -284,6 +284,8 @@ size_t HTS_ftell(HTS_File * fp)
        fgetpos((FILE *) fp->pointer, &pos);
- #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__)
+ #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__OpenBSD__)
        return (size_t) pos;
 +#elif defined(__NetBSD__)
 +      return (size_t) pos._pos;

Index: pkgsrc/games/simgear/Makefile
diff -u pkgsrc/games/simgear/Makefile:1.114 pkgsrc/games/simgear/Makefile:1.115
--- pkgsrc/games/simgear/Makefile:1.114 Sat Jan 16 14:46:38 2021
+++ pkgsrc/games/simgear/Makefile       Thu Feb 25 10:22:14 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.114 2021/01/16 14:46:38 nia Exp $
+# $NetBSD: Makefile,v 1.115 2021/02/25 10:22:14 nia Exp $
 
-DISTNAME=      simgear-2019.1.1
-PKGREVISION=   17
+DISTNAME=      simgear-2020.3.6
 CATEGORIES=    games devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=flightgear/release-${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.bz2
@@ -12,7 +11,6 @@ COMMENT=      Simulator Construction Tools
 LICENSE=       gnu-lgpl-v2
 
 USE_LANGUAGES=         c c++
-USE_PKGLOCALEDIR=      yes
 USE_CMAKE=             yes
 
 CONFIGURE_DIRS=                sgbuild
@@ -20,12 +18,12 @@ BUILD_DIRS=         sgbuild
 CMAKE_ARG_PATH=                ..
 
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=           -DSIMGEAR_SHARED=ON
+CMAKE_ARGS+=           -DSYSTEM_EXPAT=ON
+CMAKE_ARGS+=           -DSYSTEM_UDNS=ON
 
 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
@@ -37,6 +35,8 @@ pre-configure:
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/osg/buildlink3.mk"
+.include "../../net/udns/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/simgear/PLIST
diff -u pkgsrc/games/simgear/PLIST:1.9 pkgsrc/games/simgear/PLIST:1.10
--- pkgsrc/games/simgear/PLIST:1.9      Tue Nov 26 22:40:07 2019
+++ pkgsrc/games/simgear/PLIST  Thu Feb 25 10:22:14 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/11/26 22:40:07 nia Exp $
+@comment $NetBSD: PLIST,v 1.10 2021/02/25 10:22:14 nia Exp $
 include/simgear/bucket/newbucket.hxx
 include/simgear/bvh/BVHBoundingBoxVisitor.hxx
 include/simgear/bvh/BVHGroup.hxx
@@ -55,12 +55,22 @@ include/simgear/canvas/layout/SpacerItem
 include/simgear/compiler.h
 include/simgear/constants.h
 include/simgear/debug/BufferedLogCallback.hxx
+include/simgear/debug/ErrorReportingCallback.hxx
+include/simgear/debug/LogCallback.hxx
+include/simgear/debug/LogEntry.hxx
 include/simgear/debug/OsgIoCapture.hxx
 include/simgear/debug/debug_types.h
 include/simgear/debug/logstream.hxx
 include/simgear/embedded_resources/EmbeddedResource.hxx
 include/simgear/embedded_resources/EmbeddedResourceManager.hxx
 include/simgear/embedded_resources/EmbeddedResourceProxy.hxx
+include/simgear/emesary/Emesary.hxx
+include/simgear/emesary/INotification.hxx
+include/simgear/emesary/IReceiver.hxx
+include/simgear/emesary/ITransmitter.hxx
+include/simgear/emesary/ReceiptStatus.hxx
+include/simgear/emesary/Transmitter.hxx
+include/simgear/emesary/notifications.hxx
 include/simgear/environment/metar.hxx
 include/simgear/environment/precipitation.hxx
 include/simgear/ephemeris/celestialBody.hxx
@@ -140,10 +150,12 @@ include/simgear/misc/SVGpreserveAspectRa
 include/simgear/misc/SimpleMarkdown.hxx
 include/simgear/misc/argparse.hxx
 include/simgear/misc/interpolator.hxx
+include/simgear/misc/lru_cache.hxx
 include/simgear/misc/make_new.hxx
 include/simgear/misc/sg_dir.hxx
 include/simgear/misc/sg_hash.hxx
 include/simgear/misc/sg_path.hxx
+include/simgear/misc/simgear_optional.hxx
 include/simgear/misc/stdint.hxx
 include/simgear/misc/stopwatch.hxx
 include/simgear/misc/strutils.hxx
@@ -153,6 +165,7 @@ include/simgear/misc/texcoord.hxx
 include/simgear/nasal/cppbind/Ghost.hxx
 include/simgear/nasal/cppbind/NasalCallContext.hxx
 include/simgear/nasal/cppbind/NasalContext.hxx
+include/simgear/nasal/cppbind/NasalEmesaryInterface.hxx
 include/simgear/nasal/cppbind/NasalHash.hxx
 include/simgear/nasal/cppbind/NasalMe.hxx
 include/simgear/nasal/cppbind/NasalMethodHolder.hxx
@@ -208,6 +221,7 @@ include/simgear/scene/model/ModelRegistr
 include/simgear/scene/model/PrimitiveCollector.hxx
 include/simgear/scene/model/SGClipGroup.hxx
 include/simgear/scene/model/SGInteractionAnimation.hxx
+include/simgear/scene/model/SGLight.hxx
 include/simgear/scene/model/SGMaterialAnimation.hxx
 include/simgear/scene/model/SGOffsetTransform.hxx
 include/simgear/scene/model/SGPickAnimation.hxx
@@ -286,7 +300,7 @@ include/simgear/scene/util/UpdateOnceCal
 include/simgear/scene/util/VectorArrayAdapter.hxx
 include/simgear/scene/util/parse_color.hxx
 include/simgear/scene/util/project.hxx
-include/simgear/scene/viewer/ClusteredForward.hxx
+include/simgear/scene/viewer/ClusteredShading.hxx
 include/simgear/scene/viewer/Compositor.hxx
 include/simgear/scene/viewer/CompositorBuffer.hxx
 include/simgear/scene/viewer/CompositorPass.hxx
@@ -343,5 +357,7 @@ lib/cmake/SimGear/SimGearConfig.cmake
 lib/cmake/SimGear/SimGearConfigVersion.cmake
 lib/cmake/SimGear/SimGearTargets-release.cmake
 lib/cmake/SimGear/SimGearTargets.cmake
-lib/libSimGearCore.a
-lib/libSimGearScene.a
+lib/libSimGearCore.so
+lib/libSimGearCore.so.${PKGVERSION}
+lib/libSimGearScene.so
+lib/libSimGearScene.so.${PKGVERSION}

Index: pkgsrc/games/simgear/distinfo
diff -u pkgsrc/games/simgear/distinfo:1.11 pkgsrc/games/simgear/distinfo:1.12
--- pkgsrc/games/simgear/distinfo:1.11  Sat May 16 02:12:45 2020
+++ pkgsrc/games/simgear/distinfo       Thu Feb 25 10:22:14 2021
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.11 2020/05/16 02:12:45 joerg Exp $
+$NetBSD: distinfo,v 1.12 2021/02/25 10:22:14 nia 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
+SHA1 (simgear-2020.3.6.tar.bz2) = 193b1d3f1cc1bce90a1f0895c12aaacb3f8d4202
+RMD160 (simgear-2020.3.6.tar.bz2) = eb742854cb4f3e1e1d7f91f5ddd6b5410251b947
+SHA512 (simgear-2020.3.6.tar.bz2) = eaa8e3663c5fb486ea0fdad26c490fa49472596157d8d19e60426d5a1d340dfda4e5e3d82f68542bb6d9689abb8e867dc33761ea578b9c8f6c07aeb4b942880e
+Size (simgear-2020.3.6.tar.bz2) = 1408963 bytes
+SHA1 (patch-simgear_canvas_ShivaVG_src_shConfig.h) = 0cb3c4c6049bbc5aeed85153f4cca6381219fd61
+SHA1 (patch-simgear_canvas_ShivaVG_src_shDefs.h) = 3aacbfdf03b9dd7111bfe039cf929a54c0953ef8
 SHA1 (patch-simgear_io_test__untar.cxx) = b3625254f9410411b30a8c3e30845c3d1509a993
 SHA1 (patch-simgear_io_untar.cxx) = 2cc21468bd0319aae012fb7c16e9e279888e34e3
-SHA1 (patch-simgear_misc_strutils.cxx) = a72f601803ca285c778ccf12bfe25ff886a182cb
+SHA1 (patch-simgear_misc_strutils.cxx) = c442cf04d88f2c61845a25d6bf7492b75654aeaa
 SHA1 (patch-simgear_package_md5.h) = 91dc8741ed547c26a6de8ab8bd25ee441e0e5e92

Index: pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h
diff -u pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h:1.2 pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h:1.3
--- pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h:1.2        Mon Aug  6 11:03:18 2018
+++ pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h    Thu Feb 25 10:22:14 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-simgear_canvas_ShivaVG_src_shConfig.h,v 1.2 2018/08/06 11:03:18 jperkin Exp $
+$NetBSD: patch-simgear_canvas_ShivaVG_src_shConfig.h,v 1.3 2021/02/25 10:22:14 nia Exp $
 
 Support NetBSD and SunOS.
 
---- simgear/canvas/ShivaVG/src/shConfig.h.orig 2018-06-03 18:56:36.000000000 +0000
+--- simgear/canvas/ShivaVG/src/shConfig.h.orig 2021-01-23 18:01:02.000000000 +0000
 +++ simgear/canvas/ShivaVG/src/shConfig.h
 @@ -16,7 +16,7 @@
          #define NOMINMAX
@@ -22,6 +22,6 @@ Support NetBSD and SunOS.
 +    // NetBSD
 +    #define VG_API_NETBSD
 +
- #else
+ #elif defined(__OpenBSD__)
  
-     // Unsupported system
+     // FreeBSD

Index: pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs.h
diff -u pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs.h:1.1 pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs.h:1.2
--- pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs.h:1.1  Sat Aug  4 04:04:28 2018
+++ pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs.h      Thu Feb 25 10:22:14 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-simgear_canvas_ShivaVG_src_shDefs.h,v 1.1 2018/08/04 04:04:28 nia Exp $
+$NetBSD: patch-simgear_canvas_ShivaVG_src_shDefs.h,v 1.2 2021/02/25 10:22:14 nia Exp $
 
 Support NetBSD.
 
---- simgear/canvas/ShivaVG/src/shDefs.h.orig   2018-06-03 18:56:36.000000000 +0000
+--- simgear/canvas/ShivaVG/src/shDefs.h.orig   2021-01-23 18:01:02.000000000 +0000
 +++ simgear/canvas/ShivaVG/src/shDefs.h
 @@ -161,7 +161,7 @@ SHfloat getMaxFloat();
  
  /* OpenGL headers */
  
--#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD)
-+#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD) || defined(VG_API_NETBSD)
+-#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD) || defined(VG_API_OPENBSD)
++#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD) || defined(VG_API_NETBSD) || defined(VG_API_OPENBSD)
      #include <GL/gl.h>
      #include <GL/glx.h>
  #elif defined(VG_API_MACOSX)
Index: pkgsrc/games/simgear/patches/patch-simgear_misc_strutils.cxx
diff -u pkgsrc/games/simgear/patches/patch-simgear_misc_strutils.cxx:1.1 pkgsrc/games/simgear/patches/patch-simgear_misc_strutils.cxx:1.2
--- pkgsrc/games/simgear/patches/patch-simgear_misc_strutils.cxx:1.1    Sat Aug  4 04:04:28 2018
+++ pkgsrc/games/simgear/patches/patch-simgear_misc_strutils.cxx        Thu Feb 25 10:22:14 2021
@@ -1,16 +1,15 @@
-$NetBSD: patch-simgear_misc_strutils.cxx,v 1.1 2018/08/04 04:04:28 nia Exp $
+$NetBSD: patch-simgear_misc_strutils.cxx,v 1.2 2021/02/25 10:22:14 nia Exp $
 
 Support NetBSD.
 
---- simgear/misc/strutils.cxx.orig     2018-06-03 18:56:36.000000000 +0000
+--- simgear/misc/strutils.cxx.orig     2021-01-23 18:01:02.000000000 +0000
 +++ simgear/misc/strutils.cxx
-@@ -1017,7 +1017,8 @@ std::string error_string(int errnum)
+@@ -1170,7 +1170,7 @@ std::string error_string(int errnum)
    retcode = strerror_s(buf, sizeof(buf), errnum);
  #elif defined(_GNU_SOURCE)
    return std::string(strerror_r(errnum, buf, sizeof(buf)));
--#elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__)
-+#elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || \
-+    defined(__FreeBSD__) || defined(__NetBSD__)
+-#elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
    int retcode;
    // POSIX.1-2001 and POSIX.1-2008
    retcode = strerror_r(errnum, buf, sizeof(buf));

Prev by Date: CVS commit: pkgsrc/devel/tex-l3packages
Next by Date: Re: CVS commit: pkgsrc/print/tex-latex-bin
Previous by Thread: CVS commit: pkgsrc/devel/tex-l3packages
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index