(pkgsrc)

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

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

Wesnoth 1.12.1

Sunday, January 25 2015

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

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

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

8 files changed, 54 insertions, 44 deletions

diff --git a/games/wesnoth/patches/patch-ae b/games/wesnoth/patches/patch-ae
index 86baf143909..255688f42d5 100644
--- a/games/wesnoth/patches/patch-ae
+++ b/games/wesnoth/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2010/08/28 20:08:40 adam Exp $
+$NetBSD: patch-ae,v 1.7 2015/03/10 05:16:28 mef Exp $
+
+Make it build on FreeBSD and DragonFly
 
 --- src/network_worker.cpp.orig	2010-01-01 13:16:49.000000000 +0000
 +++ src/network_worker.cpp
diff --git a/games/wesnoth/patches/patch-af b/games/wesnoth/patches/patch-af
index 57864b43dd4..1d1d3413a57 100644
--- a/games/wesnoth/patches/patch-af
+++ b/games/wesnoth/patches/patch-af
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.6 2013/08/30 08:14:42 obache Exp $
+$NetBSD: patch-af,v 1.7 2015/03/10 05:16:28 mef Exp $
 
---- src/preferences.cpp.orig	2013-02-10 09:52:18.000000000 +0000
-+++ src/preferences.cpp
-@@ -33,6 +33,7 @@
- #include "serialization/parser.hpp"
+--- src/preferences.cpp.orig	2015-01-24 06:21:14.000000000 +0900
++++ src/preferences.cpp	2015-03-10 00:48:59.000000000 +0900
+@@ -32,6 +32,7 @@
+ #include "util.hpp"
  
  #include <sys/stat.h> // for setting the permissions of the preferences file
 +#include <unistd.h>
+ #include <boost/concept_check.hpp>
  
  static lg::log_domain log_config("config");
