- Update to 0.8.7.

- Add an offical url of distfiles in case when sourceforge.net is down or
  having the problem with mirror.
- Remove SDL_ttf dependency, they imported SDL_ttf into this tarball. They
  said that they fixed memory corruption errors on font rendering in their
  imported SDL_ttf. I guess, I will let Wesnoth to use own SDL_ttf for now.

6 files changed, 167 insertions, 113 deletions

diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index 95810f0d47cf..43e66b171ee3 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	0.8.5
+PORTVERSION=	0.8.7
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www.wesnoth.org/files/
 MASTER_SITE_SUBDIR=	wesnoth
 .if defined(LITE)
 PKGNAMESUFFIX=	-lite
@@ -19,7 +20,7 @@ MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A fantasy turn-based strategy game
 
 USE_GCC=	3.4
-USE_SDL=	image mixer net ttf
+USE_SDL=	image mixer net
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 WANT_GNOME=	yes
@@ -30,6 +31,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-sdltest \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE} \
+		--with-freetype-prefix=${LOCALBASE} \
 		--with-localedir=${PREFIX}/share/locale
 CONFIGURE_ENV=	CPPFLAGS="-ftemplate-depth-45" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl"
diff --git a/games/wesnoth-devel/distinfo b/games/wesnoth-devel/distinfo
index c5acba1dc904..2be7a29b1daf 100644
--- a/games/wesnoth-devel/distinfo
+++ b/games/wesnoth-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (wesnoth-0.8.5.tar.gz) = 2b7cee60a6a37662f628e8971f18b5fc
-SIZE (wesnoth-0.8.5.tar.gz) = 31763952
-MD5 (wesnoth-lite-0.8.5.tar.gz) = e3e12fbf733b28d54d91274f56f636b7
-SIZE (wesnoth-lite-0.8.5.tar.gz) = 17669038
+MD5 (wesnoth-0.8.7.tar.gz) = 313a27d86c310c28ae049ea72b89c124
+SIZE (wesnoth-0.8.7.tar.gz) = 33383831
+MD5 (wesnoth-lite-0.8.7.tar.gz) = 6af27660d3e96cb6277a366369414664
+SIZE (wesnoth-lite-0.8.7.tar.gz) = 23261782
diff --git a/games/wesnoth-devel/files/patch-configure b/games/wesnoth-devel/files/patch-configure
deleted file mode 100644
index 2461bb21a243..000000000000
--- a/games/wesnoth-devel/files/patch-configure
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.orig	Tue Oct  5 23:42:20 2004
-+++ configure	Tue Oct  5 23:43:44 2004
-@@ -10043,36 +10043,6 @@
- 
- 
- 
--if test x$kde = xyes && test x$kdefound = xyes; then
--  KDE_TRUE=
--  KDE_FALSE='#'
--else
--  KDE_TRUE='#'
--  KDE_FALSE=
--fi
--
--
--
--if test x$gnome = xyes && test x$gnome1found = xyes; then
--  GNOME1_TRUE=
--  GNOME1_FALSE='#'
--else
--  GNOME1_TRUE='#'
--  GNOME1_FALSE=
--fi
--
--
--
--if test x$gnome = xyes && test x$gnome1found = xno; then
--  GNOME2_TRUE=
--  GNOME2_FALSE='#'
--else
--  GNOME2_TRUE='#'
--  GNOME2_FALSE=
--fi
--
--
--
- if test x$GXX = xyes; then
-   GCC_TRUE=
-   GCC_FALSE='#'
-@@ -13259,6 +13229,34 @@
- fi
- 
- 
-+
-+if test x$kde = xyes && test x$kdefound = xyes; then
-+  KDE_TRUE=
-+  KDE_FALSE='#'
-+else
-+  KDE_TRUE='#'
-+  KDE_FALSE=
-+fi
-+
-+
-+
-+if test x$gnome = xyes && test x$gnome1found = xyes; then
-+  GNOME1_TRUE=
-+  GNOME1_FALSE='#'
-+else
-+  GNOME1_TRUE='#'
-+  GNOME1_FALSE=
-+fi
-+
-+
-+
-+if test x$gnome = xyes && test x$gnome1found = xno; then
-+  GNOME2_TRUE=
-+  GNOME2_FALSE='#'
-+else
-+  GNOME2_TRUE='#'
-+  GNOME2_FALSE=
-+fi
- 
- 
- 
diff --git a/games/wesnoth-devel/files/patch-src::Makefile.in b/games/wesnoth-devel/files/patch-src::Makefile.in
index 8da0562ab287..c350ff86de81 100644
--- a/games/wesnoth-devel/files/patch-src::Makefile.in
+++ b/games/wesnoth-devel/files/patch-src::Makefile.in
@@ -1,12 +1,15 @@
---- src/Makefile.in.orig	Tue Oct  5 23:45:33 2004
-+++ src/Makefile.in	Tue Oct  5 23:45:59 2004
-@@ -660,8 +660,7 @@
+--- src/Makefile.in.orig	Mon Nov  1 22:21:14 2004
++++ src/Makefile.in	Mon Nov  1 22:23:02 2004
+@@ -680,10 +680,10 @@
+ 			 sdl_ttf/SDL_ttf.h \
  			 wesconfig.h
  
