Fix issues with newer GCC

13 files changed, 167 insertions, 20 deletions

diff --git a/net/synergy1.2/distinfo b/net/synergy1.2/distinfo
index f65fd55298c..73eab5bac75 100644
--- a/net/synergy1.2/distinfo
+++ b/net/synergy1.2/distinfo
@@ -1,7 +1,17 @@
-$NetBSD: distinfo,v 1.3 2009/06/05 09:49:53 hasso Exp $
+$NetBSD: distinfo,v 1.4 2011/11/22 20:07:20 joerg Exp $
 
 SHA1 (synergy-1.2.7.tar.gz) = 5964460892fd9e9cb55c5bfe4e781f2bc08d0b76
 RMD160 (synergy-1.2.7.tar.gz) = 6bdbe5adbc13c2f49afcb99ccaa20b96a12c2bcf
 Size (synergy-1.2.7.tar.gz) = 707319 bytes
-SHA1 (patch-aa) = 20747abe2f447adb5967a767ee5ec9d9f09c8fb4
-SHA1 (patch-ab) = 2a4b8c368f0733f0c6e9d60b42660e459a2a55c1
+SHA1 (patch-aa) = 5a48140c7622195a716eededae2d1ee0f6fa4e85
+SHA1 (patch-ab) = 011deedba1d2a793ff4add4196c8a10708e864f5
+SHA1 (patch-lib-arch-CArchDaemonUnix.cpp) = 1d11d87f9a388ba68403ff74d4fcd5fa180a919e
+SHA1 (patch-lib_arch_CMultibyte.cpp) = 66cc7cd1e327a1bfd519cb003835914221cbb369
+SHA1 (patch-lib_base_CStringUtil.cpp) = 8f803bcab5a37bd4bf5a918fe3333338bd7d22c2
+SHA1 (patch-lib_client_CClient.cpp) = afa4dc5089da155756a5ea4772be216256f71663
+SHA1 (patch-lib_client_CServerProxy.cpp) = d6692bebbb6c71684cd320822859701b96fb7efc
+SHA1 (patch-lib_net_CTCPSocket.cpp) = 609768fa601c76e6431c222ab66e7aabf59bab49
+SHA1 (patch-lib_server_CServer.cpp) = eefe1004a9dd7216c0496f9e9b46cfa0fa2f13f3
+SHA1 (patch-lib_synergy_CPacketStreamFilter.cpp) = 614734a5a276950ff688e4d3a9c3e7ae66fed743
+SHA1 (patch-lib_synergy_IKeyState.cpp) = fb6a64639156f56bb353ed598835cb5badb3a1f2
+SHA1 (patch-lib_synergy_IPrimaryScreen.cpp) = 3a04d64a8270ed2da265213bacdf32c72ad01fcc
diff --git a/net/synergy1.2/patches/patch-aa b/net/synergy1.2/patches/patch-aa
index 2e0fe2ed01f..505fbe635a5 100644
--- a/net/synergy1.2/patches/patch-aa
+++ b/net/synergy1.2/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2009/02/09 17:04:49 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2011/11/22 20:07:20 joerg Exp $
 
---- lib/platform/CXWindowsScreen.cpp.orig	2009-02-09 17:47:55.000000000 +0100
+--- lib/platform/CXWindowsScreen.cpp.orig	2005-12-15 05:46:20.000000000 +0000
 +++ lib/platform/CXWindowsScreen.cpp
-@@ -923,7 +923,7 @@ CXWindowsScreen::openIM()
+@@ -25,6 +25,7 @@
+ #include "CStringUtil.h"
+ #include "IEventQueue.h"
+ #include "TMethodEventJob.h"
++#include <cstdlib>
+ #include <cstring>
+ #if X_DISPLAY_MISSING
+ #	error X11 is required to build synergy
+@@ -923,7 +924,7 @@ CXWindowsScreen::openIM()
  	// find the appropriate style.  synergy supports XIMPreeditNothing
  	// only at the moment.
  	XIMStyles* styles;
@@ -11,7 +19,7 @@ $NetBSD: patch-aa,v 1.1 2009/02/09 17:04:49 joerg Exp $
  		styles == NULL) {
  		LOG((CLOG_WARN "cannot get IM styles"));
  		XCloseIM(im);
-@@ -946,7 +946,7 @@ CXWindowsScreen::openIM()
+@@ -946,7 +947,7 @@ CXWindowsScreen::openIM()
  	}
  
  	// create an input context for the style and tell it about our window
