- update wesnoth to 1.8 series

- switch to new depends

looks ok to sthen,
tested by many on ports@

games/wesnoth/Makefile

@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.31 2010/10/11 08:14:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2010/10/12 20:33:17 jasper Exp $
 
 COMMENT=	fantasy turn-based strategy game
 
-DISTNAME=	wesnoth-1.6.5
-REVISION=	2
+DISTNAME=	wesnoth-1.8.4
 
 CATEGORIES=	games x11
 
-HOMEPAGE=	http://www.wesnoth.org/
-
 MAINTAINER=	Jasper Lievisse Adriaanse <jasper@openbsd.org>
 
+HOMEPAGE=	http://www.wesnoth.org/
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=	.tar.bz2
 
@@ -22,22 +21,34 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += X11 Xau Xdmcp Xrender c cairo expat fontconfig freetype
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 m pixman-1 png
-WANTLIB += pthread pthread-stubs stdc++ xcb z
+WANTLIB += pthread pthread-stubs stdc++ xcb z boost_iostreams-mt
+WANTLIB += gthread-2.0 xcb-render xcb-render-util
+WANTLIB += boost_regex-mt SDL SDL_image SDL_net SDL_ttf fribidi
+WANTLIB += pango-1.0 pangoft2-1.0 pangocairo-1.0 lua dbus-1
+WANTLIB += SDL_mixer
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS=	boost_iostreams-mt::devel/boost \
-		boost_regex-mt::devel/boost \
-		SDL::devel/sdl \
-		SDL_image::devel/sdl-image \
-		SDL_net::devel/sdl-net \
-		SDL_mixer::devel/sdl-mixer \
-		SDL_ttf::devel/sdl-ttf \
-		fribidi::devel/fribidi \
-		pango-1.0,pangoft2-1.0,pangocairo-1.0::devel/pango
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS=	::devel/boost \
+		::devel/sdl \
+		::devel/sdl-image \
+		::devel/sdl-net \
+		::devel/sdl-mixer \
+		::devel/sdl-ttf \
+		::devel/fribidi \
+		::devel/pango \
+		::lang/lua \
+		::x11/dbus
 
-CONFIGURE_STYLE=gnu
+RUN_DEPENDS=	::devel/desktop-file-utils \
+		::textproc/libxslt
+
+BUILD_DEPENDS+=		${MODGNU_AUTOCONF_DEPENDS} \
+			${MODGNU_AUTOMAKE_DEPENDS}
+
+CONFIGURE_STYLE=	gnu
+AUTOMAKE_VERSION=	1.9
+AUTOCONF_VERSION=	2.60
 
 CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
@@ -69,4 +80,8 @@ BUILD_DEPENDS+=	::graphics/pngmeta \
 CONFIGURE_ARGS+=--enable-tinygui
 .endif
 
+pre-configure:
+	cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
+
 .include <bsd.port.mk>

games/wesnoth/distinfo

@@ -1,5 +1,5 @@
-MD5 (wesnoth-1.6.5.tar.bz2) = STgmu9m6NVkwdlp+j+N0mg==
-RMD160 (wesnoth-1.6.5.tar.bz2) = f+lX1+62GVYlLQ/G6erXRXK+Q6E=
-SHA1 (wesnoth-1.6.5.tar.bz2) = Iy2sOkMnVVv1IhLPRCDJ6oIyIOQ=
-SHA256 (wesnoth-1.6.5.tar.bz2) = fvBHrjZCeKW/m9xpIo932CX3k/HE2a2ui0fwiC5/MNc=
-SIZE (wesnoth-1.6.5.tar.bz2) = 230239169
+MD5 (wesnoth-1.8.4.tar.bz2) = Lc6D+DXszh1QXqYORrc1bw==
+RMD160 (wesnoth-1.8.4.tar.bz2) = hrb2yjnPhxNNiemJ7SCECDaurCg=
+SHA1 (wesnoth-1.8.4.tar.bz2) = MLguBlI/moK3cKb8Ti1CUb01jso=
+SHA256 (wesnoth-1.8.4.tar.bz2) = rynd9A+D7gFpctbtuHYdcyP47V1r8VAFZZv/T9cZDrk=
+SIZE (wesnoth-1.8.4.tar.bz2) = 300557790

