UPDATE: net/synergy 1.4.10 => 1.4.12

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: net/synergy 1.4.10 => 1.4.12

Brian Callahan-3
Hi ports --

Here's an update for net/synergy to its latest version.
Works for me on amd64 and loongson.

OK?

~Brian


synergy1412.diff (8K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/synergy 1.4.10 => 1.4.12

Aaron Bieber
On Sat, May 11, 2013 at 03:22:40PM -0400, Brian Callahan wrote:
> Hi ports --
>
> Here's an update for net/synergy to its latest version.
> Works for me on amd64 and loongson.
>
> OK?

OK abieber@

>
> ~Brian
>

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/synergy/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 11 Mar 2013 11:35:57 -0000 1.17
> +++ Makefile 11 May 2013 19:17:22 -0000
> @@ -2,8 +2,9 @@
>  
>  COMMENT= mouse and keyboard sharing utility
>  
> -DISTNAME= synergy-1.4.10-Source
> -PKGNAME= ${DISTNAME:S/-Source//}
> +V= 1.4.12
> +DISTNAME= synergy-${V}-Source
> +PKGNAME= synergy-${V}
>  CATEGORIES= net x11
>  
>  MAINTAINER= Brian Callahan <[hidden email]>
> @@ -17,16 +18,18 @@ WANTLIB += ICE SM X11 Xext Xi Xinerama X
>  
>  MASTER_SITES= http://synergy.googlecode.com/files/
>  
> -BUILD_DEPENDS= archivers/gtar
> +BUILD_DEPENDS= archivers/gtar \
> + archivers/unzip
>  
> -# The synergy devs decided to release a fucked tarball.
> -# Our tar complains, then errors out.
>  # tar: Invalid header, starting valid header search.
>  TAR= ${LOCALBASE}/bin/gtar
>  
>  MODULES= devel/cmake
>  
>  NO_TEST= Yes
> +
> +post-extract:
> + @cd ${WRKSRC}/tools ; ${LOCALBASE}/bin/unzip cryptopp562.zip -d cryptopp562
>  
>  pre-patch:
>   @cd ${WRKSRC} ; perl -pi -e 's/\r$$//' CMakeLists.txt
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/synergy/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 8 Jan 2013 20:35:36 -0000 1.6
> +++ distinfo 11 May 2013 19:17:22 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (synergy-1.4.10-Source.tar.gz) = BtWizrTPiAjNqyJEGJfHtU7ItLyDUawRb5rM9UxyD74=
> -SIZE (synergy-1.4.10-Source.tar.gz) = 3598533
> +SHA256 (synergy-1.4.12-Source.tar.gz) = NbYMjXM2igy5DapinmT2YXG5NKeZqCQnQxl5zKcmCEk=
> +SIZE (synergy-1.4.12-Source.tar.gz) = 3954996
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/net/synergy/patches/patch-CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 8 Jan 2013 20:35:36 -0000 1.1
> +++ patches/patch-CMakeLists_txt 11 May 2013 19:17:22 -0000
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-CMakeLists_txt,v 1.1 2013/01/08 20:35:36 bcallah Exp $
> ---- CMakeLists.txt.orig Tue Jan  8 13:23:44 2013
> -+++ CMakeLists.txt Tue Jan  8 13:24:40 2013
> -@@ -86,7 +86,7 @@ if (UNIX)
> +--- CMakeLists.txt.orig Thu Apr 18 10:50:31 2013
> ++++ CMakeLists.txt Thu Apr 18 10:50:31 2013
> +@@ -87,7 +87,7 @@ if (UNIX)
>   check_include_files(strings.h HAVE_STRINGS_H)
>   check_include_files(string.h HAVE_STRING_H)
>   check_include_files(sys/select.h HAVE_SYS_SELECT_H)
> @@ -10,7 +10,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 201
>   check_include_files(sys/stat.h HAVE_SYS_STAT_H)
>   check_include_files(sys/time.h HAVE_SYS_TIME_H)
>   check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
> -@@ -97,7 +97,6 @@ if (UNIX)
> +@@ -98,7 +98,6 @@ if (UNIX)
>   check_function_exists(gmtime_r HAVE_GMTIME_R)
>   check_function_exists(nanosleep HAVE_NANOSLEEP)
>   check_function_exists(poll HAVE_POLL)
> @@ -18,7 +18,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 201
>   check_function_exists(strftime HAVE_STRFTIME)
>   check_function_exists(vsnprintf HAVE_VSNPRINTF)
>   check_function_exists(inet_aton HAVE_INET_ATON)
> -@@ -139,6 +138,8 @@ if (UNIX)
> +@@ -140,6 +139,8 @@ if (UNIX)
>   else (HAVE_PTHREAD)
>   message(FATAL_ERROR "Missing library: pthread")
>   endif()
> @@ -27,7 +27,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 201
>  
>   if (APPLE)
>   exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION)
> -@@ -173,78 +174,53 @@ if (UNIX)
> +@@ -174,78 +175,53 @@ if (UNIX)
>  
>   else()
>  
> Index: patches/patch-src_lib_ipc_CIpcClientProxy_cpp
> ===================================================================
> RCS file: /cvs/ports/net/synergy/patches/patch-src_lib_ipc_CIpcClientProxy_cpp,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_lib_ipc_CIpcClientProxy_cpp
> --- patches/patch-src_lib_ipc_CIpcClientProxy_cpp 20 Jan 2013 09:19:31 -0000 1.2
> +++ patches/patch-src_lib_ipc_CIpcClientProxy_cpp 11 May 2013 19:17:22 -0000
> @@ -3,9 +3,9 @@ $OpenBSD: patch-src_lib_ipc_CIpcClientPr
>  On loongson/sparc64:
>  Same as CIpcServerProxy.cpp
>  
> ---- src/lib/ipc/CIpcClientProxy.cpp.orig Fri Jul 27 20:59:20 2012
> -+++ src/lib/ipc/CIpcClientProxy.cpp Sun Jan 20 02:09:33 2013
> -@@ -143,7 +143,11 @@ CIpcClientProxy::send(const CIpcMessage& message)
> +--- src/lib/ipc/CIpcClientProxy.cpp.orig Mon Sep  3 22:09:56 2012
> ++++ src/lib/ipc/CIpcClientProxy.cpp Thu Apr 18 10:50:31 2013
> +@@ -144,7 +144,11 @@ CIpcClientProxy::send(const CIpcMessage& message)
>   case kIpcLogLine: {
>   const CIpcLogLineMessage& llm = static_cast<const CIpcLogLineMessage&>(message);
>   CString logLine = llm.logLine();
> Index: patches/patch-src_lib_ipc_CIpcServerProxy_cpp
> ===================================================================
> RCS file: /cvs/ports/net/synergy/patches/patch-src_lib_ipc_CIpcServerProxy_cpp,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_lib_ipc_CIpcServerProxy_cpp
> --- patches/patch-src_lib_ipc_CIpcServerProxy_cpp 20 Jan 2013 09:19:31 -0000 1.2
> +++ patches/patch-src_lib_ipc_CIpcServerProxy_cpp 11 May 2013 19:17:22 -0000
> @@ -10,9 +10,9 @@ CIpcServerProxy.cpp:93: error: within th
>  
>  gcc bug fixed in 4.3.3
>  
> ---- src/lib/ipc/CIpcServerProxy.cpp.orig Fri Jul 13 11:34:59 2012
> -+++ src/lib/ipc/CIpcServerProxy.cpp Sun Jan 20 02:09:02 2013
> -@@ -90,7 +90,11 @@ CIpcServerProxy::send(const CIpcMessage& message)
> +--- src/lib/ipc/CIpcServerProxy.cpp.orig Mon Sep  3 22:09:56 2012
> ++++ src/lib/ipc/CIpcServerProxy.cpp Thu Apr 18 10:50:31 2013
> +@@ -91,7 +91,11 @@ CIpcServerProxy::send(const CIpcMessage& message)
>   case kIpcCommand: {
>   const CIpcCommandMessage& cm = static_cast<const CIpcCommandMessage&>(message);
>   CString command = cm.command();
> Index: patches/patch-src_lib_server_CClientProxy1_4_cpp
> ===================================================================
> RCS file: patches/patch-src_lib_server_CClientProxy1_4_cpp
> diff -N patches/patch-src_lib_server_CClientProxy1_4_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_lib_server_CClientProxy1_4_cpp 11 May 2013 19:17:22 -0000
> @@ -0,0 +1,19 @@
> +$OpenBSD$
> +
> +On loongson/sparc64:
> +Same issue as CIpcClientProxy.
> +
> +--- src/lib/server/CClientProxy1_4.cpp.orig Sat May 11 12:46:51 2013
> ++++ src/lib/server/CClientProxy1_4.cpp Sat May 11 12:56:15 2013
> +@@ -102,7 +102,11 @@ CClientProxy1_4::cryptoIv()
> + CString data(reinterpret_cast<const char*>(iv), CRYPTO_IV_SIZE);
> +
> + LOG((CLOG_DEBUG2 "send crypto iv change to \"%s\"", getName().c_str()));
> ++#if defined(__mips64__) || defined(__sparc64__)
> ++ CProtocolUtil::writef(static_cast<void*>(getStream()), static_cast<const char*>(kMsgDCryptoIv), &data);
> ++#else
> + CProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data);
> ++#endif
> +
> + // change IV only after we've sent the current IV, otherwise
> + // the client won't be able to decrypt the new IV.
> Index: patches/patch-src_lib_synergy_CProtocolUtil_h
> ===================================================================
> RCS file: /cvs/ports/net/synergy/patches/patch-src_lib_synergy_CProtocolUtil_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_lib_synergy_CProtocolUtil_h
> --- patches/patch-src_lib_synergy_CProtocolUtil_h 8 Jan 2013 20:35:36 -0000 1.1
> +++ patches/patch-src_lib_synergy_CProtocolUtil_h 11 May 2013 19:17:22 -0000
> @@ -2,9 +2,9 @@ $OpenBSD: patch-src_lib_synergy_CProtoco
>  
>  Move private function to public so loongson can use it.
>  
> ---- src/lib/synergy/CProtocolUtil.h.orig Sun Jan  6 12:33:25 2013
> -+++ src/lib/synergy/CProtocolUtil.h Sun Jan  6 12:33:50 2013
> -@@ -71,6 +71,7 @@ class CProtocolUtil { (public)
> +--- src/lib/synergy/CProtocolUtil.h.orig Mon Sep  3 22:09:56 2012
> ++++ src/lib/synergy/CProtocolUtil.h Thu Apr 18 10:50:31 2013
> +@@ -72,6 +72,7 @@ class CProtocolUtil { (public)
>   static bool readf(synergy::IStream*,
>   const char* fmt, ...);
>  
> @@ -12,7 +12,7 @@ Move private function to public so loong
>   private:
>   static void vwritef(synergy::IStream*,
>   const char* fmt, UInt32 size, va_list);
> -@@ -78,7 +79,6 @@ class CProtocolUtil { (public)
> +@@ -79,7 +80,6 @@ class CProtocolUtil { (public)
>   const char* fmt, va_list);
>  
>   static UInt32 getLength(const char* fmt, va_list);
> Index: patches/patch-tools_CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-tools_CMakeLists_txt
> diff -N patches/patch-tools_CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-tools_CMakeLists_txt 11 May 2013 19:17:22 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- tools/CMakeLists.txt.orig Thu Apr 18 11:04:00 2013
> ++++ tools/CMakeLists.txt Thu Apr 18 11:04:49 2013
> +@@ -56,8 +56,6 @@ if (UNIX)
> + if (DARWIN_VERSION GREATER 10)
> + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare")
> + endif()
> +- else()
> +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
> + endif()
> + endif()
> +