From nobody Mon Sep 18 11:53:59 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq39M4yjSz4t4Qw; Mon, 18 Sep 2023 11:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq39M4NlBz4H19; Mon, 18 Sep 2023 11:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695038039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXRV66KC73ZAc4HlckwkW5wQ4PaiG0PngfOBntEHjdQ=; b=TxUn6G7G7u7ulp/pcQje3Iild38gkToYbAn8+/17HWqhFeFyBgmriEPtYU2PrwE1hfIdjN d+LgtsvM5ue/WdUrIDdSkSs7O6doT7u2WYB0xgGz21jYrq4Lmu4MS4ccWKWbH8UDVsUdAQ ZNBdVSCK7I2m8sKHWGoxIWVWrwY2UgW+7YkciG89h1WqCeuKhxRtmxgVSH2iV2Ssxonhz2 m0Jd+fgE3URtLX1jcEXa7prJ3chH6+JgsgXgDYc0H6k0jq5MOz/xgKH0lbGRzNDeoUb/ru vJovdlpZUR41Rod8gwY7w76zU9VukUb4Y/xBFTyCu/42tmw9XYL5hrLqhB0fRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695038039; a=rsa-sha256; cv=none; b=XG6+jgcVHCh/GYbPhml+sUqxaA1l5V/m0khE7wR8qiV2PXU66aYWW9cC9VzDqAsnUFQmBn fv8dkCSt8GxlOQnuG7wKvPwv42Ve5li1MC/XlBUoF6fcpa0fKZSV3SuqgC3TVDW0HaKprW 7JnTmrawKskrki29u0YsVJ3GdVvAMeO22hkoDhAjV5GWdj/mivlzjqN0m1znuLNKw8NN6/ Hgnab/ovqJzgJoKLFwwfTGRFS/pR/i3D0y6ZsV/SRRbC05vjXH4hpOnE465q3bany7gMZp v8KyZrkE0kCUSrPiQXfB/dtiFfAP6JWNJZzkOMcCoctOosmlGnHUq31ZnB7Y2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695038039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXRV66KC73ZAc4HlckwkW5wQ4PaiG0PngfOBntEHjdQ=; b=kZJD0BUlzelQhqGPu05oAkvSzqPC6K2shP9zc0BgP6HnsGQ1JWL0GuuN7qJRkynd3nOeGp kSVfkHKO3HLko6lyvGf6xAvIVjWXHHnhI6JmTDBjr8vg3LNSnbIUmGPPVxdSmMcjzv0iHU kikc9RY6ut8le31iJUouybuEgR8bE8ffy/ncf7iuQuijCnQMP2ALsIf5xzQAZWrzB+U13X s2RiolnId73rOvltVy14H1eFplHxHCmyy8lab1OhPFrlFQP1uQ1CDb7PYcd0Og0C8ElHup TTeNBj2C/CHiJnz0JIjlloHlqXNaMjPVo/M2NKngnWAxLpN7CB1+g+G4vGoP9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq39M3QPFzVNM; Mon, 18 Sep 2023 11:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IBrx58046119; Mon, 18 Sep 2023 11:53:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IBrx1q046116; Mon, 18 Sep 2023 11:53:59 GMT (envelope-from git) Date: Mon, 18 Sep 2023 11:53:59 GMT Message-Id: <202309181153.38IBrx1q046116@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 3d48e47e1359 - main - games/openbve: update OpenBVE to version 1.9.2.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d48e47e13591473c52d89312812ff810a21f377 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d48e47e13591473c52d89312812ff810a21f377 commit 3d48e47e13591473c52d89312812ff810a21f377 Author: Alexey Dokuchaev AuthorDate: 2023-09-18 11:52:56 +0000 Commit: Alexey Dokuchaev 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