mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

- Fix build with gcc 4.2

Browse Source 
- Pass maintainership to the submitter

PR:		118281
Submitted by:	Pietro Cerutti <gahr@gahr.ch>
Approved by:	portmgr (pav)
This commit is contained in:
Martin Wilke 2007-11-27 22:49:11 +00:00
parent 17ea8b00dc
commit 9402b6c4eb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=202848
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
games/nil/Makefile
View File

@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-cvs-backup-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= gahr@gahr.ch
COMMENT= A multiplayer game like Quake in 2D or Worms done right
WRKSRC= ${WRKDIR}/${PORTNAME}
@ -27,10 +27,6 @@ OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
BROKEN= Broken with gcc 4.2
.endif
.if ${ARCH} == "ia64"
BROKEN= does not link on ${ARCH}
.endif

11
games/nil/files/patch-src-client-controls_keymapper_bindings.h Normal file
View File

@ -0,0 +1,11 @@
--- src/client/controls/keymapper_bindings.h.orig 2007-11-27 14:19:00.000000000 +0100
+++ src/client/controls/keymapper_bindings.h 2007-11-27 14:19:25.000000000 +0100
@@ -112,7 +112,7 @@
/*! Find a key based on a mouse button
@param button The number of the button
@return Returns the iterator */
- iterator Evtmapper_bindings::find_by_mouse_button(int button);
+ iterator find_by_mouse_button(int button);
/*! Find a key based on its command function
@param cmdfunction The commandfunction we are searching for
@return Returns the iterator*/

20
games/nil/files/patch-src-common-net_tcp_socket.cpp Normal file
View File

@ -0,0 +1,20 @@
--- src/common/net/tcp_socket.cpp.orig 2007-11-27 15:14:42.000000000 +0100
+++ src/common/net/tcp_socket.cpp 2007-11-27 15:15:07.000000000 +0100
@@ -47,7 +47,7 @@
int recv_result = recv(socket, ((char*)buf)+bytes_done, bytes_left, 0);
if (recv_result < 0) {
- logmsg(lt_error,"recv(%i,((char*)%x)+%i,%i,0); returned %i (%s)", socket,(int)buf,bytes_done,bytes_left,errno,strerror(errno));
+ logmsg(lt_error,"recv(%i,((char*)%x)+%i,%i,0); returned %i (%s)", socket,(size_t)buf,bytes_done,bytes_left,errno,strerror(errno));
// This is in most cases a critical error, so stop the loop
return ERROR_SOCKET;
} else if (recv_result > 0) {
@@ -75,7 +75,7 @@
int send_result = send(socket, ((char*)buf)+bytes_done, bytes_left, 0);
if (send_result < 0) {
- logmsg(lt_error,"send(%i,((char*)%x)+%i,%i,0); returned %i (%s)", socket,(int)buf,bytes_done,bytes_left,errno,strerror(errno));
+ logmsg(lt_error,"send(%i,((char*)%x)+%i,%i,0); returned %i (%s)", socket,(size_t)buf,bytes_done,bytes_left,errno,strerror(errno));
// This is in most cases a critical error, so stop the loop
return ERROR_SOCKET;
} else if (send_result > 0) {