games/wesnoth/patches/patch-Makefile_am

@@ -1,12 +1,21 @@
-$OpenBSD: patch-Makefile_am,v 1.1 2009/11/11 16:01:33 jasper Exp $
---- Makefile.am.orig	Sun Jul 12 15:41:23 2009
-+++ Makefile.am	Sun Jul 12 15:41:44 2009
+$OpenBSD: patch-Makefile_am,v 1.2 2010/10/12 20:33:18 jasper Exp $
+--- Makefile.am.orig	Thu Apr  8 11:19:10 2010
++++ Makefile.am	Thu Apr  8 11:20:26 2010
 @@ -5,7 +5,7 @@ pkgdatadir=$(datadir)/@DATADIR@
  bin_SCRIPTS =
  
  # Ignore junk -- object files, editor backup files, wmllint backup files.
--findfilterflags=! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -wholename "data/test/*" \)
+-findfilterflags=! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -regex "data/test/*" \)
 +findfilterflags=! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -path "data/test/*" \)
  
  # List all datafiles, ignoring junk
- finddata=(cd $(top_srcdir) && find data fonts icons images sounds $(findfilterflags) -print )
+ finddata=(cd $(top_srcdir) && find data fonts icons images sounds l10n-track $(findfilterflags) -print )
+@@ -86,7 +86,7 @@ if INSTALLDATA
+ 	done
+ if TINYGUI
+ 	@echo "Shrink installed images by a factor of two."
+-	(cd $(top_srcdir) && find data/core/images data/campaigns images  \( $(findfilterflags) -a -name '*.png' -and -not -name 'bar-energy-tinygui.png' -print \) ) | while read p; do \
++	(cd $(top_srcdir) && find data/core/images data/campaigns images  \( $(findfilterflags) -a -name '*.png' -and ! -name 'bar-energy-tinygui.png' -print \) ) | while read p; do \
+ 	  $(w_preparefileinstall) \
+ 	  eval `identify $$d$$p | cut -f 3 -d ' ' | sed s/^/imagewidth=/ | sed s/x/\;imageheight=/` ;\
+ 	  case $${imagewidth}x$$imageheight in \

games/wesnoth/patches/patch-Makefile_in

@@ -1,21 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2009/11/11 16:01:33 jasper Exp $
---- Makefile.in.orig	Sun Sep  6 17:46:42 2009
-+++ Makefile.in	Wed Oct 28 21:47:08 2009
-@@ -323,7 +323,7 @@ SUBDIRS = po m4 src doc $(ISUBDIRS)
- bin_SCRIPTS = 
- 
- # Ignore junk -- object files, editor backup files, wmllint backup files.
--findfilterflags = ! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -wholename "data/test/*" \)
-+findfilterflags = ! \( -name .svn -prune -o -name ".\#*" -o -name "*~" -o -name "*bak" -o -name 'Makefile' -o -name '*Makefile' -o -type d -o -path "data/test/*" \)
- 
- # List all datafiles, ignoring junk
- finddata = (cd $(top_srcdir) && find data fonts icons images sounds $(findfilterflags) -print )
-@@ -995,7 +995,7 @@ install-data-local:
- @DUMMYLOCALES_TRUE@@INSTALLDATA_TRUE@	  ln -s C "$$loclnk"; done; \
- @DUMMYLOCALES_TRUE@@INSTALLDATA_TRUE@	true
- @INSTALLDATA_TRUE@@TINYGUI_TRUE@	@echo "Shrink installed images by a factor of two."
--@INSTALLDATA_TRUE@@TINYGUI_TRUE@	(cd $(top_srcdir) && find data/core/images data/campaigns images  \( $(findfilterflags) -a -name '*.png' -and -not -name 'bar-energy-tinygui.png' -print \) ) | while read p; do \
-+@INSTALLDATA_TRUE@@TINYGUI_TRUE@	(cd $(top_srcdir) && find data/core/images data/campaigns images  \( $(findfilterflags) -a -name '*.png' -and ! -name 'bar-energy-tinygui.png' -print \) ) | while read p; do \
- @INSTALLDATA_TRUE@@TINYGUI_TRUE@	  $(w_preparefileinstall) \
- @INSTALLDATA_TRUE@@TINYGUI_TRUE@	  eval `identify $$d$$p | cut -f 3 -d ' ' | sed s/^/imagewidth=/ | sed s/x/\;imageheight=/` ;\
- @INSTALLDATA_TRUE@@TINYGUI_TRUE@	  case $${imagewidth}x$$imageheight in \

