Fix build with clang and newer curl.

3 files changed, 29 insertions, 1 deletions

diff --git a/games/crossfire-client/distinfo b/games/crossfire-client/distinfo
index e4899d8e958..17d989b7cf8 100644
--- a/games/crossfire-client/distinfo
+++ b/games/crossfire-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2011/04/01 15:31:33 wiz Exp $
+$NetBSD: distinfo,v 1.4 2011/08/20 15:31:33 joerg Exp $
 
 SHA1 (crossfire-client-1.11.0.tar.gz) = 934618207de854841c3e4673f896e9784ee70073
 RMD160 (crossfire-client-1.11.0.tar.gz) = 9fffcd301c0f32a583b5f6e5a9db77c7900d1cd7
@@ -9,6 +9,8 @@ Size (crossfire-client-images-1.11.0.tar.gz) = 2731254 bytes
 SHA1 (crossfire-client-sounds-1.11.0.tar.gz) = a6e2d6b7b00ef610ffc8b3462cf51655415791b6
 RMD160 (crossfire-client-sounds-1.11.0.tar.gz) = 85250759a46927ea45976e86acb26c6b61c7686c
 Size (crossfire-client-sounds-1.11.0.tar.gz) = 322847 bytes
+SHA1 (patch-common-metaserver.c) = 28707f7782fb97f2bf67f130b0beaba85dc3eec4
+SHA1 (patch-gtk-v2-src-metaserver.c) = ba8f9b1bd5ac876769c0911f166f1d2df38f55eb
 SHA1 (patch-gtk-v2_src_png.c) = 07fd35221a197124203daa066e687fe282190f3d
 SHA1 (patch-gtk_png.c) = 56bbe0d69725b9401754368b72776efa53df18d2
 SHA1 (patch-x11_png.c) = c04898bcd7d14f311f3d2a10431c9dfb651ef982
diff --git a/games/crossfire-client/patches/patch-common-metaserver.c b/games/crossfire-client/patches/patch-common-metaserver.c
new file mode 100644
index 00000000000..162a9314406
--- /dev/null
+++ b/games/crossfire-client/patches/patch-common-metaserver.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-common-metaserver.c,v 1.1 2011/08/20 15:31:33 joerg Exp $
+
+--- common/metaserver.c.orig	2011-08-20 13:33:08.000000000 +0000
++++ common/metaserver.c
+@@ -47,7 +47,6 @@ const char *rcsid_common_metaserver_c =
+ 
+ #ifdef HAVE_CURL_CURL_H
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+ 
diff --git a/games/crossfire-client/patches/patch-gtk-v2-src-metaserver.c b/games/crossfire-client/patches/patch-gtk-v2-src-metaserver.c
new file mode 100644
index 00000000000..797d02f3c2e
--- /dev/null
+++ b/games/crossfire-client/patches/patch-gtk-v2-src-metaserver.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-gtk-v2-src-metaserver.c,v 1.1 2011/08/20 15:31:33 joerg Exp $
+
+--- gtk-v2/src/metaserver.c.orig	2011-08-20 13:51:04.000000000 +0000
++++ gtk-v2/src/metaserver.c
+@@ -60,7 +60,8 @@ gboolean metaserver_selection_func (
+     return TRUE;
+ }
+ 
+-get_metaserver()
++void
++get_metaserver(void)
+ {
+     static int has_init=0;
+     GtkTreeIter iter;