Sun Dec 14 19:20:55 2008 UTC ()
Changes 2.1.8:
* Fix buffer overrun by create_md5sum().
* Make aifill player removal recursion safe.
* Send connection info when cmdlevel is changed.
* Send information about lost connections not attached to players.
* Fix longstanding connection freezing bug.
* Updated German, Korean, Catalan translations.


(adam)
diff -r1.35 -r1.36 pkgsrc/games/freeciv-client/Makefile
diff -r1.34 -r1.35 pkgsrc/games/freeciv-share/Makefile.common
diff -r1.20 -r1.21 pkgsrc/games/freeciv-share/distinfo
diff -r1.9 -r1.10 pkgsrc/games/freeciv-share/patches/patch-aa
diff -r1.7 -r1.8 pkgsrc/games/freeciv-share/patches/patch-ab
cvs diff -r1.35 -r1.36 pkgsrc/games/freeciv-client/Makefile (expand / switch to unified diff)

--- pkgsrc/games/freeciv-client/Makefile 2008/11/10 17:21:35 1.35
+++ pkgsrc/games/freeciv-client/Makefile 2008/12/14 19:20:55 1.36
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.35 2008/11/10 17:21:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.36 2008/12/14 19:20:55 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4PKGREVISION= 1 
5COMMENT= Freeciv client 4COMMENT= Freeciv client
6 5
7PKG_DESTDIR_SUPPORT= user-destdir 6PKG_DESTDIR_SUPPORT= user-destdir
8 7
9DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share 8DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share
10 9
11CONFLICTS= freeciv-client-gtk<=1.11.4 10CONFLICTS= freeciv-client-gtk<=1.11.4
12 11
13USE_TOOLS+= pkg-config 12USE_TOOLS+= pkg-config
14CONFIGURE_ARGS+= --disable-make-data 13CONFIGURE_ARGS+= --disable-make-data
15CONFIGURE_ARGS+= --disable-server 14CONFIGURE_ARGS+= --disable-server
16 15
17.include "../../games/freeciv-share/Makefile.common" 16.include "../../games/freeciv-share/Makefile.common"
cvs diff -r1.34 -r1.35 pkgsrc/games/freeciv-share/Makefile.common (expand / switch to unified diff)

--- pkgsrc/games/freeciv-share/Makefile.common 2008/09/15 19:03:33 1.34
+++ pkgsrc/games/freeciv-share/Makefile.common 2008/12/14 19:20:54 1.35
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile.common,v 1.34 2008/09/15 19:03:33 adam Exp $ 1# $NetBSD: Makefile.common,v 1.35 2008/12/14 19:20:54 adam Exp $
2 2
3DISTNAME= freeciv-${FC_VERS} 3DISTNAME= freeciv-${FC_VERS}
4FC_VERS= 2.1.6 4FC_VERS= 2.1.8
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ \ 6MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ \
7 http://www.freeciv.org/ftp/stable/ \ 7 http://www.freeciv.org/ftp/stable/ \
8 ftp://ftp.freeciv.org/pub/freeciv/beta/ \ 8 ftp://ftp.freeciv.org/pub/freeciv/beta/ \
9 http://www.freeciv.org/ftp/beta/ 9 http://www.freeciv.org/ftp/beta/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.freeciv.org/ 13HOMEPAGE= http://www.freeciv.org/
14 14
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_TOOLS+= gmake msgfmt pkg-config 16USE_TOOLS+= gmake msgfmt pkg-config
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
cvs diff -r1.20 -r1.21 pkgsrc/games/freeciv-share/distinfo (expand / switch to unified diff)

