Update to 1.1.8

6 files changed, 33 insertions, 20 deletions

diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index 8c5b1732d7fc..b058c1816e09 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	synergy
-PORTVERSION= 	1.0.14
+PORTVERSION= 	1.1.8
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}2
@@ -18,8 +18,7 @@ GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-DOCS=		AUTHORS BUGS ChangeLog COPYING FAQ HISTORY INSTALL \
-		NEWS README TODO
+DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/synergy/distinfo b/sysutils/synergy/distinfo
index 62c3866fde89..85e3f96d85d8 100644
--- a/sysutils/synergy/distinfo
+++ b/sysutils/synergy/distinfo
@@ -1,2 +1,2 @@
-MD5 (synergy-1.0.14.tar.gz) = c9cc67852f4287b184578faa150acd4c
-SIZE (synergy-1.0.14.tar.gz) = 553219
+MD5 (synergy-1.1.8.tar.gz) = 665c81a2ce054606939fdab2cd2e9097
+SIZE (synergy-1.1.8.tar.gz) = 630768
diff --git a/sysutils/synergy/files/patch-CArchNetworkBSD.cpp b/sysutils/synergy/files/patch-CArchNetworkBSD.cpp
new file mode 100644
index 000000000000..0173cf1196a7
--- /dev/null
+++ b/sysutils/synergy/files/patch-CArchNetworkBSD.cpp
@@ -0,0 +1,19 @@
+--- lib/arch/CArchNetworkBSD.cpp.orig	Wed Sep  1 13:52:08 2004
++++ lib/arch/CArchNetworkBSD.cpp	Wed Sep  1 13:52:31 2004
+@@ -50,7 +50,6 @@
+ #if HAVE_ALLOCA_H
+ #	define freea(x_)
+ #else
+-#	define alloca(x_) malloc(x_)
+ #	define freea(x_) free(x_)
+ #endif
+ 
+@@ -292,7 +291,7 @@
+ 
+ 	// allocate space for translated query
+ 	struct pollfd* pfd = reinterpret_cast<struct pollfd*>(
+-								alloca((1 + num) * sizeof(struct pollfd)));
++								malloc((1 + num) * sizeof(struct pollfd)));
+ 
+ 	// translate query
+ 	for (int i = 0; i < num; ++i) {
diff --git a/sysutils/synergy/files/patch-CXWindowsScreen.cpp b/sysutils/synergy/files/patch-CXWindowsScreen.cpp
deleted file mode 100644
index 713ac6fe6e01..000000000000
--- a/sysutils/synergy/files/patch-CXWindowsScreen.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/platform/CXWindowsScreen.cpp.orig	Sun Jul 20 09:21:19 2003
-+++ lib/platform/CXWindowsScreen.cpp	Fri Oct 17 14:28:26 2003
-@@ -293,7 +293,7 @@
- 			}
- 		}
- #if HAVE_POLL
--		int timeout = static_cast<int>(1000.0 * dtimeout);
-+		int timeout = (dtimeout < 0) ? -1 :  static_cast<int>(1000.0 * dtimeout);
- #else
- 		struct timeval timeout;
- 		struct timeval* timeoutPtr;
diff --git a/sysutils/synergy/files/patch-IPlatformScreen.h b/sysutils/synergy/files/patch-IPlatformScreen.h
new file mode 100644
index 000000000000..7ddf753eb915
--- /dev/null
+++ b/sysutils/synergy/files/patch-IPlatformScreen.h
@@ -0,0 +1,10 @@
+--- lib/synergy/IPlatformScreen.h.orig	Wed Sep  1 13:56:16 2004
++++ lib/synergy/IPlatformScreen.h	Wed Sep  1 13:56:47 2004
+@@ -171,7 +171,6 @@
+ 						getActiveModifiers() const = 0;
+ 	virtual const char*	getKeyName(KeyButton) const = 0;
+ 
+-protected:
+ 	//! Handle system event
+ 	/*!
+ 	A platform screen is expected to install a handler for system
diff --git a/sysutils/synergy/pkg-plist b/sysutils/synergy/pkg-plist
index 4f75821d1932..51cc2756d4eb 100644
--- a/sysutils/synergy/pkg-plist
+++ b/sysutils/synergy/pkg-plist
@@ -2,14 +2,10 @@ bin/synergyc
 bin/synergys
 share/examples/synergy/synergy.conf
 %%PORTDOCS%%share/doc/synergy/AUTHORS
-%%PORTDOCS%%share/doc/synergy/BUGS
 %%PORTDOCS%%share/doc/synergy/COPYING
 %%PORTDOCS%%share/doc/synergy/ChangeLog
-%%PORTDOCS%%share/doc/synergy/FAQ
-%%PORTDOCS%%share/doc/synergy/HISTORY
 %%PORTDOCS%%share/doc/synergy/INSTALL
 %%PORTDOCS%%share/doc/synergy/NEWS
 %%PORTDOCS%%share/doc/synergy/README
-%%PORTDOCS%%share/doc/synergy/TODO
 %%PORTDOCS%%@dirrm share/doc/synergy
 @dirrm share/examples/synergy