git: 3d48e47e1359 - main - games/openbve: update OpenBVE to version 1.9.2.2

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Mon, 18 Sep 2023 11:53:59 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3d48e47e13591473c52d89312812ff810a21f377

commit 3d48e47e13591473c52d89312812ff810a21f377
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-09-18 11:52:56 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-09-18 11:52:56 +0000

    games/openbve: update OpenBVE to version 1.9.2.2
    
    Among the usual round of bug fixes and significant changes, it is
    now possible to uncouple vehicles from the player train.  Whilst
    (probably) not immediately useful, it is another significant step
    along the path of moving away from the simple linear world model.
    
    While here, make ALL_TARGET subject to defined(WITH_DEBUG).
    
    Reported by:    portscout
---
 games/openbve/Makefile             | 4 ++--
 games/openbve/distinfo             | 6 +++---
 games/openbve/files/patch-makefile | 9 ++++++---
 games/openbve/pkg-plist            | 1 -
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/games/openbve/Makefile b/games/openbve/Makefile
index c1db82e124b9..b7cb4e549b86 100644
--- a/games/openbve/Makefile
+++ b/games/openbve/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	${GH_PROJECT:tl}
-PORTVERSION=	1.9.1.2
+PORTVERSION=	1.9.2.2
 CATEGORIES=	games
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -18,7 +18,7 @@ GH_PROJECT=	OpenBVE
 USES=		gmake mono:nuget openal:soft sdl
 USE_SDL=	sdl2
 MAKEFILE=	makefile
-ALL_TARGET=	all-release
+ALL_TARGET=	all-${WITH_DEBUG:?debug:release}
 
 NUGET_DEPENDS=	CS-Script.lib=3.30.3 \
 		DotNetZip=1.16.0 \
diff --git a/games/openbve/distinfo b/games/openbve/distinfo
index 7adf038ea245..fc54159fc07f 100644
--- a/games/openbve/distinfo
+++ b/games/openbve/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1691663724
-SHA256 (leezer3-OpenBVE-1.9.1.2_GH0.tar.gz) = 73746211bf6bdf36b58e66e902328593e48a747683b44b3520f039a6cfc13444
-SIZE (leezer3-OpenBVE-1.9.1.2_GH0.tar.gz) = 11816157
+TIMESTAMP = 1694768061
+SHA256 (leezer3-OpenBVE-1.9.2.2_GH0.tar.gz) = 3159cc4e5c44c9f82837d51592a2eee3fa1ad7d6249924ef31a3ceab42ac538e
+SIZE (leezer3-OpenBVE-1.9.2.2_GH0.tar.gz) = 9719069
 SHA256 (cs-script.lib.3.30.3.nupkg) = 783ebcee59e0fb9d0c6fde41097f695feebb829ac467c60501c237e262eca964
 SIZE (cs-script.lib.3.30.3.nupkg) = 182751
 SHA256 (dotnetzip.1.16.0.nupkg) = 465cc790eec3c42bd192bfa0a4cf006ecdf85dba2f9814e65df3bb2ed9c4ef91
diff --git a/games/openbve/files/patch-makefile b/games/openbve/files/patch-makefile
index 90232905c27b..24241e64de7c 100644
--- a/games/openbve/files/patch-makefile
+++ b/games/openbve/files/patch-makefile
@@ -1,4 +1,4 @@
---- makefile.orig	2020-09-21 21:11:53 UTC
+--- makefile.orig	2023-09-15 08:54:21 UTC
 +++ makefile
 @@ -1,6 +1,6 @@
  # Version checking
@@ -8,7 +8,7 @@
  MONO_VERSION:= $(shell mono --version | awk '/version/ { print $$5 }')
  MIN_NUGET_VERSION:= "2.16.0"
  NUGET_VERSION:= $(shell nuget help 2> /dev/null | awk '/Version:/ { print $$3; exit 0}')
-@@ -55,7 +55,7 @@ reset:=$(shell tput sgr0)
+@@ -56,7 +56,7 @@ reset:=$(shell tput sgr0)
  .PHONY: prequisite-check
  
  restore:
@@ -17,7 +17,7 @@
  
  debug: openbve-debug
  release: openbve-release
-@@ -104,45 +104,6 @@ endif
+@@ -105,48 +105,6 @@ endif
  
  debian: $(DEBIAN_BUILD_RESULT)
  
@@ -53,6 +53,9 @@
 - $(info nuget Version $(NUGET_VERSION) found.)
 - ifeq "$(call GreaterVersion, $(NUGET_VERSION), $(MIN_NUGET_VERSION))" "$(NUGET_VERSION)"
 - #Nothing
+- else ifeq ($(strip $(NUGET_VERSION)),)
+- $(info Unable to determine the nuget version installed.)
+- $(info OpenBVE requires a minimum nuget version of 2.16- The build will fail with versions below this.)
 - else
 - $(info OpenBVE requires a minimum nuget version of 2.16)
 - $(info Please run $(red)nuget update -self$(reset) with administrative priveledges.)
diff --git a/games/openbve/pkg-plist b/games/openbve/pkg-plist
index 83a39de294aa..d1bca74b0193 100644
--- a/games/openbve/pkg-plist
+++ b/games/openbve/pkg-plist
@@ -773,7 +773,6 @@ bin/openbve-routeviewer
 %%DATADIR%%/Data/TrainEditor2/undo.png
 %%DATADIR%%/Data/TrainEditor2/zoomin.png
 %%DATADIR%%/Data/TrainEditor2/zoomout.png
-%%DATADIR%%/Data/icon.bmp
 %%DATADIR%%/Data/icon.ico
 %%DATADIR%%/DevTools/LBAHeader.exe
 %%DATADIR%%/DevTools/LBAHeader.exe.config