--- pkgsrc/games/freeciv-share/distinfo 2008/09/15 19:03:33 1.20
+++ pkgsrc/games/freeciv-share/distinfo 2008/12/14 19:20:55 1.21
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.20 2008/09/15 19:03:33 adam Exp $ 1$NetBSD: distinfo,v 1.21 2008/12/14 19:20:55 adam Exp $
2 2
3SHA1 (freeciv-2.1.6.tar.bz2) = 6685a5ad65201f6b80782a1e4752d597e2447831 3SHA1 (freeciv-2.1.8.tar.bz2) = 6f532dbbb68e6ae3d126d867db5c8a8b6c1eacee
4RMD160 (freeciv-2.1.6.tar.bz2) = 085637b8b7219756772adcdd05f38afe1dc73980 4RMD160 (freeciv-2.1.8.tar.bz2) = 77c49538c9c456efac04959b57c95f2cc28a8a73
5Size (freeciv-2.1.6.tar.bz2) = 29647438 bytes 5Size (freeciv-2.1.8.tar.bz2) = 29640362 bytes
6SHA1 (patch-aa) = 8f26ed755b413451793072c53908e478a9d695ad 6SHA1 (patch-aa) = 62805543fce84e197414b5b9f55b8b41c2b02c02
7SHA1 (patch-ab) = 0f8aa917fa79653e6f2adc0155d31577623d310b 7SHA1 (patch-ab) = 5f28acdb25cfb3d6b2021bc7e4737d9e47e760a8
cvs diff -r1.9 -r1.10 pkgsrc/games/freeciv-share/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/freeciv-share/patches/Attic/patch-aa 2008/06/21 23:31:46 1.9
+++ pkgsrc/games/freeciv-share/patches/Attic/patch-aa 2008/12/14 19:20:55 1.10
@@ -1,186 +1,186 @@ @@ -1,186 +1,186 @@
1$NetBSD: patch-aa,v 1.9 2008/06/21 23:31:46 adam Exp $ 1$NetBSD: patch-aa,v 1.10 2008/12/14 19:20:55 adam Exp $
2 2
3--- configure.orig 2008-06-16 09:57:05.000000000 +0200 3--- configure.orig 2008-11-30 14:18:36.000000000 +0100
4+++ configure 4+++ configure
5@@ -13687,13 +13687,13 @@ echo "${ECHO_T}yes" >&6 5@@ -15172,13 +15172,13 @@ echo "${ECHO_T}yes" >&6
6  6
7  7
8  8
9- if (test $ac_tr_lib == HAVE_LIBX11 \ 9- if (test $ac_tr_lib == HAVE_LIBX11 \
10- || test $ac_tr_lib == HAVE_LIBXEXT \ 10- || test $ac_tr_lib == HAVE_LIBXEXT \
11- || test $ac_tr_lib == HAVE_LIBXT \ 11- || test $ac_tr_lib == HAVE_LIBXT \
12- || test $ac_tr_lib == HAVE_LIBXMU \ 12- || test $ac_tr_lib == HAVE_LIBXMU \
13- || test $ac_tr_lib == HAVE_LIBXPM \ 13- || test $ac_tr_lib == HAVE_LIBXPM \
14- || test $ac_tr_lib == HAVE_LIBXAW \ 14- || test $ac_tr_lib == HAVE_LIBXAW \
15- || test $ac_tr_lib == HAVE_LIBXAW3D); then 15- || test $ac_tr_lib == HAVE_LIBXAW3D); then
16+ if (test $ac_tr_lib = HAVE_LIBX11 \ 16+ if (test $ac_tr_lib = HAVE_LIBX11 \
17+ || test $ac_tr_lib = HAVE_LIBXEXT \ 17+ || test $ac_tr_lib = HAVE_LIBXEXT \
18+ || test $ac_tr_lib = HAVE_LIBXT \ 18+ || test $ac_tr_lib = HAVE_LIBXT \
19+ || test $ac_tr_lib = HAVE_LIBXMU \ 19+ || test $ac_tr_lib = HAVE_LIBXMU \
20+ || test $ac_tr_lib = HAVE_LIBXPM \ 20+ || test $ac_tr_lib = HAVE_LIBXPM \
21+ || test $ac_tr_lib = HAVE_LIBXAW \ 21+ || test $ac_tr_lib = HAVE_LIBXAW \
22+ || test $ac_tr_lib = HAVE_LIBXAW3D); then 22+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
23 cat >>confdefs.h <<_ACEOF 23 cat >>confdefs.h <<_ACEOF
24 #define $ac_tr_lib 1 24 #define $ac_tr_lib 1
25 _ACEOF 25 _ACEOF
26@@ -13791,13 +13791,13 @@ echo "${ECHO_T}yes" >&6 26@@ -15276,13 +15276,13 @@ echo "${ECHO_T}yes" >&6
27  27
28  28
29  29
30- if (test $ac_tr_lib == HAVE_LIBX11 \ 30- if (test $ac_tr_lib == HAVE_LIBX11 \
31- || test $ac_tr_lib == HAVE_LIBXEXT \ 31- || test $ac_tr_lib == HAVE_LIBXEXT \
32- || test $ac_tr_lib == HAVE_LIBXT \ 32- || test $ac_tr_lib == HAVE_LIBXT \
33- || test $ac_tr_lib == HAVE_LIBXMU \ 33- || test $ac_tr_lib == HAVE_LIBXMU \
34- || test $ac_tr_lib == HAVE_LIBXPM \ 34- || test $ac_tr_lib == HAVE_LIBXPM \
35- || test $ac_tr_lib == HAVE_LIBXAW \ 35- || test $ac_tr_lib == HAVE_LIBXAW \
36- || test $ac_tr_lib == HAVE_LIBXAW3D); then 36- || test $ac_tr_lib == HAVE_LIBXAW3D); then
37+ if (test $ac_tr_lib = HAVE_LIBX11 \ 37+ if (test $ac_tr_lib = HAVE_LIBX11 \
38+ || test $ac_tr_lib = HAVE_LIBXEXT \ 38+ || test $ac_tr_lib = HAVE_LIBXEXT \
39+ || test $ac_tr_lib = HAVE_LIBXT \ 39+ || test $ac_tr_lib = HAVE_LIBXT \
40+ || test $ac_tr_lib = HAVE_LIBXMU \ 40+ || test $ac_tr_lib = HAVE_LIBXMU \
41+ || test $ac_tr_lib = HAVE_LIBXPM \ 41+ || test $ac_tr_lib = HAVE_LIBXPM \
42+ || test $ac_tr_lib = HAVE_LIBXAW \ 42+ || test $ac_tr_lib = HAVE_LIBXAW \
43+ || test $ac_tr_lib = HAVE_LIBXAW3D); then 43+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
44 cat >>confdefs.h <<_ACEOF 44 cat >>confdefs.h <<_ACEOF
45 #define $ac_tr_lib 1 45 #define $ac_tr_lib 1
46 _ACEOF 46 _ACEOF
47@@ -13891,13 +13891,13 @@ echo "${ECHO_T}yes" >&6 47@@ -15376,13 +15376,13 @@ echo "${ECHO_T}yes" >&6
48  48
49  49
50  50
51- if (test $ac_tr_lib == HAVE_LIBX11 \ 51- if (test $ac_tr_lib == HAVE_LIBX11 \
52- || test $ac_tr_lib == HAVE_LIBXEXT \ 52- || test $ac_tr_lib == HAVE_LIBXEXT \
53- || test $ac_tr_lib == HAVE_LIBXT \ 53- || test $ac_tr_lib == HAVE_LIBXT \
54- || test $ac_tr_lib == HAVE_LIBXMU \ 54- || test $ac_tr_lib == HAVE_LIBXMU \
55- || test $ac_tr_lib == HAVE_LIBXPM \ 55- || test $ac_tr_lib == HAVE_LIBXPM \
56- || test $ac_tr_lib == HAVE_LIBXAW \ 56- || test $ac_tr_lib == HAVE_LIBXAW \
57- || test $ac_tr_lib == HAVE_LIBXAW3D); then 57- || test $ac_tr_lib == HAVE_LIBXAW3D); then
58+ if (test $ac_tr_lib = HAVE_LIBX11 \ 58+ if (test $ac_tr_lib = HAVE_LIBX11 \
59+ || test $ac_tr_lib = HAVE_LIBXEXT \ 59+ || test $ac_tr_lib = HAVE_LIBXEXT \
60+ || test $ac_tr_lib = HAVE_LIBXT \ 60+ || test $ac_tr_lib = HAVE_LIBXT \
61+ || test $ac_tr_lib = HAVE_LIBXMU \ 61+ || test $ac_tr_lib = HAVE_LIBXMU \
62+ || test $ac_tr_lib = HAVE_LIBXPM \ 62+ || test $ac_tr_lib = HAVE_LIBXPM \
63+ || test $ac_tr_lib = HAVE_LIBXAW \ 63+ || test $ac_tr_lib = HAVE_LIBXAW \
64+ || test $ac_tr_lib = HAVE_LIBXAW3D); then 64+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
65 cat >>confdefs.h <<_ACEOF 65 cat >>confdefs.h <<_ACEOF
66 #define $ac_tr_lib 1 66 #define $ac_tr_lib 1
67 _ACEOF 67 _ACEOF
68@@ -13987,13 +13987,13 @@ echo "${ECHO_T}yes" >&6 68@@ -15472,13 +15472,13 @@ echo "${ECHO_T}yes" >&6
69  69
70  70
71  71
72- if (test $ac_tr_lib == HAVE_LIBX11 \ 72- if (test $ac_tr_lib == HAVE_LIBX11 \
73- || test $ac_tr_lib == HAVE_LIBXEXT \ 73- || test $ac_tr_lib == HAVE_LIBXEXT \
74- || test $ac_tr_lib == HAVE_LIBXT \ 74- || test $ac_tr_lib == HAVE_LIBXT \
75- || test $ac_tr_lib == HAVE_LIBXMU \ 75- || test $ac_tr_lib == HAVE_LIBXMU \
76- || test $ac_tr_lib == HAVE_LIBXPM \ 76- || test $ac_tr_lib == HAVE_LIBXPM \
77- || test $ac_tr_lib == HAVE_LIBXAW \ 77- || test $ac_tr_lib == HAVE_LIBXAW \
78- || test $ac_tr_lib == HAVE_LIBXAW3D); then 78- || test $ac_tr_lib == HAVE_LIBXAW3D); then
79+ if (test $ac_tr_lib = HAVE_LIBX11 \ 79+ if (test $ac_tr_lib = HAVE_LIBX11 \
80+ || test $ac_tr_lib = HAVE_LIBXEXT \ 80+ || test $ac_tr_lib = HAVE_LIBXEXT \
81+ || test $ac_tr_lib = HAVE_LIBXT \ 81+ || test $ac_tr_lib = HAVE_LIBXT \
82+ || test $ac_tr_lib = HAVE_LIBXMU \ 82+ || test $ac_tr_lib = HAVE_LIBXMU \
83+ || test $ac_tr_lib = HAVE_LIBXPM \ 83+ || test $ac_tr_lib = HAVE_LIBXPM \
84+ || test $ac_tr_lib = HAVE_LIBXAW \ 84+ || test $ac_tr_lib = HAVE_LIBXAW \
85+ || test $ac_tr_lib = HAVE_LIBXAW3D); then 85+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
86 cat >>confdefs.h <<_ACEOF 86 cat >>confdefs.h <<_ACEOF
87 #define $ac_tr_lib 1 87 #define $ac_tr_lib 1
88 _ACEOF 88 _ACEOF
89@@ -14089,13 +14089,13 @@ echo "${ECHO_T}yes" >&6 89@@ -15574,13 +15574,13 @@ echo "${ECHO_T}yes" >&6
90  90
91  91
92  92
93- if (test $ac_tr_lib == HAVE_LIBX11 \ 93- if (test $ac_tr_lib == HAVE_LIBX11 \
94- || test $ac_tr_lib == HAVE_LIBXEXT \ 94- || test $ac_tr_lib == HAVE_LIBXEXT \
95- || test $ac_tr_lib == HAVE_LIBXT \ 95- || test $ac_tr_lib == HAVE_LIBXT \
96- || test $ac_tr_lib == HAVE_LIBXMU \ 96- || test $ac_tr_lib == HAVE_LIBXMU \
97- || test $ac_tr_lib == HAVE_LIBXPM \ 97- || test $ac_tr_lib == HAVE_LIBXPM \
98- || test $ac_tr_lib == HAVE_LIBXAW \ 98- || test $ac_tr_lib == HAVE_LIBXAW \
99- || test $ac_tr_lib == HAVE_LIBXAW3D); then 99- || test $ac_tr_lib == HAVE_LIBXAW3D); then
100+ if (test $ac_tr_lib = HAVE_LIBX11 \ 100+ if (test $ac_tr_lib = HAVE_LIBX11 \
101+ || test $ac_tr_lib = HAVE_LIBXEXT \ 101+ || test $ac_tr_lib = HAVE_LIBXEXT \
102+ || test $ac_tr_lib = HAVE_LIBXT \ 102+ || test $ac_tr_lib = HAVE_LIBXT \
103+ || test $ac_tr_lib = HAVE_LIBXMU \ 103+ || test $ac_tr_lib = HAVE_LIBXMU \
104+ || test $ac_tr_lib = HAVE_LIBXPM \ 104+ || test $ac_tr_lib = HAVE_LIBXPM \
105+ || test $ac_tr_lib = HAVE_LIBXAW \ 105+ || test $ac_tr_lib = HAVE_LIBXAW \
106+ || test $ac_tr_lib = HAVE_LIBXAW3D); then 106+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
107 cat >>confdefs.h <<_ACEOF 107 cat >>confdefs.h <<_ACEOF
108 #define $ac_tr_lib 1 108 #define $ac_tr_lib 1
109 _ACEOF 109 _ACEOF
110@@ -14188,13 +14188,13 @@ echo "${ECHO_T}yes" >&6 110@@ -15673,13 +15673,13 @@ echo "${ECHO_T}yes" >&6
111  111
112  112
113  113
114- if (test $ac_tr_lib == HAVE_LIBX11 \ 114- if (test $ac_tr_lib == HAVE_LIBX11 \
115- || test $ac_tr_lib == HAVE_LIBXEXT \ 115- || test $ac_tr_lib == HAVE_LIBXEXT \
116- || test $ac_tr_lib == HAVE_LIBXT \ 116- || test $ac_tr_lib == HAVE_LIBXT \
117- || test $ac_tr_lib == HAVE_LIBXMU \ 117- || test $ac_tr_lib == HAVE_LIBXMU \
118- || test $ac_tr_lib == HAVE_LIBXPM \ 118- || test $ac_tr_lib == HAVE_LIBXPM \
119- || test $ac_tr_lib == HAVE_LIBXAW \ 119- || test $ac_tr_lib == HAVE_LIBXAW \
120- || test $ac_tr_lib == HAVE_LIBXAW3D); then 120- || test $ac_tr_lib == HAVE_LIBXAW3D); then
121+ if (test $ac_tr_lib = HAVE_LIBX11 \ 121+ if (test $ac_tr_lib = HAVE_LIBX11 \
122+ || test $ac_tr_lib = HAVE_LIBXEXT \ 122+ || test $ac_tr_lib = HAVE_LIBXEXT \
123+ || test $ac_tr_lib = HAVE_LIBXT \ 123+ || test $ac_tr_lib = HAVE_LIBXT \
124+ || test $ac_tr_lib = HAVE_LIBXMU \ 124+ || test $ac_tr_lib = HAVE_LIBXMU \
125+ || test $ac_tr_lib = HAVE_LIBXPM \ 125+ || test $ac_tr_lib = HAVE_LIBXPM \
126+ || test $ac_tr_lib = HAVE_LIBXAW \ 126+ || test $ac_tr_lib = HAVE_LIBXAW \
127+ || test $ac_tr_lib = HAVE_LIBXAW3D); then 127+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
128 cat >>confdefs.h <<_ACEOF 128 cat >>confdefs.h <<_ACEOF
129 #define $ac_tr_lib 1 129 #define $ac_tr_lib 1
130 _ACEOF 130 _ACEOF
131@@ -14288,13 +14288,13 @@ echo "${ECHO_T}yes" >&6 131@@ -15773,13 +15773,13 @@ echo "${ECHO_T}yes" >&6
132  132
133  133
134  134
135- if (test $ac_tr_lib == HAVE_LIBX11 \ 135- if (test $ac_tr_lib == HAVE_LIBX11 \
136- || test $ac_tr_lib == HAVE_LIBXEXT \ 136- || test $ac_tr_lib == HAVE_LIBXEXT \
137- || test $ac_tr_lib == HAVE_LIBXT \ 137- || test $ac_tr_lib == HAVE_LIBXT \
138- || test $ac_tr_lib == HAVE_LIBXMU \ 138- || test $ac_tr_lib == HAVE_LIBXMU \
139- || test $ac_tr_lib == HAVE_LIBXPM \ 139- || test $ac_tr_lib == HAVE_LIBXPM \
140- || test $ac_tr_lib == HAVE_LIBXAW \ 140- || test $ac_tr_lib == HAVE_LIBXAW \
141- || test $ac_tr_lib == HAVE_LIBXAW3D); then 141- || test $ac_tr_lib == HAVE_LIBXAW3D); then
142+ if (test $ac_tr_lib = HAVE_LIBX11 \ 142+ if (test $ac_tr_lib = HAVE_LIBX11 \
143+ || test $ac_tr_lib = HAVE_LIBXEXT \ 143+ || test $ac_tr_lib = HAVE_LIBXEXT \
144+ || test $ac_tr_lib = HAVE_LIBXT \ 144+ || test $ac_tr_lib = HAVE_LIBXT \
145+ || test $ac_tr_lib = HAVE_LIBXMU \ 145+ || test $ac_tr_lib = HAVE_LIBXMU \
146+ || test $ac_tr_lib = HAVE_LIBXPM \ 146+ || test $ac_tr_lib = HAVE_LIBXPM \
147+ || test $ac_tr_lib = HAVE_LIBXAW \ 147+ || test $ac_tr_lib = HAVE_LIBXAW \
148+ || test $ac_tr_lib = HAVE_LIBXAW3D); then 148+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
149 cat >>confdefs.h <<_ACEOF 149 cat >>confdefs.h <<_ACEOF
150 #define $ac_tr_lib 1 150 #define $ac_tr_lib 1
151 _ACEOF 151 _ACEOF
152@@ -14388,13 +14388,13 @@ echo "${ECHO_T}yes" >&6 152@@ -15873,13 +15873,13 @@ echo "${ECHO_T}yes" >&6
153  153
154  154
155  155
156- if (test $ac_tr_lib == HAVE_LIBX11 \ 156- if (test $ac_tr_lib == HAVE_LIBX11 \
157- || test $ac_tr_lib == HAVE_LIBXEXT \ 157- || test $ac_tr_lib == HAVE_LIBXEXT \
158- || test $ac_tr_lib == HAVE_LIBXT \ 158- || test $ac_tr_lib == HAVE_LIBXT \
159- || test $ac_tr_lib == HAVE_LIBXMU \ 159- || test $ac_tr_lib == HAVE_LIBXMU \
160- || test $ac_tr_lib == HAVE_LIBXPM \ 160- || test $ac_tr_lib == HAVE_LIBXPM \
161- || test $ac_tr_lib == HAVE_LIBXAW \ 161- || test $ac_tr_lib == HAVE_LIBXAW \
162- || test $ac_tr_lib == HAVE_LIBXAW3D); then 162- || test $ac_tr_lib == HAVE_LIBXAW3D); then
163+ if (test $ac_tr_lib = HAVE_LIBX11 \ 163+ if (test $ac_tr_lib = HAVE_LIBX11 \
164+ || test $ac_tr_lib = HAVE_LIBXEXT \ 164+ || test $ac_tr_lib = HAVE_LIBXEXT \
165+ || test $ac_tr_lib = HAVE_LIBXT \ 165+ || test $ac_tr_lib = HAVE_LIBXT \
166+ || test $ac_tr_lib = HAVE_LIBXMU \ 166+ || test $ac_tr_lib = HAVE_LIBXMU \
167+ || test $ac_tr_lib = HAVE_LIBXPM \ 167+ || test $ac_tr_lib = HAVE_LIBXPM \
168+ || test $ac_tr_lib = HAVE_LIBXAW \ 168+ || test $ac_tr_lib = HAVE_LIBXAW \
169+ || test $ac_tr_lib = HAVE_LIBXAW3D); then 169+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
170 cat >>confdefs.h <<_ACEOF 170 cat >>confdefs.h <<_ACEOF
171 #define $ac_tr_lib 1 171 #define $ac_tr_lib 1
172 _ACEOF 172 _ACEOF
173@@ -14486,13 +14486,13 @@ echo "${ECHO_T}yes" >&6 173@@ -15971,13 +15971,13 @@ echo "${ECHO_T}yes" >&6
174  174
175  175
176  176
177- if (test $ac_tr_lib == HAVE_LIBX11 \ 177- if (test $ac_tr_lib == HAVE_LIBX11 \
178- || test $ac_tr_lib == HAVE_LIBXEXT \ 178- || test $ac_tr_lib == HAVE_LIBXEXT \
179- || test $ac_tr_lib == HAVE_LIBXT \ 179- || test $ac_tr_lib == HAVE_LIBXT \
180- || test $ac_tr_lib == HAVE_LIBXMU \ 180- || test $ac_tr_lib == HAVE_LIBXMU \
181- || test $ac_tr_lib == HAVE_LIBXPM \ 181- || test $ac_tr_lib == HAVE_LIBXPM \
182- || test $ac_tr_lib == HAVE_LIBXAW \ 182- || test $ac_tr_lib == HAVE_LIBXAW \
183- || test $ac_tr_lib == HAVE_LIBXAW3D); then 183- || test $ac_tr_lib == HAVE_LIBXAW3D); then
184+ if (test $ac_tr_lib = HAVE_LIBX11 \ 184+ if (test $ac_tr_lib = HAVE_LIBX11 \
185+ || test $ac_tr_lib = HAVE_LIBXEXT \ 185+ || test $ac_tr_lib = HAVE_LIBXEXT \
186+ || test $ac_tr_lib = HAVE_LIBXT \ 186+ || test $ac_tr_lib = HAVE_LIBXT \
cvs diff -r1.7 -r1.8 pkgsrc/games/freeciv-share/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/games/freeciv-share/patches/Attic/patch-ab 2008/05/24 21:03:55 1.7
+++ pkgsrc/games/freeciv-share/patches/Attic/patch-ab 2008/12/14 19:20:55 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ab,v 1.7 2008/05/24 21:03:55 adam Exp $ 1$NetBSD: patch-ab,v 1.8 2008/12/14 19:20:55 adam Exp $
2 2
3--- Makefile.in.orig 2008-04-22 00:16:03.000000000 +0200 3--- Makefile.in.orig 2008-11-30 14:19:36.000000000 +0100
4+++ Makefile.in 4+++ Makefile.in
5@@ -186,10 +186,10 @@ ACLOCAL_AMFLAGS = -I m4 5@@ -191,10 +191,10 @@ ACLOCAL_AMFLAGS = -I m4
6 @CLIENT_TRUE@@SERVER_TRUE@MSUBDIRS = manual 6 @CLIENT_TRUE@@SERVER_TRUE@MSUBDIRS = manual
7 @SERVER_FALSE@MSUBDIRS =  7 @SERVER_FALSE@MSUBDIRS =
8  8
9-@MAKE_DATA_TRUE@DSUBDIRS = data 9-@MAKE_DATA_TRUE@DSUBDIRS = data
10+@MAKE_DATA_TRUE@DSUBDIRS = data po doc 10+@MAKE_DATA_TRUE@DSUBDIRS = data po doc
11 @MAKE_DATA_FALSE@DSUBDIRS =  11 @MAKE_DATA_FALSE@DSUBDIRS =
12  12
13-SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS) 13-SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
14+SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) $(MSUBDIRS) 14+SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) $(MSUBDIRS)
15  15
16 EXTRA_DIST = autogen.sh \ 16 EXTRA_DIST = autogen.sh \
17 config.mac.h \ 17 config.mac.h \