aboutsummaryrefslogtreecommitdiff
path: root/games/wesnoth-devel/files
diff options
context:
space:
mode:
authorJeremy Messenger <mezz@FreeBSD.org>2005-07-25 19:43:15 +0000
committerJeremy Messenger <mezz@FreeBSD.org>2005-07-25 19:43:15 +0000
commit1d574d81801beb54c4b0b4f3a6a5a572c4b6e361 (patch)
tree97be0f5336fb1765e7f7ec38645ed5c0df849683 /games/wesnoth-devel/files
parentcc1eee849ff746f3e3e020ac56500af4a41c2dd3 (diff)
downloadports-1d574d81801beb54c4b0b4f3a6a5a572c4b6e361.tar.gz
ports-1d574d81801beb54c4b0b4f3a6a5a572c4b6e361.zip
Update to 0.9.4, see ChangeLog for detail:
Notes
Notes: svn path=/head/; revision=140111
Diffstat (limited to 'games/wesnoth-devel/files')
-rw-r--r--games/wesnoth-devel/files/patch-src::Makefile.in6
-rw-r--r--games/wesnoth-devel/files/patch-src::language.cpp14
2 files changed, 9 insertions, 11 deletions
diff --git a/games/wesnoth-devel/files/patch-src::Makefile.in b/games/wesnoth-devel/files/patch-src::Makefile.in
index 100588b32197..291011e40f62 100644
--- a/games/wesnoth-devel/files/patch-src::Makefile.in
+++ b/games/wesnoth-devel/files/patch-src::Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig Tue Jun 7 19:32:02 2005
-+++ src/Makefile.in Tue Jun 7 19:33:28 2005
-@@ -912,10 +912,10 @@
+--- src/Makefile.in.orig Mon Jul 25 13:41:55 2005
++++ src/Makefile.in Mon Jul 25 13:42:40 2005
+@@ -918,10 +918,10 @@
exploder_LDADD = @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBZIPIOS) $(LIBINTL) $(PNG_LIBS)
cutter_LDADD = @SDL_IMAGE_LIBS@ @SDL_LIBS@ $(LIBZIPIOS) $(LIBINTL) $(PNG_LIBS)
diff --git a/games/wesnoth-devel/files/patch-src::language.cpp b/games/wesnoth-devel/files/patch-src::language.cpp
index c60d625cdd6b..7f06454db3d8 100644
--- a/games/wesnoth-devel/files/patch-src::language.cpp
+++ b/games/wesnoth-devel/files/patch-src::language.cpp
@@ -1,17 +1,15 @@
---- src/language.cpp.orig Tue Jun 7 19:36:19 2005
-+++ src/language.cpp Tue Jun 7 19:36:39 2005
-@@ -124,12 +124,12 @@
- static void wesnoth_setlocale(int category, std::string const &slocale)
- {
- char const *locale = slocale.c_str();
+--- 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);