Update to 0.9.4:

 * language and i18n:
   * updated translations:
     * Basque, British English, Catalan, Chinese, Dutch, French, German,
        Hungarian, Russian, Swedish, Turkish
   * fixed help description of income and upkeep (#13565)
   * updated several unit descriptions
   * standardized on "magi" as plural of "mage"
   * document that Woses receive no traits (#13630)
   * replay suggested save game now translated (#13558)
   * fixed some typos (#13714,#13715,#13716,#13717,#13718)
   * added terrain descriptions to in-game help
   * fixed blank terrain entries in unit help
   * ignore LANGUAGE in environment: broke translations (forum thread 6614)
   * added Swedish man pages to the list of man pages to be installed
 * unit balancing and modifications:
   * max level units given After-Max-Level-Advancement (AMLA) of 3 HP/100XP
     added to max HP, with no auto-heal; Necrophage has healing AMLA
     with no bonus HP
   * changed Naga Warrior attack from 5-5 to 7-4
   * decreased Thug hitpoints from 36 to 32
   * decreased Dwarvish Ulfserker  hitpoints from 40 to 34
   * changed Elvish Shaman and Druid to the state before 0.9.3
   * decreased Elvish Shaman cost from 17 to 16 gold
   * removed obsolete units Mounted Captain, Mounted Commander
 * graphics and sound improvements:
   * new or revised images for Dark Sorcerer, Dwarvish Thunderguard, Necromancer
   * new death animations: Elvish Sharpshooter, Elvish Marksman
   * default colour depth is no longer forced to 16 bits
   * new tiles for some terrain in the editor terrain list and mini map
 * WML improvements:
   * #define's in user campaigns are now local to each campaign (patch 4138)
   * correctly preprocess files that do not end with a final newline
 * campaigns
   * Heir to the Throne:
     * made campaign easier on "Easy" level
     * removed duplicate file inclusion - campaign should now start faster
   * Eastern Invasion:
     * revised Approaching Weldyn for quicker gameplay
     * tweaked Undead Crossing
     * removed duplicate file inclusion - campaign should now start faster
   * The Dark Hordes:
     * cleaned up old id tags; added portraits for Tanar, Nati and Gwiti
     * removed duplicate file inclusion - campaign should now start faster
   * The Rise of Wesnoth:
     * removed duplicate file inclusion - campaign should now start faster
     * fixed Lt. Aethyr death events not triggering in Rise of Wesnoth (#13848)
   * Son of the Black Eye: revised map for Desert of Death
 * server
   * now supports redirection based on client version number
   * can now act as proxy
 * editor
   * changed the layout of the terrain palette (#11965)
   * relocated and enlarged the buttons (#11967)
   * maps can't be saved with illegal characters (#10704)
   * replaced the buttons under the minimap with a toolbar
 * build process
   * added quotes to configure.ac (forum thread 6747)
   * new utility extractsources to extract lists of sources from Makefile.am
   * new utility makemam to construct Makefile.am from Makefile.am.in and
     files containing lists of sources
   * fix libpng not being detected on NetBSD (#13808)
 * user interface improvements:
   * show scrollbar in multiplayer lobby when there are many players (#13521)
   * multiplayer lobby player list no longer resets to start (#13345)
   * fixed game host sometimes not recognized as side owner (forum thread 6783)
 * remove redundant {utils} and {~utils} references (#13843)
 * various bug fixes and code cleanups

5 files changed, 102 insertions, 71 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 0fa5ce06244..8959ae47f35 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/28 11:26:59 wiz Exp $
 #
 
-DISTNAME=	wesnoth-0.9.3
+DISTNAME=	wesnoth-0.9.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index 922202bcd04..b7469f2e6ae 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2005/07/14 21:47:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/07/28 11:26:59 wiz Exp $
 bin/wesnoth
 bin/wmlxgettext
 man/de/man6/wesnoth.6
 man/man6/wesnoth.6
+man/sv/man6/wesnoth.6
 share/wesnoth/data/campaigns/Eastern_Invasion.cfg
 share/wesnoth/data/campaigns/Heir_To_The_Throne.cfg
-share/wesnoth/data/campaigns/README
 share/wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg
 share/wesnoth/data/campaigns/The_Dark_Hordes.cfg
 share/wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg
@@ -157,8 +157,8 @@ share/wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg
-share/wesnoth/data/scenarios/Eastern_Invasion/deaths.cfg
-share/wesnoth/data/scenarios/Eastern_Invasion/intro.cfg
+share/wesnoth/data/scenarios/Eastern_Invasion/utils/deaths.cfg
+share/wesnoth/data/scenarios/Eastern_Invasion/utils/intro.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg
@@ -189,8 +189,8 @@ share/wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/bigmap.cfg
-share/wesnoth/data/scenarios/Heir_To_The_Throne/deaths.cfg
-share/wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg
+share/wesnoth/data/scenarios/Heir_To_The_Throne/utils/deaths.cfg
+share/wesnoth/data/scenarios/Heir_To_The_Throne/utils/intro.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg
@@ -212,7 +212,7 @@ share/wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg
-share/wesnoth/data/scenarios/The_Dark_Hordes/intro.cfg
+share/wesnoth/data/scenarios/The_Dark_Hordes/utils/intro.cfg
 share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg
 share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg
 share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg
@@ -240,12 +240,12 @@ share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
 share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg
 share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
 share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg
-share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg
-share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg
-share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg
-share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg
-share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg
-share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/utils/trow-deaths.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/utils/trow-intro.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/utils/trow-macros.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/utils/trow-nlmsg.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/utils/trow-nohome.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/utils/trow-noisle.cfg
 share/wesnoth/data/scenarios/multiplayer/2p_Blitz.cfg
 share/wesnoth/data/scenarios/multiplayer/2p_Charge.cfg
 share/wesnoth/data/scenarios/multiplayer/2p_Den_of_Onis.cfg
@@ -454,8 +454,6 @@ share/wesnoth/data/units/Merman_Netcaster.cfg
 share/wesnoth/data/units/Merman_Spearman.cfg
 share/wesnoth/data/units/Merman_Triton.cfg
 share/wesnoth/data/units/Merman_Warrior.cfg
-share/wesnoth/data/units/Mounted_Captain.cfg
-share/wesnoth/data/units/Mounted_Commander.cfg
 share/wesnoth/data/units/Mounted_Fighter.cfg
 share/wesnoth/data/units/Mounted_Warrior.cfg
 share/wesnoth/data/units/Mudcrawler.cfg
@@ -626,6 +624,7 @@ share/wesnoth/images/attacks/pike.png
 share/wesnoth/images/attacks/pincers.png
 share/wesnoth/images/attacks/pistol.png
 share/wesnoth/images/attacks/pitchfork.png
+share/wesnoth/images/attacks/plaguestaff.png
 share/wesnoth/images/attacks/rapier.png
 share/wesnoth/images/attacks/short-sword.png
 share/wesnoth/images/attacks/slam.png
@@ -654,14 +653,32 @@ share/wesnoth/images/buttons/checkbox.png
 share/wesnoth/images/buttons/downarrow-button-active.png
 share/wesnoth/images/buttons/downarrow-button-pressed.png
 share/wesnoth/images/buttons/downarrow-button.png
+share/wesnoth/images/buttons/draw_button_editor-active.png
+share/wesnoth/images/buttons/draw_button_editor-pressed.png
+share/wesnoth/images/buttons/draw_button_editor.png
 share/wesnoth/images/buttons/endturn-button-active.png
 share/wesnoth/images/buttons/endturn-button.png
+share/wesnoth/images/buttons/flip_map_button_editor-active.png
+share/wesnoth/images/buttons/flip_map_button_editor-pressed.png
+share/wesnoth/images/buttons/flip_map_button_editor.png
+share/wesnoth/images/buttons/flood_button_editor-active.png
+share/wesnoth/images/buttons/flood_button_editor-pressed.png
+share/wesnoth/images/buttons/flood_button_editor.png
 share/wesnoth/images/buttons/lite-active.png
 share/wesnoth/images/buttons/lite-pressed.png
 share/wesnoth/images/buttons/lite.png
 share/wesnoth/images/buttons/lite_small-active.png
 share/wesnoth/images/buttons/lite_small-pressed.png
 share/wesnoth/images/buttons/lite_small.png
+share/wesnoth/images/buttons/paste_button_editor-active.png
+share/wesnoth/images/buttons/paste_button_editor-pressed.png
+share/wesnoth/images/buttons/paste_button_editor.png
+share/wesnoth/images/buttons/redo_button_editor-active.png
+share/wesnoth/images/buttons/redo_button_editor-pressed.png
+share/wesnoth/images/buttons/redo_button_editor.png
+share/wesnoth/images/buttons/resize_button_editor-active.png
+share/wesnoth/images/buttons/resize_button_editor-pressed.png
+share/wesnoth/images/buttons/resize_button_editor.png
 share/wesnoth/images/buttons/scrollbottom-active.png
 share/wesnoth/images/buttons/scrollbottom.png
 share/wesnoth/images/buttons/scrollgroove-bottom.png
@@ -673,9 +690,24 @@ share/wesnoth/images/buttons/scrolltop-active.png
 share/wesnoth/images/buttons/scrolltop.png
 share/wesnoth/images/buttons/slider-selected.png
 share/wesnoth/images/buttons/slider.png
+share/wesnoth/images/buttons/start_position_button_editor-active.png
+share/wesnoth/images/buttons/start_position_button_editor-pressed.png
+share/wesnoth/images/buttons/start_position_button_editor.png
+share/wesnoth/images/buttons/toggle_grid_button_editor-active.png
+share/wesnoth/images/buttons/toggle_grid_button_editor-pressed.png
+share/wesnoth/images/buttons/toggle_grid_button_editor.png
+share/wesnoth/images/buttons/undo_button_editor-active.png
+share/wesnoth/images/buttons/undo_button_editor-pressed.png
+share/wesnoth/images/buttons/undo_button_editor.png
 share/wesnoth/images/buttons/uparrow-button-active.png
 share/wesnoth/images/buttons/uparrow-button-pressed.png
 share/wesnoth/images/buttons/uparrow-button.png
+share/wesnoth/images/buttons/zoom_in_button_editor-active.png
+share/wesnoth/images/buttons/zoom_in_button_editor-pressed.png
+share/wesnoth/images/buttons/zoom_in_button_editor.png
+share/wesnoth/images/buttons/zoom_out_button_editor-active.png
+share/wesnoth/images/buttons/zoom_out_button_editor-pressed.png
+share/wesnoth/images/buttons/zoom_out_button_editor.png
 share/wesnoth/images/campaigns/Eastern_Invasion/maps/eastern_invasion.png
 share/wesnoth/images/campaigns/Heir_To_The_Throne/story/story0a.png
 share/wesnoth/images/campaigns/Heir_To_The_Throne/story/story0b.png
@@ -887,8 +919,14 @@ share/wesnoth/images/dwarf-warrior-attack-mace.png
 share/wesnoth/images/dwarf-warrior-attack.png
 share/wesnoth/images/dwarf-warrior-defend.png
 share/wesnoth/images/dwarf-warrior.png
+share/wesnoth/images/editor/brush-1-active.png
+share/wesnoth/images/editor/brush-1-pressed.png
 share/wesnoth/images/editor/brush-1.png
+share/wesnoth/images/editor/brush-2-active.png
+share/wesnoth/images/editor/brush-2-pressed.png
 share/wesnoth/images/editor/brush-2.png
+share/wesnoth/images/editor/brush-3-active.png
+share/wesnoth/images/editor/brush-3-pressed.png
 share/wesnoth/images/editor/brush-3.png
 share/wesnoth/images/elder-mage-attack.png
 share/wesnoth/images/elder-mage-defend.png
@@ -1039,6 +1077,10 @@ share/wesnoth/images/elvish-marksman-attack4.png
 share/wesnoth/images/elvish-marksman-bow-defend.png
 share/wesnoth/images/elvish-marksman-bow.png
 share/wesnoth/images/elvish-marksman-defend.png
+share/wesnoth/images/elvish-marksman-die1.png
+share/wesnoth/images/elvish-marksman-die2.png
+share/wesnoth/images/elvish-marksman-die3.png
+share/wesnoth/images/elvish-marksman-die4.png
 share/wesnoth/images/elvish-marksman.png
 share/wesnoth/images/elvish-marshal-attack.png
 share/wesnoth/images/elvish-marshal-attack1.png
@@ -1118,6 +1160,10 @@ share/wesnoth/images/elvish-sharpshooter-attack4.png
 share/wesnoth/images/elvish-sharpshooter-bow-defend.png
 share/wesnoth/images/elvish-sharpshooter-bow.png
 share/wesnoth/images/elvish-sharpshooter-defend.png
+share/wesnoth/images/elvish-sharpshooter-die1.png
+share/wesnoth/images/elvish-sharpshooter-die2.png
+share/wesnoth/images/elvish-sharpshooter-die3.png
+share/wesnoth/images/elvish-sharpshooter-die4.png
 share/wesnoth/images/elvish-sharpshooter.png
 share/wesnoth/images/elvish-shyde-defend.png
 share/wesnoth/images/elvish-shyde-ftouch-attack1.png
@@ -2005,6 +2051,9 @@ share/wesnoth/images/portraits/Heir_To_The_Throne/delfador.png
 share/wesnoth/images/portraits/Heir_To_The_Throne/kalenz.png
 share/wesnoth/images/portraits/Heir_To_The_Throne/konrad.png
 share/wesnoth/images/portraits/Heir_To_The_Throne/lisar.png
+share/wesnoth/images/portraits/The_Dark_Hordes/gwiti.png
+share/wesnoth/images/portraits/The_Dark_Hordes/gwiti_lich.png
+share/wesnoth/images/portraits/The_Dark_Hordes/nati.png
 share/wesnoth/images/portraits/The_Rise_of_Wesnoth/addroran.png
 share/wesnoth/images/portraits/The_Rise_of_Wesnoth/aethyr.png
 share/wesnoth/images/portraits/The_Rise_of_Wesnoth/archmage.png
@@ -2202,9 +2251,11 @@ share/wesnoth/images/skeletal-dragon.png
 share/wesnoth/images/terrain/alpha.png
 share/wesnoth/images/terrain/alphamask.png
 share/wesnoth/images/terrain/bridge-n-end.png
+share/wesnoth/images/terrain/bridge-n-s-tile.png
 share/wesnoth/images/terrain/bridge-n-s.png
 share/wesnoth/images/terrain/bridge-n.png
 share/wesnoth/images/terrain/bridge-ne-end.png
+share/wesnoth/images/terrain/bridge-ne-sw-tile.png
 share/wesnoth/images/terrain/bridge-ne-sw.png
 share/wesnoth/images/terrain/bridge-ne.png
 share/wesnoth/images/terrain/bridge-nw-end.png
@@ -2212,6 +2263,7 @@ share/wesnoth/images/terrain/bridge-nw.png
 share/wesnoth/images/terrain/bridge-s-end.png
 share/wesnoth/images/terrain/bridge-s.png
 share/wesnoth/images/terrain/bridge-se-end.png
+share/wesnoth/images/terrain/bridge-se-nw-tile.png
 share/wesnoth/images/terrain/bridge-se-nw.png
 share/wesnoth/images/terrain/bridge-se.png
 share/wesnoth/images/terrain/bridge-sw-end.png
@@ -2258,6 +2310,10 @@ share/wesnoth/images/terrain/castle-convex-nw.png
 share/wesnoth/images/terrain/castle-convex-se.png
 share/wesnoth/images/terrain/castle-convex-sw.png
 share/wesnoth/images/terrain/castle-convex-w.png
+share/wesnoth/images/terrain/castle-ruin-tile.png
+share/wesnoth/images/terrain/castle-sunken-ruin-tile.png
+share/wesnoth/images/terrain/castle-swamp-ruin-tile.png
+share/wesnoth/images/terrain/castle-tile.png
 share/wesnoth/images/terrain/castle-walls.tmpl
 share/wesnoth/images/terrain/castle.png
 share/wesnoth/images/terrain/cave-floor-n-ne-se-s.png
@@ -2438,6 +2494,7 @@ share/wesnoth/images/terrain/dwarven-doors.png
 share/wesnoth/images/terrain/dwarven-keep-floor.png
 share/wesnoth/images/terrain/dwarven-keep.png
 share/wesnoth/images/terrain/dwarven-village.png
+share/wesnoth/images/terrain/dwarven_castle-tile.png
 share/wesnoth/images/terrain/encampment-concave-e.png
 share/wesnoth/images/terrain/encampment-concave-ne.png
 share/wesnoth/images/terrain/encampment-concave-nw.png
@@ -2450,6 +2507,7 @@ share/wesnoth/images/terrain/encampment-convex-nw.png
 share/wesnoth/images/terrain/encampment-convex-se.png
 share/wesnoth/images/terrain/encampment-convex-sw.png
 share/wesnoth/images/terrain/encampment-convex-w.png
+share/wesnoth/images/terrain/encampment-tile.png
 share/wesnoth/images/terrain/flag-sotbe-1.png
 share/wesnoth/images/terrain/flag-sotbe-2.png
 share/wesnoth/images/terrain/flag-sotbe-3.png
@@ -2503,6 +2561,7 @@ share/wesnoth/images/terrain/forest-castle-s.png
 share/wesnoth/images/terrain/forest-castle-se.png
 share/wesnoth/images/terrain/forest-castle-sw.png
 share/wesnoth/images/terrain/forest-castle.png
+share/wesnoth/images/terrain/forest-tile.png
 share/wesnoth/images/terrain/forest.png
 share/wesnoth/images/terrain/forest2.png
 share/wesnoth/images/terrain/forest2_small.png
@@ -2611,6 +2670,7 @@ share/wesnoth/images/terrain/keep-keep-nw.png
 share/wesnoth/images/terrain/keep-keep-se.png
 share/wesnoth/images/terrain/keep-keep-sw.png
 share/wesnoth/images/terrain/keep-keep-w.png
+share/wesnoth/images/terrain/keep-tile.png
 share/wesnoth/images/terrain/keep-wall-0-e.png
 share/wesnoth/images/terrain/keep-wall-0-ne.png
 share/wesnoth/images/terrain/keep-wall-0-nw.png
@@ -2872,6 +2932,7 @@ share/wesnoth/images/terrain/snow-forest-castle-se.png
 share/wesnoth/images/terrain/snow-forest-castle-sw-nw.png
 share/wesnoth/images/terrain/snow-forest-castle-sw.png
 share/wesnoth/images/terrain/snow-forest-castle.png
+share/wesnoth/images/terrain/snow-forest-tile.png
 share/wesnoth/images/terrain/snow-forest.png
 share/wesnoth/images/terrain/snow-forest2.png
 share/wesnoth/images/terrain/snow-forest3.png
@@ -3172,25 +3233,37 @@ share/wesnoth/images/terrain/tropical-forest.png
 share/wesnoth/images/terrain/tropical-forest2.png
 share/wesnoth/images/terrain/tropical-forest3.png
 share/wesnoth/images/terrain/tropical-forest4.png
+share/wesnoth/images/terrain/village-cave-tile.png
 share/wesnoth/images/terrain/village-cave.png
+share/wesnoth/images/terrain/village-coast-tile.png
 share/wesnoth/images/terrain/village-coast.png
 share/wesnoth/images/terrain/village-desert-shadow.png
+share/wesnoth/images/terrain/village-desert-tile.png
 share/wesnoth/images/terrain/village-desert.png
+share/wesnoth/images/terrain/village-desert2-tile.png
 share/wesnoth/images/terrain/village-desert2.png
 share/wesnoth/images/terrain/village-dusk.png
 share/wesnoth/images/terrain/village-dusk2.png
 share/wesnoth/images/terrain/village-dusk3.png
 share/wesnoth/images/terrain/village-dusk4.png
+share/wesnoth/images/terrain/village-elven-tile.png
 share/wesnoth/images/terrain/village-elven.png
 share/wesnoth/images/terrain/village-elven2.png
 share/wesnoth/images/terrain/village-first_watch.png
+share/wesnoth/images/terrain/village-human-hills-tile.png
+share/wesnoth/images/terrain/village-human-mountain-tile.png
+share/wesnoth/images/terrain/village-human-snow-hills-tile.png
+share/wesnoth/images/terrain/village-human-tile.png
 share/wesnoth/images/terrain/village-human.png
 share/wesnoth/images/terrain/village-human2.png
 share/wesnoth/images/terrain/village-human3.png
 share/wesnoth/images/terrain/village-second_watch.png
+share/wesnoth/images/terrain/village-snow-tile.png
 share/wesnoth/images/terrain/village-snow.png
+share/wesnoth/images/terrain/village-swampwater-tile.png
 share/wesnoth/images/terrain/village-swampwater.png
 share/wesnoth/images/terrain/village-tropical-forest.png
+share/wesnoth/images/terrain/village-tropical-tile.png
 share/wesnoth/images/terrain/village.png
 share/wesnoth/images/terrain/void-n-ne-se-s.png
 share/wesnoth/images/terrain/void-n-ne-se.png
@@ -3390,7 +3463,7 @@ share/wesnoth/images/undead-skeleton-defend.png
 share/wesnoth/images/undead-skeleton-dying-2.png
 share/wesnoth/images/undead-skeleton-dying.png
 share/wesnoth/images/undead-skeleton.png
-share/wesnoth/images/undead-sorcerer-defence.png
+share/wesnoth/images/undead-sorcerer-defend.png
 share/wesnoth/images/undead-sorcerer-die-1.png
 share/wesnoth/images/undead-sorcerer-die-2.png
 share/wesnoth/images/undead-sorcerer-ranged1.png
@@ -3664,6 +3737,7 @@ share/wesnoth/sounds/zombie-hit.wav
 @dirrm share/wesnoth/images/portraits/core/James_Woo
 @dirrm share/wesnoth/images/portraits/core
 @dirrm share/wesnoth/images/portraits/The_Rise_of_Wesnoth
+@dirrm share/wesnoth/images/portraits/The_Dark_Hordes
 @dirrm share/wesnoth/images/portraits/Heir_To_The_Throne
 @dirrm share/wesnoth/images/portraits/Eastern_Invasion
 @dirrm share/wesnoth/images/portraits
@@ -3699,11 +3773,15 @@ share/wesnoth/sounds/zombie-hit.wav
 @dirrm share/wesnoth/data/terrain-graphics
 @dirrm share/wesnoth/data/scenarios/tutorial
 @dirrm share/wesnoth/data/scenarios/multiplayer
+@dirrm share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/utils
 @dirrm share/wesnoth/data/scenarios/The_Rise_of_Wesnoth
+@dirrm share/wesnoth/data/scenarios/The_Dark_Hordes/utils
 @dirrm share/wesnoth/data/scenarios/The_Dark_Hordes
 @dirrm share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils
 @dirrm share/wesnoth/data/scenarios/Son_Of_The_Black_Eye
+@dirrm share/wesnoth/data/scenarios/Heir_To_The_Throne/utils
 @dirrm share/wesnoth/data/scenarios/Heir_To_The_Throne
+@dirrm share/wesnoth/data/scenarios/Eastern_Invasion/utils
 @dirrm share/wesnoth/data/scenarios/Eastern_Invasion
 @dirrm share/wesnoth/data/scenarios
 @dirrm share/wesnoth/data/maps/multiplayer
@@ -3717,3 +3795,5 @@ share/wesnoth/sounds/zombie-hit.wav
 @dirrm share/wesnoth/data/campaigns
 @dirrm share/wesnoth/data
 @dirrm share/wesnoth
+@dirrm man/sv/man6
+@dirrm man/sv
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 95588bfbab4..4535519ae12 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.10 2005/07/24 14:32:01 wiz Exp $
+$NetBSD: distinfo,v 1.11 2005/07/28 11:26:59 wiz Exp $
 
-SHA1 (wesnoth-0.9.3.tar.gz) = b65889e8d280685badd30088e72091121e12f9a2
-RMD160 (wesnoth-0.9.3.tar.gz) = ae07f85acddd8f6bb82799367dc6521f7ced88fc
-Size (wesnoth-0.9.3.tar.gz) = 38203711 bytes
-SHA1 (patch-aa) = ea207093d71522f952d9633570281ff051d60c78
-SHA1 (patch-ac) = bca54460fd6587d6f3a98879419bfa76152681d3
+SHA1 (wesnoth-0.9.4.tar.gz) = 00ba666767d58ad508951390bf3715aa4977a200
+RMD160 (wesnoth-0.9.4.tar.gz) = b242d4841dd52fc5d7313321d47a4a6d7d2478f2
+Size (wesnoth-0.9.4.tar.gz) = 38929151 bytes
diff --git a/games/wesnoth/patches/patch-aa b/games/wesnoth/patches/patch-aa
deleted file mode 100644
index 8eac0d1c3ae..00000000000
--- a/games/wesnoth/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/07/24 14:31:55 wiz Exp $
-
---- Makefile.in.orig	2005-06-29 22:32:22.000000000 +0200
-+++ Makefile.in
-@@ -267,12 +267,12 @@ bin_SCRIPTS = utils/wmlxgettext
- findfilterflags = -name CVS -prune -o -name ".cvs*" -o -name ".\#*" -o -type d
- @LITE_FALSE@findmoredata = ;find images music $(findfilterflags) -o -print
- @LITE_TRUE@findmoredata = ;find images $(findfilterflags) -o -path "images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" -o -print
--@LITE_FALSE@findmoredatadirs = find images music -type d -not \( -name CVS -prune \) -print
--@LITE_TRUE@findmoredatadirs = find images -type d -not \( -name CVS -prune -o -path "images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" \) -print
-+@LITE_FALSE@findmoredatadirs = find images music -type d ! \( -name CVS -prune \) -print
-+@LITE_TRUE@findmoredatadirs = find images -type d ! \( -name CVS -prune -o -path "images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" \) -print
- finddata = (cd $(top_srcdir) && find data fonts sounds $(findfilterflags) -o -print \
- 	 $(findmoredata) )
- 
--finddatadirs = (cd $(top_srcdir) && find data fonts sounds -type d -not \( -name CVS -prune \) -print; $(findmoredatadirs) )
-+finddatadirs = (cd $(top_srcdir) && find data fonts sounds -type d ! \( -name CVS -prune \) -print; $(findmoredatadirs) )
- findnoinst = (cd $(top_srcdir) && find utils -name CVS -prune -o -name ".cvs*" -o -name ".\#*" -o -type d -o -print && find MANUAL*)
- w_preparefileinstall = if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  case $$p in \
diff --git a/games/wesnoth/patches/patch-ac b/games/wesnoth/patches/patch-ac
deleted file mode 100644
index 2e64a9515ba..00000000000
--- a/games/wesnoth/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/07/24 14:31:37 wiz Exp $
-
---- configure.orig	2005-06-29 22:32:22.000000000 +0200
-+++ configure
-@@ -8586,7 +8586,7 @@ fi
- done
- test -n "$PNG_CONFIG" || PNG_CONFIG="none"
- 
--
-+if false; then
- if test "x$PNG_CONFIG" = "xnone"; then
-     pngfound=no
-     { echo "$as_me:$LINENO: WARNING: *** LIBPNG not found." >&5
-@@ -8596,8 +8596,11 @@ else
-     PNG_CFLAGS=`$PNG_CONFIG --cflags`
-     PNG_LIBS=`$PNG_CONFIG --libs`
- fi
--
--
-+else
-+    pngfound=yes
-+    PNG_CFLAGS=`pkg-config --cflags libpng12`
-+    PNG_LIBS=`pkg-config --libs libpng12`
-+fi
- 
- 
-