3 files changed, 16 insertions, 87 deletions

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>