Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Jun 2021 21:56:59 GMT
From:      Neel Chauhan <nc@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 504b372caa8e - main - games/jaggedalliance2: update to 0.18.0
Message-ID:  <202106012156.151Luxmj063151@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=504b372caa8e07496ecdfb568dcdfe005a430cac

commit 504b372caa8e07496ecdfb568dcdfe005a430cac
Author:     Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2021-06-01 21:56:16 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2021-06-01 21:56:16 +0000

    games/jaggedalliance2: update to 0.18.0
    
    Changes: https://ja2-stracciatella.github.io/2021/04/23/release-0.18.0.html
    
    PR:             256355
    Submitted by:   timp87@gmail.com (maintainer)
---
 games/jaggedalliance2/Makefile  | 107 +++++++++++++-----------
 games/jaggedalliance2/distinfo  | 180 +++++++++++++++++++++-------------------
 games/jaggedalliance2/pkg-plist |  34 ++++++--
 3 files changed, 180 insertions(+), 141 deletions(-)

diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile
index 6ea3c24729cc..685dd0faeb81 100644
--- a/games/jaggedalliance2/Makefile
+++ b/games/jaggedalliance2/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	ja2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.17.0
-PORTREVISION=	7
+DISTVERSION=	0.18.0
 CATEGORIES=	games
 
 MAINTAINER=	timp87@gmail.com
@@ -20,26 +19,30 @@ LICENSE_PERMS_SFI-SCLA=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell \
 ONLY_FOR_ARCHS=		aarch64 amd64 arm armv6 armv7 i386 powerpc64le
 ONLY_FOR_ARCHS_REASON=	Needs a little endian environment
 
-BUILD_DEPENDS=	string_theory>=3.3:devel/string_theory
+BUILD_DEPENDS=	string_theory>=3.1:devel/string_theory \
+		rapidjson>=1.1.0:devel/rapidjson \
+		sol2>=3.2.2:devel/sol2
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
-USES=		cargo cmake compiler:c++11-lang pkgconfig sdl
+USES=		cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53
 USE_GITHUB=	yes
 GH_ACCOUNT=	ja2-stracciatella
 GH_PROJECT=	ja2-stracciatella
-USE_LDCONFIG=	yes
 USE_SDL=	sdl2
+USE_GL=		gl
+USE_XORG=	ice sm x11 xext
+GH_TUPLE=	mackron:miniaudio:634cdb028f340075ae8e8a1126620695688d2ac3:miniaudio
 
 CMAKE_ARGS=	-DEXTRA_DATA_DIR:PATH="${DATADIR}"
-CMAKE_OFF=	LOCAL_STRING_THEORY_LIB WITH_UNITTESTS
+CMAKE_OFF=	LOCAL_STRING_THEORY_LIB WITH_UNITTESTS LOCAL_RAPIDJSON_LIB LOCAL_LUA_LIB LOCAL_SOL_LIB LOCAL_MINIAUDIO_LIB
 
-CARGO_CRATES=	aho-corasick-0.7.10 \
+CARGO_CRATES=	aho-corasick-0.7.13 \
 		ansi_term-0.11.0 \
 		arrayref-0.3.6 \
 		arrayvec-0.5.1 \
 		atty-0.2.14 \
-		autocfg-1.0.0 \
-		base64-0.11.0 \
+		autocfg-1.0.1 \
+		base64-0.12.3 \
 		bitflags-1.2.1 \
 		blake2b_simd-0.5.10 \
 		block-buffer-0.7.3 \
@@ -49,75 +52,78 @@ CARGO_CRATES=	aho-corasick-0.7.10 \
 		caseless-0.2.1 \
 		cbindgen-0.13.2 \
 		cfg-if-0.1.10 \
-		chrono-0.4.11 \
-		clap-2.33.0 \
+		chrono-0.4.15 \
+		clap-2.33.3 \
 		constant_time_eq-0.1.5 \
+		crossbeam-channel-0.4.4 \
 		crossbeam-deque-0.7.3 \
 		crossbeam-epoch-0.8.2 \
-		crossbeam-queue-0.2.1 \
 		crossbeam-utils-0.7.2 \
 		digest-0.8.1 \
 		dirs-1.0.5 \
-		dunce-1.0.0 \
-		either-1.5.3 \
+		dunce-1.0.1 \
+		either-1.6.1 \
 		generic-array-0.12.3 \
 		getopts-0.2.21 \
-		getrandom-0.1.14 \
-		hermit-abi-0.1.10 \
+		getrandom-0.1.15 \
+		hashbrown-0.9.0 \
+		hermit-abi-0.1.15 \
 		hex-0.3.2 \
-		indexmap-1.3.2 \
-		itoa-0.4.5 \
+		indexmap-1.6.0 \
+		itoa-0.4.6 \
 		json_comments-0.2.0 \
 		lazy_static-1.4.0 \
