CVS commit: pkgsrc/games/openttd

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Apr 28 20:01:49 UTC 2024

Modified Files:
        pkgsrc/games/openttd: Makefile PLIST distinfo
        pkgsrc/games/openttd/patches: patch-cmake_InstallAndPackage.cmake

Log Message:
openttd: Update to 14.0

pkgsrc changes:
---------------
  * OpenTTD now requires C++20.
  * Check patches applications.

upstream changes:
-----------------
  * https://cdn.openttd.org/openttd-releases/14.0/changelog.txt


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/games/openttd/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/games/openttd/PLIST
cvs rdiff -u -r1.46 -r1.47 pkgsrc/games/openttd/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/openttd/Makefile
diff -u pkgsrc/games/openttd/Makefile:1.121 pkgsrc/games/openttd/Makefile:1.122
--- pkgsrc/games/openttd/Makefile:1.121 Sat Apr  6 08:05:35 2024
+++ pkgsrc/games/openttd/Makefile       Sun Apr 28 20:01:49 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.121 2024/04/06 08:05:35 wiz Exp $
+# $NetBSD: Makefile,v 1.122 2024/04/28 20:01:49 triaxx Exp $
 
-DISTNAME=      openttd-13.4-source
+DISTNAME=      openttd-14.0-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   4
 CATEGORIES=    games
 MASTER_SITES=  https://proxy.binaries.openttd.org/openttd-releases/${PKGVERSION_NOREV}/
 MASTER_SITES+= https://cdn.openttd.org/openttd-releases/${PKGVERSION_NOREV}/