- AM_CXXFLAGS = @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
--	-DLOCALEDIR=\"$(LOCALEDIR)\" -DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) \
--	-I../intl -I$(top_srcdir)/intl
-+	-DLOCALEDIR=\"$(LOCALEDIR)\" -DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
+-AM_CXXFLAGS = -I sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
++AM_CXXFLAGS = -I sdl_ttf @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
+ 	-DLOCALEDIR=\"$(LOCALEDIR)\" -DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
+ 
+-AM_CFLAGS = -I sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
++AM_CFLAGS = -I sdl_ttf @SDL_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
+ 	-DLOCALEDIR=\"$(LOCALEDIR)\" -DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
  
  CXXLD = $(LDPREFIX) $(CXX)
- all: all-recursive
diff --git a/games/wesnoth-devel/files/patch-src::help.cpp b/games/wesnoth-devel/files/patch-src::help.cpp
index 836c0540340d..77900083c246 100644
--- a/games/wesnoth-devel/files/patch-src::help.cpp
+++ b/games/wesnoth-devel/files/patch-src::help.cpp
@@ -1,11 +1,11 @@
---- src/help.cpp.orig	Tue Oct  5 23:47:06 2004
-+++ src/help.cpp	Tue Oct  5 23:47:19 2004
-@@ -29,7 +29,7 @@
- #include <cassert>
+--- src/help.cpp.orig	Mon Nov  1 22:25:36 2004
++++ src/help.cpp	Mon Nov  1 22:25:48 2004
+@@ -31,7 +31,7 @@
  #include <algorithm>
  #include <iostream>
+ #include <list>
 -#include <locale>
 +#include <locale.h>
+ #include <map>
  #include <queue>
  #include <set>
- #include <stack>
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index 8268fa975bb8..e1cd78dcf38b 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -140,6 +140,14 @@ share/locale/sk/LC_MESSAGES/wesnoth-sotbe.mo
 share/locale/sk/LC_MESSAGES/wesnoth-tdh.mo
 share/locale/sk/LC_MESSAGES/wesnoth-trow.mo
 share/locale/sk/LC_MESSAGES/wesnoth.mo
+share/locale/sl/LC_MESSAGES/wesnoth-editor.mo
+share/locale/sl/LC_MESSAGES/wesnoth-ei.mo
+share/locale/sl/LC_MESSAGES/wesnoth-httt.mo
+share/locale/sl/LC_MESSAGES/wesnoth-lib.mo
+share/locale/sl/LC_MESSAGES/wesnoth-sotbe.mo
+share/locale/sl/LC_MESSAGES/wesnoth-tdh.mo
+share/locale/sl/LC_MESSAGES/wesnoth-trow.mo
+share/locale/sl/LC_MESSAGES/wesnoth.mo
 share/locale/sv/LC_MESSAGES/wesnoth-editor.mo
 share/locale/sv/LC_MESSAGES/wesnoth-ei.mo
 share/locale/sv/LC_MESSAGES/wesnoth-httt.mo
