From root@idspreng.unibe.ch  Fri Apr 28 09:44:33 2006
Return-Path: <root@idspreng.unibe.ch>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A1E1E16A400
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Apr 2006 09:44:33 +0000 (UTC)
	(envelope-from root@idspreng.unibe.ch)
Received: from mailhub03.unibe.ch (mailhub.unibe.ch [130.92.9.70])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DA7FF43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Apr 2006 09:44:30 +0000 (GMT)
	(envelope-from root@idspreng.unibe.ch)
Received: from localhost (scanhub03.unibe.ch [130.92.5.63])
	by mailhub03.unibe.ch (Postfix) with ESMTP id 2CE743F461
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Apr 2006 11:44:24 +0200 (CEST)
Received: from mailhub03.unibe.ch ([130.92.9.70])
 by localhost (scanhub03.unibe.ch [130.92.5.63]) (amavisd-new, port 10024)
 with LMTP id 29812-03-14 for <FreeBSD-gnats-submit@freebsd.org>;
 Fri, 28 Apr 2006 11:44:22 +0200 (CEST)
Received: from theblade.unibe.ch (theblade-eth0.unibe.ch [130.92.4.117])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mailhub03.unibe.ch (Postfix) with ESMTP id 35AA53F83B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Apr 2006 11:44:22 +0200 (CEST)
Received: from idspreng.unibe.ch (idspreng.unibe.ch [130.92.7.175])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by theblade.unibe.ch (Postfix) with ESMTP id C7A39E2409F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Apr 2006 11:44:18 +0200 (CEST)
Received: from idspreng.unibe.ch (localhost [127.0.0.1])
	by idspreng.unibe.ch (8.13.4/8.13.4) with ESMTP id k3S9igQ0014794
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Apr 2006 11:44:42 +0200 (CEST)
	(envelope-from root@idspreng.unibe.ch)
Received: (from root@localhost)
	by idspreng.unibe.ch (8.13.4/8.13.4/Submit) id k3S9igW7014793;
	Fri, 28 Apr 2006 11:44:42 +0200 (CEST)
	(envelope-from root)
Message-Id: <200604280944.k3S9igW7014793@idspreng.unibe.ch>
Date: Fri, 28 Apr 2006 11:44:42 +0200 (CEST)
From: Thomas Spreng <spreng@socket.ch>
Reply-To: Thomas Spreng <spreng@socket.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update sysutils/synergy port to 1.3.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         96455
>Category:       ports
>Synopsis:       Update sysutils/synergy port to 1.3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    kevlo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 28 09:50:28 GMT 2006
>Closed-Date:    Thu May 18 03:24:54 GMT 2006
>Last-Modified:  Thu May 18 03:24:54 GMT 2006
>Originator:     Thomas Spreng <spreng@socket.ch>
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD idspreng.unibe.ch 6.0-RELEASE FreeBSD 6.0-RELEASE #1: Thu Apr 6 10:46:37 CEST 2006 toor@idspreng.unibe.ch:/usr/obj/usr/src/sys/IDSPRENG i386


	
>Description:
	Patch to update synergy to the latest version. I also removed the patch 
	which was included in the previous port versions because the port runs fine
	with the original sources and I don't see the necessity for including it 
	in this version as well (the patch basically changed alloca() calls to malloc()).
	
>How-To-Repeat:
	
>Fix:

	

--- synergy.diff begins here ---
diff -ruN synergy.bak/Makefile synergy/Makefile
--- synergy.bak/Makefile	Fri Apr 28 10:37:59 2006
+++ synergy/Makefile	Fri Apr 28 09:30:37 2006
@@ -2,11 +2,11 @@
 # Date created:		26 March 2003
 # Whom:			Kevin Lo <kevlo@FreeBSD.org>
 #
-# $FreeBSD: ports/sysutils/synergy/Makefile,v 1.9 2005/11/17 00:57:07 kevlo Exp $
+# $FreeBSD: $
 #
 
 PORTNAME=	synergy
-PORTVERSION= 	1.2.6
+PORTVERSION= 	1.3.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}2
@@ -24,7 +24,7 @@
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 	${MKDIR} ${PREFIX}/share/examples/synergy
diff -ruN synergy.bak/distinfo synergy/distinfo
--- synergy.bak/distinfo	Fri Apr 28 10:37:59 2006
+++ synergy/distinfo	Fri Apr 28 09:31:40 2006
@@ -1,3 +1,3 @@
-MD5 (synergy-1.2.6.tar.gz) = 80b495847c408d23ae5d52e1ca4218b1
-SHA256 (synergy-1.2.6.tar.gz) = 77a7062c80863bc6e65cbd73f606749dab2dd3e5424ea763c447884b83f1d803
-SIZE (synergy-1.2.6.tar.gz) = 679489
+MD5 (synergy-1.3.1.tar.gz) = a6e09d6b71cb217f23069980060abf27
+SHA256 (synergy-1.3.1.tar.gz) = 4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691
+SIZE (synergy-1.3.1.tar.gz) = 793172
diff -ruN synergy.bak/files/patch-CArchNetworkBSD.cpp synergy/files/patch-CArchNetworkBSD.cpp
--- synergy.bak/files/patch-CArchNetworkBSD.cpp	Fri Apr 28 10:37:59 2006
+++ synergy/files/patch-CArchNetworkBSD.cpp	Thu Jan  1 01:00:00 1970
@@ -1,19 +0,0 @@
---- 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 -ruN synergy.bak/pkg-plist synergy/pkg-plist
--- synergy.bak/pkg-plist	Fri Apr 28 10:37:59 2006
+++ synergy/pkg-plist	Fri Apr 28 10:36:25 2006
@@ -1,11 +1,11 @@
 bin/synergyc
 bin/synergys
-share/examples/synergy/synergy.conf
-%%PORTDOCS%%share/doc/synergy/AUTHORS
-%%PORTDOCS%%share/doc/synergy/COPYING
-%%PORTDOCS%%share/doc/synergy/ChangeLog
-%%PORTDOCS%%share/doc/synergy/INSTALL
-%%PORTDOCS%%share/doc/synergy/NEWS
-%%PORTDOCS%%share/doc/synergy/README
-%%PORTDOCS%%@dirrm share/doc/synergy
-@dirrm share/examples/synergy
+%%EXAMPLESDIR%%/synergy.conf
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- synergy.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kevlo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Apr 28 09:52:09 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96455 
State-Changed-From-To: open->closed 
State-Changed-By: kevlo 
State-Changed-When: Thu May 18 03:24:31 UTC 2006 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96455 
>Unformatted:
