From c3c20a3dc5bb9d9ddf960071bedf9a46f50db70f Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 9 Feb 2009 17:04:49 +0000
Subject: DESTDIR support. Use (void *)NULL as sentinal.

---
 net/synergy1.2/Makefile         |  4 +++-
 net/synergy1.2/distinfo         |  3 ++-
 net/synergy1.2/patches/patch-aa | 31 +++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 net/synergy1.2/patches/patch-aa

diff --git a/net/synergy1.2/Makefile b/net/synergy1.2/Makefile
index cf37c6d0e7f..e6770a82b29 100644
--- a/net/synergy1.2/Makefile
+++ b/net/synergy1.2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/02/19 19:39:53 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/02/09 17:04:49 joerg Exp $
 #
 
 DISTNAME=		synergy-1.2.7
@@ -9,6 +9,8 @@ MAINTAINER=		yui@yui.pe.kr
 HOMEPAGE=		http://synergy2.sourceforge.net/
 COMMENT=		Let an user share a mouse and keyboard among computers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 
diff --git a/net/synergy1.2/distinfo b/net/synergy1.2/distinfo
index 9280f20fad0..4ba5bb093fd 100644
--- a/net/synergy1.2/distinfo
+++ b/net/synergy1.2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2006/06/01 23:26:56 minskim Exp $
+$NetBSD: distinfo,v 1.2 2009/02/09 17:04:49 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
diff --git a/net/synergy1.2/patches/patch-aa b/net/synergy1.2/patches/patch-aa
new file mode 100644
index 00000000000..2e0fe2ed01f
--- /dev/null
+++ b/net/synergy1.2/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2009/02/09 17:04:49 joerg Exp $
+
+--- lib/platform/CXWindowsScreen.cpp.orig	2009-02-09 17:47:55.000000000 +0100
++++ lib/platform/CXWindowsScreen.cpp
+@@ -923,7 +923,7 @@ CXWindowsScreen::openIM()
+ 	// find the appropriate style.  synergy supports XIMPreeditNothing
+ 	// only at the moment.
+ 	XIMStyles* styles;
+-	if (XGetIMValues(im, XNQueryInputStyle, &styles, NULL) != NULL ||
++	if (XGetIMValues(im, XNQueryInputStyle, &styles, (void *)NULL) != NULL ||
+ 		styles == NULL) {
+ 		LOG((CLOG_WARN "cannot get IM styles"));
+ 		XCloseIM(im);
+@@ -946,7 +946,7 @@ CXWindowsScreen::openIM()
+ 	}
+ 
+ 	// create an input context for the style and tell it about our window
+-	XIC ic = XCreateIC(im, XNInputStyle, style, XNClientWindow, m_window, NULL);
++	XIC ic = XCreateIC(im, XNInputStyle, style, XNClientWindow, m_window, (void *)NULL);
+ 	if (ic == NULL) {
+ 		LOG((CLOG_WARN "cannot create IC"));
+ 		XCloseIM(im);
+@@ -955,7 +955,7 @@ CXWindowsScreen::openIM()
+ 
+ 	// find out the events we must select for and do so
+ 	unsigned long mask;
+-	if (XGetICValues(ic, XNFilterEvents, &mask, NULL) != NULL) {
++	if (XGetICValues(ic, XNFilterEvents, &mask, (void *)NULL) != NULL) {
+ 		LOG((CLOG_WARN "cannot get IC filter events"));
+ 		XDestroyIC(ic);
+ 		XCloseIM(im);
-- 
cgit v1.2.3