CVS commit: pkgsrc/games/openttd

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

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Jul 17 20:26:09 UTC 2023

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

Log Message:
openttd: Update to 13.3

upstream changes:
-----------------
  * 13.3:       https://github.com/OpenTTD/OpenTTD/releases/tag/13.3
  * 13.2:       https://github.com/OpenTTD/OpenTTD/releases/tag/13.2
  * 13.1:       https://github.com/OpenTTD/OpenTTD/releases/tag/13.1
  * 13.0:       https://github.com/OpenTTD/OpenTTD/releases/tag/13.0
  * 13.0-RC2:   https://github.com/OpenTTD/OpenTTD/releases/tag/13.0-RC2
  * 13.0-RC1:   https://github.com/OpenTTD/OpenTTD/releases/tag/13.0-RC1
  * 13.0-beta2: https://github.com/OpenTTD/OpenTTD/releases/tag/13.0-beta2
  * 13.0-beta1: https://github.com/OpenTTD/OpenTTD/releases/tag/13.0-beta1


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/games/openttd/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/games/openttd/PLIST
cvs rdiff -u -r1.42 -r1.43 pkgsrc/games/openttd/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.111 pkgsrc/games/openttd/Makefile:1.112
--- pkgsrc/games/openttd/Makefile:1.111 Sat May  6 19:09:27 2023
+++ pkgsrc/games/openttd/Makefile       Mon Jul 17 20:26:08 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.111 2023/05/06 19:09:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.112 2023/07/17 20:26:08 triaxx Exp $
 
-DISTNAME=      openttd-12.2-source
+DISTNAME=      openttd-13.3-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   7
 CATEGORIES=    games
 MASTER_SITES=  https://proxy.binaries.openttd.org/openttd-releases/${PKGVERSION_NOREV}/
+MASTER_SITES+= https://cdn.openttd.org/openttd-releases/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/games/openttd/PLIST
diff -u pkgsrc/games/openttd/PLIST:1.29 pkgsrc/games/openttd/PLIST:1.30
--- pkgsrc/games/openttd/PLIST:1.29     Sun May  8 12:06:01 2022
+++ pkgsrc/games/openttd/PLIST  Mon Jul 17 20:26:08 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2022/05/08 12:06:01 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.30 2023/07/17 20:26:08 triaxx Exp $
 bin/openttd
 man/man6/openttd.6
 share/applications/openttd.desktop
@@ -27,6 +27,7 @@ share/openttd/ai/compat_1.7.nut
 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/baseset/no_music.obm
 share/openttd/baseset/no_sound.obs
 share/openttd/baseset/openttd.32.bmp
@@ -52,6 +53,7 @@ share/openttd/game/compat_1.7.nut
 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/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.42 pkgsrc/games/openttd/distinfo:1.43
--- pkgsrc/games/openttd/distinfo:1.42  Wed Dec 28 10:13:29 2022
+++ pkgsrc/games/openttd/distinfo       Mon Jul 17 20:26:08 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.42 2022/12/28 10:13:29 nia Exp $
+$NetBSD: distinfo,v 1.43 2023/07/17 20:26:08 triaxx Exp $
 
-BLAKE2s (openttd-12.2-source.tar.xz) = 340eb17b3123514fc845011abff5ab4e1432c17e5c29c0f3be2f99360eabfeaf
-SHA512 (openttd-12.2-source.tar.xz) = 577792faee1d5e0c19fbfe31501dab3359f8e1327caa87e6378bb3e616ab6b2c64d02044c6ac99f7c40397df7bc6847a6b432852a5318a2db574203ddebfaef6
-Size (openttd-12.2-source.tar.xz) = 7377496 bytes
-SHA1 (patch-cmake_InstallAndPackage.cmake) = 18b02c11bf59639124c2a852d5a19dda3ae0ff81
+BLAKE2s (openttd-13.3-source.tar.xz) = 7fbba0842b627c67a76b911c9cfe810d3ecf2a47240a0838dcbebd95baf94186
+SHA512 (openttd-13.3-source.tar.xz) = bb91755f65bd3c3f4716b6722f29bc63633e04557d427cb224f4c3aecdbd3744df4921aba3872966fc587541fe2cdaa2fd80891236a9c87826cea0a6865e2318
+Size (openttd-13.3-source.tar.xz) = 7417568 bytes
+SHA1 (patch-cmake_InstallAndPackage.cmake) = ccac4a306d243b57cf6dcc36636d65f2dab434aa
 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.1 pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake:1.2
--- pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake:1.1        Tue May  4 17:08:05 2021
+++ pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake    Mon Jul 17 20:26:08 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-cmake_InstallAndPackage.cmake,v 1.1 2021/05/04 17:08:05 nia Exp $
+$NetBSD: patch-cmake_InstallAndPackage.cmake,v 1.2 2023/07/17 20:26:08 triaxx Exp $
 
 Do not try to generate Linux distribution packages.
 
---- cmake/InstallAndPackage.cmake.orig 2021-05-03 18:41:45.000000000 +0000
+--- cmake/InstallAndPackage.cmake.orig 2023-06-11 16:42:59.000000000 +0000
 +++ cmake/InstallAndPackage.cmake
-@@ -145,47 +145,9 @@ elseif(UNIX)
+@@ -154,51 +154,9 @@ elseif(UNIX)
      if(OPTION_PACKAGE_DEPENDENCIES)
          set(CPACK_GENERATOR "TXZ")
          set(PLATFORM "generic")
 -    elseif(NOT OPTION_INSTALL_FHS)
-+    else()
++    else(NOT OPTION_INSTALL_FHS)
          set(CPACK_GENERATOR "TXZ")
          set(PLATFORM "unknown")
 -    else()
@@ -38,6 +38,10 @@ Do not try to generate Linux distributio
 -            if(DISTRO_ID STREQUAL "arch")
 -                set(PLATFORM "arch")
 -                set(CPACK_GENERATOR "TXZ")
+-            elseif(DISTRO_ID STREQUAL "fedora" OR DISTRO_ID STREQUAL "rhel")
+-                set(PLATFORM "fedora")
+-                set(CPACK_GENERATOR "RPM")
+-                include(PackageRPM)
 -            else()
 -                set(UNSUPPORTED_PLATFORM_NAME "Linux distribution '${DISTRO_ID}' from /etc/os-release")
 -            endif()