Changes 2.0.9:

- Fix memory leaks in AI code.
- Client worklist fix.
- Several compilation fixes.
- Fix for status of bribed units.
- Fix client crashes.
- Fxi server crashes.
- Extra checks against starting position on poles.
- Fix security problem in attributes code.
- Helicopters no longer lose hitpoints when on a carrier.
- Fix bug causing some pregame messages to be lost.

6 files changed, 28 insertions, 27 deletions

diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index f0a4000cca2..c3fbacb7cc9 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2006/12/15 20:32:55 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2007/03/18 13:12:14 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	Freeciv client
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index c61af6c1d07..570236f8bcb 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.28 2006/06/11 13:51:25 joerg Exp $
+# $NetBSD: Makefile.common,v 1.29 2007/03/18 13:12:14 adam Exp $
 
 DISTNAME=	freeciv-${FC_VERS}
-FC_VERS=	2.0.8
+FC_VERS=	2.0.9
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		http://www.freeciv.org/ftp/stable/ \
diff --git a/games/freeciv-share/PLIST b/games/freeciv-share/PLIST
index 7a83e8265d4..a360687b53a 100644
--- a/games/freeciv-share/PLIST
+++ b/games/freeciv-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/03/18 13:12:14 adam Exp $
 man/man6/civclient.6
 man/man6/civserver.6
 share/freeciv/civ1.serv
@@ -297,6 +297,7 @@ share/freeciv/trident/tiles.spec
 share/freeciv/trident/units.png
 share/freeciv/trident/units.spec
 share/freeciv/trident_shields.tilespec
+share/locale/ar/LC_MESSAGES/freeciv.mo
 share/locale/ca/LC_MESSAGES/freeciv.mo
 share/locale/cs/LC_MESSAGES/freeciv.mo
 share/locale/da/LC_MESSAGES/freeciv.mo
@@ -304,6 +305,7 @@ share/locale/de/LC_MESSAGES/freeciv.mo
 share/locale/en_GB/LC_MESSAGES/freeciv.mo
 share/locale/es/LC_MESSAGES/freeciv.mo
 share/locale/et/LC_MESSAGES/freeciv.mo
+share/locale/fa/LC_MESSAGES/freeciv.mo
 share/locale/fi/LC_MESSAGES/freeciv.mo
 share/locale/fr/LC_MESSAGES/freeciv.mo
 share/locale/he_IL/LC_MESSAGES/freeciv.mo
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index 6623e8b5200..10decb90ad1 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2006/07/15 20:05:18 rillig Exp $
+$NetBSD: distinfo,v 1.15 2007/03/18 13:12:14 adam Exp $
 
-SHA1 (freeciv-2.0.8.tar.bz2) = b9098dc46ed169e053f9c7405cc3abf9cebe9792
-RMD160 (freeciv-2.0.8.tar.bz2) = 7ab93442cf63db22e9e660d2c1955990a1376d26
-Size (freeciv-2.0.8.tar.bz2) = 8535513 bytes
-SHA1 (patch-aa) = bd0557f5deafacf2d6c47d79e81700aebb6b42ac
-SHA1 (patch-ab) = 77095569f21bd66c1d4ef34d30b485d320097df1
+SHA1 (freeciv-2.0.9.tar.bz2) = 9e1b64a96f38821abadc636621d276f70dedd686
+RMD160 (freeciv-2.0.9.tar.bz2) = e79cfc1d00f4f1b7ff28e84aca42dd2ef1e158d5
+Size (freeciv-2.0.9.tar.bz2) = 8875323 bytes
+SHA1 (patch-aa) = 7ea40fe657a1e1dd0078a9eea341087479e87e30
+SHA1 (patch-ab) = 7d1b9a0280c921753eb3541176fa90b50bce70de
 SHA1 (patch-ac) = e986b8c7a6d4007170a10f75c8f96e886179eada
diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa
index 12f3498978a..e65776a8593 100644
--- a/games/freeciv-share/patches/patch-aa
+++ b/games/freeciv-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2006/04/15 09:30:45 adam Exp $
+$NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
 
---- configure.orig	2006-03-06 08:04:47.000000000 +0100
+--- configure.orig	2007-03-18 13:46:06.000000000 +0100
 +++ configure
-@@ -13758,13 +13758,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14364,13 +14364,13 @@ echo "${ECHO_T}yes" >&6; }
  
  
  
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.5 2006/04/15 09:30:45 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13871,13 +13871,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14475,13 +14475,13 @@ echo "${ECHO_T}yes" >&6; }
  
  
  
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.5 2006/04/15 09:30:45 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13980,13 +13980,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14582,13 +14582,13 @@ echo "${ECHO_T}yes" >&6; }
  
  
  
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.5 2006/04/15 09:30:45 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14085,13 +14085,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14685,13 +14685,13 @@ echo "${ECHO_T}yes" >&6; }
  
  
  
@@ -86,7 +86,7 @@ $NetBSD: patch-aa,v 1.5 2006/04/15 09:30:45 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14196,13 +14196,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14794,13 +14794,13 @@ echo "${ECHO_T}yes" >&6; }
  
  
  
@@ -107,7 +107,7 @@ $NetBSD: patch-aa,v 1.5 2006/04/15 09:30:45 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14304,13 +14304,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14900,13 +14900,13 @@ echo "${ECHO_T}yes" >&6; }
  
  
  
@@ -128,7 +128,7 @@ $NetBSD: patch-aa,v 1.5 2006/04/15 09:30:45 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14413,13 +14413,13 @@ echo "${ECHO_T}yes" >&6
+@@ -15007,13 +15007,13 @@ echo "${ECHO_T}yes" >&6; }
  
  
  
@@ -149,7 +149,7 @@ $NetBSD: patch-aa,v 1.5 2006/04/15 09:30:45 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14522,13 +14522,13 @@ echo "${ECHO_T}yes" >&6
+@@ -15114,13 +15114,13 @@ echo "${ECHO_T}yes" >&6; }
  
  
  
@@ -170,7 +170,7 @@ $NetBSD: patch-aa,v 1.5 2006/04/15 09:30:45 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14629,13 +14629,13 @@ echo "${ECHO_T}yes" >&6
+@@ -15219,13 +15219,13 @@ echo "${ECHO_T}yes" >&6; }
  
  
  
diff --git a/games/freeciv-share/patches/patch-ab b/games/freeciv-share/patches/patch-ab
index 26ab2c2d373..a2b677d614c 100644
--- a/games/freeciv-share/patches/patch-ab
+++ b/games/freeciv-share/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.4 2006/04/15 09:30:45 adam Exp $
+$NetBSD: patch-ab,v 1.5 2007/03/18 13:12:14 adam Exp $
 
---- Makefile.in.orig	2006-03-06 08:05:19.000000000 +0100
+--- Makefile.in.orig	2007-02-12 00:38:05.000000000 +0100
 +++ Makefile.in
-@@ -275,8 +275,8 @@ target_vendor = @target_vendor@
+@@ -283,8 +283,8 @@ target_vendor = @target_vendor@
  @CLIENT_TRUE@@SERVER_TRUE@MSUBDIRS = manual
  @SERVER_FALSE@MSUBDIRS = 
  @MAKE_DATA_FALSE@DSUBDIRS = 
 -@MAKE_DATA_TRUE@DSUBDIRS = data
--SUBDIRS = $(DSUBDIRS) intl utility common tests $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
+-SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
 +@MAKE_DATA_TRUE@DSUBDIRS = data po doc
-+SUBDIRS = $(DSUBDIRS) intl utility common tests $(SSUBDIRS) $(CSUBDIRS) $(MSUBDIRS)
++SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) $(MSUBDIRS)
  EXTRA_DIST = acconfig.old			\
  		autogen.sh 			\
  		config.mac.h			\