-		libc-0.2.68 \
-		log-0.4.8 \
+		libc-0.2.77 \
+		log-0.4.11 \
 		maybe-uninit-2.0.0 \
 		md-5-0.8.0 \
 		memchr-2.3.3 \
-		memoffset-0.5.4 \
-		num-integer-0.1.42 \
-		num-traits-0.2.11 \
-		num_cpus-1.12.0 \
+		memoffset-0.5.5 \
+		num-integer-0.1.43 \
+		num-traits-0.2.12 \
+		num_cpus-1.13.0 \
 		opaque-debug-0.2.3 \
-		ppv-lite86-0.2.6 \
-		proc-macro2-1.0.10 \
-		quote-1.0.3 \
+		ppv-lite86-0.2.9 \
+		proc-macro2-1.0.21 \
+		quote-1.0.7 \
 		rand-0.7.3 \
 		rand_chacha-0.2.2 \
 		rand_core-0.5.1 \
 		rand_hc-0.2.0 \
-		rayon-1.3.0 \
-		rayon-core-1.7.0 \
-		redox_syscall-0.1.56 \
-		redox_users-0.3.4 \
-		regex-1.3.6 \
-		regex-syntax-0.6.17 \
-		remove_dir_all-0.5.2 \
-		rust-argon2-0.7.0 \
-		ryu-1.0.3 \
+		rayon-1.4.0 \
+		rayon-core-1.8.0 \
+		redox_syscall-0.1.57 \
+		redox_users-0.3.5 \
+		regex-1.3.9 \
+		regex-syntax-0.6.18 \
+		remove_dir_all-0.5.3 \
+		rust-argon2-0.8.2 \
+		ryu-1.0.5 \
 		scopeguard-1.1.0 \
-		serde-1.0.105 \
-		serde_derive-1.0.105 \
-		serde_json-1.0.50 \
+		serde-1.0.116 \
+		serde_derive-1.0.116 \
+		serde_json-1.0.57 \
 		simplelog-0.6.0 \
-		smallvec-1.2.0 \
 		strsim-0.8.0 \
-		syn-1.0.17 \
+		syn-1.0.41 \
 		tempfile-3.1.0 \
 		term-0.5.2 \
 		textwrap-0.11.0 \
 		thread_local-1.0.1 \
-		time-0.1.42 \
+		time-0.1.44 \
+		tinyvec-0.3.4 \
 		toml-0.5.6 \
-		typenum-1.11.2 \
-		unicode-normalization-0.1.12 \
-		unicode-width-0.1.7 \
-		unicode-xid-0.2.0 \
-		vec_map-0.8.1 \
+		typenum-1.12.0 \
+		unicode-normalization-0.1.13 \
+		unicode-width-0.1.8 \
+		unicode-xid-0.2.1 \
+		vec_map-0.8.2 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
-		winapi-0.3.8 \
+		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0
+
 CARGO_CARGOLOCK=	${WRKSRC}/rust/Cargo.lock
 CARGO_CARGOTOML=	${WRKSRC}/rust/Cargo.toml
 CARGO_BUILD=		no
@@ -127,6 +133,11 @@ CARGO_TEST=		no
 MAKE_ENV=	${CARGO_ENV:NCARGO_TARGET_DIR=*}
 LDFLAGS+=	-Wl,--as-needed
 
+pre-patch:
+	@${REINPLACE_CMD} -e 's|https://github.com/mackron/miniaudio/archive/634cdb028f340075ae8e8a1126620695688d2ac3.zip|${DISTDIR}/mackron-miniaudio-634cdb028f340075ae8e8a1126620695688d2ac3_GH0.tar.gz|' \
+		-e 's|b30045e95cec65bfe1d9fe3639f480a2|975a4d15815118a7ded8fbc7d3de68f6|' \
+		${WRKSRC}/dependencies/lib-miniaudio/getter/CMakeLists.txt.in
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/some/place/where/the/data/is|${DATADIR}|' \
 		${WRKSRC}/rust/stracciatella/src/stracciatella.rs
diff --git a/games/jaggedalliance2/distinfo b/games/jaggedalliance2/distinfo
index d5c0648d8bf9..dd11534e0b69 100644
--- a/games/jaggedalliance2/distinfo
+++ b/games/jaggedalliance2/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1596544732
-SHA256 (rust/crates/aho-corasick-0.7.10.tar.gz) = 8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada
-SIZE (rust/crates/aho-corasick-0.7.10.tar.gz) = 111039
+TIMESTAMP = 1619370350
+SHA256 (rust/crates/aho-corasick-0.7.13.tar.gz) = 043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86
+SIZE (rust/crates/aho-corasick-0.7.13.tar.gz) = 111381
 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
 SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
 SHA256 (rust/crates/arrayref-0.3.6.tar.gz) = a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544
