diff options
| -rw-r--r-- | games/wesnoth/Makefile | 5 | ||||
| -rw-r--r-- | games/wesnoth/PLIST | 46 | ||||
| -rw-r--r-- | games/wesnoth/distinfo | 10 | ||||
| -rw-r--r-- | games/wesnoth/patches/patch-CMakeLists.txt | 6 |
4 files changed, 53 insertions, 14 deletions
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 4728ec3a8d8..0f62f55201d 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.182 2022/06/30 11:18:26 nia Exp $ +# $NetBSD: Makefile,v 1.183 2022/07/27 08:40:58 adam Exp $ -DISTNAME= wesnoth-1.16.2 -PKGREVISION= 4 +DISTNAME= wesnoth-1.16.5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wesnoth/} EXTRACT_SUFX= .tar.bz2 diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST index c7c235000bc..c85d8bd3535 100644 --- a/games/wesnoth/PLIST +++ b/games/wesnoth/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.61 2022/01/21 20:37:07 adam Exp $ +@comment $NetBSD: PLIST,v 1.62 2022/07/27 08:40:58 adam Exp $ bin/wesnoth bin/wesnothd man/ca/man6/wesnoth.6 @@ -95,6 +95,7 @@ share/doc/wesnoth/html/images/tr/multiplayer-1.14.7.jpg share/doc/wesnoth/html/images/tr/recruit-1.14.7.jpg share/doc/wesnoth/html/images/tr/right_pane-1.14.7.jpg share/doc/wesnoth/html/images/tr/top_pane-1.14.7.jpg +share/doc/wesnoth/html/manual.bg.html share/doc/wesnoth/html/manual.ca.html share/doc/wesnoth/html/manual.cs.html share/doc/wesnoth/html/manual.de.html @@ -215,7 +216,6 @@ share/wesnoth/data/ai/micro_ais/cas/ca_protect_unit_attack.lua share/wesnoth/data/ai/micro_ais/cas/ca_protect_unit_finish.lua share/wesnoth/data/ai/micro_ais/cas/ca_protect_unit_move.lua share/wesnoth/data/ai/micro_ais/cas/ca_recruit_random.lua -share/wesnoth/data/ai/micro_ais/cas/ca_recruit_rushers.lua share/wesnoth/data/ai/micro_ais/cas/ca_return_guardian.lua share/wesnoth/data/ai/micro_ais/cas/ca_simple_attack.lua share/wesnoth/data/ai/micro_ais/cas/ca_stationed_guardian.lua @@ -1911,6 +1911,7 @@ share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/rithrandil.png share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/ruddry.png share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/tinry.png share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/typhon.png +share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/cs/trow-logo.png share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/es/trow-logo.png share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/fr/trow-logo.png share/wesnoth/data/campaigns/The_Rise_Of_Wesnoth/images/story/l10n/gl/trow-logo.png @@ -2617,7 +2618,7 @@ share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/storytxt.cfg share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg share/wesnoth/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg -share/wesnoth/data/campaigns/World_Conquest/MODDING.txt +share/wesnoth/data/campaigns/World_Conquest/Modding.md share/wesnoth/data/campaigns/World_Conquest/STRUCTURE.txt share/wesnoth/data/campaigns/World_Conquest/TODO.txt share/wesnoth/data/campaigns/World_Conquest/_main.cfg @@ -5973,12 +5974,15 @@ share/wesnoth/data/core/images/terrain/embellishments/mushroom5.png share/wesnoth/data/core/images/terrain/embellishments/mushroom6.png share/wesnoth/data/core/images/terrain/embellishments/mushroom7.png share/wesnoth/data/core/images/terrain/embellishments/rocks.png +share/wesnoth/data/core/images/terrain/embellishments/rocks10.png share/wesnoth/data/core/images/terrain/embellishments/rocks2.png share/wesnoth/data/core/images/terrain/embellishments/rocks3.png share/wesnoth/data/core/images/terrain/embellishments/rocks4.png share/wesnoth/data/core/images/terrain/embellishments/rocks5.png share/wesnoth/data/core/images/terrain/embellishments/rocks6.png share/wesnoth/data/core/images/terrain/embellishments/rocks7.png +share/wesnoth/data/core/images/terrain/embellishments/rocks8.png +share/wesnoth/data/core/images/terrain/embellishments/rocks9.png share/wesnoth/data/core/images/terrain/embellishments/snowbits-small.png share/wesnoth/data/core/images/terrain/embellishments/snowbits-small2.png share/wesnoth/data/core/images/terrain/embellishments/snowbits-small3.png @@ -5986,7 +5990,10 @@ share/wesnoth/data/core/images/terrain/embellishments/snowbits-small4.png share/wesnoth/data/core/images/terrain/embellishments/snowbits-small5.png share/wesnoth/data/core/images/terrain/embellishments/snowbits-small6.png share/wesnoth/data/core/images/terrain/embellishments/snowbits-small7.png +share/wesnoth/data/core/images/terrain/embellishments/snowbits-small8.png +share/wesnoth/data/core/images/terrain/embellishments/snowbits-small9.png share/wesnoth/data/core/images/terrain/embellishments/stones-small.png +share/wesnoth/data/core/images/terrain/embellishments/stones-small10.png share/wesnoth/data/core/images/terrain/embellishments/stones-small2.png share/wesnoth/data/core/images/terrain/embellishments/stones-small3.png share/wesnoth/data/core/images/terrain/embellishments/stones-small4.png @@ -5994,6 +6001,7 @@ share/wesnoth/data/core/images/terrain/embellishments/stones-small5.png share/wesnoth/data/core/images/terrain/embellishments/stones-small6.png share/wesnoth/data/core/images/terrain/embellishments/stones-small7.png share/wesnoth/data/core/images/terrain/embellishments/stones-small8.png +share/wesnoth/data/core/images/terrain/embellishments/stones-small9.png share/wesnoth/data/core/images/terrain/embellishments/water-lilies-flower-small.png share/wesnoth/data/core/images/terrain/embellishments/water-lilies-flower-small2.png share/wesnoth/data/core/images/terrain/embellishments/water-lilies-flower-small3.png @@ -7440,6 +7448,9 @@ share/wesnoth/data/core/images/terrain/misc/rubble-tile.png share/wesnoth/data/core/images/terrain/misc/rubble.png share/wesnoth/data/core/images/terrain/misc/rubble2.png share/wesnoth/data/core/images/terrain/misc/rubble3.png +share/wesnoth/data/core/images/terrain/misc/rubble4.png +share/wesnoth/data/core/images/terrain/misc/rubble5.png +share/wesnoth/data/core/images/terrain/misc/rubble6.png share/wesnoth/data/core/images/terrain/misc/smoke-A01.png share/wesnoth/data/core/images/terrain/misc/smoke-A02.png share/wesnoth/data/core/images/terrain/misc/smoke-A03.png @@ -8577,6 +8588,13 @@ share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-corner-r.png share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-corner-tl.png share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-corner-tr.png share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-mine-tile.png +share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-snow-concave-tl.png +share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-snow-concave-tr.png +share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-snow-convex-bl.png +share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-snow-convex-br.png +share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-snow-convex-l.png +share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-snow-convex-r.png +share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-snow-corner-bl.png share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-tile.png share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-concave-tl.png share/wesnoth/data/core/images/terrain/walls/stone/wall-stone-white-concave-tr.png @@ -12637,7 +12655,19 @@ share/wesnoth/data/core/images/units/monsters/croc/crocodile-float-attack5.png share/wesnoth/data/core/images/units/monsters/croc/crocodile-float-attack6.png share/wesnoth/data/core/images/units/monsters/croc/crocodile-float-defend1.png share/wesnoth/data/core/images/units/monsters/croc/crocodile-float-defend2.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-float-ne-defend1.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-float-ne-defend2.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-float-ne.png share/wesnoth/data/core/images/units/monsters/croc/crocodile-float.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-ne-attack1.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-ne-attack2.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-ne-attack3.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-ne-attack4.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-ne-attack5.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-ne-attack6.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-ne-defend1.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-ne-defend2.png +share/wesnoth/data/core/images/units/monsters/croc/crocodile-ne.png share/wesnoth/data/core/images/units/monsters/croc/crocodile-no-tail.png share/wesnoth/data/core/images/units/monsters/croc/crocodile-tail.png share/wesnoth/data/core/images/units/monsters/croc/crocodile.png @@ -16195,8 +16225,11 @@ share/wesnoth/data/schema/units/types.cfg share/wesnoth/data/test/_main.cfg share/wesnoth/data/test/macros/pathfind_answers.cfg share/wesnoth/data/test/macros/readme.txt +share/wesnoth/data/test/macros/start_position_common_keep_a_b.cfg share/wesnoth/data/test/macros/test.lua share/wesnoth/data/test/macros/wml_unit_test_macros.cfg +share/wesnoth/data/test/maps/2p_single_castle.map +share/wesnoth/data/test/maps/4p_single_castle.map share/wesnoth/data/test/maps/generic_unit_test.map share/wesnoth/data/test/maps/move_skip_sighted.map share/wesnoth/data/test/maps/pathfind_1.cfg @@ -16234,6 +16267,7 @@ share/wesnoth/data/test/scenarios/facing.cfg share/wesnoth/data/test/scenarios/feeding.cfg share/wesnoth/data/test/scenarios/filter_this_unit.cfg share/wesnoth/data/test/scenarios/filter_vision.cfg +share/wesnoth/data/test/scenarios/firststrike_and_laststrike.cfg share/wesnoth/data/test/scenarios/for-loops.cfg share/wesnoth/data/test/scenarios/has_ally.cfg share/wesnoth/data/test/scenarios/heal.cfg @@ -16247,9 +16281,14 @@ share/wesnoth/data/test/scenarios/put_to_recall_and_modify.cfg share/wesnoth/data/test/scenarios/readme.txt share/wesnoth/data/test/scenarios/recall_by_unit_tag.cfg share/wesnoth/data/test/scenarios/recruit_facing.cfg +share/wesnoth/data/test/scenarios/reflexive_drains.cfg +share/wesnoth/data/test/scenarios/reflexive_poison.cfg +share/wesnoth/data/test/scenarios/reflexive_slow.cfg share/wesnoth/data/test/scenarios/scatter_units.cfg share/wesnoth/data/test/scenarios/sighted_events.cfg share/wesnoth/data/test/scenarios/simple_find_path.cfg +share/wesnoth/data/test/scenarios/simulate_combat_clone_adjacent.cfg +share/wesnoth/data/test/scenarios/simulate_combat_occupied.cfg share/wesnoth/data/test/scenarios/store_locations.cfg share/wesnoth/data/test/scenarios/store_reachable_locations_vision.cfg share/wesnoth/data/test/scenarios/store_unit_defense.cfg @@ -16286,6 +16325,7 @@ share/wesnoth/data/test/scenarios/test_modify_shroud.cfg share/wesnoth/data/test/scenarios/test_modify_unit.cfg share/wesnoth/data/test/scenarios/test_move.cfg share/wesnoth/data/test/scenarios/test_move_unit.cfg +share/wesnoth/data/test/scenarios/test_move_unit_to_occupied_hex.cfg share/wesnoth/data/test/scenarios/test_movetype.cfg share/wesnoth/data/test/scenarios/test_relative_dir.cfg share/wesnoth/data/test/scenarios/test_require.cfg diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index e29ab03d438..72b075b3ad7 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.80 2022/01/21 20:37:07 adam Exp $ +$NetBSD: distinfo,v 1.81 2022/07/27 08:40:58 adam Exp $ -BLAKE2s (wesnoth-1.16.2.tar.bz2) = edebe9a7c5d12b77e727e3b5573dd3af7931db1b5bc49d7111fbb51198d0a87a -SHA512 (wesnoth-1.16.2.tar.bz2) = bb1c307981de4990fc341310b358c5e1c54673d7434bc0a0fa0a7b5caf11e6db3255ad0eb57b6b188ff6ab8f287321fc8821813d0ef3661cfa637985070bb540 -Size (wesnoth-1.16.2.tar.bz2) = 474763733 bytes -SHA1 (patch-CMakeLists.txt) = c16a7c3bd32a799c7fc742d130e2700709233ea0 +BLAKE2s (wesnoth-1.16.5.tar.bz2) = 2cf807ff4586180abde2688e7a2441c2d955b2a4eee5525c7b060c8f4d7dc1db +SHA512 (wesnoth-1.16.5.tar.bz2) = 8abb1f31f9a4e503047e6f19ab6795e02fff287db5142a7395a5007fc8e12252014de5baff9419ef173316ebdb00f1492b78a26b2eae9f6e435d3112c1f05978 +Size (wesnoth-1.16.5.tar.bz2) = 475511378 bytes +SHA1 (patch-CMakeLists.txt) = 2670d4a527019706d8614c7e715e25c39f044d0e SHA1 (patch-src_CMakeLists.txt) = 776c522ccfc544d8898d786fe164c2be1812db1a SHA1 (patch-src_color__range.cpp) = bdce94054a0fb2972e63a968fdb78e34db1213a6 SHA1 (patch-src_wesnoth.cpp) = 73fa69b47de231c5ce16f66a52b449d5242ffe67 diff --git a/games/wesnoth/patches/patch-CMakeLists.txt b/games/wesnoth/patches/patch-CMakeLists.txt index db11088a26c..908301c8061 100644 --- a/games/wesnoth/patches/patch-CMakeLists.txt +++ b/games/wesnoth/patches/patch-CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.5 2022/01/21 20:37:07 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.6 2022/07/27 08:40:58 adam Exp $ Do not look for X11 on macOS. We don't have readline as a module. Do not bother with uninstaller. ---- CMakeLists.txt.orig 2022-01-16 18:10:36.000000000 +0000 +--- CMakeLists.txt.orig 2022-07-13 16:10:31.000000000 +0000 +++ CMakeLists.txt @@ -76,7 +76,9 @@ find_package(ICU REQUIRED COMPONENTS dat # no, gettext executables are not required when NLS is deactivated @@ -20,7 +20,7 @@ Do not bother with uninstaller. # TODO: can use find_package and Fontconfig::Fontconfig with cmake 3.14+ pkg_check_modules(FONTCONFIG REQUIRED fontconfig>=2.4.1) pkg_check_modules(PANGO REQUIRED pango>=1.22.0) -- pkg_check_modules(LIBREADLINE REQUIRED readline) +- pkg_check_modules(LIBREADLINE readline) endif() if(ENABLE_TESTS) |