@@ -254,6 +262,7 @@ share/wesnoth/data/maps/Tutorial/Basic_Training
 share/wesnoth/data/maps/Tutorial/Traits_and_Specialties
 share/wesnoth/data/maps/multiplayer/BattleWorld
 share/wesnoth/data/maps/multiplayer/Blitz
+share/wesnoth/data/maps/multiplayer/Broken_Bridge
 share/wesnoth/data/maps/multiplayer/CastleHoppingIsle
 share/wesnoth/data/maps/multiplayer/Castles
 share/wesnoth/data/maps/multiplayer/ForestofFear
@@ -263,7 +272,6 @@ share/wesnoth/data/maps/multiplayer/Wesbowl
 share/wesnoth/data/maps/multiplayer/Weslin
 share/wesnoth/data/multiplayer.cfg
 share/wesnoth/data/names.cfg
-share/wesnoth/data/sample_translation.cfg
 share/wesnoth/data/scenario-test.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg
@@ -378,9 +386,13 @@ 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/multiplayer/An_Island.cfg
 share/wesnoth/data/scenarios/multiplayer/Blitz.cfg
+share/wesnoth/data/scenarios/multiplayer/BrokenBridge.cfg
 share/wesnoth/data/scenarios/multiplayer/CastleHoppingIsle.cfg
 share/wesnoth/data/scenarios/multiplayer/ForestOfFear.cfg
 share/wesnoth/data/scenarios/multiplayer/Random_Scenario.cfg
+share/wesnoth/data/scenarios/multiplayer/Random_Scenario_Desert.cfg
+share/wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg
+share/wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg
 share/wesnoth/data/scenarios/multiplayer/Wesbowl.cfg
 share/wesnoth/data/scenarios/multiplayer/WeslinBridge.cfg
 share/wesnoth/data/scenarios/multiplayer/battleworld.cfg
@@ -391,7 +403,6 @@ share/wesnoth/data/scenarios/tutorial/Traits_and_Specialties.cfg
 share/wesnoth/data/scenarios/tutorial/utils.cfg
 share/wesnoth/data/schedules.cfg
 share/wesnoth/data/terrain-graphics.cfg
-share/wesnoth/data/terrain-graphics/adjacent-north.cfg
 share/wesnoth/data/terrain-graphics/adjacent.cfg
 share/wesnoth/data/terrain-graphics/base.cfg
 share/wesnoth/data/terrain-graphics/bridges.cfg
@@ -399,10 +410,12 @@ share/wesnoth/data/terrain-graphics/buildings.cfg
 share/wesnoth/data/terrain-graphics/canyon.cfg
 share/wesnoth/data/terrain-graphics/castle-transitions.cfg
 share/wesnoth/data/terrain-graphics/castles.cfg
+share/wesnoth/data/terrain-graphics/forests.cfg
 share/wesnoth/data/terrain-graphics/util.cfg
 share/wesnoth/data/terrain.cfg
 share/wesnoth/data/themes/default.cfg
 share/wesnoth/data/themes/editor.cfg
+share/wesnoth/data/tips.cfg
 share/wesnoth/data/tools/exploder/castle-concave.cfg
 share/wesnoth/data/tools/exploder/castle-convex.cfg
 share/wesnoth/data/tools/exploder/castle-exploded-concave.cfg
@@ -515,6 +528,7 @@ share/wesnoth/data/units/Goblin_Knight.cfg
 share/wesnoth/data/units/Goblin_Pillager.cfg
 share/wesnoth/data/units/Goblin_Spearman.cfg
 share/wesnoth/data/units/Grand_Knight.cfg
+share/wesnoth/data/units/Grand_Marshal.cfg
 share/wesnoth/data/units/Great_Mage.cfg
 share/wesnoth/data/units/Great_Troll.cfg
 share/wesnoth/data/units/Gryphon.cfg
@@ -523,6 +537,7 @@ share/wesnoth/data/units/Gryphon_Rider.cfg
 share/wesnoth/data/units/Halbardier.cfg
 share/wesnoth/data/units/Heavy_Infantry.cfg
 share/wesnoth/data/units/Heavy_Infantryman.cfg
+share/wesnoth/data/units/Horse_Lord.cfg
 share/wesnoth/data/units/Horseman.cfg
 share/wesnoth/data/units/Initiate.cfg
 share/wesnoth/data/units/Iron_Mauler.cfg