@@ -9,10 +9,10 @@ SHA256 (rust/crates/arrayvec-0.5.1.tar.gz) = cff77d8686867eceff3105329d4698d96c2
 SIZE (rust/crates/arrayvec-0.5.1.tar.gz) = 26816
 SHA256 (rust/crates/atty-0.2.14.tar.gz) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
 SIZE (rust/crates/atty-0.2.14.tar.gz) = 5470
-SHA256 (rust/crates/autocfg-1.0.0.tar.gz) = f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d
-SIZE (rust/crates/autocfg-1.0.0.tar.gz) = 12870
-SHA256 (rust/crates/base64-0.11.0.tar.gz) = b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7
-SIZE (rust/crates/base64-0.11.0.tar.gz) = 48362
+SHA256 (rust/crates/autocfg-1.0.1.tar.gz) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
+SIZE (rust/crates/autocfg-1.0.1.tar.gz) = 12908
+SHA256 (rust/crates/base64-0.12.3.tar.gz) = 3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff
+SIZE (rust/crates/base64-0.12.3.tar.gz) = 57545
 SHA256 (rust/crates/bitflags-1.2.1.tar.gz) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
 SIZE (rust/crates/bitflags-1.2.1.tar.gz) = 16745
 SHA256 (rust/crates/blake2b_simd-0.5.10.tar.gz) = d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a
@@ -31,72 +31,74 @@ SHA256 (rust/crates/cbindgen-0.13.2.tar.gz) = 2db2df1ebc842c41fd2c4ae5b5a577faf6
 SIZE (rust/crates/cbindgen-0.13.2.tar.gz) = 160484
 SHA256 (rust/crates/cfg-if-0.1.10.tar.gz) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
 SIZE (rust/crates/cfg-if-0.1.10.tar.gz) = 7933
-SHA256 (rust/crates/chrono-0.4.11.tar.gz) = 80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2
-SIZE (rust/crates/chrono-0.4.11.tar.gz) = 139811
-SHA256 (rust/crates/clap-2.33.0.tar.gz) = 5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9
-SIZE (rust/crates/clap-2.33.0.tar.gz) = 196458
+SHA256 (rust/crates/chrono-0.4.15.tar.gz) = 942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b
+SIZE (rust/crates/chrono-0.4.15.tar.gz) = 150581
+SHA256 (rust/crates/clap-2.33.3.tar.gz) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
+SIZE (rust/crates/clap-2.33.3.tar.gz) = 201925
 SHA256 (rust/crates/constant_time_eq-0.1.5.tar.gz) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc
 SIZE (rust/crates/constant_time_eq-0.1.5.tar.gz) = 4936
+SHA256 (rust/crates/crossbeam-channel-0.4.4.tar.gz) = b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87
+SIZE (rust/crates/crossbeam-channel-0.4.4.tar.gz) = 86868
 SHA256 (rust/crates/crossbeam-deque-0.7.3.tar.gz) = 9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285
 SIZE (rust/crates/crossbeam-deque-0.7.3.tar.gz) = 19888
 SHA256 (rust/crates/crossbeam-epoch-0.8.2.tar.gz) = 058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace
 SIZE (rust/crates/crossbeam-epoch-0.8.2.tar.gz) = 39283
-SHA256 (rust/crates/crossbeam-queue-0.2.1.tar.gz) = c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db
-SIZE (rust/crates/crossbeam-queue-0.2.1.tar.gz) = 14543
 SHA256 (rust/crates/crossbeam-utils-0.7.2.tar.gz) = c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8
 SIZE (rust/crates/crossbeam-utils-0.7.2.tar.gz) = 34338
 SHA256 (rust/crates/digest-0.8.1.tar.gz) = f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5
 SIZE (rust/crates/digest-0.8.1.tar.gz) = 9449
 SHA256 (rust/crates/dirs-1.0.5.tar.gz) = 3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901
 SIZE (rust/crates/dirs-1.0.5.tar.gz) = 12908
-SHA256 (rust/crates/dunce-1.0.0.tar.gz) = d0ad6bf6a88548d1126045c413548df1453d9be094a8ab9fd59bf1fdd338da4f
-SIZE (rust/crates/dunce-1.0.0.tar.gz) = 5167
-SHA256 (rust/crates/either-1.5.3.tar.gz) = bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3
-SIZE (rust/crates/either-1.5.3.tar.gz) = 12278
+SHA256 (rust/crates/dunce-1.0.1.tar.gz) = b2641c4a7c0c4101df53ea572bffdc561c146f6c2eb09e4df02bc4811e3feeb4
+SIZE (rust/crates/dunce-1.0.1.tar.gz) = 7988
+SHA256 (rust/crates/either-1.6.1.tar.gz) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457
+SIZE (rust/crates/either-1.6.1.tar.gz) = 13641
 SHA256 (rust/crates/generic-array-0.12.3.tar.gz) = c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec
 SIZE (rust/crates/generic-array-0.12.3.tar.gz) = 18017
 SHA256 (rust/crates/getopts-0.2.21.tar.gz) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5
 SIZE (rust/crates/getopts-0.2.21.tar.gz) = 18457
