summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-02-09 17:04:49 +0000
committerjoerg <joerg@pkgsrc.org>2009-02-09 17:04:49 +0000
commit3b70f4f77ee93c9153931a8ada5a3b8415188ae1 (patch)
tree41b3d1033cd68fcb220c74127d044fbab3bd9a7b /net
parenta5ef458265d3da4a5a1a798bf771d195897fcf00 (diff)
downloadpkgsrc-3b70f4f77ee93c9153931a8ada5a3b8415188ae1.tar.gz
DESTDIR support. Use (void *)NULL as sentinal.
Diffstat (limited to 'net')
-rw-r--r--net/synergy1.2/Makefile4
-rw-r--r--net/synergy1.2/distinfo3
-rw-r--r--net/synergy1.2/patches/patch-aa31
3 files changed, 36 insertions, 2 deletions
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);