- long overdue update of wesnoth to 1.6.5

joint work with tom murphy
thanks to sthen@ for torturing his armish for countless hours.

ok sthen@

games/wesnoth/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.27 2009/08/10 06:31:43 kili Exp $
+# $OpenBSD: Makefile,v 1.28 2009/11/11 16:01:33 jasper Exp $
 
 COMMENT=	fantasy turn-based strategy game
 
-DISTNAME=	wesnoth-1.4.7
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	wesnoth-1.6.5
 CATEGORIES=	games x11
 
 HOMEPAGE=	http://www.wesnoth.org/
@@ -19,16 +18,21 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	X11 c freetype m pthread pthread-stubs stdc++ xcb z
+WANTLIB += X11 Xau Xdmcp Xrender c cairo expat fontconfig freetype
+WANTLIB += glib-2.0 glitz gmodule-2.0 gobject-2.0 m pixman-1 png
+WANTLIB += pthread pthread-stubs stdc++ xcb z
 
 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 \
-		fribidi::devel/fribidi
+		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
 
 CONFIGURE_STYLE=gnu
@@ -42,7 +46,7 @@ CONFIGURE_ARGS+=--enable-server \
 		--enable-editor \
 		--with-fifodir=/var/run \
 		--enable-desktop-entry \
-		--with-desktop-dir=${PREFIX}/share/applications \
+		--with-desktopdir=${PREFIX}/share/applications \
 		--with-icondir=${PREFIX}/share/pixmaps
 
 MAKE_FLAGS=	LIBINTL="-L${LOCALBASE}/lib -lintl -liconv"
@@ -54,7 +58,7 @@ FLAVORS=	lite tinygui
 FLAVOR?=
 
 .if ${FLAVOR:L:Mlite}
-CONFIGURE_ARGS+=--enable-lite
+CONFIGURE_ARGS+=--enable-lowmem
 .endif
 
 .if ${FLAVOR:L:Mtinygui}

games/wesnoth/distinfo

@@ -1,5 +1,5 @@
-MD5 (wesnoth-1.4.7.tar.bz2) = /dNBw9Zr8b6iETx524UtaA==
-RMD160 (wesnoth-1.4.7.tar.bz2) = ilFaynkEJKVQUFUS60KxAYYOh7I=
-SHA1 (wesnoth-1.4.7.tar.bz2) = +OsX56eq/12P/x4YoUee/Pky/Sc=
-SHA256 (wesnoth-1.4.7.tar.bz2) = Y8hYie+MCObdXql37dBX1kzmWkk05mHiItKw3YniaEc=
-SIZE (wesnoth-1.4.7.tar.bz2) = 155052245
+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

games/wesnoth/patches/patch-Makefile_am

@@ -0,0 +1,12 @@
+$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
+@@ -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 -path "data/test/*" \)
+ 
+ # List all datafiles, ignoring junk
+ finddata=(cd $(top_srcdir) && find data fonts icons images sounds $(findfilterflags) -print )

games/wesnoth/patches/patch-Makefile_in

@@ -0,0 +1,21 @@
+$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,12 +1,29 @@
-$OpenBSD: patch-configure,v 1.4 2008/10/10 14:27:38 jasper Exp $
---- configure.orig	Tue Sep  2 23:49:41 2008
-+++ configure	Wed Oct  8 00:31:12 2008
-@@ -5922,7 +5922,7 @@ if test "x$debug" = "xyes"
- then
- 	CXXFLAGS="$CXXFLAGS -O0 -DDEBUG -ggdb3 -W -Wall -ansi"
+--- 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"
-+	CXXFLAGS="-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-src_campaign_server_campaign_server_cpp

@@ -0,0 +1,13 @@
+$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 @@
+ #include <errno.h>
+ #endif
+ 
++#include <unistd.h>
++#include <sys/types.h>
++
+ #define LOG_CS lg::err(lg::network, false)
+ 
+ //compatibility code for MS compilers

games/wesnoth/patches/patch-src_clipboard_cpp