@@ -20,7 +28,7 @@ $NetBSD: patch-aa,v 1.1 2009/02/09 17:04:49 joerg Exp $
  	if (ic == NULL) {
  		LOG((CLOG_WARN "cannot create IC"));
  		XCloseIM(im);
-@@ -955,7 +955,7 @@ CXWindowsScreen::openIM()
+@@ -955,7 +956,7 @@ CXWindowsScreen::openIM()
  
  	// find out the events we must select for and do so
  	unsigned long mask;
diff --git a/net/synergy1.2/patches/patch-ab b/net/synergy1.2/patches/patch-ab
index c4367d74aec..9c8e2b42a0f 100644
--- a/net/synergy1.2/patches/patch-ab
+++ b/net/synergy1.2/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2009/06/05 09:49:53 hasso Exp $
+$NetBSD: patch-ab,v 1.2 2011/11/22 20:07:20 joerg Exp $
 
---- lib/arch/CArchNetworkBSD.cpp.orig	2009-06-05 12:09:52 +0300
-+++ lib/arch/CArchNetworkBSD.cpp	2009-06-05 12:11:02 +0300
-@@ -50,6 +50,8 @@
- #if HAVE_ALLOCA_H
- #	define freea(x_)
- #else
-+#	undef alloca
-+#	undef freea
- #	define alloca(x_) malloc(x_)
- #	define freea(x_) free(x_)
- #endif
+--- lib/arch/CArchNetworkBSD.cpp.orig	2011-11-22 19:34:07.000000000 +0000
++++ lib/arch/CArchNetworkBSD.cpp
+@@ -28,6 +28,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #if HAVE_POLL
+ #	include <poll.h>
diff --git a/net/synergy1.2/patches/patch-lib-arch-CArchDaemonUnix.cpp b/net/synergy1.2/patches/patch-lib-arch-CArchDaemonUnix.cpp
new file mode 100644
index 00000000000..c924c1178dd
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib-arch-CArchDaemonUnix.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib-arch-CArchDaemonUnix.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/arch/CArchDaemonUnix.cpp.orig	2005-01-01 20:52:42.000000000 +0000
++++ lib/arch/CArchDaemonUnix.cpp
+@@ -19,6 +19,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <stdlib.h>
+ 
+ //
+ // CArchDaemonUnix
diff --git a/net/synergy1.2/patches/patch-lib_arch_CMultibyte.cpp b/net/synergy1.2/patches/patch-lib_arch_CMultibyte.cpp
new file mode 100644
index 00000000000..2d0d5f6c402
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib_arch_CMultibyte.cpp
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_arch_CMultibyte.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/arch/CMultibyte.cpp.orig	2011-11-22 19:34:33.000000000 +0000
++++ lib/arch/CMultibyte.cpp
+@@ -18,15 +18,13 @@
+ #include "common.h"
+ #include "CArch.h"
+ #include <limits.h>
++#include <stdlib.h>
+ #include <string.h>
+ #if HAVE_LOCALE_H
+ #	include <locale.h>
+ #endif
+ #if HAVE_WCHAR_H || defined(_MSC_VER)
+ #	include <wchar.h>
+-#elif __APPLE__
+-	// wtf?  Darwin puts mbtowc() et al. in stdlib
+-#	include <stdlib.h>
+ #else
+ 	// platform apparently has no wchar_t support.  provide dummy
+ 	// implementations.  hopefully at least the C++ compiler has
diff --git a/net/synergy1.2/patches/patch-lib_base_CStringUtil.cpp b/net/synergy1.2/patches/patch-lib_base_CStringUtil.cpp
new file mode 100644
index 00000000000..66b40e4949d
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib_base_CStringUtil.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_base_CStringUtil.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/base/CStringUtil.cpp.orig	2011-11-22 19:35:22.000000000 +0000
++++ lib/base/CStringUtil.cpp
+@@ -20,6 +20,7 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <algorithm>
++#include <cstring>
+ 
+ //
+ // CStringUtil
diff --git a/net/synergy1.2/patches/patch-lib_client_CClient.cpp b/net/synergy1.2/patches/patch-lib_client_CClient.cpp
new file mode 100644
index 00000000000..d05dd73bbf2
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib_client_CClient.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_client_CClient.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/client/CClient.cpp.orig	2011-11-22 19:38:57.000000000 +0000
++++ lib/client/CClient.cpp
+@@ -26,6 +26,8 @@
+ #include "CLog.h"
+ #include "IEventQueue.h"
+ #include "TMethodEventJob.h"
++#include <stdlib.h>
++#include <string.h>
+ 
+ //
+ // CClient
diff --git a/net/synergy1.2/patches/patch-lib_client_CServerProxy.cpp b/net/synergy1.2/patches/patch-lib_client_CServerProxy.cpp
new file mode 100644
index 00000000000..517d953cd84
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib_client_CServerProxy.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_client_CServerProxy.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/client/CServerProxy.cpp.orig	2011-11-22 19:39:17.000000000 +0000
++++ lib/client/CServerProxy.cpp
+@@ -24,6 +24,7 @@
+ #include "TMethodEventJob.h"
+ #include "XBase.h"
+ #include <memory>
++#include <string.h>
+ 
+ //
+ // CServerProxy
diff --git a/net/synergy1.2/patches/patch-lib_net_CTCPSocket.cpp b/net/synergy1.2/patches/patch-lib_net_CTCPSocket.cpp
new file mode 100644
index 00000000000..9a395cb6454
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib_net_CTCPSocket.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_net_CTCPSocket.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/net/CTCPSocket.cpp.orig	2011-11-22 19:36:24.000000000 +0000
++++ lib/net/CTCPSocket.cpp
+@@ -23,6 +23,7 @@
+ #include "IEventJob.h"
+ #include "CArch.h"
+ #include "XArch.h"
++#include <stdlib.h>
+ #include <string.h>
+ 
+ //
diff --git a/net/synergy1.2/patches/patch-lib_server_CServer.cpp b/net/synergy1.2/patches/patch-lib_server_CServer.cpp
new file mode 100644
index 00000000000..d0715520b3b
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib_server_CServer.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_server_CServer.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/server/CServer.cpp.orig	2011-11-22 19:39:54.000000000 +0000
++++ lib/server/CServer.cpp
+@@ -28,6 +28,7 @@
+ #include "CLog.h"
+ #include "TMethodEventJob.h"
+ #include "CArch.h"
++#include <stdlib.h>
+ #include <string.h>
+ 
+ //
diff --git a/net/synergy1.2/patches/patch-lib_synergy_CPacketStreamFilter.cpp b/net/synergy1.2/patches/patch-lib_synergy_CPacketStreamFilter.cpp
new file mode 100644
index 00000000000..605344cc934
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib_synergy_CPacketStreamFilter.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_synergy_CPacketStreamFilter.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/synergy/CPacketStreamFilter.cpp.orig	2011-11-22 19:37:00.000000000 +0000
++++ lib/synergy/CPacketStreamFilter.cpp
+@@ -16,6 +16,7 @@
+ #include "IEventQueue.h"
+ #include "CLock.h"
+ #include "TMethodEventJob.h"
++#include <string.h>
+ 
+ //
+ // CPacketStreamFilter
diff --git a/net/synergy1.2/patches/patch-lib_synergy_IKeyState.cpp b/net/synergy1.2/patches/patch-lib_synergy_IKeyState.cpp
new file mode 100644
index 00000000000..50e533b871b
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib_synergy_IKeyState.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_synergy_IKeyState.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/synergy/IKeyState.cpp.orig	2011-11-22 19:37:22.000000000 +0000
++++ lib/synergy/IKeyState.cpp
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include "IKeyState.h"
++#include <stdlib.h>
+ 
+ //
+ // IKeyState
diff --git a/net/synergy1.2/patches/patch-lib_synergy_IPrimaryScreen.cpp b/net/synergy1.2/patches/patch-lib_synergy_IPrimaryScreen.cpp
new file mode 100644
index 00000000000..3212e33c859
--- /dev/null
+++ b/net/synergy1.2/patches/patch-lib_synergy_IPrimaryScreen.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_synergy_IPrimaryScreen.cpp,v 1.1 2011/11/22 20:07:20 joerg Exp $
+
+--- lib/synergy/IPrimaryScreen.cpp.orig	2011-11-22 19:37:41.000000000 +0000
++++ lib/synergy/IPrimaryScreen.cpp
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include "IPrimaryScreen.h"
++#include <stdlib.h>
+ 
+ //
+ // IPrimaryScreen