Date: Sat, 07 Dec 2013 00:10:42 +0800 From: Kevin Lo <kevlo@FreeBSD.org> To: Emanuel Haupt <ehaupt@FreeBSD.org> Cc: svn-ports-head@freebsd.org, gnn@FreeBSD.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r335679 - head/sysutils/synergy-devel Message-ID: <52A1F702.70804@FreeBSD.org> In-Reply-To: <20131206090558.0909894ce72a78238698d22c@FreeBSD.org> References: <201312051853.rB5Ir6Bx053707@svn.freebsd.org> <52A127F5.1080304@FreeBSD.org> <20131206090558.0909894ce72a78238698d22c@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------060802090906000401090302 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 2013/12/06 16:05, Emanuel Haupt wrote: > Kevin Lo <kevlo@FreeBSD.org> wrote: >> On 2013/12/06 02:53, Emanuel Haupt wrote: >>> Author: ehaupt >>> Date: Thu Dec 5 18:53:06 2013 >>> New Revision: 335679 >>> URL: http://svnweb.freebsd.org/changeset/ports/335679 >>> >>> Log: >>> - Update to 1.4.15 >>> - Add LICENSE >>> - Eliminate the need for archivers/unzip as an extract dependency >>> - Support staging >>> >>> Approved by: gnn (maintainer) >>> >>> Modified: >>> head/sysutils/synergy-devel/Makefile >>> head/sysutils/synergy-devel/distinfo >>> >>> Modified: head/sysutils/synergy-devel/Makefile >>> ============================================================================== >>> --- head/sysutils/synergy-devel/Makefile Thu Dec 5 18:27:03 >>> 2013 (r335678) +++ >>> head/sysutils/synergy-devel/Makefile Thu Dec 5 18:53:06 >>> 2013 (r335679) @@ -2,7 +2,7 @@ >>> # $FreeBSD$ >>> >>> PORTNAME= synergy >>> -PORTVERSION= 1.4.12 >>> +PORTVERSION= 1.4.15 >>> DISTVERSIONSUFFIX= -Source >>> CATEGORIES= sysutils >>> MASTER_SITES= GOOGLE_CODE >>> @@ -11,7 +11,7 @@ PKGNAMESUFFIX= -devel >>> MAINTAINER= gnn@FreeBSD.org >>> COMMENT= Mouse and keyboard sharing utility >>> >>> -EXTRACT_DEPENDS= unzip:${PORTSDIR}/archivers/unzip >>> +LICENSE= GPLv2 >>> >>> CONFLICTS= synergy-[0-9]* >>> USES= cmake >>> @@ -24,20 +24,19 @@ PLIST_FILES= bin/synergys bin/synergyc >>> PORTEXAMPLES= synergy.conf.example >>> synergy.conf.example-basic \ synergy.conf.example-advanced >>> >>> -NO_STAGE= yes >>> post-extract: >>> cd ${WRKSRC}/tools/ >>> ${MKDIR} ${WRKSRC}/tools/cryptopp562 >>> - (cd ${WRKSRC}/tools/cryptopp562 && unzip >>> ${WRKSRC}/tools/cryptopp562.zip) >>> + (cd ${WRKSRC}/tools/cryptopp562 && ${TAR} xfz >>> ${WRKSRC}/tools/cryptopp562.zip) >>> do-install: >>> .for f in synergys synergyc >>> - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin >>> + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${STAGEDIR} >>> ${PREFIX}/bin .endfor >>> .if !defined(NOPORTEXAMPLES) >>> - ${MKDIR} ${EXAMPLESDIR} >>> + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} >>> .for f in ${PORTEXAMPLES} >>> - ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${EXAMPLESDIR} >>> + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR} >>> ${EXAMPLESDIR} .endfor >>> .endif >>> >>> >>> Modified: head/sysutils/synergy-devel/distinfo >>> ============================================================================== >>> --- head/sysutils/synergy-devel/distinfo Thu Dec 5 18:27:03 >>> 2013 (r335678) +++ >>> head/sysutils/synergy-devel/distinfo Thu Dec 5 18:53:06 >>> 2013 (r335679) @@ -1,2 +1,2 @@ -SHA256 >>> (synergy-1.4.12-Source.tar.gz) = >>> 35b60c8d73368a0cb90daa629e64f66171b934a799a82427431979cca7260849 >>> -SIZE (synergy-1.4.12-Source.tar.gz) = 3954996 +SHA256 >>> (synergy-1.4.15-Source.tar.gz) = >>> 643745888ec6150e74cb6da9813f8c7572f2f87cf35f0bd4f64cc1e467ef3550 >>> +SIZE (synergy-1.4.15-Source.tar.gz) = 4122349 >> It doesn't build on -CURRENT... > Seems like 1.4.12 had the same issue. Cc the maintainer (gnn). Attached patch fixes build on -CURRENT. Ok? > > Emanuel Kevin --------------060802090906000401090302 Content-Type: text/plain; charset=UTF-8; name="patch-synergy-devel" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-synergy-devel" Index: sysutils/synergy-devel/files/patch-CConfig.cpp =================================================================== --- sysutils/synergy-devel/files/patch-CConfig.cpp (revision 0) +++ sysutils/synergy-devel/files/patch-CConfig.cpp (working copy) @@ -0,0 +1,14 @@ +--- src/lib/server/CConfig.cpp.orig 2011-01-21 11:51:35.000000000 +0800 ++++ src/lib/server/CConfig.cpp 2013-11-26 10:00:44.000000000 +0800 +@@ -1908,9 +1908,9 @@ + return m_line; + } + +-CConfigReadContext::operator void*() const ++CConfigReadContext::operator bool() const + { +- return m_stream; ++ return m_stream.good(); + } + + bool Index: sysutils/synergy-devel/files/patch-CConfig.h =================================================================== --- sysutils/synergy-devel/files/patch-CConfig.h (revision 0) +++ sysutils/synergy-devel/files/patch-CConfig.h (working copy) @@ -0,0 +1,11 @@ +--- src/lib/server/CConfig.h.orig 2013-09-12 16:03:30.000000000 +0800 ++++ src/lib/server/CConfig.h 2013-09-12 16:04:07.000000000 +0800 +@@ -483,7 +483,7 @@ + bool readLine(CString&); + UInt32 getLineNumber() const; + +- operator void*() const; ++ operator bool() const; + bool operator!() const; + + OptionValue parseBoolean(const CString&) const; Index: sysutils/synergy-devel/files/patch-gtest-port.h =================================================================== --- sysutils/synergy-devel/files/patch-gtest-port.h (revision 0) +++ sysutils/synergy-devel/files/patch-gtest-port.h (working copy) @@ -0,0 +1,11 @@ +--- tools/gtest-1.6.0/include/gtest/internal/gtest-port.h.orig 2011-05-07 10:25:30.000000000 +0800 ++++ tools/gtest-1.6.0/include/gtest/internal/gtest-port.h 2013-09-12 17:39:09.000000000 +0800 +@@ -204,6 +204,8 @@ + #define GTEST_NAME_ "Google Test" + #define GTEST_PROJECT_URL_ "http://code.google.com/p/googletest/" + ++#define GTEST_USE_OWN_TR1_TUPLE 1 ++ + // Determines the version of gcc that is used to compile this. + #ifdef __GNUC__ + // 40302 means version 4.3.2. --------------060802090906000401090302--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52A1F702.70804>