@@ -0,0 +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
+@@ -17,6 +17,7 @@
+ #include "global.hpp"
+ 
+ #include "clipboard.hpp"
++#include <unistd.h>
+ 
+ #if defined(_X11) && !defined(__APPLE__)
+ 

games/wesnoth/patches/patch-src_editor2_editor_controller_cpp

@@ -0,0 +1,126 @@
+$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

@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_game_cpp,v 1.1 2009/11/11 16:01:34 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()
+ 
+ bool game_controller::play_multiplayer()
+ {
+-	int res;
++	int res = 0;
+ 
+ 	state_ = game_state();
+ 	state_.campaign_type = "multiplayer";

games/wesnoth/patches/patch-src_help_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_help_cpp,v 1.3 2008/04/03 10:23:01 jasper Exp $
---- src/help.cpp.orig	Mon Feb 25 19:58:29 2008
-+++ src/help.cpp	Wed Mar 26 11:20:27 2008
-@@ -46,7 +46,7 @@
- #include <algorithm>
- #include <iostream>
- #include <list>
--#include <locale>
-+#include <locale.h>
- #include <map>
- #include <queue>
- #include <set>

games/wesnoth/patches/patch-src_language_cpp

@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_language_cpp,v 1.4 2008/04/03 10:23:01 jasper Exp $
---- src/language.cpp.orig	Sat Feb 16 09:47:16 2008
-+++ src/language.cpp	Wed Mar 26 11:20:27 2008
-@@ -125,12 +125,10 @@ static void wesnoth_setlocale(int category, std::strin
- #endif
- #endif
- 
--#ifdef __BEOS__
- 	if(setenv ("LANG", locale, 1) == -1)
- 		std::cerr << "setenv LANG failed: " << strerror(errno);
- 	if(setenv ("LC_ALL", locale, 1) == -1)
- 		std::cerr << "setenv LC_ALL failed: " << strerror(errno);
--#endif
- #ifdef __APPLE__
- 	if(setenv ("LANGUAGE", locale, 1) == -1)
- 		std::cerr << "setenv LANGUAGE failed: " << strerror(errno);

games/wesnoth/patches/patch-src_mouse_events_cpp

@@ -0,0 +1,12 @@
+$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_network_cpp

@@ -0,0 +1,16 @@
+$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 {
+ 	int in_packets;
+ 	int in_bytes;
+ 	int day;
+-	const static size_t type_width = 16;
+-	const static size_t packet_width = 7;
+-	const static size_t bytes_width = 10;
++	static const size_t type_width = 16;
++	static const size_t packet_width = 7;
++	static const size_t bytes_width = 10;
+ 	bandwidth_stats& operator+=(const bandwidth_stats& a)
+ 	{
+ 		out_packets += a.out_packets;

games/wesnoth/patches/patch-src_preferences_cpp

@@ -0,0 +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 @@
+ 
+ #include <sys/stat.h> // for setting the permissions of the preferences file
+ 
++#include <unistd.h>
++
+ namespace {
+ 
+ bool colour_cursors = false;

games/wesnoth/patches/patch-src_server_jwsmtp_mailer_h

@@ -0,0 +1,12 @@
+$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,12 +1,11 @@
-$OpenBSD: patch-src_server_server_cpp,v 1.6 2009/03/18 11:42:16 jasper Exp $
---- src/server/server.cpp.orig	Sun Mar 15 17:36:20 2009
-+++ src/server/server.cpp	Sun Mar 15 17:36:33 2009
-@@ -35,6 +35,8 @@
- #include "proxy.hpp"
+--- 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 @@
  #include "simple_wml.hpp"
+ #include "ban.hpp"
  
 +#include <unistd.h>
 +
- #include <boost/scoped_ptr.hpp>
- #include <algorithm>
- #include <cassert>
+ #include "user_handler.hpp"
+ #include "sample_user_handler.hpp"
+ 

games/wesnoth/patches/patch-src_server_simple_wml_cpp

@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_server_simple_wml_cpp,v 1.1 2009/03/18 11:42:16 jasper Exp $
-
-Security fix for CVE-2009-0366, fixes DoS.
-Patch from upstream svn -r33069.
-
---- src/server/simple_wml.cpp.orig	Sun Mar 15 17:36:44 2009
-+++ src/server/simple_wml.cpp	Sun Mar 15 17:37:23 2009
-@@ -27,6 +27,10 @@ char* uncompress_buffer(const string_span& input, stri
- 	int len = 0;
- 	int pos = 0;
- 	while(filter.good() && (len = filter.read(&buf[pos], chunk_size).gcount()) == chunk_size) {
-+		if(pos + chunk_size > 40000000) {
-+			throw error("WML document exceeds 40MB limit");
-+		}
-+
- 		pos += len;
- 		buf.resize(pos + chunk_size);
- 		len = 0;

games/wesnoth/patches/patch-src_widgets_menu_hpp

@@ -0,0 +1,13 @@
+$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)
+ 	void set_max_height(const int new_max_height);
+ 	void set_max_width(const int new_max_width);
+ 
++	#ifdef nitems
++	#undef nitems
++	#endif
+ 	size_t nitems() const { return items_.size(); }
+ 
+ 	int process();

games/wesnoth/pkg/PFRAG.no-lite

@@ -1,6 +1,4 @@
-@comment $OpenBSD: PFRAG.no-lite,v 1.7 2008/04/25 13:51:37 deanna Exp $
-share/wesnoth/data/campaigns/Northern_Rebirth/music/
-share/wesnoth/data/campaigns/Northern_Rebirth/music/nr-sad.ogg
+@comment $OpenBSD: PFRAG.no-lite,v 1.8 2009/11/11 16:01:34 jasper Exp $
 share/wesnoth/data/core/music/
 share/wesnoth/data/core/music/battle.ogg
 share/wesnoth/data/core/music/breaking_the_chains.ogg
@@ -9,18 +7,25 @@ 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/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/main_menu_new.ogg
 share/wesnoth/data/core/music/northerners.ogg
 share/wesnoth/data/core/music/nunc_dimittis.ogg
 share/wesnoth/data/core/music/revelation.ogg
+share/wesnoth/data/core/music/sad.ogg
+share/wesnoth/data/core/music/siege_of_laurelmor.ogg
 share/wesnoth/data/core/music/silence.ogg
+share/wesnoth/data/core/music/suspense.ogg
 share/wesnoth/data/core/music/the_city_falls.ogg
+share/wesnoth/data/core/music/the_dangerous_symphony.ogg
+share/wesnoth/data/core/music/the_deep_path.ogg
 share/wesnoth/data/core/music/the_king_is_dead.ogg
+share/wesnoth/data/core/music/transience.ogg
 share/wesnoth/data/core/music/traveling_minstrels.ogg
 share/wesnoth/data/core/music/underground.ogg
 share/wesnoth/data/core/music/vengeful.ogg
@@ -29,6 +34,10 @@ share/wesnoth/data/core/music/victory2.ogg
 share/wesnoth/data/core/music/wanderer.ogg
 share/wesnoth/data/core/sounds/
 share/wesnoth/data/core/sounds/ambient/
+share/wesnoth/data/core/sounds/ambient/birds1.ogg
+share/wesnoth/data/core/sounds/ambient/birds2.ogg
+share/wesnoth/data/core/sounds/ambient/birds3.ogg
+share/wesnoth/data/core/sounds/ambient/campfire.ogg
 share/wesnoth/data/core/sounds/ambient/morning.ogg
 share/wesnoth/data/core/sounds/ambient/night.ogg
 share/wesnoth/data/core/sounds/ambient/ship.ogg
@@ -47,6 +56,7 @@ share/wesnoth/data/core/sounds/bow-puny-fire.ogg
 share/wesnoth/data/core/sounds/bow-puny-miss.ogg
 share/wesnoth/data/core/sounds/bow-puny.ogg
 share/wesnoth/data/core/sounds/bow.ogg
+share/wesnoth/data/core/sounds/cave-in.ogg
 share/wesnoth/data/core/sounds/claws.ogg
 share/wesnoth/data/core/sounds/club.ogg
 share/wesnoth/data/core/sounds/crossbow-fire-miss.ogg