-SHA256 (rust/crates/getrandom-0.1.14.tar.gz) = 7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb
-SIZE (rust/crates/getrandom-0.1.14.tar.gz) = 24698
-SHA256 (rust/crates/hermit-abi-0.1.10.tar.gz) = 725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e
-SIZE (rust/crates/hermit-abi-0.1.10.tar.gz) = 9127
+SHA256 (rust/crates/getrandom-0.1.15.tar.gz) = fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6
+SIZE (rust/crates/getrandom-0.1.15.tar.gz) = 24786
+SHA256 (rust/crates/hashbrown-0.9.0.tar.gz) = 00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7
+SIZE (rust/crates/hashbrown-0.9.0.tar.gz) = 77321
+SHA256 (rust/crates/hermit-abi-0.1.15.tar.gz) = 3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9
+SIZE (rust/crates/hermit-abi-0.1.15.tar.gz) = 9597
 SHA256 (rust/crates/hex-0.3.2.tar.gz) = 805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77
 SIZE (rust/crates/hex-0.3.2.tar.gz) = 9053
-SHA256 (rust/crates/indexmap-1.3.2.tar.gz) = 076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292
-SIZE (rust/crates/indexmap-1.3.2.tar.gz) = 47144
-SHA256 (rust/crates/itoa-0.4.5.tar.gz) = b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e
-SIZE (rust/crates/itoa-0.4.5.tar.gz) = 11194
+SHA256 (rust/crates/indexmap-1.6.0.tar.gz) = 55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2
+SIZE (rust/crates/indexmap-1.6.0.tar.gz) = 47565
+SHA256 (rust/crates/itoa-0.4.6.tar.gz) = dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6
+SIZE (rust/crates/itoa-0.4.6.tar.gz) = 12167
 SHA256 (rust/crates/json_comments-0.2.0.tar.gz) = ab25c689752fbb49903458495d3e71853229e262a2e6136325359e0705606483
 SIZE (rust/crates/json_comments-0.2.0.tar.gz) = 7272
 SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
 SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443
-SHA256 (rust/crates/libc-0.2.68.tar.gz) = dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0
-SIZE (rust/crates/libc-0.2.68.tar.gz) = 468882
-SHA256 (rust/crates/log-0.4.8.tar.gz) = 14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7
-SIZE (rust/crates/log-0.4.8.tar.gz) = 31297
+SHA256 (rust/crates/libc-0.2.77.tar.gz) = f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235
+SIZE (rust/crates/libc-0.2.77.tar.gz) = 507233
+SHA256 (rust/crates/log-0.4.11.tar.gz) = 4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b
+SIZE (rust/crates/log-0.4.11.tar.gz) = 36276
 SHA256 (rust/crates/maybe-uninit-2.0.0.tar.gz) = 60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00
 SIZE (rust/crates/maybe-uninit-2.0.0.tar.gz) = 11809
 SHA256 (rust/crates/md-5-0.8.0.tar.gz) = a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8
 SIZE (rust/crates/md-5-0.8.0.tar.gz) = 13122
 SHA256 (rust/crates/memchr-2.3.3.tar.gz) = 3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400
 SIZE (rust/crates/memchr-2.3.3.tar.gz) = 22566
-SHA256 (rust/crates/memoffset-0.5.4.tar.gz) = b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8
-SIZE (rust/crates/memoffset-0.5.4.tar.gz) = 6927
-SHA256 (rust/crates/num-integer-0.1.42.tar.gz) = 3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba
-SIZE (rust/crates/num-integer-0.1.42.tar.gz) = 19463
-SHA256 (rust/crates/num-traits-0.2.11.tar.gz) = c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096
-SIZE (rust/crates/num-traits-0.2.11.tar.gz) = 42000
-SHA256 (rust/crates/num_cpus-1.12.0.tar.gz) = 46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6
-SIZE (rust/crates/num_cpus-1.12.0.tar.gz) = 11867
+SHA256 (rust/crates/memoffset-0.5.5.tar.gz) = c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f
+SIZE (rust/crates/memoffset-0.5.5.tar.gz) = 7318
+SHA256 (rust/crates/num-integer-0.1.43.tar.gz) = 8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b
+SIZE (rust/crates/num-integer-0.1.43.tar.gz) = 21966
+SHA256 (rust/crates/num-traits-0.2.12.tar.gz) = ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611
+SIZE (rust/crates/num-traits-0.2.12.tar.gz) = 43807
+SHA256 (rust/crates/num_cpus-1.13.0.tar.gz) = 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3
+SIZE (rust/crates/num_cpus-1.13.0.tar.gz) = 14704
 SHA256 (rust/crates/opaque-debug-0.2.3.tar.gz) = 2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c
 SIZE (rust/crates/opaque-debug-0.2.3.tar.gz) = 5643