@@ -535,8 +550,24 @@ share/wesnoth/data/units/Lord.cfg
 share/wesnoth/data/units/Mage.cfg
 share/wesnoth/data/units/Mage_of_Light.cfg
 share/wesnoth/data/units/Master_Bowman.cfg
+share/wesnoth/data/units/Mermaid_Diviner.cfg
+share/wesnoth/data/units/Mermaid_Enchantress.cfg
+share/wesnoth/data/units/Mermaid_Initiate.cfg
+share/wesnoth/data/units/Mermaid_Priestess.cfg
+share/wesnoth/data/units/Mermaid_Siren.cfg
 share/wesnoth/data/units/Merman.cfg
+share/wesnoth/data/units/Merman_Entangler.cfg
+share/wesnoth/data/units/Merman_Fighter.cfg
+share/wesnoth/data/units/Merman_Hoplite.cfg
+share/wesnoth/data/units/Merman_Hunter.cfg
+share/wesnoth/data/units/Merman_Javelineer.cfg
 share/wesnoth/data/units/Merman_Lord.cfg
+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/Mudcrawler.cfg
 share/wesnoth/data/units/Naga.cfg
 share/wesnoth/data/units/Necromancer.cfg
@@ -725,6 +756,21 @@ share/wesnoth/images/buttons/slider.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/campaigns/Heir_To_The_Throne/story0a.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story0b.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story1.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story2.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story3.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story4.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story5.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story6.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story7.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story8.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story9.png
+share/wesnoth/images/campaigns/Son_Of_The_Black_Eye/sotbe.png
+share/wesnoth/images/campaigns/Son_Of_The_Black_Eye/sotbe1.png
+share/wesnoth/images/campaigns/Son_Of_The_Black_Eye/sotbe2.png
+share/wesnoth/images/campaigns/Son_Of_The_Black_Eye/sotbe3.png
 share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/east.png
 share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/trow-logo.png
 share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/west.png
@@ -1059,7 +1105,10 @@ share/wesnoth/images/elvish-shaman-heal2.png
 share/wesnoth/images/elvish-shaman-heal3.png
 share/wesnoth/images/elvish-shaman-heal4.png
 share/wesnoth/images/elvish-shaman-heal5.png
-share/wesnoth/images/elvish-shaman-healing.png
+share/wesnoth/images/elvish-shaman-heal6.png
+share/wesnoth/images/elvish-shaman-heal7.png
+share/wesnoth/images/elvish-shaman-heal8.png
+share/wesnoth/images/elvish-shaman-heal9.png
 share/wesnoth/images/elvish-shaman.png
 share/wesnoth/images/elvish-sharpshooter+female-attack.png
 share/wesnoth/images/elvish-sharpshooter+female-attack1.png
@@ -1273,6 +1322,7 @@ share/wesnoth/images/human-dragoon-moving.png
 share/wesnoth/images/human-dragoon-range1.png
 share/wesnoth/images/human-dragoon-range2.png
 share/wesnoth/images/human-dragoon.png
+share/wesnoth/images/human-duelist-attack.png
 share/wesnoth/images/human-duelist-defend.png
 share/wesnoth/images/human-duelist-ranged.png
 share/wesnoth/images/human-duelist.png
@@ -1302,6 +1352,12 @@ share/wesnoth/images/human-longbowman-attack2.png
 share/wesnoth/images/human-longbowman-defend-close.png
 share/wesnoth/images/human-longbowman-defend.png
 share/wesnoth/images/human-longbowman.png
+share/wesnoth/images/human-marshal-attack-crossbow.png
+share/wesnoth/images/human-marshal-attack-sword1.png
+share/wesnoth/images/human-marshal-attack-sword2.png
+share/wesnoth/images/human-marshal-defense.png
+share/wesnoth/images/human-marshal-leading.png
+share/wesnoth/images/human-marshal.png
 share/wesnoth/images/human-masterbowman-defend.png
 share/wesnoth/images/human-masterbowman.png
 share/wesnoth/images/human-pikeman-attack-1.png