- #define ERR_CFG LOG_STREAM(err , log_config)
diff --git a/games/wesnoth/patches/patch-data_tools_addon__manager_html_py b/games/wesnoth/patches/patch-data_tools_addon__manager_html_py
new file mode 100644
index 00000000000..47217a49cb0
--- /dev/null
+++ b/games/wesnoth/patches/patch-data_tools_addon__manager_html_py
@@ -0,0 +1,11 @@
+$NetBSD: patch-data_tools_addon__manager_html_py,v 1.1 2015/03/10 05:16:28 mef Exp $
+
+Add shebang (to match REPLACE.python.old=     .*python[^ ]*)
+
+--- data/tools/addon_manager/html.py~	2015-01-24 06:21:14.000000000 +0900
++++ data/tools/addon_manager/html.py	2015-03-10 11:09:19.000000000 +0900
+@@ -1,3 +1,4 @@
++#!@python@
+ # encoding: utf8
+ import time, os, glob, sys, re
+ from subprocess import Popen
diff --git a/games/wesnoth/patches/patch-data_tools_castle-clutter_mk_all-castles_sh b/games/wesnoth/patches/patch-data_tools_castle-clutter_mk_all-castles_sh
new file mode 100644
index 00000000000..966985fe853
--- /dev/null
+++ b/games/wesnoth/patches/patch-data_tools_castle-clutter_mk_all-castles_sh
@@ -0,0 +1,12 @@
+$NetBSD: patch-data_tools_castle-clutter_mk_all-castles_sh,v 1.1 2015/03/10 05:16:28 mef Exp $
+
+Add missing ! on shebang line (to be processed by REPLACE_BASH)
+
+--- data/tools/castle-cutter/mk-all-castles.sh~	2015-01-24 06:21:14.000000000 +0900
++++ data/tools/castle-cutter/mk-all-castles.sh	2015-03-10 12:39:34.000000000 +0900
+@@ -1,4 +1,4 @@
+-#/bin/bash
++#!/bin/bash
+ 
+ ./mk-castle.sh -b castle -c cutout.png -o castle -t castle-walls.tmpl castle.png
+ 
diff --git a/games/wesnoth/patches/patch-data_tools_unit__tree_helpers_py b/games/wesnoth/patches/patch-data_tools_unit__tree_helpers_py
new file mode 100644
index 00000000000..d544cad3df9
--- /dev/null
+++ b/games/wesnoth/patches/patch-data_tools_unit__tree_helpers_py
@@ -0,0 +1,11 @@
+$NetBSD: patch-data_tools_unit__tree_helpers_py,v 1.1 2015/03/10 05:16:28 mef Exp $
+
+Add shebang (to match REPLACE.python.old=     .*python[^ ]*)
+
+--- data/tools/unit_tree/helpers.py~	2015-01-24 06:21:14.000000000 +0900
++++ data/tools/unit_tree/helpers.py	2015-03-10 12:15:24.000000000 +0900
+@@ -1,3 +1,4 @@
++#!@python
+ """
+ Various helpers for use by the wmlunits tool.
+ """
diff --git a/games/wesnoth/patches/patch-data_tools_wesnoth_campaignserver__client_py b/games/wesnoth/patches/patch-data_tools_wesnoth_campaignserver__client_py
new file mode 100644
index 00000000000..20e665b760c
--- /dev/null
+++ b/games/wesnoth/patches/patch-data_tools_wesnoth_campaignserver__client_py
@@ -0,0 +1,11 @@
+$NetBSD: patch-data_tools_wesnoth_campaignserver__client_py,v 1.1 2015/03/10 05:16:28 mef Exp $
+
+Add shebang (to match REPLACE.python.old=     .*python[^ ]*)
+
+--- data/tools/wesnoth/campaignserver_client.py~	2015-03-10 10:48:54.000000000 +0900
++++ data/tools/wesnoth/campaignserver_client.py	2015-03-10 11:15:44.000000000 +0900
+@@ -1,3 +1,4 @@
++#!@/python@
+ import gzip, zlib, StringIO
+ import socket, struct, glob, sys, shutil, threading, os, fnmatch
+ import wesnoth.wmldata as wmldata
diff --git a/games/wesnoth/patches/patch-src_construct__dialog.hpp b/games/wesnoth/patches/patch-src_construct__dialog.hpp
deleted file mode 100644
index a5a4bf430bb..00000000000
--- a/games/wesnoth/patches/patch-src_construct__dialog.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_construct__dialog.hpp,v 1.2 2013/08/30 08:14:42 obache Exp $
-
-The key argument of std::map must not be const as it can't be assigned
-internally otherwise.
-
---- src/construct_dialog.hpp.orig	2013-06-13 20:18:13.000000000 +0000
-+++ src/construct_dialog.hpp
-@@ -190,11 +190,11 @@ public:
- 		int x, y;
- 		SDL_Rect interior, message, textbox;
- 		unsigned int menu_width;
--		std::map<preview_pane *const, SDL_Rect > panes;
-+		std::map<preview_pane *, SDL_Rect > panes;
- 		int label_x, label_y;
- 		int menu_x, menu_y, menu_height;
- 		int image_x, image_y, caption_x, caption_y;
--		std::map<dialog_button *const, std::pair<int,int> > buttons;
-+		std::map<dialog_button *, std::pair<int,int> > buttons;
- 		//use get_frame().get_layout() to check frame dimensions
- 	};
- 	typedef dialog_frame::style style;
diff --git a/games/wesnoth/patches/patch-src_filechooser.cpp b/games/wesnoth/patches/patch-src_filechooser.cpp
deleted file mode 100644
index 722f0fb638f..00000000000
--- a/games/wesnoth/patches/patch-src_filechooser.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_filechooser.cpp,v 1.2 2013/08/30 08:14:42 obache Exp $
-
-The key argument of std::map must not be const as it can't be assigned
-internally otherwise.
-
---- src/filechooser.cpp.orig	2013-06-13 20:21:52.000000000 +0000
-+++ src/filechooser.cpp
-@@ -96,7 +96,7 @@ gui::dialog::dimension_measurements file
- 	//shift the extra buttons up
- 	if (show_directory_buttons_)
- 	{
--		std::map<gui::dialog_button *const, std::pair<int,int> >::iterator i;
-+		std::map<gui::dialog_button *, std::pair<int,int> >::iterator i;
- 		for(i = dim.buttons.begin(); i != dim.buttons.end(); ++i)
- 		{
- 			const int btn_h = i->first->height();