-SHA256 (rust/crates/ppv-lite86-0.2.6.tar.gz) = 74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b
-SIZE (rust/crates/ppv-lite86-0.2.6.tar.gz) = 20522
-SHA256 (rust/crates/proc-macro2-1.0.10.tar.gz) = df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3
-SIZE (rust/crates/proc-macro2-1.0.10.tar.gz) = 35622
-SHA256 (rust/crates/quote-1.0.3.tar.gz) = 2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f
-SIZE (rust/crates/quote-1.0.3.tar.gz) = 22939
+SHA256 (rust/crates/ppv-lite86-0.2.9.tar.gz) = c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20
+SIZE (rust/crates/ppv-lite86-0.2.9.tar.gz) = 20933
+SHA256 (rust/crates/proc-macro2-1.0.21.tar.gz) = 36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c
+SIZE (rust/crates/proc-macro2-1.0.21.tar.gz) = 36909
+SHA256 (rust/crates/quote-1.0.7.tar.gz) = aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37
+SIZE (rust/crates/quote-1.0.7.tar.gz) = 25170
 SHA256 (rust/crates/rand-0.7.3.tar.gz) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
 SIZE (rust/crates/rand-0.7.3.tar.gz) = 112246
 SHA256 (rust/crates/rand_chacha-0.2.2.tar.gz) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
@@ -105,40 +107,38 @@ SHA256 (rust/crates/rand_core-0.5.1.tar.gz) = 90bde5296fc891b0cef12a6d03ddccc162
 SIZE (rust/crates/rand_core-0.5.1.tar.gz) = 21116
 SHA256 (rust/crates/rand_hc-0.2.0.tar.gz) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
 SIZE (rust/crates/rand_hc-0.2.0.tar.gz) = 11670
-SHA256 (rust/crates/rayon-1.3.0.tar.gz) = db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098
-SIZE (rust/crates/rayon-1.3.0.tar.gz) = 143294
-SHA256 (rust/crates/rayon-core-1.7.0.tar.gz) = 08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9
-SIZE (rust/crates/rayon-core-1.7.0.tar.gz) = 58306
-SHA256 (rust/crates/redox_syscall-0.1.56.tar.gz) = 2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84
-SIZE (rust/crates/redox_syscall-0.1.56.tar.gz) = 17117
-SHA256 (rust/crates/redox_users-0.3.4.tar.gz) = 09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431
-SIZE (rust/crates/redox_users-0.3.4.tar.gz) = 12526
-SHA256 (rust/crates/regex-1.3.6.tar.gz) = 7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3
-SIZE (rust/crates/regex-1.3.6.tar.gz) = 235465
-SHA256 (rust/crates/regex-syntax-0.6.17.tar.gz) = 7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae
-SIZE (rust/crates/regex-syntax-0.6.17.tar.gz) = 294004
-SHA256 (rust/crates/remove_dir_all-0.5.2.tar.gz) = 4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e
-SIZE (rust/crates/remove_dir_all-0.5.2.tar.gz) = 8907
-SHA256 (rust/crates/rust-argon2-0.7.0.tar.gz) = 2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017
-SIZE (rust/crates/rust-argon2-0.7.0.tar.gz) = 27757
-SHA256 (rust/crates/ryu-1.0.3.tar.gz) = 535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76
-SIZE (rust/crates/ryu-1.0.3.tar.gz) = 41983
+SHA256 (rust/crates/rayon-1.4.0.tar.gz) = cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270
+SIZE (rust/crates/rayon-1.4.0.tar.gz) = 152348
+SHA256 (rust/crates/rayon-core-1.8.0.tar.gz) = 91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0
+SIZE (rust/crates/rayon-core-1.8.0.tar.gz) = 63519
+SHA256 (rust/crates/redox_syscall-0.1.57.tar.gz) = 41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce
+SIZE (rust/crates/redox_syscall-0.1.57.tar.gz) = 17087
+SHA256 (rust/crates/redox_users-0.3.5.tar.gz) = de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d
+SIZE (rust/crates/redox_users-0.3.5.tar.gz) = 12644
+SHA256 (rust/crates/regex-1.3.9.tar.gz) = 9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6
+SIZE (rust/crates/regex-1.3.9.tar.gz) = 236683
+SHA256 (rust/crates/regex-syntax-0.6.18.tar.gz) = 26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8
+SIZE (rust/crates/regex-syntax-0.6.18.tar.gz) = 294440
+SHA256 (rust/crates/remove_dir_all-0.5.3.tar.gz) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
+SIZE (rust/crates/remove_dir_all-0.5.3.tar.gz) = 9184
+SHA256 (rust/crates/rust-argon2-0.8.2.tar.gz) = 9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19
+SIZE (rust/crates/rust-argon2-0.8.2.tar.gz) = 28291
+SHA256 (rust/crates/ryu-1.0.5.tar.gz) = 71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e
+SIZE (rust/crates/ryu-1.0.5.tar.gz) = 49570
 SHA256 (rust/crates/scopeguard-1.1.0.tar.gz) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
 SIZE (rust/crates/scopeguard-1.1.0.tar.gz) = 11470
