[pkgsrc/trunk]: pkgsrc/games/wesnoth (pkgsrc)

[mef <mef%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae853e4b6010
branches:  trunk
changeset: 648046:ae853e4b6010
user:      mef <mef%pkgsrc.org@localhost>
date:      Tue Mar 10 05:16:28 2015 +0000

description:
(pkgsrc)
  - drop two patches, upstream corrected.
    (the comments on patches were):
    The key argument of std::map must not be const as it can't be assigned
    internally otherwise.
  - Add buildlink to audio/libvorbis, sysutils/dbus
  - Add sysutils/desktop-file-utils/desktopdb.mk to include
  - Add post-patch: target to removed patched *.orig files
    (otherwise those are installed)
  - Adjust several REPLACE_PYTHON and REPLACE_BASH
  - Add patch to correct missing shebang lines necessary for REPLACE_.*

Update 1.10.7 to 1.12.1
-----------------------
  - changelog is too huge to list here, instead pick only for 1.12.1
    from: http://www.wesnoth.org/

Wesnoth 1.12.1

Sunday, January 25 2015

Wesnoth 1.12.1 is now available. This is a maintenance release
for the stable 1.12.x series and, as such, it delivers an
assortment of bug fixes and other improvements over version
1.12.0. Check the forum thread for a list of the most notable
changes in this version.

As on previous occasions, we also offer two versions of the
changelog: a trimmed-down players changelog including only
those items considered to be relevant in regular gameplay, and
a more technical full changelog for enthusiasts and content
creators.

The source code, Windows, and Apple OS X packages are already
available on the downloads page. You may also find packages
for other platforms there as they become available.  You may
comment on this release in the forums.

diffstat:

 games/wesnoth/Makefile                                                   |    30 +-
 games/wesnoth/PLIST                                                      |  4303 +++++++--
 games/wesnoth/distinfo                                                   |    18 +-
 games/wesnoth/patches/patch-ae                                           |     4 +-
 games/wesnoth/patches/patch-af                                           |    12 +-
 games/wesnoth/patches/patch-data_tools_addon__manager_html_py            |    11 +
 games/wesnoth/patches/patch-data_tools_castle-clutter_mk_all-castles_sh  |    12 +
 games/wesnoth/patches/patch-data_tools_unit__tree_helpers_py             |    11 +
 games/wesnoth/patches/patch-data_tools_wesnoth_campaignserver__client_py |    11 +
 games/wesnoth/patches/patch-src_construct__dialog.hpp                    |    21 -
 games/wesnoth/patches/patch-src_filechooser.cpp                          |    16 -
 11 files changed, 3259 insertions(+), 1190 deletions(-)

diffs (truncated from 6353 to 300 lines):

diff -r ad0ad4de61b9 -r ae853e4b6010 games/wesnoth/Makefile
--- a/games/wesnoth/Makefile    Tue Mar 10 02:41:57 2015 +0000
+++ b/games/wesnoth/Makefile    Tue Mar 10 05:16:28 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.110 2014/11/07 19:39:33 adam Exp $
+# $NetBSD: Makefile,v 1.111 2015/03/10 05:16:28 mef Exp $
 
-DISTNAME=      wesnoth-1.10.7
-PKGREVISION=   1
+DISTNAME=      wesnoth-1.12.1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=  .tar.bz2
@@ -18,6 +17,7 @@
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config
 USE_TOOLS+=            perl:run msgfmt
+USE_TOOLS+=            bash
 
 UNLIMIT_RESOURCES+=    datasize
 UNLIMIT_RESOURCES+=    stacksize
@@ -31,22 +31,29 @@
 SUBST_SED.prefix=      -e 's,/usr/local,${PREFIX},'
 
 PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 1.10.6
+REPLACE_PYTHON+=       data/tools/GUI.pyw
 REPLACE_PYTHON+=       data/tools/*.py
 REPLACE_PYTHON+=       data/tools/wesnoth/*.py
 REPLACE_PYTHON+=       data/tools/wml*
 REPLACE_PYTHON+=       data/tools/about_cfg_to_wiki
+REPLACE_PYTHON+=        data/tools/addon_manager/html.py
 REPLACE_PYTHON+=       data/tools/extractbindings
 REPLACE_PYTHON+=       data/tools/imgcheck
 REPLACE_PYTHON+=       data/tools/journeylifter
+REPLACE_PYTHON+=       data/tools/rmtrans/rmtrans.py
 REPLACE_PYTHON+=       data/tools/trackplacer
+REPLACE_PYTHON+=       data/tools/unit_tree/helpers.py
 REPLACE_PYTHON+=       data/tools/wesnoth_addon_manager
+REPLACE_PYTHON+=       data/tools/wesnoth_addon_manager/html.py
+REPLACE_PYTHON+=        data/tools/wesnoth/campaignserver_client.py
 REPLACE_PYTHON+=       data/tools/unit_tree/TeamColorizer
 REPLACE_PYTHON+=       data/tools/unit_tree/overview.py
 REPLACE_PYTHON+=       utils/ai_test/*.py
 REPLACE_PYTHON+=       utils/*.py
 
-REPLACE_SH+=           data/tools/castle-cutter/mk-castle.sh
-REPLACE_SH+=           data/tools/castle-cutter/mk-all-castles.sh
+REPLACE_BASH+=         data/tools/castle-cutter/mk-all-castles.sh
+REPLACE_BASH+=         data/tools/castle-cutter/mk-castle.sh
+REPLACE_BASH+=         data/tools/unit_tree/update-wmlunits
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
@@ -68,8 +75,18 @@
 
 LDFLAGS.SunOS+=                -lintl -lsocket
 
+# To avoid *.orig files (after patch) installed
+post-patch:
+       (cd ${WRKSRC}; \
+       ${RM} data/tools/addon_manager/html.py.orig; \
+       ${RM} data/tools/castle-cutter/mk-all-castles.sh.orig; \
+       ${RM} data/tools/unit_tree/helpers.py.orig; \
+       ${RM} data/tools/wesnoth/campaignserver_client.py.orig;\
+       )
+
 BUILDLINK_API_DEPENDS.SDL_mixer+=      SDL_mixer>=1.2.5nb3
 .include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 BUILDLINK_API_DEPENDS.SDL+=            SDL>=1.2.7
 .include "../../devel/SDL/buildlink3.mk"
@@ -85,4 +102,7 @@
 .include "../../lang/lua/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../net/SDL_net/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff -r ad0ad4de61b9 -r ae853e4b6010 games/wesnoth/PLIST
--- a/games/wesnoth/PLIST       Tue Mar 10 02:41:57 2015 +0000
+++ b/games/wesnoth/PLIST       Tue Mar 10 05:16:28 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2014/10/28 13:17:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.41 2015/03/10 05:16:28 mef Exp $
 bin/wesnoth
 bin/wesnothd
 man/cs/man6/wesnoth.6
@@ -52,11 +52,9 @@
 man/vi/man6/wesnothd.6
 man/zh_CN/man6/wesnoth.6
 man/zh_CN/man6/wesnothd.6
-man/zh_TW/man6/wesnoth.6
 man/zh_TW/man6/wesnothd.6
 ${PLIST.icons}share/applications/wesnoth.desktop
 ${PLIST.icons}share/applications/wesnoth_editor.desktop
-share/doc/wesnoth/images/.gitignore
 share/doc/wesnoth/images/README.txt
 share/doc/wesnoth/images/de/game-screen-1.9.14.jpg
 share/doc/wesnoth/images/de/main-menu-1.9.14.jpg
@@ -70,19 +68,19 @@
 share/doc/wesnoth/images/es/recruit-1.9.14.jpg
 share/doc/wesnoth/images/es/right_pane-1.9.14.jpg
 share/doc/wesnoth/images/es/top_pane-1.9.14.jpg
-share/doc/wesnoth/images/fr/game-screen-1.9.4.jpg
-share/doc/wesnoth/images/fr/main-menu-1.10.1.jpg
-share/doc/wesnoth/images/fr/multiplayer-1.9.4.jpg
-share/doc/wesnoth/images/fr/recruit-1.9.4.jpg
-share/doc/wesnoth/images/fr/right_pane-1.9.4.jpg
-share/doc/wesnoth/images/fr/top_pane-1.9.4.jpg
-share/doc/wesnoth/images/game-screen-1.9.4.jpg
-share/doc/wesnoth/images/gl/game-screen-1.9.4.jpg
-share/doc/wesnoth/images/gl/main-menu-1.9.4.jpg
-share/doc/wesnoth/images/gl/multiplayer-1.9.4.jpg
-share/doc/wesnoth/images/gl/recruit-1.9.4.jpg
-share/doc/wesnoth/images/gl/right_pane-1.9.4.jpg
-share/doc/wesnoth/images/gl/top_pane-1.9.4.jpg
+share/doc/wesnoth/images/fr/game-screen-1.11.11.jpg
+share/doc/wesnoth/images/fr/main-menu-1.11.11.jpg
+share/doc/wesnoth/images/fr/multiplayer-1.11.11.jpg
+share/doc/wesnoth/images/fr/recruit-1.11.11.jpg
+share/doc/wesnoth/images/fr/right_pane-1.11.11.jpg
+share/doc/wesnoth/images/fr/top_pane-1.11.11.jpg
+share/doc/wesnoth/images/game-screen-1.11.9.jpg
+share/doc/wesnoth/images/gl/game-screen-1.11.9.jpg
+share/doc/wesnoth/images/gl/main-menu-1.11.9.jpg
+share/doc/wesnoth/images/gl/multiplayer-1.11.9.jpg
+share/doc/wesnoth/images/gl/recruit-1.11.9.jpg
+share/doc/wesnoth/images/gl/right_pane-1.11.9.jpg
+share/doc/wesnoth/images/gl/top_pane-1.11.9.jpg
 share/doc/wesnoth/images/hu/game-screen-1.9.4.jpg
 share/doc/wesnoth/images/hu/main-menu-1.9.4.jpg
 share/doc/wesnoth/images/hu/multiplayer-1.9.4.jpg
@@ -95,15 +93,21 @@
 share/doc/wesnoth/images/it/recruit-1.9.4.jpg
 share/doc/wesnoth/images/it/right_pane-1.9.4.jpg
 share/doc/wesnoth/images/it/top_pane-1.9.4.jpg
-share/doc/wesnoth/images/main-menu-1.9.4.jpg
-share/doc/wesnoth/images/multiplayer-1.9.4.jpg
+share/doc/wesnoth/images/main-menu-1.11.9.jpg
+share/doc/wesnoth/images/multiplayer-1.11.9.jpg
+share/doc/wesnoth/images/orb-black.jpg
 share/doc/wesnoth/images/orb-blue.jpg
 share/doc/wesnoth/images/orb-green.jpg
-share/doc/wesnoth/images/orb-none.jpg
 share/doc/wesnoth/images/orb-red.jpg
 share/doc/wesnoth/images/orb-yellow.jpg
-share/doc/wesnoth/images/recruit-1.9.4.jpg
-share/doc/wesnoth/images/right_pane-1.9.4.jpg
+share/doc/wesnoth/images/pt/game-screen-1.11.19.jpg
+share/doc/wesnoth/images/pt/main-menu-1.11.19.jpg
+share/doc/wesnoth/images/pt/multiplayer-1.11.19.jpg
+share/doc/wesnoth/images/pt/recruit-1.11.19.jpg
+share/doc/wesnoth/images/pt/right_pane-1.11.19.jpg
+share/doc/wesnoth/images/pt/top_pane-1.11.19.jpg
+share/doc/wesnoth/images/recruit-1.11.9.jpg
+share/doc/wesnoth/images/right_pane-1.11.9.jpg
 share/doc/wesnoth/images/ru/game-screen-1.9.7.jpg
 share/doc/wesnoth/images/ru/main-menu-1.9.7.jpg
 share/doc/wesnoth/images/ru/multiplayer-1.9.7.jpg
@@ -116,7 +120,6 @@
 share/doc/wesnoth/images/schedule-firstwatch.png
 share/doc/wesnoth/images/schedule-morning.png
 share/doc/wesnoth/images/schedule-secondwatch.png
-share/doc/wesnoth/images/schedule-underground-illum.png
 share/doc/wesnoth/images/schedule-underground.png
 share/doc/wesnoth/images/sr/game-screen-1.9.11.jpg
 share/doc/wesnoth/images/sr/main-menu-1.9.11.jpg
@@ -142,7 +145,7 @@
 share/doc/wesnoth/images/sr@latin/recruit-1.7.10.jpg
 share/doc/wesnoth/images/sr@latin/right_pane-1.9.11.jpg
 share/doc/wesnoth/images/sr@latin/top_pane-1.9.11.jpg
-share/doc/wesnoth/images/top_pane-1.9.4.jpg
+share/doc/wesnoth/images/top_pane-1.11.9.jpg
 share/doc/wesnoth/images/tr/game-screen-1.5.7.jpg
 share/doc/wesnoth/images/tr/main-menu-1.5.11.jpg
 share/doc/wesnoth/images/tr/multiplayer-1.5.11.jpg
@@ -187,10 +190,15 @@
 share/wesnoth/data/COPYING.txt
 share/wesnoth/data/_main.cfg
 share/wesnoth/data/advanced_preferences.cfg
-share/wesnoth/data/ai/ais/testing_ai_default.cfg
+share/wesnoth/data/ai/ais/ai_default_rca.cfg
+share/wesnoth/data/ai/ais/ai_default_rca_strong.cfg
+share/wesnoth/data/ai/ais/ai_generic_rush.cfg
+share/wesnoth/data/ai/aliases/dev_multiplayer.cfg
 share/wesnoth/data/ai/aliases/dev_singleplayer.cfg
 share/wesnoth/data/ai/aliases/idle.cfg
 share/wesnoth/data/ai/aliases/stable_singleplayer.cfg
+share/wesnoth/data/ai/dev/ai_old_recruitment.cfg
+share/wesnoth/data/ai/dev/akihara_recruitment.cfg
 share/wesnoth/data/ai/dev/formula_ai.cfg
 share/wesnoth/data/ai/dev/formula_ai_poisoning.cfg
 share/wesnoth/data/ai/dev/idle_ai.cfg
@@ -208,37 +216,111 @@
 share/wesnoth/data/ai/formula/recruitment.fai
 share/wesnoth/data/ai/formula/scouting_eval.fai
 share/wesnoth/data/ai/formula/scouting_move.fai
+share/wesnoth/data/ai/lua/ai_helper.lua
+share/wesnoth/data/ai/lua/battle_calcs.lua
+share/wesnoth/data/ai/lua/cache.lua
+share/wesnoth/data/ai/lua/debug.lua
+share/wesnoth/data/ai/lua/dummy_engine_lua.lua
+share/wesnoth/data/ai/lua/extCAexample.lua
+share/wesnoth/data/ai/lua/generic_recruit_engine.lua
+share/wesnoth/data/ai/lua/generic_rush_engine.lua
+share/wesnoth/data/ai/lua/move_to_any_target.lua
 share/wesnoth/data/ai/lua/patrol.lua
+share/wesnoth/data/ai/lua/retreat.lua
 share/wesnoth/data/ai/lua/stdlib.lua
 share/wesnoth/data/ai/maps/scenario-AI_Arena_small.map
 share/wesnoth/data/ai/maps/scenario-test_move_to_targets.map
+share/wesnoth/data/ai/micro_ais/cas/ca_big_animals.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_bottleneck_attack.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_bottleneck_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_coward.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_forest_animals_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_forest_animals_new_rabbit.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_forest_animals_tusker_attack.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_forest_animals_tusklet_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_goto.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_hang_out.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_healer_initialize.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_healer_may_attack.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_healer_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_herding_attack_close_enemy.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_herding_dog_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_herding_f_herding_area.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_herding_herd_sheep.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_herding_sheep_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_herding_sheep_runs_dog.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_herding_sheep_runs_enemy.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_hunter.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_lurkers.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_messenger_attack.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_messenger_escort_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_messenger_f_next_waypoint.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_messenger_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_patrol.lua
+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
+share/wesnoth/data/ai/micro_ais/cas/ca_swarm_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_swarm_scatter.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_wolves_move.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_wolves_multipacks_attack.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_wolves_multipacks_functions.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_wolves_multipacks_wander.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_wolves_wander.lua
+share/wesnoth/data/ai/micro_ais/cas/ca_zone_guardian.lua
+share/wesnoth/data/ai/micro_ais/engines/lurker_moves.fai
+share/wesnoth/data/ai/micro_ais/engines/priority_target_engine.lua
+share/wesnoth/data/ai/micro_ais/engines/urudin_engine.lua
+share/wesnoth/data/ai/micro_ais/maps/animals.map
+share/wesnoth/data/ai/micro_ais/maps/bottleneck_defense.map
+share/wesnoth/data/ai/micro_ais/maps/goto.map
+share/wesnoth/data/ai/micro_ais/maps/lurkers.map
+share/wesnoth/data/ai/micro_ais/maps/messenger_escort.map
+share/wesnoth/data/ai/micro_ais/maps/protect_unit.map
+share/wesnoth/data/ai/micro_ais/micro_ai_helper.lua
+share/wesnoth/data/ai/micro_ais/micro_ai_self_data.lua
+share/wesnoth/data/ai/micro_ais/micro_ai_unit_variables.lua
+share/wesnoth/data/ai/micro_ais/micro_ai_wml_tag.lua
+share/wesnoth/data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/animals.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/bottleneck_defense.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/dragon.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/goto.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/guardians.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/hang_out.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/healer_support.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/lurkers.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/messenger_escort.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/patrols.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/protect_unit.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/recruiting.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/scenario_micro_ai.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/simple_attack.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/swarm.cfg
+share/wesnoth/data/ai/micro_ais/scenarios/wolves.cfg
 share/wesnoth/data/ai/scenarios/ai_arena_small/0001-healing.cfg
 share/wesnoth/data/ai/scenarios/ai_arena_small/0002-poisoning.cfg
 share/wesnoth/data/ai/scenarios/ai_arena_small/0003-simple_combat.cfg
 share/wesnoth/data/ai/scenarios/ai_arena_small/0004-filtered_combat.cfg
+share/wesnoth/data/ai/scenarios/ai_arena_small/0005-recruitment_test.cfg
 share/wesnoth/data/ai/scenarios/scenario-AI_Arena_small.cfg
 share/wesnoth/data/ai/scenarios/scenario-lua-ai.cfg
+share/wesnoth/data/ai/scenarios/scenario-no_engine.cfg
 share/wesnoth/data/ai/scenarios/scenario-test_move_to_targets.cfg
 share/wesnoth/data/ai/utils/default_config.cfg
 share/wesnoth/data/campaigns/An_Orcish_Incursion/_main.cfg
-share/wesnoth/data/campaigns/An_Orcish_Incursion/images/.gitignore
-share/wesnoth/data/campaigns/An_Orcish_Incursion/images/an-orcish-incursion-map.png
 share/wesnoth/data/campaigns/An_Orcish_Incursion/images/campaign_image.png