diff options
author | Philip Paeps <philip@FreeBSD.org> | 2009-03-24 20:09:03 +0000 |
---|---|---|
committer | Philip Paeps <philip@FreeBSD.org> | 2009-03-24 20:09:03 +0000 |
commit | a7fb8a41f41999e5e5419e85c162e0a1f60b7c4b (patch) | |
tree | 32408d0e7659af9927dec6c49645b496df76e57d /games/wesnoth/files | |
parent | 431720987706d2c6f39ca3d7f07ba4fcb97e397f (diff) | |
download | ports-a7fb8a41f41999e5e5419e85c162e0a1f60b7c4b.tar.gz ports-a7fb8a41f41999e5e5419e85c162e0a1f60b7c4b.zip |
Notes
Diffstat (limited to 'games/wesnoth/files')
-rw-r--r-- | games/wesnoth/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | games/wesnoth/files/patch-configure | 11 | ||||
-rw-r--r-- | games/wesnoth/files/patch-multiplayer_connect.cpp | 11 | ||||
-rw-r--r-- | games/wesnoth/files/patch-src-Makefile.in | 11 | ||||
-rw-r--r-- | games/wesnoth/files/patch-src::help.cpp | 11 | ||||
-rw-r--r-- | games/wesnoth/files/patch-src::language.cpp | 15 | ||||
-rw-r--r-- | games/wesnoth/files/patch-window_builder.cpp | 13 |
7 files changed, 57 insertions, 26 deletions
diff --git a/games/wesnoth/files/patch-Makefile.in b/games/wesnoth/files/patch-Makefile.in new file mode 100644 index 000000000000..67524d8aeb8b --- /dev/null +++ b/games/wesnoth/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2009-03-24 16:52:32.000000000 +0100 ++++ Makefile.in 2009-03-24 16:52:43.000000000 +0100 +@@ -279,7 +279,7 @@ + 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 ) diff --git a/games/wesnoth/files/patch-configure b/games/wesnoth/files/patch-configure new file mode 100644 index 000000000000..727eb61da92c --- /dev/null +++ b/games/wesnoth/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2009-03-16 01:47:21.000000000 +0300 ++++ configure +@@ -13309,7 +13309,7 @@ + + + +-for ac_func in round socket strtoul sendfile ++for ac_func in round socket strtoul + do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/games/wesnoth/files/patch-multiplayer_connect.cpp b/games/wesnoth/files/patch-multiplayer_connect.cpp new file mode 100644 index 000000000000..0a8fe7836a68 --- /dev/null +++ b/games/wesnoth/files/patch-multiplayer_connect.cpp @@ -0,0 +1,11 @@ +--- src/multiplayer_connect.cpp.orig 2008-09-07 18:16:37.000000000 -0700 ++++ src/multiplayer_connect.cpp 2008-09-07 18:17:40.000000000 -0700 +@@ -642,7 +642,7 @@ + res["current_player"] = id_.empty() ? current_player_ : id_; + + if (id_.empty()) { +- char const *description; ++ char const *description = NULL; + switch(controller_) { + case CNTR_NETWORK: + description = N_("(Vacant slot)"); diff --git a/games/wesnoth/files/patch-src-Makefile.in b/games/wesnoth/files/patch-src-Makefile.in new file mode 100644 index 000000000000..13f43fc9c441 --- /dev/null +++ b/games/wesnoth/files/patch-src-Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2008-11-02 19:33:40.000000000 +0100 ++++ src/Makefile.in 2008-11-02 19:33:49.000000000 +0100 +@@ -1783,7 +1783,7 @@ + game_config.o: revision.hpp + .PRECIOUS: revision.hpp + revision.hpp: FORCE +- if [ "$(REVISION)" == "" ] || [ "$(REVISION)" == "exported" ]; then echo '' >/tmp/westemp$$$$; \ ++ if [ "$(REVISION)" = "" ] || [ "$(REVISION)" = "exported" ]; then echo '' >/tmp/westemp$$$$; \ + else echo '#define REVISION "$(REVISION)"' >/tmp/westemp$$$$; fi;\ + if cmp -s revision.hpp /tmp/westemp$$$$ 2>/dev/null; then :; else cp /tmp/westemp$$$$ revision.hpp; fi; \ + if [ -e /tmp/westemp$$$$ ]; then rm /tmp/westemp$$$$; fi diff --git a/games/wesnoth/files/patch-src::help.cpp b/games/wesnoth/files/patch-src::help.cpp deleted file mode 100644 index 926ac47fe6a5..000000000000 --- a/games/wesnoth/files/patch-src::help.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/help.cpp.orig Tue Jun 7 19:34:15 2005 -+++ src/help.cpp Tue Jun 7 19:34:22 2005 -@@ -41,7 +41,7 @@ - #include <algorithm> - #include <iostream> - #include <list> --#include <locale> -+#include <locale.h> - #include <map> - #include <queue> - #include <set> diff --git a/games/wesnoth/files/patch-src::language.cpp b/games/wesnoth/files/patch-src::language.cpp deleted file mode 100644 index 7f06454db3d8..000000000000 --- a/games/wesnoth/files/patch-src::language.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- src/language.cpp.orig Mon Jul 25 13:44:10 2005 -+++ src/language.cpp Mon Jul 25 13:45:47 2005 -@@ -133,12 +133,10 @@ - unsetenv ("LANGUAGE"); // void so no return value to check - #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); diff --git a/games/wesnoth/files/patch-window_builder.cpp b/games/wesnoth/files/patch-window_builder.cpp new file mode 100644 index 000000000000..5e0cfe356eaa --- /dev/null +++ b/games/wesnoth/files/patch-window_builder.cpp @@ -0,0 +1,13 @@ +--- src/gui/widgets/window_builder.cpp.orig 2008-11-02 17:31:45.000000000 +0100 ++++ src/gui/widgets/window_builder.cpp 2008-11-02 17:32:43.000000000 +0100 +@@ -199,6 +199,10 @@ + std::cerr << cfg; + assert(false); + } ++ ++ // Appease the compiler on FreeBSD ++ // Unreachable ++ return NULL; + } + + } // namespace |