games/wesnoth/patches/patch-configure

@@ -1,29 +0,0 @@
---- configure.orig	Sun Sep  6 17:46:43 2009
-+++ configure	Wed Oct 28 23:04:03 2009
-@@ -6006,8 +6006,8 @@ then
- 	CXXFLAGS="-O0 -DDEBUG -ggdb3 -W -Wall -ansi $CXXFLAGS"
- else
- 	# Don't use ansi for CFLAGS since it fails to compile.
--	CFLAGS="-O2 -W -Wall $CFLAGS"
--	CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS"
-+	CFLAGS="-W -Wall $CFLAGS"
-+	CXXFLAGS="-W -Wall $CXXFLAGS"
- fi
- 
- if test "x$profile" = "xyes"
-@@ -6021,15 +6021,6 @@ then
- #   Strict compilation for C files is disabled until somebody wants to clean them.
- #	CFLAGS="$CFLAGS -Werror -Wno-unused -Wno-sign-compare"
- 	CXXFLAGS="$CXXFLAGS -Werror -Wno-unused -Wno-sign-compare"
--fi
--
--# Make tests default in svn version
--svn_in_version=`expr match "$1.6.5" '.*svn'`
--test_build=yes
--if test $svn_in_version = 0
--then
--	#disabling building tests for release version
--	test_build=no
- fi
- 
- # Check whether --enable-tests was given.

games/wesnoth/patches/patch-configure_ac

