[Midnightbsd-cvs] mports: mports/sysutils: Add synergy

[laffer1 at midnightbsd.org]

Log Message:
-----------
Add synergy

Modified Files:
--------------
    mports/sysutils:
        Makefile (r1.57 -> r1.58)

Added Files:
-----------
    mports/sysutils/synergy:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/sysutils/synergy/files:
        patch-lib__server__CClientProxy1_0.cpp (r1.1)
        patch-lib__server__CServer.cpp (r1.1)

-------------- next part --------------
--- /dev/null
+++ sysutils/synergy/pkg-descr
@@ -0,0 +1,7 @@
+Synergy lets you easily share a single mouse and keyboard between
+multiple computers with different operating systems, each with its
+own display, without special hardware.  It's intended for users
+with multiple computers on their desk since each system uses its
+own display.
+
+WWW:	http://synergy2.sourceforge.net
--- /dev/null
+++ sysutils/synergy/pkg-plist
@@ -0,0 +1,11 @@
+bin/synergyc
+bin/synergys
+%%EXAMPLESDIR%%/synergy.conf
+ at dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- /dev/null
+++ sysutils/synergy/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	synergy
+# Date created:		26 March 2003
+# Whom:			Kevin Lo <kevlo at FreeBSD.org>
+#
+# $MidnightBSD: mports/sysutils/synergy/Makefile,v 1.1 2007/12/30 00:45:50 laffer1 Exp $
+# $FreeBSD: ports/sysutils/synergy/Makefile,v 1.14 2007/07/25 01:25:03 kevlo Exp $
+#
+
+PORTNAME=	synergy
+PORTVERSION= 	1.3.1
+PORTREVISION=	2
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}2
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Mouse and keyboard sharing utility
+
+GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
+	${MKDIR} ${PREFIX}/share/examples/synergy
+	${INSTALL_DATA} ${WRKSRC}/examples/synergy.conf ${PREFIX}/share/examples/synergy
+
+.include <bsd.port.mk>
--- /dev/null
+++ sysutils/synergy/distinfo
@@ -0,0 +1,3 @@
+MD5 (synergy-1.3.1.tar.gz) = a6e09d6b71cb217f23069980060abf27
+SHA256 (synergy-1.3.1.tar.gz) = 4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691
+SIZE (synergy-1.3.1.tar.gz) = 793172
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/sysutils/Makefile,v
retrieving revision 1.57
retrieving revision 1.58
diff -L sysutils/Makefile -L sysutils/Makefile -u -r1.57 -r1.58
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -54,6 +54,7 @@
     SUBDIR += screen
     SUBDIR += screenie
     SUBDIR += searchmonkey
+    SUBDIR += synergy
     SUBDIR += system-tools-backends
     SUBDIR += timemon
     SUBDIR += ucspi-tcp
--- /dev/null
+++ sysutils/synergy/files/patch-lib__server__CServer.cpp
@@ -0,0 +1,30 @@
+--- ./lib/server/CServer.cpp.orig	2006-04-02 03:47:04.000000000 +0200
++++ ./lib/server/CServer.cpp	2007-07-24 16:59:59.000000000 +0200
+@@ -434,16 +434,23 @@
+ 				SInt32 x, SInt32 y, bool forScreensaver)
+ {
+ 	assert(dst != NULL);
++	assert(m_active != NULL);
++
++	LOG((CLOG_INFO "switch from \"%s\" to \"%s\" at %d,%d", getName(m_active).c_str(), getName(dst).c_str(), x, y));
++
+ #ifndef NDEBUG
+ 	{
+ 		SInt32 dx, dy, dw, dh;
+ 		dst->getShape(dx, dy, dw, dh);
+-		assert(x >= dx && y >= dy && x < dx + dw && y < dy + dh);
++
++		if(!(x >= dx && y >= dy && x < dx + dw && y < dy + dh)) {
++			LOG((CLOG_ERR "debug check failed"));
++			LOG((CLOG_ERR "x=%d dx=%d dw=%d", x, dx, dw));
++			LOG((CLOG_ERR "y=%d dy=%d dh=%d", y, dy, dh));
++			assert(0);
++		}
+ 	}
+ #endif
+-	assert(m_active != NULL);
+-
+-	LOG((CLOG_INFO "switch from \"%s\" to \"%s\" at %d,%d", getName(m_active).c_str(), getName(dst).c_str(), x, y));
+ 
+ 	// stop waiting to switch
+ 	stopSwitch();
--- /dev/null
+++ sysutils/synergy/files/patch-lib__server__CClientProxy1_0.cpp
@@ -0,0 +1,28 @@
+--- ./lib/server/CClientProxy1_0.cpp.orig	2006-04-02 03:47:03.000000000 +0200
++++ ./lib/server/CClientProxy1_0.cpp	2007-07-24 16:59:59.000000000 +0200
+@@ -401,7 +401,7 @@
+ 							&x, &y, &w, &h, &dummy1, &mx, &my)) {
+ 		return false;
+ 	}
+-	LOG((CLOG_DEBUG "received client \"%s\" info shape=%d,%d %dx%d", getName().c_str(), x, y, w, h));
++	LOG((CLOG_DEBUG "received client \"%s\" info shape=%d,%d %dx%d mouse=%d,%d", getName().c_str(), x, y, w, h, mx, my));
+ 
+ 	// validate
+ 	if (w <= 0 || h <= 0) {
+@@ -413,8 +413,14 @@
+ 	m_info.m_y  = y;
+ 	m_info.m_w  = w;
+ 	m_info.m_h  = h;
+-	m_info.m_mx = mx;
+-	m_info.m_my = my;
++	
++	if(mx >= x && mx < x+w && my >= y && my < y+h) {
++		m_info.m_mx = mx;
++		m_info.m_my = my;
++	} else {
++		m_info.m_mx = x + w/2;
++		m_info.m_my = y + h/2;
++	}
+ 
+ 	// acknowledge receipt
+ 	LOG((CLOG_DEBUG1 "send info ack to \"%s\"", getName().c_str()));