diff options
| author | Kevin Lo <kevlo@FreeBSD.org> | 2013-11-26 02:16:54 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@FreeBSD.org> | 2013-11-26 02:16:54 +0000 |
| commit | 51b1189c76d1044dcebfe8f61e4026440af0aa38 (patch) | |
| tree | edb0573ef5b535bf26d2d606d3274222ba66f9f4 /sysutils | |
| parent | b5b282ff96e496cfbbd62fad5bd918f4e3929df1 (diff) | |
| download | ports-51b1189c76d1044dcebfe8f61e4026440af0aa38.tar.gz ports-51b1189c76d1044dcebfe8f61e4026440af0aa38.zip | |
- Fix hang on reading config [1]
- support STAGE
PR: ports/184015 [1]
Submitted by: Henry Hu <henry.hu.sh at gmail dot com>
Notes
Notes:
svn path=/head/; revision=334913
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/synergy/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/synergy/files/patch-CConfig.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile index 5c9bcc5ed2f7..4e3d2e67c7e3 100644 --- a/sysutils/synergy/Makefile +++ b/sysutils/synergy/Makefile @@ -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 diff --git a/sysutils/synergy/files/patch-CConfig.cpp b/sysutils/synergy/files/patch-CConfig.cpp index 985bdf499b31..e9ba4102d999 100644 --- a/sysutils/synergy/files/patch-CConfig.cpp +++ b/sysutils/synergy/files/patch-CConfig.cpp @@ -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 |