@@ -1425,18 +1481,37 @@ share/wesnoth/images/mage-attack3.png
 share/wesnoth/images/mage-defend.png
 share/wesnoth/images/mage.png
 share/wesnoth/images/maps/eastern_invasion.png
-share/wesnoth/images/maps/sotbe.png
-share/wesnoth/images/maps/sotbe1.png
-share/wesnoth/images/maps/sotbe2.png
-share/wesnoth/images/maps/sotbe3.png
 share/wesnoth/images/maps/the_great_continent.png
 share/wesnoth/images/maps/the_green_isle.png
 share/wesnoth/images/maps/wesnoth.png
+share/wesnoth/images/mermaid-diviner.png
+share/wesnoth/images/mermaid-enchantress.png
+share/wesnoth/images/mermaid-initiate.png
+share/wesnoth/images/mermaid-priestess.png
+share/wesnoth/images/mermaid-siren.png
 share/wesnoth/images/merman-attack.png
 share/wesnoth/images/merman-defend.png
+share/wesnoth/images/merman-entangler.png
+share/wesnoth/images/merman-fighter-attack.png
+share/wesnoth/images/merman-fighter-defend.png
+share/wesnoth/images/merman-fighter.png
+share/wesnoth/images/merman-hoplite-attack.png
+share/wesnoth/images/merman-hoplite-defend.png
+share/wesnoth/images/merman-hoplite.png
+share/wesnoth/images/merman-hunter.png
+share/wesnoth/images/merman-javelineer.png
 share/wesnoth/images/merman-king-attack.png
 share/wesnoth/images/merman-king-defend.png
 share/wesnoth/images/merman-king.png
+share/wesnoth/images/merman-netcaster.png
+share/wesnoth/images/merman-spearman.png
+share/wesnoth/images/merman-triton-attack-blade.png
+share/wesnoth/images/merman-triton-attack-pierce.png
+share/wesnoth/images/merman-triton-defend.png
+share/wesnoth/images/merman-triton.png
+share/wesnoth/images/merman-warrior-attack.png
+share/wesnoth/images/merman-warrior-defend.png
+share/wesnoth/images/merman-warrior.png
 share/wesnoth/images/merman.png
 share/wesnoth/images/misc/ball.png
 share/wesnoth/images/misc/bar-energy-ally.png
@@ -1502,6 +1577,7 @@ share/wesnoth/images/misc/item-holywater.png
 share/wesnoth/images/misc/item-sceptreoffire.png
 share/wesnoth/images/misc/item-staff.png
 share/wesnoth/images/misc/item-stormtrident.png
+share/wesnoth/images/misc/leader-crown.png
 share/wesnoth/images/misc/lobby.png
 share/wesnoth/images/misc/logo.png
 share/wesnoth/images/misc/mainmenu-background.png
@@ -1568,17 +1644,6 @@ share/wesnoth/images/misc/selected-ellipse-9-bottom.png
 share/wesnoth/images/misc/selected-ellipse-9-top.png
 share/wesnoth/images/misc/slowed.png
 share/wesnoth/images/misc/status-bg.png
-%%LITE:%%share/wesnoth/images/misc/story0a.png
-%%LITE:%%share/wesnoth/images/misc/story0b.png
-%%LITE:%%share/wesnoth/images/misc/story1.png
-%%LITE:%%share/wesnoth/images/misc/story2.png
-%%LITE:%%share/wesnoth/images/misc/story3.png
-%%LITE:%%share/wesnoth/images/misc/story4.png
-%%LITE:%%share/wesnoth/images/misc/story5.png
-%%LITE:%%share/wesnoth/images/misc/story6.png
-%%LITE:%%share/wesnoth/images/misc/story7.png
-%%LITE:%%share/wesnoth/images/misc/story8.png
-%%LITE:%%share/wesnoth/images/misc/story9.png
 share/wesnoth/images/misc/title.png
 share/wesnoth/images/misc/top-bg.png
 share/wesnoth/images/misc/topleft-corner.png
@@ -1664,6 +1729,9 @@ share/wesnoth/images/noble-lord.png
 share/wesnoth/images/noble-youth-attack.png
 share/wesnoth/images/noble-youth-defend.png
 share/wesnoth/images/noble-youth.png
