Pullup ticket 1695 - requested by salo

security update for freeciv

Revisions pulled up:
- pkgsrc/games/freeciv-client/Makefile		1.27, 1.29
- pkgsrc/games/freeciv-server/Makefile		1.23
- pkgsrc/games/freeciv-share/Makefile		1.13
- pkgsrc/games/freeciv-share/Makefile.common	1.26, 1.27
- pkgsrc/games/freeciv-share/distinfo		1.13
- pkgsrc/games/freeciv-share/patches/patch-aa	1.5
- pkgsrc/games/freeciv-share/patches/patch-ab	1.4

   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Sat Apr 15 09:30:46 UTC 2006

   Modified Files:
           pkgsrc/games/freeciv-client: Makefile
           pkgsrc/games/freeciv-server: Makefile
           pkgsrc/games/freeciv-share: Makefile Makefile.common distinfo
           pkgsrc/games/freeciv-share/patches: patch-aa patch-ab

   Log Message:
   Changes 2.0.8:
   - Simplification of pubserver authentication system, and other
     pubserver-related changes.
   - Fix problems with some strings in some languages on windows.
   - Fix a potential desynchronization bug when establishing connections.
   - Fix a potential crash when reading packets (CVE-2006-0047).
   - Fix some bugs allowing illegal rehoming of units.
   - Allow loading of savegames created by Freeciv 2.1.
   - Allow client goto into unknown tiles.
   - Fix a set of crashes likely to happen with the XAW client on
     64-bit systems.
   - Fix a bug that allowed unlimited incoming airlifts.
---
   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Thu Jun  8 16:06:50 UTC 2006

   Modified Files:
           pkgsrc/games/freeciv-share: Makefile.common

   Log Message:
   This package needs zlib.
---
   Modified Files:
           pkgsrc/games/freeciv-client: Makefile

   Log Message:
   Needs pkg-config to build.

7 files changed, 29 insertions, 29 deletions

diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index bd92ce069ba..f1a83f6c6e7 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:09:14 joerg Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2006/06/09 22:00:04 ghen Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	2
 COMMENT=	Freeciv client with Xaw interface
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
@@ -9,6 +8,8 @@ DEPENDS+=	freeciv-sounds>=3.0:../../games/freeciv-sounds
 
 CONFLICTS=	freeciv-client-gtk<=1.11.4
 
+USE_TOOLS+=	pkg-config
+
 CONFIGURE_ARGS+=	--disable-make-data
 CONFIGURE_ARGS+=	--disable-server
 
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 1626820d40a..e7c24e870a3 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:09:14 joerg Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2006/06/09 22:00:04 ghen Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	Freeciv game server
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile
index 387ed510332..48b7d9d14ae 100644
--- a/games/freeciv-share/Makefile
+++ b/games/freeciv-share/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:15 joerg Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2006/06/09 22:00:04 ghen Exp $
 
 PKGNAME=	${DISTNAME:S/-/-share-/}
-PKGREVISION=	1
 COMMENT=	Machine independent files for Freeciv
 
 .include "../../games/freeciv-share/Makefile.common"
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index e8a49406fc6..3ac33eb7988 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.24 2006/03/04 21:29:41 jlam Exp $
+# $NetBSD: Makefile.common,v 1.24.2.1 2006/06/09 22:00:04 ghen Exp $
 
 DISTNAME=	freeciv-${FC_VERS}
-FC_VERS=	2.0.7
+FC_VERS=	2.0.8
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		http://www.freeciv.org/ftp/stable/ \
@@ -28,7 +28,8 @@ SUBST_SED.data+=	-e "s|@CLIENT_FALSE@|@MAKE_DATA_FALSE@|g"
 SUBST_SED.data+=	-e "s|@CLIENT_TRUE@|@MAKE_DATA_TRUE@|g"
 SUBST_SED.data+=	-e "s|@SERVER_FALSE@|@MAKE_DATA_FALSE@|g"
 SUBST_SED.data+=	-e "s|@SERVER_TRUE@|@MAKE_DATA_TRUE@|g"
-SUBST_MESSAGE.data=	"Fixing installation of data files."
+SUBST_MESSAGE.data=	Fixing installation of data files.
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index c460640e16a..6fc837c4fcd 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/11/16 16:03:50 adam Exp $
+$NetBSD: distinfo,v 1.12.4.1 2006/06/09 22:00:04 ghen Exp $
 
-SHA1 (freeciv-2.0.7.tar.bz2) = 4b4a7f2169e5cc8c3b1db79177c721d75e9e8f23
-RMD160 (freeciv-2.0.7.tar.bz2) = 5cdc70f1c3fc67180edeb905eda75b245cf412e2
-Size (freeciv-2.0.7.tar.bz2) = 8473763 bytes
-SHA1 (patch-aa) = 54d4f8298827872350a3e8be791918da50369c19
-SHA1 (patch-ab) = 24cb0f428323fd295e61d4fc49e5dfdff7e4615b
+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
diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa
index 06b9d64faa9..f5644e1f681 100644
--- a/games/freeciv-share/patches/patch-aa
+++ b/games/freeciv-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
+$NetBSD: patch-aa,v 1.4.6.1 2006/06/09 22:00:04 ghen Exp $
 
---- configure.orig	2005-08-23 16:22:20.000000000 +0000
+--- configure.orig	2006-03-06 08:04:47.000000000 +0100
 +++ configure
-@@ -12203,13 +12203,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13758,13 +13758,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -12316,13 +12316,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13871,13 +13871,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -12425,13 +12425,13 @@ echo "${ECHO_T}yes" >&6
+@@ -13980,13 +13980,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -12530,13 +12530,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14085,13 +14085,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -86,7 +86,7 @@ $NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -12641,13 +12641,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14196,13 +14196,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -107,7 +107,7 @@ $NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -12749,13 +12749,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14304,13 +14304,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -128,7 +128,7 @@ $NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -12858,13 +12858,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14413,13 +14413,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -149,7 +149,7 @@ $NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -12967,13 +12967,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14522,13 +14522,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -170,7 +170,7 @@ $NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -13074,13 +13074,13 @@ echo "${ECHO_T}yes" >&6
+@@ -14629,13 +14629,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
diff --git a/games/freeciv-share/patches/patch-ab b/games/freeciv-share/patches/patch-ab
index 72d9e886596..bf948aedb65 100644
--- a/games/freeciv-share/patches/patch-ab
+++ b/games/freeciv-share/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2005/08/24 10:36:41 adam Exp $
+$NetBSD: patch-ab,v 1.3.6.1 2006/06/09 22:00:04 ghen Exp $
 
---- Makefile.in.orig	2005-08-23 18:06:02.000000000 +0000
+--- Makefile.in.orig	2006-03-06 08:05:19.000000000 +0100
 +++ Makefile.in
-@@ -276,8 +276,8 @@ target_vendor = @target_vendor@
+@@ -275,8 +275,8 @@ target_vendor = @target_vendor@
  @CLIENT_TRUE@@SERVER_TRUE@MSUBDIRS = manual
  @SERVER_FALSE@MSUBDIRS = 
  @MAKE_DATA_FALSE@DSUBDIRS =