diff options
| author | miwi <miwi@FreeBSD.org> | 2007-11-28 06:49:11 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2007-11-28 06:49:11 +0800 |
| commit | 6b1405781d3e8ca8f4bc41f4b6061809c8e9cb6b (patch) | |
| tree | 315a4165469de070b3add536c1336e4f2dfcc566 /games/nil | |
| parent | d3f4a438bbb75a1b9a20d068fb8eebfea9b755ae (diff) | |
| download | freebsd-ports-gnome-6b1405781d3e8ca8f4bc41f4b6061809c8e9cb6b.tar.gz freebsd-ports-gnome-6b1405781d3e8ca8f4bc41f4b6061809c8e9cb6b.tar.zst freebsd-ports-gnome-6b1405781d3e8ca8f4bc41f4b6061809c8e9cb6b.zip | |
- Fix build with gcc 4.2
- Pass maintainership to the submitter
PR: 118281
Submitted by: Pietro Cerutti <gahr@gahr.ch>
Approved by: portmgr (pav)
Diffstat (limited to 'games/nil')
| -rw-r--r-- | games/nil/Makefile | 6 | ||||
| -rw-r--r-- | games/nil/files/patch-src-client-controls_keymapper_bindings.h | 11 | ||||
| -rw-r--r-- | games/nil/files/patch-src-common-net_tcp_socket.cpp | 20 |
3 files changed, 32 insertions, 5 deletions
diff --git a/games/nil/Makefile b/games/nil/Makefile index bc41954ad404..631aaf856498 100644 --- a/games/nil/Makefile +++ b/games/nil/Makefile @@ -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 diff --git a/games/nil/files/patch-src-client-controls_keymapper_bindings.h b/games/nil/files/patch-src-client-controls_keymapper_bindings.h new file mode 100644 index 000000000000..95548f001ded --- /dev/null +++ b/games/nil/files/patch-src-client-controls_keymapper_bindings.h @@ -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*/
diff --git a/games/nil/files/patch-src-common-net_tcp_socket.cpp b/games/nil/files/patch-src-common-net_tcp_socket.cpp new file mode 100644 index 000000000000..9a408909965d --- /dev/null +++ b/games/nil/files/patch-src-common-net_tcp_socket.cpp @@ -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) { |