+share/wesnoth/images/ogre-attack1.png
+share/wesnoth/images/ogre-attack2.png
+share/wesnoth/images/ogre-defend.png
 share/wesnoth/images/ogre.png
 share/wesnoth/images/orc-archer-attack.png
 share/wesnoth/images/orc-archer-attack2.png
@@ -1702,6 +1770,21 @@ share/wesnoth/images/orcish-warlord.png
 share/wesnoth/images/orcish-warrior-defend.png
 share/wesnoth/images/orcish-warrior-melee1.png
 share/wesnoth/images/orcish-warrior.png
+share/wesnoth/images/owaec-captain-attack-morningstar.png
+share/wesnoth/images/owaec-captain-attack-sword.png
+share/wesnoth/images/owaec-captain-defend.png
+share/wesnoth/images/owaec-captain-moving.png
+share/wesnoth/images/owaec-captain.png
+share/wesnoth/images/owaec-commander-attack-morningstar.png
+share/wesnoth/images/owaec-commander-attack-sword.png
+share/wesnoth/images/owaec-commander-defend.png
+share/wesnoth/images/owaec-commander-moving.png
+share/wesnoth/images/owaec-commander.png
+share/wesnoth/images/owaec-lord-attack-morningstar.png
+share/wesnoth/images/owaec-lord-attack-sword.png
+share/wesnoth/images/owaec-lord-defend.png
+share/wesnoth/images/owaec-lord-moving.png
+share/wesnoth/images/owaec-lord.png
 share/wesnoth/images/paladin-attack-sword.png
 share/wesnoth/images/paladin-healing.png
 share/wesnoth/images/paladin-moving.png
@@ -1714,6 +1797,9 @@ 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/Heir_To_The_Throne/lisar_angry.png
+share/wesnoth/images/portraits/The_Rise_of_Wesnoth/burin.png
+share/wesnoth/images/portraits/The_Rise_of_Wesnoth/edmond.png
+share/wesnoth/images/portraits/The_Rise_of_Wesnoth/haldric.png
 share/wesnoth/images/projectiles/bone-n.png
 share/wesnoth/images/projectiles/bone-ne.png
 share/wesnoth/images/projectiles/bullet.png
@@ -1746,6 +1832,7 @@ share/wesnoth/images/projectiles/spear-n.png
 share/wesnoth/images/projectiles/spear-ne.png
 share/wesnoth/images/projectiles/stone.png
 share/wesnoth/images/projectiles/thorns.png
+share/wesnoth/images/projectiles/water-spray.png
 share/wesnoth/images/projectiles/water_spay.png
 share/wesnoth/images/projectiles/web.png
 share/wesnoth/images/projectiles/whitemissile-n.png
@@ -1840,14 +1927,20 @@ share/wesnoth/images/skeletal-dragon-defend.png
 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.png
 share/wesnoth/images/terrain/bridge-n.png
+share/wesnoth/images/terrain/bridge-ne-end.png
 share/wesnoth/images/terrain/bridge-ne-sw.png
 share/wesnoth/images/terrain/bridge-ne.png
+share/wesnoth/images/terrain/bridge-nw-end.png
 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.png
 share/wesnoth/images/terrain/bridge-se.png
+share/wesnoth/images/terrain/bridge-sw-end.png
 share/wesnoth/images/terrain/bridge-sw.png
 share/wesnoth/images/terrain/bridge.png
 share/wesnoth/images/terrain/canyon-all.png
@@ -2165,6 +2258,24 @@ share/wesnoth/images/terrain/grassland-sw-nw-n.png
 share/wesnoth/images/terrain/grassland-sw-nw.png
 share/wesnoth/images/terrain/grassland-sw.png
 share/wesnoth/images/terrain/grassland-test.png