-SHA256 (rust/crates/serde-1.0.105.tar.gz) = e707fbbf255b8fc8c3b99abb91e7257a622caeb20a9818cbadbeeede4e0932ff
-SIZE (rust/crates/serde-1.0.105.tar.gz) = 73358
-SHA256 (rust/crates/serde_derive-1.0.105.tar.gz) = ac5d00fc561ba2724df6758a17de23df5914f20e41cb00f94d5b7ae42fffaff8
-SIZE (rust/crates/serde_derive-1.0.105.tar.gz) = 49700
-SHA256 (rust/crates/serde_json-1.0.50.tar.gz) = 78a7a12c167809363ec3bd7329fc0a3369056996de43c4b37ef3cd54a6ce4867
-SIZE (rust/crates/serde_json-1.0.50.tar.gz) = 72229
+SHA256 (rust/crates/serde-1.0.116.tar.gz) = 96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5
+SIZE (rust/crates/serde-1.0.116.tar.gz) = 74443
+SHA256 (rust/crates/serde_derive-1.0.116.tar.gz) = f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8
+SIZE (rust/crates/serde_derive-1.0.116.tar.gz) = 50697
+SHA256 (rust/crates/serde_json-1.0.57.tar.gz) = 164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c
+SIZE (rust/crates/serde_json-1.0.57.tar.gz) = 114723
 SHA256 (rust/crates/simplelog-0.6.0.tar.gz) = aa9c948a5a26cd38340ddbeaa557a8c8a5ce4442408eb60453bee2bb3c84a3fb
 SIZE (rust/crates/simplelog-0.6.0.tar.gz) = 14396
-SHA256 (rust/crates/smallvec-1.2.0.tar.gz) = 5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc
-SIZE (rust/crates/smallvec-1.2.0.tar.gz) = 23658
 SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
 SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309
-SHA256 (rust/crates/syn-1.0.17.tar.gz) = 0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03
-SIZE (rust/crates/syn-1.0.17.tar.gz) = 198158
+SHA256 (rust/crates/syn-1.0.41.tar.gz) = 6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b
+SIZE (rust/crates/syn-1.0.41.tar.gz) = 224979
 SHA256 (rust/crates/tempfile-3.1.0.tar.gz) = 7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9
 SIZE (rust/crates/tempfile-3.1.0.tar.gz) = 25823
 SHA256 (rust/crates/term-0.5.2.tar.gz) = edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42
@@ -147,27 +147,33 @@ SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b0
 SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322
 SHA256 (rust/crates/thread_local-1.0.1.tar.gz) = d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14
 SIZE (rust/crates/thread_local-1.0.1.tar.gz) = 12609
-SHA256 (rust/crates/time-0.1.42.tar.gz) = db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f
-SIZE (rust/crates/time-0.1.42.tar.gz) = 30005
+SHA256 (rust/crates/time-0.1.44.tar.gz) = 6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255
+SIZE (rust/crates/time-0.1.44.tar.gz) = 28885
+SHA256 (rust/crates/tinyvec-0.3.4.tar.gz) = 238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117
+SIZE (rust/crates/tinyvec-0.3.4.tar.gz) = 17586
 SHA256 (rust/crates/toml-0.5.6.tar.gz) = ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a
 SIZE (rust/crates/toml-0.5.6.tar.gz) = 54341
