diff options
author | joerg <joerg> | 2011-08-20 15:32:48 +0000 |
---|---|---|
committer | joerg <joerg> | 2011-08-20 15:32:48 +0000 |
commit | 175a63d70d9f91c56f83f7ff810499309da23dea (patch) | |
tree | 843b2b10112edd47cdd0ed36a2095217b4e5289b /games | |
parent | a1e0eb94ed2d3d73e0fa1bc9190020558eedd8f1 (diff) | |
download | pkgsrc-175a63d70d9f91c56f83f7ff810499309da23dea.tar.gz |
Fix build with newer curl. Improve compatibility with clang.
Diffstat (limited to 'games')
-rw-r--r-- | games/crossfire-server/distinfo | 5 | ||||
-rw-r--r-- | games/crossfire-server/patches/patch-server-c_misc.c | 15 | ||||
-rw-r--r-- | games/crossfire-server/patches/patch-server-c_wiz.c | 31 | ||||
-rw-r--r-- | games/crossfire-server/patches/patch-socket-metaserver.c | 12 |
4 files changed, 62 insertions, 1 deletions
diff --git a/games/crossfire-server/distinfo b/games/crossfire-server/distinfo index 95af9478dda..57ea93a82b3 100644 --- a/games/crossfire-server/distinfo +++ b/games/crossfire-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2011/04/01 15:21:50 wiz Exp $ +$NetBSD: distinfo,v 1.5 2011/08/20 15:32:48 joerg Exp $ SHA1 (crossfire-1.11.0.arch.tar.gz) = 29a3ea7cfd5df4dc5a375f5b4302aebb4d609964 RMD160 (crossfire-1.11.0.arch.tar.gz) = 8fa48ef33a83f1ed158a957db664a9deed96e1fc @@ -13,3 +13,6 @@ SHA1 (patch-aa) = b4a855a8aee117b42d6edbb7c6fd2819b6b33180 SHA1 (patch-ab) = 2cf11e9901f72cf018f162e4bf4d2980257a0bbf SHA1 (patch-ae) = 1c9d973c932d5c6ee6ee642611d64850e05e3985 SHA1 (patch-crossedit_png.c) = 4802c077285b47c7afc5acc7128020d6f54087ab +SHA1 (patch-server-c_misc.c) = 203ef2baf2ef37406b6f88093646a8f69212892b +SHA1 (patch-server-c_wiz.c) = 1f44d16218c842cc3f51213841e9276ca0b76715 +SHA1 (patch-socket-metaserver.c) = f08f319322455d5f1309eb4e87741fa99bda5acb diff --git a/games/crossfire-server/patches/patch-server-c_misc.c b/games/crossfire-server/patches/patch-server-c_misc.c new file mode 100644 index 00000000000..bb41c57601f --- /dev/null +++ b/games/crossfire-server/patches/patch-server-c_misc.c @@ -0,0 +1,15 @@ +$NetBSD: patch-server-c_misc.c,v 1.1 2011/08/20 15:32:48 joerg Exp $ + +Consistently return a value. + +--- server/c_misc.c.orig 2011-08-20 14:13:17.000000000 +0000 ++++ server/c_misc.c +@@ -1079,7 +1079,7 @@ int command_listen (object *op, char *pa + if (i < 0) { + draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_SUBTYPE_NONE, + "Verbose level should be positive.", NULL); +- return; ++ return 1; + } + op->contr->listening=(char) i; + draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_SUBTYPE_NONE, diff --git a/games/crossfire-server/patches/patch-server-c_wiz.c b/games/crossfire-server/patches/patch-server-c_wiz.c new file mode 100644 index 00000000000..52a29a77b65 --- /dev/null +++ b/games/crossfire-server/patches/patch-server-c_wiz.c @@ -0,0 +1,31 @@ +$NetBSD: patch-server-c_wiz.c,v 1.1 2011/08/20 15:32:48 joerg Exp $ + +--- server/c_wiz.c.orig 2011-08-20 14:21:07.000000000 +0000 ++++ server/c_wiz.c +@@ -2134,17 +2134,17 @@ int command_follow(object* op, char* par + draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_DM, "You stop following %s.", NULL, op->contr->followed_player); + FREE_AND_CLEAR_STR(op->contr->followed_player); + } +- return; ++ return 1; + } + + other = find_player_partial_name(params); + if (!other) { + draw_ext_info(NDI_UNIQUE, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_DM, "No such player or ambiguous name.", NULL); +- return; ++ return 1; + } + if (other == op->contr) { + draw_ext_info(NDI_UNIQUE, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_DM, "You can't follow yourself.", NULL); +- return; ++ return 1; + } + + if (op->contr->followed_player) +@@ -2152,4 +2152,5 @@ int command_follow(object* op, char* par + + op->contr->followed_player = add_string(other->ob->name); + draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_DM, "Following %s.", NULL, op->contr->followed_player); ++ return 1; + } diff --git a/games/crossfire-server/patches/patch-socket-metaserver.c b/games/crossfire-server/patches/patch-socket-metaserver.c new file mode 100644 index 00000000000..110f16b2d88 --- /dev/null +++ b/games/crossfire-server/patches/patch-socket-metaserver.c @@ -0,0 +1,12 @@ +$NetBSD: patch-socket-metaserver.c,v 1.1 2011/08/20 15:32:48 joerg Exp $ + +--- socket/metaserver.c.orig 2008-02-01 05:56:29.000000000 +0000 ++++ socket/metaserver.c +@@ -48,7 +48,6 @@ + + #ifdef HAVE_CURL_CURL_H + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + #endif + |