@@ -17,12 +16,12 @@ WRKSRC=             ${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 
-USE_CXX_FEATURES+=     c++17 charconv
+USE_CXX_FEATURES+=     c++20 charconv
 
 BUILD_DEFS+=   VARBASE
 
 # Uses alloca, cannot use standard C++ on NetBSD
-FORCE_CXX_STD=         gnu++17
+FORCE_CXX_STD=         gnu++20
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -55,5 +54,6 @@ PLIST.unix=   yes
 .include "../../devel/cmake/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/openttd/PLIST
diff -u pkgsrc/games/openttd/PLIST:1.31 pkgsrc/games/openttd/PLIST:1.32
--- pkgsrc/games/openttd/PLIST:1.31     Mon Jul 17 21:07:58 2023
+++ pkgsrc/games/openttd/PLIST  Sun Apr 28 20:01:49 2024
@@ -1,12 +1,27 @@
-@comment $NetBSD: PLIST,v 1.31 2023/07/17 21:07:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2024/04/28 20:01:49 triaxx Exp $
 bin/openttd
 man/man6/openttd.6
 ${PLIST.unix}share/applications/openttd.desktop
+share/doc/openttd/CONTRIBUTING.md
 share/doc/openttd/COPYING.md
+share/doc/openttd/CREDITS.md
 share/doc/openttd/README.md
 share/doc/openttd/changelog.txt
+share/doc/openttd/docs/admin_network.md
+share/doc/openttd/docs/debugging_desyncs.md
+share/doc/openttd/docs/desync.md
+share/doc/openttd/docs/directory_structure.md
+share/doc/openttd/docs/eints.md
+share/doc/openttd/docs/game_coordinator.md
+share/doc/openttd/docs/linkgraph.md
+share/doc/openttd/docs/logging_and_performance_metrics.md
+share/doc/openttd/docs/multiplayer.md
+share/doc/openttd/docs/obg_format.txt
+share/doc/openttd/docs/obm_format.txt
+share/doc/openttd/docs/obs_format.txt
+share/doc/openttd/docs/savegame_format.md
+share/doc/openttd/docs/symbol_server.md
 share/doc/openttd/known-bugs.txt
-share/doc/openttd/multiplayer.md
 ${PLIST.unix}share/icons/hicolor/128x128/apps/openttd.png
 ${PLIST.unix}share/icons/hicolor/16x16/apps/openttd.png
 ${PLIST.unix}share/icons/hicolor/256x256/apps/openttd.png
@@ -28,6 +43,11 @@ share/openttd/ai/compat_1.8.nut
 share/openttd/ai/compat_1.9.nut
 share/openttd/ai/compat_12.nut
 share/openttd/ai/compat_13.nut
+share/openttd/ai/compat_14.nut
+share/openttd/baseset/OpenTTD-Mono.ttf
+share/openttd/baseset/OpenTTD-Sans.ttf
+share/openttd/baseset/OpenTTD-Serif.ttf
+share/openttd/baseset/OpenTTD-Small.ttf
 share/openttd/baseset/no_music.obm
 share/openttd/baseset/no_sound.obs
 share/openttd/baseset/openttd.32.bmp
@@ -54,6 +74,7 @@ share/openttd/game/compat_1.8.nut
 share/openttd/game/compat_1.9.nut
 share/openttd/game/compat_12.nut
 share/openttd/game/compat_13.nut
+share/openttd/game/compat_14.nut
 share/openttd/lang/afrikaans.lng
 share/openttd/lang/arabic_egypt.lng
 share/openttd/lang/basque.lng

Index: pkgsrc/games/openttd/distinfo
diff -u pkgsrc/games/openttd/distinfo:1.46 pkgsrc/games/openttd/distinfo:1.47
--- pkgsrc/games/openttd/distinfo:1.46  Sun Oct 15 15:32:26 2023
+++ pkgsrc/games/openttd/distinfo       Sun Apr 28 20:01:49 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.46 2023/10/15 15:32:26 triaxx Exp $
+$NetBSD: distinfo,v 1.47 2024/04/28 20:01:49 triaxx Exp $
 
-BLAKE2s (openttd-13.4-source.tar.xz) = d2529ea293b329f14b24e1c6e115061f960f5be45f402a1e4e5c77d760726a74
-SHA512 (openttd-13.4-source.tar.xz) = 84f57a39c0dade44f0e6153dff7a40eec0da8e2f892ce870d5f9e037f80daa5c7c46ff786fa51c3671366dd5056504cd7ccbc1c4e5bce8b2c5575533b454c001
-Size (openttd-13.4-source.tar.xz) = 7428012 bytes
+BLAKE2s (openttd-14.0-source.tar.xz) = 1008115055bd7f2f0e6a82e421c3137474974e9587e8c30d55a80a315142dbd6
+SHA512 (openttd-14.0-source.tar.xz) = 8c669f5f8578df116166587b85f7f94c4409876099590f5ee4a12b92cbd0e0f50002b8319df635a14b7cbf3e6308b2905587137a8127d0814146025e174925c4
+Size (openttd-14.0-source.tar.xz) = 7997536 bytes
+SHA1 (patch-cmake_InstallAndPackage.cmake) = c7af3d74c1d6c22989242a75b2108f6d28cc0164
 SHA1 (patch-cmake_PackageBundle.cmake) = a22c8080c03ac8885beac3fc4b2b1c2f94eafe6b
-SHA1 (patch-cmake_InstallAndPackage.cmake) = 47cf19bf6b77dc5bcf954ee5ffdb4967f2af19ea
 SHA1 (patch-src_core_alloc__func.hpp) = 9c5a855316e3262c51c1b4c836de760d53abb759

Index: pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake
diff -u pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake:1.3 pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake:1.4
--- pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake:1.3        Mon Jul 17 21:07:58 2023
+++ pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake    Sun Apr 28 20:01:49 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-cmake_InstallAndPackage.cmake,v 1.3 2023/07/17 21:07:58 adam Exp $
+$NetBSD: patch-cmake_InstallAndPackage.cmake,v 1.4 2024/04/28 20:01:49 triaxx Exp $
 
 Do not try to generate Linux distribution packages.
 
 --- cmake/InstallAndPackage.cmake.orig 2023-06-11 16:42:59.000000000 +0000
 +++ cmake/InstallAndPackage.cmake
-@@ -121,7 +121,7 @@ set(CPACK_PACKAGE_EXECUTABLES "openttd;O
+@@ -152,7 +152,7 @@ set(CPACK_PACKAGE_EXECUTABLES "openttd;O
  set(CPACK_STRIP_FILES YES)
  set(CPACK_OUTPUT_FILE_PREFIX "bundles")
  
@@ -13,7 +13,7 @@ Do not try to generate Linux distributio
      # Stripping would produce unreadable stacktraces.
      set(CPACK_STRIP_FILES NO)
      set(CPACK_GENERATOR "Bundle")
-@@ -154,10 +154,11 @@ elseif(UNIX)
+@@ -185,10 +185,11 @@ elseif(UNIX)
      if(OPTION_PACKAGE_DEPENDENCIES)
          set(CPACK_GENERATOR "TXZ")
          set(PLATFORM "generic")