-SHA256 (rust/crates/typenum-1.11.2.tar.gz) = 6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9
-SIZE (rust/crates/typenum-1.11.2.tar.gz) = 31853
-SHA256 (rust/crates/unicode-normalization-0.1.12.tar.gz) = 5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4
-SIZE (rust/crates/unicode-normalization-0.1.12.tar.gz) = 91057
-SHA256 (rust/crates/unicode-width-0.1.7.tar.gz) = caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479
-SIZE (rust/crates/unicode-width-0.1.7.tar.gz) = 16644
-SHA256 (rust/crates/unicode-xid-0.2.0.tar.gz) = 826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c
-SIZE (rust/crates/unicode-xid-0.2.0.tar.gz) = 14994
-SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a
-SIZE (rust/crates/vec_map-0.8.1.tar.gz) = 14959
+SHA256 (rust/crates/typenum-1.12.0.tar.gz) = 373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33
+SIZE (rust/crates/typenum-1.12.0.tar.gz) = 36037
+SHA256 (rust/crates/unicode-normalization-0.1.13.tar.gz) = 6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977
+SIZE (rust/crates/unicode-normalization-0.1.13.tar.gz) = 91691
+SHA256 (rust/crates/unicode-width-0.1.8.tar.gz) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
+SIZE (rust/crates/unicode-width-0.1.8.tar.gz) = 16732
+SHA256 (rust/crates/unicode-xid-0.2.1.tar.gz) = f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564
+SIZE (rust/crates/unicode-xid-0.2.1.tar.gz) = 14392
+SHA256 (rust/crates/vec_map-0.8.2.tar.gz) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
+SIZE (rust/crates/vec_map-0.8.2.tar.gz) = 14466
+SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.tar.gz) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f
+SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.tar.gz) = 26964
 SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
 SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = 31521
-SHA256 (rust/crates/winapi-0.3.8.tar.gz) = 8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6
-SIZE (rust/crates/winapi-0.3.8.tar.gz) = 1128308
+SHA256 (rust/crates/winapi-0.3.9.tar.gz) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.tar.gz) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SHA256 (ja2-stracciatella-ja2-stracciatella-v0.17.0_GH0.tar.gz) = 9d856bc7bd253ac3e2146597d134dbc525fb953ebd61c6ceb6e7bacdc55d5af5
-SIZE (ja2-stracciatella-ja2-stracciatella-v0.17.0_GH0.tar.gz) = 22101197
+SHA256 (mackron-miniaudio-634cdb028f340075ae8e8a1126620695688d2ac3_GH0.tar.gz) = 4e21d471a09f644c6b6d0ee53f8df6d3019f1d2bc8b6dc3dc58a6ef3353b064e
+SIZE (mackron-miniaudio-634cdb028f340075ae8e8a1126620695688d2ac3_GH0.tar.gz) = 1227075
+SHA256 (ja2-stracciatella-ja2-stracciatella-v0.18.0_GH0.tar.gz) = a1ce2ac9aa25c3aa016eba129e6ce3cc6904ffe1058a9d18ae9429492199b2cb
+SIZE (ja2-stracciatella-ja2-stracciatella-v0.18.0_GH0.tar.gz) = 19094458
diff --git a/games/jaggedalliance2/pkg-plist b/games/jaggedalliance2/pkg-plist
index bb567a3efb44..c449b423dba0 100644
--- a/games/jaggedalliance2/pkg-plist
+++ b/games/jaggedalliance2/pkg-plist
@@ -32,9 +32,16 @@ share/icons/hicolor/scalable/apps/ja2-stracciatella.svg
 %%DATADIR%%/externalized/dealer-inventory-peter-santos.json
 %%DATADIR%%/externalized/dealer-inventory-sam.json
 %%DATADIR%%/externalized/dealer-inventory-tony.json
+%%DATADIR%%/externalized/dealers.json
 %%DATADIR%%/externalized/game.json
 %%DATADIR%%/externalized/imp.json
+%%DATADIR%%/externalized/items.json
+%%DATADIR%%/externalized/loading-screens-mapping.json
+%%DATADIR%%/externalized/loading-screens.json
 %%DATADIR%%/externalized/magazines.json
+%%DATADIR%%/externalized/mercs-MERC-listings.json
+%%DATADIR%%/externalized/mercs-profile-info.json
+%%DATADIR%%/externalized/mercs-rpc-small-faces.json
 %%DATADIR%%/externalized/music.json
 %%DATADIR%%/externalized/readme.txt
 %%DATADIR%%/externalized/resource_packs/gog_jagged_alliance_2.json
@@ -42,17 +49,24 @@ share/icons/hicolor/scalable/apps/ja2-stracciatella.svg
 %%DATADIR%%/externalized/resource_packs/steam_jagged_alliance_2_classic_fr.json
 %%DATADIR%%/externalized/resource_packs/steam_jagged_alliance_2_classic_pl.json
 %%DATADIR%%/externalized/resource_packs/steam_jagged_alliance_2_classic_ru.json
+%%DATADIR%%/externalized/scripts/enums.lua
 %%DATADIR%%/externalized/shipping-destinations.json
-%%DATADIR%%/externalized/sti/interface/LOADSCREENTAB.STI
+%%DATADIR%%/externalized/sti/interface/loadscreentab.sti
 %%DATADIR%%/externalized/sti/laptop/SkillTraitSmallGreyIdent.sti