+share/wesnoth/images/terrain/grassland-to-water-n-ne-se.png
+share/wesnoth/images/terrain/grassland-to-water-n-ne.png
+share/wesnoth/images/terrain/grassland-to-water-n.png
+share/wesnoth/images/terrain/grassland-to-water-ne-se-s.png
+share/wesnoth/images/terrain/grassland-to-water-ne-se.png
+share/wesnoth/images/terrain/grassland-to-water-ne.png
+share/wesnoth/images/terrain/grassland-to-water-nw-n-ne.png
+share/wesnoth/images/terrain/grassland-to-water-nw-n.png
+share/wesnoth/images/terrain/grassland-to-water-nw.png
+share/wesnoth/images/terrain/grassland-to-water-s-sw-nw.png
+share/wesnoth/images/terrain/grassland-to-water-s-sw.png
+share/wesnoth/images/terrain/grassland-to-water-s.png
+share/wesnoth/images/terrain/grassland-to-water-se-s-sw.png
+share/wesnoth/images/terrain/grassland-to-water-se-s.png
+share/wesnoth/images/terrain/grassland-to-water-se.png
+share/wesnoth/images/terrain/grassland-to-water-sw-nw-n.png
+share/wesnoth/images/terrain/grassland-to-water-sw-nw.png
+share/wesnoth/images/terrain/grassland-to-water-sw.png
 share/wesnoth/images/terrain/grassland.png
 share/wesnoth/images/terrain/grid.png
 share/wesnoth/images/terrain/hills-n-ne.png
@@ -2180,12 +2291,22 @@ share/wesnoth/images/terrain/hills-variation2.png
 share/wesnoth/images/terrain/hills-variation3.png
 share/wesnoth/images/terrain/hills.png
 share/wesnoth/images/terrain/ice-bridge-ne-sw.png
+share/wesnoth/images/terrain/ice-n-ne-se-s.png
+share/wesnoth/images/terrain/ice-n-ne.png
 share/wesnoth/images/terrain/ice-n.png
+share/wesnoth/images/terrain/ice-ne-se.png
 share/wesnoth/images/terrain/ice-ne.png
+share/wesnoth/images/terrain/ice-nw-n-ne.png
+share/wesnoth/images/terrain/ice-nw-n.png
 share/wesnoth/images/terrain/ice-nw.png
 share/wesnoth/images/terrain/ice-pier.png
+share/wesnoth/images/terrain/ice-s-sw-nw-n.png
+share/wesnoth/images/terrain/ice-s-sw.png
 share/wesnoth/images/terrain/ice-s.png
+share/wesnoth/images/terrain/ice-se-s-sw.png
+share/wesnoth/images/terrain/ice-se-s.png
 share/wesnoth/images/terrain/ice-se.png
+share/wesnoth/images/terrain/ice-sw-nw.png
 share/wesnoth/images/terrain/ice-sw.png
 share/wesnoth/images/terrain/ice.png
 share/wesnoth/images/terrain/icebridge-se-nw.png
@@ -2244,7 +2365,6 @@ share/wesnoth/images/terrain/ocean.png
 share/wesnoth/images/terrain/ocean2.png
 share/wesnoth/images/terrain/ocean3.png
 share/wesnoth/images/terrain/out.png
-share/wesnoth/images/terrain/pier.png
 share/wesnoth/images/terrain/road-n.png
 share/wesnoth/images/terrain/road-ne.png
 share/wesnoth/images/terrain/road-nw.png
@@ -2596,6 +2716,7 @@ share/wesnoth/sounds/zombie-hit.wav
 @dirrm share/wesnoth/images/tools
 @dirrm share/wesnoth/images/terrain
 @dirrm share/wesnoth/images/projectiles
+@dirrm share/wesnoth/images/portraits/The_Rise_of_Wesnoth
 @dirrm share/wesnoth/images/portraits/Heir_To_The_Throne
 @dirrm share/wesnoth/images/portraits/Eastern_Invasion
 @dirrm share/wesnoth/images/portraits
@@ -2609,6 +2730,8 @@ share/wesnoth/sounds/zombie-hit.wav
 @dirrm share/wesnoth/images/cursors-bw
 @dirrm share/wesnoth/images/cursors
 @dirrm share/wesnoth/images/campaigns/The_Rise_of_Wesnoth
+@dirrm share/wesnoth/images/campaigns/Son_Of_The_Black_Eye
+@dirrm share/wesnoth/images/campaigns/Heir_To_The_Throne
 @dirrm share/wesnoth/images/campaigns
 @dirrm share/wesnoth/images/buttons
 @dirrm share/wesnoth/images/attacks