From 6d2e4f93314ad2cc6dcbbd4aec40dad091de019a Mon Sep 17 00:00:00 2001 From: taca Date: Thu, 23 Jun 2011 03:16:50 +0000 Subject: Update synergy pacakge to 1.3.7. (leaf package) pkgsrc change: - Add LICENSE. - Add more example files. Fixed Bugs of 1.3.7: #1668 Scroll lock has opposite behavior 1.3.x 0 #2952 Visual C++ 2008 Redistributable unpacks to root of hard drive 1.3.6 0 #2939 The hook DLL (synrgyhk.dll) is not compiled to the bin dir 1.3.6 0 #2938 Argument --help does not work 1.3.6 0 #2834 Fix buildbot console (it has nothing on it) 1.3.6 0 #691 fix compilation errors for gcc 4.3 1.2.6 0 #1187 Compile broken for modern C++ 1.3.1 0 #683 Only cross screens on during special keypress 1.3.0 0 #128 In Linux focused window loses focus when cursor moved to another screen (big problem for 1B.o3x.3ee) 12 #1663 "hos" != "host" 1.3.1 1 #610 Client side crash - Linux x64 1.3.5 2 --- net/synergy/Makefile | 17 ++++++++++----- net/synergy/PLIST | 11 ++++++---- net/synergy/distinfo | 10 +++++---- .../patches/patch-tools_gmock-1.6.0_configure | 24 ++++++++++++++++++++++ .../patches/patch-tools_gtest-1.6.0_configure | 15 ++++++++++++++ 5 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 net/synergy/patches/patch-tools_gmock-1.6.0_configure create mode 100644 net/synergy/patches/patch-tools_gtest-1.6.0_configure (limited to 'net') diff --git a/net/synergy/Makefile b/net/synergy/Makefile index aaa8540e824..d01a284269e 100644 --- a/net/synergy/Makefile +++ b/net/synergy/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2011/01/23 02:26:58 tnn Exp $ +# $NetBSD: Makefile,v 1.13 2011/06/23 03:16:50 taca Exp $ # -DISTNAME= synergy-1.3.6-Source +DISTNAME= synergy-1.3.7-Source PKGNAME= ${DISTNAME:S/-Source//} CATEGORIES= net x11 MASTER_SITES= http://synergy.googlecode.com/files/ @@ -9,11 +9,16 @@ MASTER_SITES= http://synergy.googlecode.com/files/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://synergy-foss.org/ COMMENT= Let a user share a mouse and keyboard among computers +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c c++ +EXAMPLES= MacReadme.txt org.synergy-foss.org.synergyc.plist \ + org.synergy-foss.org.synergys.plist synergy.conf.example \ + synergy.conf.example-advanced synergy.conf.example-basic + # Below rpath fix is copypasted from graphics/vtk. CMAKE_OPTS+= -DCMAKE_INSTALL_RPATH:STRING=${PREFIX}/lib:${X11BASE}/lib${LIBABISUFFIX:Q} \ CMAKE_OPTS+= -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \ @@ -36,11 +41,13 @@ post-build: ${CP} ${WRKSRC}/doc/synergys.man ${WRKSRC}/doc/synergys.1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/synergyc ${DESTDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/synergys ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/synergyc ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/synergys ${DESTDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/synergyc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/doc/synergys.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA} ${WRKSRC}/doc/*.conf ${DESTDIR}${PREFIX}/share/examples/${PKGBASE} +.for f in ${EXAMPLES} + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE} +.endfor .include "../../devel/cmake/buildlink3.mk" .if !exists(/System/Library/Frameworks/Carbon.framework) diff --git a/net/synergy/PLIST b/net/synergy/PLIST index 5d5d8638d30..9e80df652ab 100644 --- a/net/synergy/PLIST +++ b/net/synergy/PLIST @@ -1,8 +1,11 @@ -@comment $NetBSD: PLIST,v 1.5 2011/01/23 02:24:29 tnn Exp $ +@comment $NetBSD: PLIST,v 1.6 2011/06/23 03:16:50 taca Exp $ bin/synergyc bin/synergys man/man1/synergyc.1 man/man1/synergys.1 -share/examples/synergy/synergy-advanced.conf -share/examples/synergy/synergy-basic.conf -share/examples/synergy/synergy-stooges.conf +share/examples/synergy/MacReadme.txt +share/examples/synergy/org.synergy-foss.org.synergyc.plist +share/examples/synergy/org.synergy-foss.org.synergys.plist +share/examples/synergy/synergy.conf.example +share/examples/synergy/synergy.conf.example-advanced +share/examples/synergy/synergy.conf.example-basic diff --git a/net/synergy/distinfo b/net/synergy/distinfo index f8dd4714e7e..12ae445ccb4 100644 --- a/net/synergy/distinfo +++ b/net/synergy/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.7 2011/01/23 02:24:29 tnn Exp $ +$NetBSD: distinfo,v 1.8 2011/06/23 03:16:50 taca Exp $ -SHA1 (synergy-1.3.6-Source.tar.gz) = acbb8c62bc7f18cd4646c8b116c9acdeb2b405da -RMD160 (synergy-1.3.6-Source.tar.gz) = adcd5b7a2de7370a03b404c7827be58cb9f7467a -Size (synergy-1.3.6-Source.tar.gz) = 659025 bytes +SHA1 (synergy-1.3.7-Source.tar.gz) = 0f67dc4a221dc0db74ec8a35d3dd578e9d76eccc +RMD160 (synergy-1.3.7-Source.tar.gz) = 5f28bd102293437481a8c5808d5cbfc8722ee1ae +Size (synergy-1.3.7-Source.tar.gz) = 2518746 bytes +SHA1 (patch-tools_gmock-1.6.0_configure) = 45cfbcdc8b55c1e745265ed4e2bbbfe41ef000a2 +SHA1 (patch-tools_gtest-1.6.0_configure) = 35d77cab8e651bff031294f7d12570cb582aba1a diff --git a/net/synergy/patches/patch-tools_gmock-1.6.0_configure b/net/synergy/patches/patch-tools_gmock-1.6.0_configure new file mode 100644 index 00000000000..e4a0a8bb600 --- /dev/null +++ b/net/synergy/patches/patch-tools_gmock-1.6.0_configure @@ -0,0 +1,24 @@ +$NetBSD: patch-tools_gmock-1.6.0_configure,v 1.1 2011/06/23 03:16:50 taca Exp $ + +Fix wrong usage of test(1). + +--- tools/gmock-1.6.0/configure.orig 2011-05-07 02:25:30.000000000 +0000 ++++ tools/gmock-1.6.0/configure +@@ -14896,7 +14896,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + have_pthreads="$acx_pthread_ok" + fi +- if test "x$have_pthreads" == "xyes"; then ++ if test "x$have_pthreads" = "xyes"; then + HAVE_PTHREADS_TRUE= + HAVE_PTHREADS_FALSE='#' + else +@@ -14926,7 +14926,7 @@ else + enable_external_gtest=yes + fi + +-if test "x$with_gtest" == "xno"; then : ++if test "x$with_gtest" = "xno"; then : + as_fn_error "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard + dependency upon GoogleTest to build, please provide a version, or allow + GoogleMock to use any installed version and fall back upon its internal diff --git a/net/synergy/patches/patch-tools_gtest-1.6.0_configure b/net/synergy/patches/patch-tools_gtest-1.6.0_configure new file mode 100644 index 00000000000..6a21dd3089a --- /dev/null +++ b/net/synergy/patches/patch-tools_gtest-1.6.0_configure @@ -0,0 +1,15 @@ +$NetBSD: patch-tools_gtest-1.6.0_configure,v 1.1 2011/06/23 03:16:50 taca Exp $ + +Fix wrong usage of test(1). + +--- tools/gtest-1.6.0/configure.orig 2011-05-07 02:25:30.000000000 +0000 ++++ tools/gtest-1.6.0/configure +@@ -14861,7 +14861,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + have_pthreads="$acx_pthread_ok" + fi +- if test "x$have_pthreads" == "xyes"; then ++ if test "x$have_pthreads" = "xyes"; then + HAVE_PTHREADS_TRUE= + HAVE_PTHREADS_FALSE='#' + else -- cgit v1.2.3