[pkgsrc/trunk]: pkgsrc/net/synergy1.2 DESTDIR support. Use (void *)NULL as se...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/547c77f187e7
branches:  trunk
changeset: 554138:547c77f187e7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Feb 09 17:04:49 2009 +0000

description:
DESTDIR support. Use (void *)NULL as sentinal.

diffstat:

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

diffs (64 lines):

diff -r 77ee951d0c3e -r 547c77f187e7 net/synergy1.2/Makefile
--- a/net/synergy1.2/Makefile   Mon Feb 09 16:54:08 2009 +0000
+++ b/net/synergy1.2/Makefile   Mon Feb 09 17:04:49 2009 +0000
@@ -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 @@
 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 -r 77ee951d0c3e -r 547c77f187e7 net/synergy1.2/distinfo
--- a/net/synergy1.2/distinfo   Mon Feb 09 16:54:08 2009 +0000
+++ b/net/synergy1.2/distinfo   Mon Feb 09 17:04:49 2009 +0000
@@ -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 -r 77ee951d0c3e -r 547c77f187e7 net/synergy1.2/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/synergy1.2/patches/patch-aa   Mon Feb 09 17:04:49 2009 +0000
@@ -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);