git: 7de16b22fa5b - main - games/openbve: the port had been updated (+)

Alexey Dokuchaev danfe at FreeBSD.org
Sun Jul 18 07:28:46 UTC 2021


The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7de16b22fa5b76c2fa1be4fa693a5f2dfa7456b0

commit 7de16b22fa5b76c2fa1be4fa693a5f2dfa7456b0
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-07-18 07:24:56 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-07-18 07:25:01 +0000

    games/openbve: the port had been updated (+)
    
    - Update OpenBVE to version 1.8.1.0, which now supports routes from the
      legacy DOS simulator Mechanik, among other changes and bug fixes
    - AssemblyInfo.sh (shell script) had been replaced with AssemblyInfo.tt
      written in C# which means gdate(1) is no longer used and we can drop
      the build-time dependency on the `sysutils/coreutils' port/package
    
    Reported by:    portscout
---
 games/openbve/Makefile                             |  8 +++----
 games/openbve/distinfo                             |  8 ++++---
 ...patch-source_OpenBVE_Properties_AssemblyInfo.sh | 28 ----------------------
 games/openbve/pkg-plist                            | 22 +++++++++++++++++
 4 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/games/openbve/Makefile b/games/openbve/Makefile
index 70a1044fae23..c9021ffcac37 100644
--- a/games/openbve/Makefile
+++ b/games/openbve/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe at FreeBSD.org>
 
 PORTNAME=	openbve
-PORTVERSION=	1.8.0.2
+PORTVERSION=	1.8.1.0
 CATEGORIES=	games
 
 MAINTAINER=	danfe at FreeBSD.org
@@ -9,8 +9,7 @@ COMMENT=	Realistic 3D train/railway simulator
 
 LICENSE=	PD
 
-BUILD_DEPENDS=	msbuild:devel/msbuild \
-		gdate:sysutils/coreutils
+BUILD_DEPENDS=	msbuild:devel/msbuild
 LIB_DEPENDS=	libgdiplus.so:x11-toolkits/libgdiplus
 
 USE_GITHUB=	yes
@@ -23,6 +22,7 @@ ALL_TARGET=	all-release
 
 NUGET_DEPENDS=	CS-Script.lib=3.30.3 \
 		DotNetZip=1.13.8 \
+		LibUsbDotNet=2.2.29 \
 		Mono.Cecil=0.11.3 \
 		NAudio.Vorbis=1.2.0 \
 		NAudio=1.10.0 \
@@ -57,8 +57,6 @@ BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: The imported project
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/Unix/s,bash,sh,' \
-		${WRKSRC}/source/OpenBVE/OpenBve.csproj
 	@${REINPLACE_CMD} -e '/TargetFrameworkVersion/s,4\.7\.2,4.6.1,' \
 		${WRKSRC}/source/TrainEditor2/TrainEditor2.csproj
 
diff --git a/games/openbve/distinfo b/games/openbve/distinfo
index 21821e932773..25787b473fa0 100644
--- a/games/openbve/distinfo
+++ b/games/openbve/distinfo
@@ -1,8 +1,10 @@
-TIMESTAMP = 1611577407
+TIMESTAMP = 1626427324
 SHA256 (cs-script.lib.3.30.3.nupkg) = 783ebcee59e0fb9d0c6fde41097f695feebb829ac467c60501c237e262eca964
 SIZE (cs-script.lib.3.30.3.nupkg) = 182751
 SHA256 (dotnetzip.1.13.8.nupkg) = 668b03e673afc17b47198dd341259e14164e0fd294d009aaa1c602bbf942c1d9
 SIZE (dotnetzip.1.13.8.nupkg) = 912116
+SHA256 (libusbdotnet.2.2.29.nupkg) = d91ba25dc7a74eed3b0e51cc271e42ab530e3c7fc9e6a376667cb989d5c1f6dd
+SIZE (libusbdotnet.2.2.29.nupkg) = 392838
 SHA256 (mono.cecil.0.11.3.nupkg) = 43125c46ddde632ed1d26736e45fe13399f8a95a8102564286c10a9fe63d9d75
 SIZE (mono.cecil.0.11.3.nupkg) = 692913
 SHA256 (naudio.vorbis.1.2.0.nupkg) = a36d9a1b539bdd26639f7bb4d7003d636c364edf86b95896a32adb3a4272fb8b
@@ -45,5 +47,5 @@ SHA256 (system.valuetuple.4.5.0.nupkg) = 9e21fa9767d4e76bc0cee065c1d40cc34384a11
 SIZE (system.valuetuple.4.5.0.nupkg) = 204904
 SHA256 (ude.netstandard.1.2.0.nupkg) = f43abb504e4e8aebdc89445057c01ad777a5a25b757f30e1bc5f1cf18c739e1c
 SIZE (ude.netstandard.1.2.0.nupkg) = 389990
-SHA256 (leezer3-OpenBVE-1.8.0.2_GH0.tar.gz) = 7326df11784bd4fb4a65bdef734875c9c6ddd05aa366c5e0d7722e433db40318
-SIZE (leezer3-OpenBVE-1.8.0.2_GH0.tar.gz) = 10677889
+SHA256 (leezer3-OpenBVE-1.8.1.0_GH0.tar.gz) = dff4e9a14a3630723ea6546a56bda2471717e3090a55a8e3d0988127e98df3fd
+SIZE (leezer3-OpenBVE-1.8.1.0_GH0.tar.gz) = 11225190
diff --git a/games/openbve/files/patch-source_OpenBVE_Properties_AssemblyInfo.sh b/games/openbve/files/patch-source_OpenBVE_Properties_AssemblyInfo.sh
deleted file mode 100644
index cc42fe55d388..000000000000
--- a/games/openbve/files/patch-source_OpenBVE_Properties_AssemblyInfo.sh
+++ /dev/null
@@ -1,28 +0,0 @@
---- source/OpenBVE/Properties/AssemblyInfo.sh.orig	2020-09-21 21:11:53 UTC
-+++ source/OpenBVE/Properties/AssemblyInfo.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/bin/sh
- #Set base development branch revision numbers
- #This needs to be bumped once we have a stable release branch
- MajorVersion=1
-@@ -13,14 +13,14 @@ if (git describe --tags --exact-match 2> /dev/null) th
- 	InfoVersion=$(git describe --tags)
- else
- 	# determine revision and build numbers
--	if [[ "$OSTYPE" == "darwin"* ]]; then
-+	if [ "${OSTYPE%%[0-9]*}" = "darwin" ]; then
- 		#OSX
--		Revision=$(((($(date +%s) - $(date -jf "%Y-%m-%d" "2019-10-29" $B +%s))/86400 )+40 ))
--		Minutes=$(( $(date "+10#%H * 60 + 10#%M") ))
-+		Revision=$(((($(gdate +%s) - $(gdate -jf "%Y-%m-%d" "2019-10-29" $B +%s))/86400 )+40 ))
-+		Minutes=$(( $(gdate "+10#%H * 60 + 10#%M") ))
- 	else
- 		#Linux & Cygwin
--		Revision=$(( ( ($(date "+%s") - $(date --date="2019-10-29" +%s))/(60*60*24) )+40 ))
--		Minutes=$(( ( $(date "+%s") - $(date -d "today 0" +%s))/60 ))
-+		Revision=$(( ( ($(gdate "+%s") - $(gdate --date="2019-10-29" +%s))/(60*60*24) )+40 ))
-+		Minutes=$(( ( $(gdate "+%s") - $(gdate -d "today 0" +%s))/60 ))
- 	fi
- 
- 	Version=$MajorVersion.$MinorVersion.$Revision.$Minutes
diff --git a/games/openbve/pkg-plist b/games/openbve/pkg-plist
index 79c2d2ed4584..b3d2a9dd098a 100644
--- a/games/openbve/pkg-plist
+++ b/games/openbve/pkg-plist
@@ -31,6 +31,9 @@ bin/openbve-routeviewer
 %%DATADIR%%/Data/Compatibility/Limits/limit_left.csv
 %%DATADIR%%/Data/Compatibility/Limits/limit_right.csv
 %%DATADIR%%/Data/Compatibility/Limits/limit_straight.csv
+%%DATADIR%%/Data/Compatibility/Mechanik/database.xml
+%%DATADIR%%/Data/Compatibility/Mechanik/greysky.png
+%%DATADIR%%/Data/Compatibility/Mechanik/modules.xml
 %%DATADIR%%/Data/Compatibility/Poles/pole_1.csv
 %%DATADIR%%/Data/Compatibility/Poles/pole_1.png
 %%DATADIR%%/Data/Compatibility/Poles/pole_2.csv
@@ -52,6 +55,7 @@ bin/openbve-routeviewer
 %%DATADIR%%/Data/Compatibility/RoutePatches/Italy.xml
 %%DATADIR%%/Data/Compatibility/RoutePatches/Japan.xml
 %%DATADIR%%/Data/Compatibility/RoutePatches/Misc.xml
+%%DATADIR%%/Data/Compatibility/RoutePatches/Spain.xml
 %%DATADIR%%/Data/Compatibility/RoutePatches/UnitedKingdom.xml
 %%DATADIR%%/Data/Compatibility/RoutePatches/database.xml
 %%DATADIR%%/Data/Compatibility/Signals/Australian.xml
@@ -561,6 +565,7 @@ bin/openbve-routeviewer
 %%DATADIR%%/Data/In-game/Slim/stop_back_right_none.png
 %%DATADIR%%/Data/In-game/Slim/stop_tick_left.png
 %%DATADIR%%/Data/In-game/Slim/stop_tick_right.png
+%%DATADIR%%/Data/In-game/beep.wav
 %%DATADIR%%/Data/In-game/interface.cfg.txt
 %%DATADIR%%/Data/In-game/loadingbkg_0.png
 %%DATADIR%%/Data/In-game/loadingbkg_1.png
@@ -627,6 +632,7 @@ bin/openbve-routeviewer
 %%DATADIR%%/Data/Menu/icon_library_notinstalled.png
 %%DATADIR%%/Data/Menu/icon_library_outdatedversion.png
 %%DATADIR%%/Data/Menu/icon_library_protected.png
+%%DATADIR%%/Data/Menu/icon_mechanik.png
 %%DATADIR%%/Data/Menu/icon_mouse.png
 %%DATADIR%%/Data/Menu/icon_parent.png
 %%DATADIR%%/Data/Menu/icon_route.png
@@ -673,6 +679,8 @@ bin/openbve-routeviewer
 %%DATADIR%%/Data/Plugins/OpenBveAts.dll.config
 %%DATADIR%%/Data/Plugins/Route.CsvRw.dll
 %%DATADIR%%/Data/Plugins/Route.CsvRw.pdb
+%%DATADIR%%/Data/Plugins/Route.Mechanik.dll
+%%DATADIR%%/Data/Plugins/Route.Mechanik.pdb
 %%DATADIR%%/Data/Plugins/Sound.Flac.dll
 %%DATADIR%%/Data/Plugins/Sound.Flac.dll.config
 %%DATADIR%%/Data/Plugins/Sound.MP3.dll
@@ -748,6 +756,8 @@ bin/openbve-routeviewer
 %%DATADIR%%/LibRender2.dll
 %%DATADIR%%/LibRender2.dll.config
 %%DATADIR%%/LibRender2.pdb
+%%DATADIR%%/LibUsbDotNet.LibUsbDotNet.dll
+%%DATADIR%%/LibUsbDotNet.LibUsbDotNet.pdb
 %%DATADIR%%/Microsoft.Win32.Primitives.dll
 %%DATADIR%%/NAudio.Vorbis.dll
 %%DATADIR%%/NAudio.dll
@@ -900,6 +910,7 @@ bin/openbve-routeviewer
 %%DATADIR%%/System.Xml.XPath.dll
 %%DATADIR%%/System.Xml.XmlDocument.dll
 %%DATADIR%%/System.Xml.XmlSerializer.dll
+%%DATADIR%%/TolkDotNet.dll
 %%DATADIR%%/TrainEditor.exe
 %%DATADIR%%/TrainEditor.exe.config
 %%DATADIR%%/TrainEditor2.exe
@@ -913,7 +924,18 @@ bin/openbve-routeviewer
 %%DATADIR%%/Win32PluginProxy.pdb
 %%DATADIR%%/netstandard.dll
 %%DATADIR%%/x64/OpenAL32.dll
+%%DATADIR%%/x64/SAAPI64.dll
+%%DATADIR%%/x64/Tolk.dll
+%%DATADIR%%/x64/Tolk.exp
+%%DATADIR%%/x64/Tolk.lib
+%%DATADIR%%/x64/nvdaControllerClient64.dll
 %%DATADIR%%/x86/OpenAL32.dll
+%%DATADIR%%/x86/SAAPI32.dll
+%%DATADIR%%/x86/Tolk.dll
+%%DATADIR%%/x86/Tolk.exp
+%%DATADIR%%/x86/Tolk.lib
+%%DATADIR%%/x86/dolapi32.dll
+%%DATADIR%%/x86/nvdaControllerClient32.dll
 man/man6/openbve-objectviewer.6.gz
 man/man6/openbve-routeviewer.6.gz
 man/man6/openbve.6.gz


More information about the dev-commits-ports-main mailing list