Date: Tue, 26 Nov 2013 02:16:54 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334913 - in head/sysutils/synergy: . files Message-ID: <201311260216.rAQ2Gs45047108@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Tue Nov 26 02:16:54 2013 New Revision: 334913 URL: http://svnweb.freebsd.org/changeset/ports/334913 Log: - Fix hang on reading config [1] - support STAGE PR: ports/184015 [1] Submitted by: Henry Hu <henry.hu.sh at gmail dot com> Modified: head/sysutils/synergy/Makefile head/sysutils/synergy/files/patch-CConfig.cpp Modified: head/sysutils/synergy/Makefile ============================================================================== --- head/sysutils/synergy/Makefile Tue Nov 26 01:46:40 2013 (r334912) +++ head/sysutils/synergy/Makefile Tue Nov 26 02:16:54 2013 (r334913) @@ -2,6 +2,7 @@ PORTNAME= synergy PORTVERSION= 1.3.8 +PORTREVISION= 1 DISTVERSIONSUFFIX= -Source CATEGORIES= sysutils MASTER_SITES= GOOGLE_CODE @@ -23,15 +24,14 @@ PLIST_FILES= bin/synergys bin/synergyc PORTEXAMPLES= synergy.conf.example synergy.conf.example-basic \ synergy.conf.example-advanced -NO_STAGE= yes 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/files/patch-CConfig.cpp ============================================================================== --- head/sysutils/synergy/files/patch-CConfig.cpp Tue Nov 26 01:46:40 2013 (r334912) +++ head/sysutils/synergy/files/patch-CConfig.cpp Tue Nov 26 02:16:54 2013 (r334913) @@ -1,5 +1,5 @@ --- src/lib/server/CConfig.cpp.orig 2011-01-21 11:51:35.000000000 +0800 -+++ src/lib/server/CConfig.cpp 2013-09-12 17:23:04.000000000 +0800 ++++ src/lib/server/CConfig.cpp 2013-11-26 10:00:44.000000000 +0800 @@ -1908,9 +1908,9 @@ return m_line; } @@ -8,7 +8,7 @@ +CConfigReadContext::operator bool() const { - return m_stream; -+ return !m_stream.bad(); ++ return m_stream.good(); } bool
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311260216.rAQ2Gs45047108>