Changes 2.1.4:

* gui-sdl Fix crash when trying to bribe a unit
* Fixes for UTF-8 and local encoding mismatch
* Fixed crash when unit is killed by the breaking of a treaty
* gui-gtk2 Theme had checkbox images reversed in some situations
* Improvements to server authentication backend
* Check that there is no acinclude.m4 left from old builds in the source
  tree
* Fixes to strings and i18n
* Fixed pathfinding crash when ferry is forced to leave path
* Fixed warnings and crashes caused by AI trying to updgrade allied units
* Fixed "take -" crash when there is no free player slots
* Fixed crash in citizen governor
* Avoid overwriting player name given as /create parameter
* Fixed AI crash when city destroyed during trade negotiation
* Send /cut and /cmdlevel commands correctly to server
* Fixed handling of quoted command parameters

4 files changed, 22 insertions, 22 deletions

diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 163d8ae706a..8326cd66ec7 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.31 2008/04/06 08:13:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.32 2008/05/24 21:03:55 adam Exp $
 
 DISTNAME=	freeciv-${FC_VERS}
-FC_VERS=	2.1.3
+FC_VERS=	2.1.4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		http://www.freeciv.org/ftp/stable/ \
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index 83ea296beb0..dca3f456da5 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2008/04/06 08:13:32 adam Exp $
+$NetBSD: distinfo,v 1.18 2008/05/24 21:03:55 adam Exp $
 
-SHA1 (freeciv-2.1.3.tar.bz2) = a897978e87851f2a5334efd9b7fa3cf65ac075a3
-RMD160 (freeciv-2.1.3.tar.bz2) = 5cb57ce88f9492d9881128fa1eee75654b4a6e54
-Size (freeciv-2.1.3.tar.bz2) = 29407975 bytes
-SHA1 (patch-aa) = 34523216c37e86e0bf7b401481d26654dedac5a0
-SHA1 (patch-ab) = c5f1f5dc794358bb4ce9e4669fb99cb04ca89b94
+SHA1 (freeciv-2.1.4.tar.bz2) = 7be2507b9788015acc2cb1f13c8da95b5489c200
+RMD160 (freeciv-2.1.4.tar.bz2) = 60c106c9cf13f43b4fe0580e26c9dc506e956e75
+Size (freeciv-2.1.4.tar.bz2) = 29531378 bytes
+SHA1 (patch-aa) = fb6b44d327f2c880c15a29a0cc20ad21e84f8580
+SHA1 (patch-ab) = 0f8aa917fa79653e6f2adc0155d31577623d310b
diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa
index e6cdac1aba5..83aa7246831 100644
--- a/games/freeciv-share/patches/patch-aa
+++ b/games/freeciv-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
+$NetBSD: patch-aa,v 1.8 2008/05/24 21:03:55 adam Exp $
 
---- configure.orig	2007-12-23 13:00:04.000000000 +0100
+--- configure.orig	2008-04-22 00:15:05.000000000 +0200
 +++ configure
-@@ -12902,13 +12902,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13153,13 +13153,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13006,13 +13006,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13257,13 +13257,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13106,13 +13106,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13357,13 +13357,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13202,13 +13202,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13453,13 +13453,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -86,7 +86,7 @@ $NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13304,13 +13304,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13555,13 +13555,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -107,7 +107,7 @@ $NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13403,13 +13403,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13654,13 +13654,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -128,7 +128,7 @@ $NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13503,13 +13503,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13754,13 +13754,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -149,7 +149,7 @@ $NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13603,13 +13603,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13854,13 +13854,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -170,7 +170,7 @@ $NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13701,13 +13701,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13952,13 +13952,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
diff --git a/games/freeciv-share/patches/patch-ab b/games/freeciv-share/patches/patch-ab
index c3c147a9fcf..b86c7288de0 100644
--- a/games/freeciv-share/patches/patch-ab
+++ b/games/freeciv-share/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2008/01/06 16:39:16 adam Exp $
+$NetBSD: patch-ab,v 1.7 2008/05/24 21:03:55 adam Exp $
 
---- Makefile.in.orig	2007-12-23 13:00:17.000000000 +0100
+--- Makefile.in.orig	2008-04-22 00:16:03.000000000 +0200
 +++ Makefile.in
-@@ -199,10 +199,10 @@ packagesrcdir = @packagesrcdir@
+@@ -186,10 +186,10 @@ ACLOCAL_AMFLAGS = -I m4
  @CLIENT_TRUE@@SERVER_TRUE@MSUBDIRS = manual
  @SERVER_FALSE@MSUBDIRS =