+%%DATADIR%%/externalized/strategic-ai-policy.json
 %%DATADIR%%/externalized/strategic-bloodcat-placements.json
 %%DATADIR%%/externalized/strategic-bloodcat-spawns.json
 %%DATADIR%%/externalized/strategic-fact-params.json
+%%DATADIR%%/externalized/strategic-map-cache-sectors.json
 %%DATADIR%%/externalized/strategic-map-creature-lairs.json
 %%DATADIR%%/externalized/strategic-map-movement-costs.json
 %%DATADIR%%/externalized/strategic-map-npc-placements.json
+%%DATADIR%%/externalized/strategic-map-sam-sites-air-control.json
 %%DATADIR%%/externalized/strategic-map-sam-sites.json
+%%DATADIR%%/externalized/strategic-map-secrets.json
+%%DATADIR%%/externalized/strategic-map-sectors-descriptions.json
 %%DATADIR%%/externalized/strategic-map-towns.json
+%%DATADIR%%/externalized/strategic-map-traversibility-ratings.json
 %%DATADIR%%/externalized/strategic-map-underground-sectors.json
 %%DATADIR%%/externalized/strategic-mines.json
 %%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-dut.json
@@ -83,6 +97,13 @@ share/icons/hicolor/scalable/apps/ja2-stracciatella.svg
 %%DATADIR%%/externalized/strings/shipping-destinations-it.json
 %%DATADIR%%/externalized/strings/shipping-destinations-pl.json
 %%DATADIR%%/externalized/strings/shipping-destinations-rus.json
+%%DATADIR%%/externalized/strings/strategic-map-land-types-dut.json
+%%DATADIR%%/externalized/strings/strategic-map-land-types-eng.json
+%%DATADIR%%/externalized/strings/strategic-map-land-types-fr.json
+%%DATADIR%%/externalized/strings/strategic-map-land-types-ger.json
+%%DATADIR%%/externalized/strings/strategic-map-land-types-it.json
+%%DATADIR%%/externalized/strings/strategic-map-land-types-pl.json
+%%DATADIR%%/externalized/strings/strategic-map-land-types-rus.json
 %%DATADIR%%/externalized/strings/strategic-map-town-name-locatives-dut.json
 %%DATADIR%%/externalized/strings/strategic-map-town-name-locatives-eng.json
 %%DATADIR%%/externalized/strings/strategic-map-town-name-locatives-fr.json
@@ -103,13 +124,14 @@ share/icons/hicolor/scalable/apps/ja2-stracciatella.svg
 %%DATADIR%%/mods/from-russia-with-love/data/maps/A9.dat
 %%DATADIR%%/mods/from-russia-with-love/license.txt
 %%DATADIR%%/mods/from-russia-with-love/readme.txt
-%%DATADIR%%/mods/generous-rebels/GR mod.jpg
-%%DATADIR%%/mods/generous-rebels/Generous Rebels Mod.txt
 %%DATADIR%%/mods/generous-rebels/data/Maps/A10_b1.dat
-%%DATADIR%%/mods/imp-quiz-honest-answers/IMP quiz honest answers mod.txt
+%%DATADIR%%/mods/generous-rebels/data/scripts/main.lua
+%%DATADIR%%/mods/generous-rebels/Generous Rebels Mod.txt
+%%DATADIR%%/mods/generous-rebels/GR mod.jpg
 %%DATADIR%%/mods/imp-quiz-honest-answers/data/Binarydata/IMPTEXT.EDT
+%%DATADIR%%/mods/imp-quiz-honest-answers/IMP quiz honest answers mod.txt
 %%DATADIR%%/mods/o-fortuna/data/music.json
-%%DATADIR%%/mods/o-fortuna/data/music/o-fortuna.wav
+%%DATADIR%%/mods/o-fortuna/data/music/o-fortuna.mp3
 %%DATADIR%%/mods/o-fortuna/license.txt
 %%DATADIR%%/mods/o-fortuna/readme.txt
 %%DATADIR%%/mods/readme.txt
@@ -122,8 +144,8 @@ share/icons/hicolor/scalable/apps/ja2-stracciatella.svg
 %%DATADIR%%/unittests/find-files/subfolder/file.txt
 %%DATADIR%%/unittests/find-files/uppercase-ext.TXT
 %%DATADIR%%/unittests/saves/strac-linux/SaveGame01.sav
-%%DATADIR%%/unittests/saves/strac-macos/SaveGame09.sav
 %%DATADIR%%/unittests/saves/strac-macos/imp.dat
+%%DATADIR%%/unittests/saves/strac-macos/SaveGame09.sav
 %%DATADIR%%/unittests/saves/strac-win/SaveGame09.sav
 %%DATADIR%%/unittests/saves/vanilla-russian/IMP.dat
 %%DATADIR%%/unittests/saves/vanilla-russian/SaveGame06.sav



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106012156.151Luxmj063151>