Changes 2.1.2:

* Improved support for GGZ Gaming Zone.
* Fix support for Leave and Load in the same client session.
* Add GTK2 client support for saving server settings.
* Add realistic terrain requirements for three default wonders, as well a number
  of missing ones to civ1 and civ2.
* Improve startup speed, reducing duplicate internal messages sent.
* Updated GTK2 hotkeys, menus, text, and translations, especially Catalan,
  Finnish, Korean, Lithuanian, Turkish, and Ukrainian.

3 files changed, 20 insertions, 37 deletions

diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa
index e65776a8593..e6cdac1aba5 100644
--- a/games/freeciv-share/patches/patch-aa
+++ b/games/freeciv-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
+$NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
 
---- configure.orig	2007-03-18 13:46:06.000000000 +0100
+--- configure.orig	2007-12-23 13:00:04.000000000 +0100
 +++ configure
-@@ -14364,13 +14364,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -12902,13 +12902,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14475,13 +14475,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13006,13 +13006,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14582,13 +14582,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13106,13 +13106,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14685,13 +14685,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13202,13 +13202,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -86,7 +86,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14794,13 +14794,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13304,13 +13304,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -107,7 +107,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14900,13 +14900,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13403,13 +13403,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -128,7 +128,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -15007,13 +15007,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13503,13 +13503,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -149,7 +149,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -15114,13 +15114,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13603,13 +13603,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -170,7 +170,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -15219,13 +15219,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13701,13 +13701,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
diff --git a/games/freeciv-share/patches/patch-ab b/games/freeciv-share/patches/patch-ab
index a2b677d614c..c3c147a9fcf 100644
--- a/games/freeciv-share/patches/patch-ab
+++ b/games/freeciv-share/patches/patch-ab
@@ -1,15 +1,17 @@
-$NetBSD: patch-ab,v 1.5 2007/03/18 13:12:14 adam Exp $
+$NetBSD: patch-ab,v 1.6 2008/01/06 16:39:16 adam Exp $
 
---- Makefile.in.orig	2007-02-12 00:38:05.000000000 +0100
+--- Makefile.in.orig	2007-12-23 13:00:17.000000000 +0100
 +++ Makefile.in
-@@ -283,8 +283,8 @@ target_vendor = @target_vendor@
+@@ -199,10 +199,10 @@ packagesrcdir = @packagesrcdir@
  @CLIENT_TRUE@@SERVER_TRUE@MSUBDIRS = manual
  @SERVER_FALSE@MSUBDIRS = 
- @MAKE_DATA_FALSE@DSUBDIRS = 
+ 
 -@MAKE_DATA_TRUE@DSUBDIRS = data
--SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
 +@MAKE_DATA_TRUE@DSUBDIRS = data po doc
+ @MAKE_DATA_FALSE@DSUBDIRS = 
+ 
+-SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
 +SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) $(MSUBDIRS)
- EXTRA_DIST = acconfig.old			\
- 		autogen.sh 			\
+ 
+ EXTRA_DIST = autogen.sh 			\
  		config.mac.h			\
diff --git a/games/freeciv-share/patches/patch-ac b/games/freeciv-share/patches/patch-ac
deleted file mode 100644
index 24554217d51..00000000000
--- a/games/freeciv-share/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/07/15 20:05:18 rillig Exp $
-
-SunPro treats incompatible types in the ?: operator as error.
-
---- client/helpdata.c.orig	2005-10-13 09:45:45.000000000 +0200
-+++ client/helpdata.c	2006-07-15 21:58:31.317408915 +0200
-@@ -553,10 +553,10 @@ char *helptext_building(char *buf, size_
- 
- #define req_append(s)							    \
-       (req_buf[0] != '\0'						    \
--       ? my_snprintf(req_buf + strlen(req_buf),				    \
-+       ? (void)my_snprintf(req_buf + strlen(req_buf),			    \
- 		     sizeof(req_buf) - strlen(req_buf),			    \
- 		     ", %s", (s))					    \
--       : sz_strlcpy(req_buf, (s)))
-+       : (void)sz_strlcpy(req_buf, (s)))
- 
-       if (b->tech_req != A_NONE) {
- 	req_append(get_tech_name(game.player_ptr, b->tech_req));