@@ -0,0 +1,39 @@
+$OpenBSD: patch-configure_ac,v 1.1 2010/10/12 20:33:18 jasper Exp $
+
+- disable -Wall and -Werror, this breaks astarsearch.cpp.
+
+--- configure.ac.orig	Sun Aug  8 17:53:09 2010
++++ configure.ac	Sun Oct  3 19:51:01 2010
+@@ -95,8 +95,8 @@ then
+ 	CXXFLAGS="-O0 -DDEBUG -ggdb3 -W -Wall -ansi $CXXFLAGS"
+ else
+ 	# Don't use ansi for CFLAGS since it fails to compile.
+-	CFLAGS="-O2 -W -Wall $CFLAGS"
+-	CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS"
++	CFLAGS="-W $CFLAGS"
++	CXXFLAGS="-W -ansi $CXXFLAGS"
+ fi
+ 
+ if test "x$profile" = "xyes"
+@@ -108,19 +108,10 @@ fi
+ if test "x$strict" = "xyes"
+ then
+ #   Strict compilation for C files is disabled until somebody wants to clean them.
+-#	CFLAGS="-Werror -Wno-unused -Wno-sign-compare $CFLAGS"
++#	CFLAGS="-Wno-unused -Wno-sign-compare $CFLAGS"
+ 
+ 	# The current networking code breaks strict aliasing in g++ 4.5.
+-	CXXFLAGS="-Werror -Wno-unused-parameter -Wno-strict-aliasing $CXXFLAGS"
+-fi
+-
+-# Make tests default in svn version
+-svn_in_version=`expr match "$WESNOTH_VERSION" '.*svn'`
+-test_build=yes
+-if test $svn_in_version = 0 
+-then
+-	#disabling building tests for release version
+-	test_build=no
++	CXXFLAGS="-Wno-unused-parameter -Wno-strict-aliasing $CXXFLAGS"
+ fi
+ 
+ AC_ARG_ENABLE([tests],

games/wesnoth/patches/patch-doc_man_Makefile_am

@@ -0,0 +1,18 @@
+$OpenBSD: patch-doc_man_Makefile_am,v 1.1 2010/10/12 20:33:18 jasper Exp $
+
+Don't unconditionally create the language dir, as empty directories
+will be created for languages with no manual pages.
+
+--- doc/man/Makefile.am.orig	Mon Aug 23 10:51:52 2010
++++ doc/man/Makefile.am	Mon Aug 23 10:53:17 2010
+@@ -16,9 +16,9 @@ install-data-hook:
+ 		$(INSTALL) -c -m 644 $(srcdir)/$$j $(DESTDIR)$(mandir)/man6/$$j ; \
+ 	done
+ 	for i in $(MAN_LANG); do \
+-		mkdir -p $(DESTDIR)$(mandir)/$$i/man6 ; \
+ 		for j in $(INSTALL_MAN_PAGES); do \
+ 			if test -f $(srcdir)/$$i/$$j; then \
++				mkdir -p $(DESTDIR)$(mandir)/$$i/man6 ; \
+ 				$(INSTALL) -c -m 644 $(srcdir)/$$i/$$j $(DESTDIR)$(mandir)/$$i/man6/$$j ; \
+ 			fi \
+ 		done \

games/wesnoth/patches/patch-src_campaign_server_campaign_server_cpp

@@ -1,13 +1,12 @@
-$OpenBSD: patch-src_campaign_server_campaign_server_cpp,v 1.1 2009/11/11 16:01:33 jasper Exp $
---- src/campaign_server/campaign_server.cpp.orig	Sun May 24 10:54:26 2009
-+++ src/campaign_server/campaign_server.cpp	Tue Jul  7 22:18:19 2009
-@@ -40,6 +40,9 @@
+$OpenBSD: patch-src_campaign_server_campaign_server_cpp,v 1.2 2010/10/12 20:33:18 jasper Exp $
+--- src/campaign_server/campaign_server.cpp.orig	Thu Apr  8 11:17:11 2010
++++ src/campaign_server/campaign_server.cpp	Thu Apr  8 11:17:29 2010
+@@ -41,6 +41,8 @@
+ // work on Windows not sure which other platforms have a problem with it.
+ #if !(defined(_WIN32))
  #include <errno.h>
- #endif
- 
 +#include <unistd.h>
 +#include <sys/types.h>
-+
- #define LOG_CS lg::err(lg::network, false)
+ #endif
  
- //compatibility code for MS compilers
+ static lg::log_domain log_network("network");

games/wesnoth/patches/patch-src_clipboard_cpp

@@ -1,11 +1,11 @@
-$OpenBSD: patch-src_clipboard_cpp,v 1.1 2009/11/11 16:01:33 jasper Exp $
---- src/clipboard.cpp.orig	Fri Jun 12 14:59:44 2009
-+++ src/clipboard.cpp	Fri Jun 12 15:00:01 2009
+$OpenBSD: patch-src_clipboard_cpp,v 1.2 2010/10/12 20:33:18 jasper Exp $
+--- src/clipboard.cpp.orig	Thu Apr  8 11:16:48 2010
++++ src/clipboard.cpp	Thu Apr  8 11:16:58 2010
 @@ -17,6 +17,7 @@
  #include "global.hpp"
  
  #include "clipboard.hpp"
 +#include <unistd.h>
+ #include <algorithm>
  
  #if defined(_X11) && !defined(__APPLE__)
- 

games/wesnoth/patches/patch-src_editor2_editor_controller_cpp

@@ -1,126 +0,0 @@
-$OpenBSD: patch-src_editor2_editor_controller_cpp,v 1.1 2009/11/11 16:01:34 jasper Exp $
---- src/editor2/editor_controller.cpp.orig	Tue Jul  7 22:04:31 2009
-+++ src/editor2/editor_controller.cpp	Tue Jul  7 22:00:35 2009
-@@ -273,7 +273,7 @@ EXIT_STATUS editor_controller::main_loop()
- 			play_slice();
- 		}
- 	} catch (editor_exception& e) {
--		gui::message_dialog(gui(), _("Fatal error"), e.what()).show();
-+		gui::message_dialog(*gui_, _("Fatal error"), e.what()).show();
- 		return EXIT_ERROR;
- 	} catch (twml_exception& e) {
- 		e.show(gui());
-@@ -359,7 +359,7 @@ void editor_controller::replace_map_context(const map_
- void editor_controller::editor_settings_dialog()
- {
- 	if (tods_.empty()) {
--		gui::message_dialog(gui(), _("Error"), _("No editor time-of-day found.")).show();
-+		gui::message_dialog(*gui_, _("Error"), _("No editor time-of-day found.")).show();
- 		return;
- 	}
- 
-@@ -469,7 +469,7 @@ void editor_controller::save_map_as_dialog()
- void editor_controller::generate_map_dialog()
- {
- 	if (map_generators_.empty()) {
--		gui::message_dialog(gui(), _("Error"), _("No random map generators found.")).show();
-+		gui::message_dialog(*gui_, _("Error"), _("No random map generators found.")).show();
- 		return;
- 	}
- 	gui2::teditor_generate_map dialog;
-@@ -482,11 +482,11 @@ void editor_controller::generate_map_dialog()
- 			map_string = dialog.get_selected_map_generator()
- 				->create_map(std::vector<std::string>());
- 		} catch (mapgen_exception& e) {
--			gui::message_dialog(gui(), _("Map creation failed."), e.what()).show();
-+			gui::message_dialog(*gui_, _("Map creation failed."), e.what()).show();
- 			return;
- 		}
- 		if (map_string.empty()) {
--			gui::message_dialog(gui(), "", _("Map creation failed.")).show();
-+			gui::message_dialog(*gui_, "", _("Map creation failed.")).show();
- 		} else {
- 			editor_map new_map(game_config_, map_string);
- 			editor_action_whole_map a(new_map);
-@@ -508,10 +508,10 @@ void editor_controller::apply_mask_dialog()
- 			editor_action_apply_mask a(mask.get_map());
- 			perform_refresh(a);
- 		} catch (editor_map_load_exception& e) {
--			gui::message_dialog(gui(), _("Error loading mask"), e.what()).show();
-+			gui::message_dialog(*gui_, _("Error loading mask"), e.what()).show();
- 			return;
- 		} catch (editor_action_exception& e) {
--			gui::message_dialog(gui(), _("Error"), e.what()).show();
-+			gui::message_dialog(*gui_, _("Error"), e.what()).show();
- 			return;
- 		}
- 	}
-@@ -530,10 +530,10 @@ void editor_controller::create_mask_to_dialog()
- 			editor_action_create_mask a(map.get_map());
- 			perform_refresh(a);
- 		} catch (editor_map_load_exception& e) {
--			gui::message_dialog(gui(), _("Error loading map"), e.what()).show();
-+			gui::message_dialog(*gui_, _("Error loading map"), e.what()).show();
- 			return;
- 		} catch (editor_action_exception& e) {
--			gui::message_dialog(gui(), _("Error"), e.what()).show();
-+			gui::message_dialog(*gui_, _("Error"), e.what()).show();
- 			return;
- 		}
- 	}
-@@ -608,7 +608,7 @@ bool editor_controller::save_map_as(const std::string&
- 	if (is_open < map_contexts_.size()
- 			&& is_open != static_cast<unsigned>(current_context_index_)) {
- 
--		gui::dialog(gui(), _("This map is already open."), filename).show();
-+		gui::dialog(*gui_, _("This map is already open."), filename).show();
- 		return false;
- 	}
- 	std::string old_filename = get_map_context().get_filename();
-@@ -629,10 +629,10 @@ bool editor_controller::save_map(bool display_confirma
- 	try {
- 		get_map_context().save();
- 		if (display_confirmation) {
--			gui::message_dialog(gui(), "", _("Map saved.")).show();
-+			gui::message_dialog(*gui_, "", _("Map saved.")).show();
- 		}
- 	} catch (editor_map_save_exception& e) {
--		gui::message_dialog(gui(), "", e.what()).show();
-+		gui::message_dialog(*gui_, "", e.what()).show();
- 		return false;
- 	}
- 	return true;
-@@ -650,7 +650,7 @@ bool editor_controller::check_switch_open_map(const st
- {
- 	size_t i = check_open_map(fn);
- 	if (i < map_contexts_.size()) {
--		gui::dialog(gui(), _("This map is already open."), fn).show();
-+		gui::dialog(*gui_, _("This map is already open."), fn).show();
- 		switch_context(i);
- 		return true;
- 	}
-@@ -674,7 +674,7 @@ void editor_controller::load_map(const std::string& fi
- 		}
- 		if (get_map_context().is_embedded()) {
- 			const char* msg = _("Loaded embedded map data");
--			gui::message_dialog(gui(), _("Map loaded from scenario"), msg).show();
-+			gui::message_dialog(*gui_, _("Map loaded from scenario"), msg).show();
- 		} else {
- 			if (get_map_context().get_filename() != filename) {
- 				if (get_map_context().get_map_data_key().empty()) {
-@@ -688,13 +688,13 @@ void editor_controller::load_map(const std::string& fi
- 						"$new");
- 					symbols["new"] = get_map_context().get_filename();
- 					symbols["map_data"] = get_map_context().get_map_data_key();
--					gui::message_dialog(gui(), _("Map loaded from scenario"), 
-+					gui::message_dialog(*gui_, _("Map loaded from scenario"), 
- 						vgettext(msg, symbols)).show();
- 				}
- 			}
- 		}
- 	} catch (editor_map_load_exception& e) {
--		gui::message_dialog(gui(), _("Error loading map"), e.what()).show();
-+		gui::message_dialog(*gui_, _("Error loading map"), e.what()).show();
- 		return;
- 	}
- }

games/wesnoth/patches/patch-src_game_cpp

@@ -1,11 +1,11 @@
-$OpenBSD: patch-src_game_cpp,v 1.1 2009/11/11 16:01:34 jasper Exp $
+$OpenBSD: patch-src_game_cpp,v 1.2 2010/10/12 20:33:18 jasper Exp $
 
 Prevent compilation error on arm:
 game.cpp:1307: warning: `int res' might be used uninitialized in this function
 
---- src/game.cpp.orig	Mon Nov  9 13:13:30 2009
-+++ src/game.cpp	Mon Nov  9 13:13:53 2009
-@@ -1304,7 +1304,7 @@ void game_controller::start_wesnothd()
+--- src/game.cpp.orig	Sun Jul 18 12:10:00 2010
++++ src/game.cpp	Wed Aug 18 20:36:32 2010
+@@ -1157,7 +1157,7 @@ void game_controller::start_wesnothd()
  
  bool game_controller::play_multiplayer()
  {
@@ -13,4 +13,4 @@ game.cpp:1307: warning: `int res' might be used uninitialized in this function
 +	int res = 0;
  
  	state_ = game_state();
- 	state_.campaign_type = "multiplayer";
+ 	state_.classification().campaign_type = "multiplayer";

games/wesnoth/patches/patch-src_mouse_events_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_mouse_events_cpp,v 1.1 2009/11/11 16:01:34 jasper Exp $
---- src/mouse_events.cpp.orig	Sun Jun 21 11:47:04 2009
-+++ src/mouse_events.cpp	Tue Jul  7 21:47:10 2009
-@@ -663,7 +663,7 @@ bool mouse_handler::attack_enemy_(unit_map::iterator a
- 		current_team().set_action_bonus_count(1 + current_team().action_bonus_count());
- 
- 		try {
--			attack(gui(),map_,teams_,attacker_loc,defender_loc,att.attack_num,def.attack_num,units_,status_);
-+			attack(*gui_,map_,teams_,attacker_loc,defender_loc,att.attack_num,def.attack_num,units_,status_);
- 		} catch(end_level_exception&) {
- 			//if the level ends due to a unit being killed, still see if
- 			//either the attacker or defender should advance

games/wesnoth/patches/patch-src_multiplayer_create_cpp

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_multiplayer_create_cpp,v 1.1 2010/10/12 20:33:18 jasper Exp $
+--- src/multiplayer_create.cpp.orig	Wed Aug 18 21:27:34 2010
++++ src/multiplayer_create.cpp	Sat Aug 21 19:58:24 2010
+@@ -37,6 +37,9 @@
+ #include "wml_separators.hpp"
+ #include "formula_string_utils.hpp"
+ 
++/* Resolve conflict with nitems() macro from sys/param.h */
++#undef nitems
++
+ static lg::log_domain log_config("config");
+ #define ERR_CF LOG_STREAM(err, log_config)
+ 

games/wesnoth/patches/patch-src_network_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_network_cpp,v 1.1 2009/11/11 16:01:34 jasper Exp $
---- src/network.cpp.orig	Tue Jul  7 21:50:07 2009
-+++ src/network.cpp	Tue Jul  7 21:50:37 2009
-@@ -871,9 +871,9 @@ struct bandwidth_stats {
+$OpenBSD: patch-src_network_cpp,v 1.2 2010/10/12 20:33:18 jasper Exp $
+--- src/network.cpp.orig	Thu Apr  8 11:09:40 2010
++++ src/network.cpp	Thu Apr  8 11:10:32 2010
+@@ -882,9 +882,9 @@ struct bandwidth_stats {
  	int in_packets;
  	int in_bytes;
  	int day;

games/wesnoth/patches/patch-src_preferences_cpp

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_preferences_cpp,v 1.1 2009/11/11 16:01:34 jasper Exp $
---- src/preferences.cpp.orig	Fri Jun 12 15:30:32 2009
-+++ src/preferences.cpp	Fri Jun 12 15:30:52 2009
-@@ -31,6 +31,8 @@
+$OpenBSD: patch-src_preferences_cpp,v 1.2 2010/10/12 20:33:18 jasper Exp $
+--- src/preferences.cpp.orig	Thu Apr  8 11:09:19 2010
++++ src/preferences.cpp	Thu Apr  8 11:09:33 2010
+@@ -32,6 +32,8 @@
  
  #include <sys/stat.h> // for setting the permissions of the preferences file
  
 +#include <unistd.h>
 +
- namespace {
+ static lg::log_domain log_filesystem("filesystem");
+ #define ERR_FS LOG_STREAM(err, log_filesystem)
  
- bool colour_cursors = false;

games/wesnoth/patches/patch-src_server_jwsmtp_mailer_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_server_jwsmtp_mailer_h,v 1.1 2009/11/11 16:01:34 jasper Exp $
---- src/server/jwsmtp/mailer.h.orig	Tue Jul  7 22:06:30 2009
-+++ src/server/jwsmtp/mailer.h	Tue Jul  7 22:06:45 2009
-@@ -144,7 +144,7 @@ class mailer (public)
- 
-    // Constants
-    // in unix we have to have a named object.
--   const static enum {TO, Cc, Bcc, SMTP_PORT = 25, DNS_PORT = 53} consts;   
-+   static const enum {TO, Cc, Bcc, SMTP_PORT = 25, DNS_PORT = 53} consts;   
- 
-    // what type of authentication are we using.
-    // (if using authentication that is).

games/wesnoth/patches/patch-src_server_server_cpp

@@ -1,11 +1,11 @@
---- src/server/server.cpp.orig	Fri May  8 15:48:22 2009
-+++ src/server/server.cpp	Fri Jun 12 14:54:37 2009
-@@ -39,6 +39,8 @@
+$OpenBSD: patch-src_server_server_cpp,v 1.8 2010/10/12 20:33:18 jasper Exp $
+--- src/server/server.cpp.orig	Thu Apr  8 11:07:16 2010
++++ src/server/server.cpp	Thu Apr  8 11:07:44 2010
+@@ -42,6 +42,7 @@
  #include "simple_wml.hpp"
  #include "ban.hpp"
  
 +#include <unistd.h>
-+
+ 
  #include "user_handler.hpp"
  #include "sample_user_handler.hpp"
- 

games/wesnoth/patches/patch-src_widgets_menu_hpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_widgets_menu_hpp,v 1.1 2009/11/11 16:01:34 jasper Exp $
---- src/widgets/menu.hpp.orig	Sun Jul  5 13:04:03 2009
-+++ src/widgets/menu.hpp	Sun Jul  5 13:04:28 2009
-@@ -183,6 +183,9 @@ class menu : public scrollarea (public)
+$OpenBSD: patch-src_widgets_menu_hpp,v 1.2 2010/10/12 20:33:18 jasper Exp $
+--- src/widgets/menu.hpp.orig	Thu Apr  8 11:06:31 2010
++++ src/widgets/menu.hpp	Thu Apr  8 11:06:51 2010
+@@ -186,6 +186,9 @@ class menu : public scrollarea (public)
  	void set_max_height(const int new_max_height);
  	void set_max_width(const int new_max_width);
  

games/wesnoth/pkg/PFRAG.no-lite

@@ -1,19 +1,23 @@
-@comment $OpenBSD: PFRAG.no-lite,v 1.8 2009/11/11 16:01:34 jasper Exp $
+@comment $OpenBSD: PFRAG.no-lite,v 1.9 2010/10/12 20:33:18 jasper Exp $
 share/wesnoth/data/core/music/
 share/wesnoth/data/core/music/battle.ogg
 share/wesnoth/data/core/music/breaking_the_chains.ogg
+share/wesnoth/data/core/music/casualties_of_war.ogg
 share/wesnoth/data/core/music/defeat.ogg
 share/wesnoth/data/core/music/defeat2.ogg
 share/wesnoth/data/core/music/elf-land.ogg
 share/wesnoth/data/core/music/elvish-theme.ogg
 share/wesnoth/data/core/music/frantic.ogg
 share/wesnoth/data/core/music/heroes_rite.ogg
+share/wesnoth/data/core/music/into_the_shadows.ogg
+share/wesnoth/data/core/music/journeys_end.ogg
 share/wesnoth/data/core/music/knalgan_theme.ogg
 share/wesnoth/data/core/music/knolls.ogg
 share/wesnoth/data/core/music/legends_of_the_north.ogg
 share/wesnoth/data/core/music/love_theme.ogg
 share/wesnoth/data/core/music/loyalists.ogg
 share/wesnoth/data/core/music/main_menu.ogg
+share/wesnoth/data/core/music/northern_mountains.ogg
 share/wesnoth/data/core/music/northerners.ogg
 share/wesnoth/data/core/music/nunc_dimittis.ogg
 share/wesnoth/data/core/music/revelation.ogg
@@ -32,6 +36,7 @@ share/wesnoth/data/core/music/vengeful.ogg
 share/wesnoth/data/core/music/victory.ogg
 share/wesnoth/data/core/music/victory2.ogg
 share/wesnoth/data/core/music/wanderer.ogg
+share/wesnoth/data/core/music/weight_of_revenge.ogg
 share/wesnoth/data/core/sounds/
 share/wesnoth/data/core/sounds/ambient/
 share/wesnoth/data/core/sounds/ambient/birds1.ogg
@@ -113,6 +118,15 @@ share/wesnoth/data/core/sounds/hiss-big.wav
 share/wesnoth/data/core/sounds/hiss-die.wav
 share/wesnoth/data/core/sounds/hiss-hit.wav
 share/wesnoth/data/core/sounds/hiss.wav
+share/wesnoth/data/core/sounds/horn-signals/
+share/wesnoth/data/core/sounds/horn-signals/horn-1.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-2.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-3.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-4.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-5.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-6.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-7.ogg
+share/wesnoth/data/core/sounds/horn-signals/horn-8.ogg
 share/wesnoth/data/core/sounds/horse-canter.wav
 share/wesnoth/data/core/sounds/horse-die.ogg
 share/wesnoth/data/core/sounds/horse-elf-canter.wav
@@ -204,8 +218,10 @@ share/wesnoth/data/core/sounds/orc-small-hit-1.ogg
 share/wesnoth/data/core/sounds/orc-small-hit-2.ogg
 share/wesnoth/data/core/sounds/orc-small-hit-3.ogg
 share/wesnoth/data/core/sounds/orc-small-hit-4.ogg
+share/wesnoth/data/core/sounds/petrified.ogg
 share/wesnoth/data/core/sounds/pincers.ogg
 share/wesnoth/data/core/sounds/poison.ogg
+share/wesnoth/data/core/sounds/potion.ogg
 share/wesnoth/data/core/sounds/rumble.ogg
 share/wesnoth/data/core/sounds/skeleton-big-die.ogg
 share/wesnoth/data/core/sounds/skeleton-big-hit-1.ogg
@@ -228,7 +244,6 @@ share/wesnoth/data/core/sounds/squishy-hit.wav
 share/wesnoth/data/core/sounds/squishy-miss.wav
 share/wesnoth/data/core/sounds/squishy-strike.wav
 share/wesnoth/data/core/sounds/staff.wav
-share/wesnoth/data/core/sounds/stoned.ogg
 share/wesnoth/data/core/sounds/sword-1.ogg
 share/wesnoth/data/core/sounds/tail.ogg
 share/wesnoth/data/core/sounds/throw-1.wav