Wed Feb 8 00:04:53 2017 UTC ()
Fix format strings. Fix ordering of pointers relative to 0. Bump
revision.


(joerg)
diff -r1.25 -r1.26 pkgsrc/games/kajaani-kombat/Makefile
diff -r1.5 -r1.6 pkgsrc/games/kajaani-kombat/distinfo
diff -r1.1 -r1.2 pkgsrc/games/kajaani-kombat/patches/patch-client__net.cpp
diff -r0 -r1.1 pkgsrc/games/kajaani-kombat/patches/patch-config.cpp
diff -r0 -r1.1 pkgsrc/games/kajaani-kombat/patches/patch-game__server.cpp
cvs diff -r1.25 -r1.26 pkgsrc/games/kajaani-kombat/Makefile (expand / switch to unified diff)

--- pkgsrc/games/kajaani-kombat/Makefile 2015/04/25 14:22:57 1.25
+++ pkgsrc/games/kajaani-kombat/Makefile 2017/02/08 00:04:53 1.26
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.25 2015/04/25 14:22:57 tnn Exp $ 1# $NetBSD: Makefile,v 1.26 2017/02/08 00:04:53 joerg Exp $
2# 2#
3 3
4DISTNAME= kajaani-kombat-0.7 4DISTNAME= kajaani-kombat-0.7
5PKGREVISION= 10 5PKGREVISION= 11
6CATEGORIES= games 6CATEGORIES= games
7MASTER_SITES= http://kombat.kajaani.net/dl/ 7MASTER_SITES= http://kombat.kajaani.net/dl/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://kombat.kajaani.net/ 10HOMEPAGE= http://kombat.kajaani.net/
11COMMENT= Rampart-like multiplayer game set in space 11COMMENT= Rampart-like multiplayer game set in space
12 12
13USE_LANGUAGES= c++ 13USE_LANGUAGES= c++
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
15INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 15INSTALLATION_DIRS= bin ${PKGMANDIR}/man6
16 16
17do-install: 17do-install:
18 ${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${DESTDIR}${PREFIX}/bin 18 ${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${DESTDIR}${PREFIX}/bin
cvs diff -r1.5 -r1.6 pkgsrc/games/kajaani-kombat/distinfo (expand / switch to unified diff)

--- pkgsrc/games/kajaani-kombat/distinfo 2015/11/03 20:56:53 1.5
+++ pkgsrc/games/kajaani-kombat/distinfo 2017/02/08 00:04:53 1.6
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: distinfo,v 1.5 2015/11/03 20:56:53 agc Exp $ 1$NetBSD: distinfo,v 1.6 2017/02/08 00:04:53 joerg Exp $
2 2
3SHA1 (kajaani-kombat-0.7.tar.gz) = a6aa674591fef6445c1dbdba446773e9e3d91c8c 3SHA1 (kajaani-kombat-0.7.tar.gz) = a6aa674591fef6445c1dbdba446773e9e3d91c8c
4RMD160 (kajaani-kombat-0.7.tar.gz) = 0f932876dfe5f9f32d9889f0b1720dd9b570b8e2 4RMD160 (kajaani-kombat-0.7.tar.gz) = 0f932876dfe5f9f32d9889f0b1720dd9b570b8e2
5SHA512 (kajaani-kombat-0.7.tar.gz) = 84f6923b73c9529fa600c533b5a3de9ea9411f81060c5ad9fb85346fa17c9cb70bf6ba8222319e123372b01286a11b40bb355e8ef8c9bec95cd98f4d0e0460cb 5SHA512 (kajaani-kombat-0.7.tar.gz) = 84f6923b73c9529fa600c533b5a3de9ea9411f81060c5ad9fb85346fa17c9cb70bf6ba8222319e123372b01286a11b40bb355e8ef8c9bec95cd98f4d0e0460cb
6Size (kajaani-kombat-0.7.tar.gz) = 1805504 bytes 6Size (kajaani-kombat-0.7.tar.gz) = 1805504 bytes
7SHA1 (patch-aa) = bc1ec637e480db4ec499b51d9bd9fabd951b1048 7SHA1 (patch-aa) = bc1ec637e480db4ec499b51d9bd9fabd951b1048
8SHA1 (patch-client__net.cpp) = 547692aff95f540c91ca5ab9602c03f05ceb7557 8SHA1 (patch-client__net.cpp) = d0dfcaf5a7cf6063cb5fb2c23830be9372ae6414
 9SHA1 (patch-config.cpp) = d330cbb6a63e814c09fcef5ee88b19a78e9ce7f2
 10SHA1 (patch-game__server.cpp) = 8da51acf0732363212f27a12037d53438371e05f
cvs diff -r1.1 -r1.2 pkgsrc/games/kajaani-kombat/patches/patch-client__net.cpp (expand / switch to unified diff)

--- pkgsrc/games/kajaani-kombat/patches/patch-client__net.cpp 2012/11/16 00:50:13 1.1
+++ pkgsrc/games/kajaani-kombat/patches/patch-client__net.cpp 2017/02/08 00:04:53 1.2
@@ -1,13 +1,48 @@ @@ -1,13 +1,48 @@
1$NetBSD: patch-client__net.cpp,v 1.1 2012/11/16 00:50:13 joerg Exp $ 1$NetBSD: patch-client__net.cpp,v 1.2 2017/02/08 00:04:53 joerg Exp $
2 2
3--- client_net.cpp.orig 2012-11-15 15:37:19.000000000 +0000 3Pointers are not relative to 0.
 4Don't shadow local variable.
 5
 6--- client_net.cpp.orig 2005-01-22 16:51:34.000000000 +0000
4+++ client_net.cpp 7+++ client_net.cpp
 8@@ -31,13 +31,13 @@ client_tcpnet::client_tcpnet(IPaddress *
 9 assert (ret != -1);
 10
 11 cond = SDL_CreateCond();
 12- if (cond <0)
 13+ if (!cond)
 14 {
 15 fprintf (stderr, "Error creating cond variable\n");
 16 exit(2);
 17 }
 18 mutex = SDL_CreateMutex();
 19- if (mutex < 0)
 20+ if (!mutex)
 21 {
 22 fprintf (stderr, "Error creating mutex\n");
 23 exit(2);
 24@@ -45,13 +45,13 @@ client_tcpnet::client_tcpnet(IPaddress *
 25
 26 active = true;
 27 trans_th = SDL_CreateThread (&client_tcpnet::transf_func, (void *) this);
 28- if (trans_th < 0)
 29+ if (!trans_th)
 30 {
 31 fprintf(stderr, "Error starting thread: %s\n", SDL_GetError());
 32 exit(2);
 33 }
 34 input_th = SDL_CreateThread (&client_tcpnet::input_func, (void *) this);
 35- if (input_th < 0)
 36+ if (!input_th)
 37 {
 38 fprintf(stderr, "Error starting thread: %s\n", SDL_GetError());
 39 exit(2);
5@@ -192,7 +192,7 @@ int client_tcpnet::input_func(void *data 40@@ -192,7 +192,7 @@ int client_tcpnet::input_func(void *data
6 if (SDLNet_SocketReady(cl->socket) == 0) continue; 41 if (SDLNet_SocketReady(cl->socket) == 0) continue;
7 msg *m = 0; 42 msg *m = 0;
8 try { 43 try {
9- msg *m = msg::recv(cl->socket); 44- msg *m = msg::recv(cl->socket);
10+ m = msg::recv(cl->socket); 45+ m = msg::recv(cl->socket);
11 cl->in.push(m); 46 cl->in.push(m);
12 } 47 }
13 catch (string &s) 48 catch (string &s)
File Added: pkgsrc/games/kajaani-kombat/patches/patch-config.cpp
$NetBSD: patch-config.cpp,v 1.1 2017/02/08 00:04:53 joerg Exp $

Fix format string to match argument.

--- config.cpp.orig	2017-01-08 19:37:40.160134851 +0000
+++ config.cpp
@@ -228,7 +228,7 @@ void file_config::read_config( string& f
         port = ( strlen( v ) ? v : DEFAULT_PORT );
       }
       else {
-        fprintf( stderr," Unknown key/value pair (%s/%s) on line %u\n", key.c_str(), v, linenum );
+        fprintf( stderr," Unknown key/value pair (%s/%s) on line %zu\n", key.c_str(), v, linenum );
       }
     }
     /*
File Added: pkgsrc/games/kajaani-kombat/patches/patch-game__server.cpp
$NetBSD: patch-game__server.cpp,v 1.1 2017/02/08 00:04:53 joerg Exp $

Pointers are not relative to 0.

--- game_server.cpp.orig	2017-01-08 19:35:01.809714788 +0000
+++ game_server.cpp
@@ -64,7 +64,7 @@ void game_server::init_net()
   
   // OK, init server thread to listen to clients
   con_th = SDL_CreateThread (&game_server::connection_accepter, (void *) this);
-  if (con_th < 0)
+  if (!con_th)
     {
       fprintf (stderr, "[SRV] Error starting thread: %s\n", SDL_GetError());
       exit(2);