diff options
| author | Ryan Steinmetz <zi@FreeBSD.org> | 2012-04-11 17:05:25 +0000 |
|---|---|---|
| committer | Ryan Steinmetz <zi@FreeBSD.org> | 2012-04-11 17:05:25 +0000 |
| commit | 04c613685c24f5effa2543bb611b9d2310bdf8bf (patch) | |
| tree | b6af3d121b77a07accbbf1c8065a64f4ed19f9bc /net | |
| parent | Update to 4.0.7 (diff) | |
- Fix _DEPENDS
- Merge in two additional patches from upstream to fix BSD-specific issues
- Bump PORTREVISION
Notes
Notes:
svn path=/head/; revision=294656
Diffstat (limited to 'net')
| -rw-r--r-- | net/mosh/Makefile | 5 | ||||
| -rw-r--r-- | net/mosh/files/patch-src__frontend__mosh-server.cc | 11 | ||||
| -rw-r--r-- | net/mosh/files/patch-src__terminal__terminaldispatcher.cc | 20 |
3 files changed, 33 insertions, 3 deletions
diff --git a/net/mosh/Makefile b/net/mosh/Makefile index 24e21cb93253..b57c475c5a80 100644 --- a/net/mosh/Makefile +++ b/net/mosh/Makefile @@ -7,6 +7,7 @@ PORTNAME= mosh PORTVERSION= 1.1.3 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://cloud.github.com/downloads/keithw/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ @@ -16,9 +17,9 @@ COMMENT= A mobile terminal that supports intermittant connectivity LICENSE= GPLv3 -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= protobuf.7:${PORTSDIR}/devel/protobuf RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IO/Pty.pm:${PORTSDIR}/devel/p5-IO-Tty -BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf +BUILD_DEPENDS= ${LOCALBASE}/include/boost/typeof/typeof.hpp:${PORTSDIR}/devel/boost-libs USE_PERL5_RUN= yes GNU_CONFIGURE= yes diff --git a/net/mosh/files/patch-src__frontend__mosh-server.cc b/net/mosh/files/patch-src__frontend__mosh-server.cc index 51eda28a566a..d63be6493ad0 100644 --- a/net/mosh/files/patch-src__frontend__mosh-server.cc +++ b/net/mosh/files/patch-src__frontend__mosh-server.cc @@ -1,5 +1,5 @@ --- ./src/frontend/mosh-server.cc.orig 2012-04-02 18:08:49.000000000 -0400 -+++ ./src/frontend/mosh-server.cc 2012-04-10 15:29:12.000000000 -0400 ++++ ./src/frontend/mosh-server.cc 2012-04-11 06:59:21.000000000 -0400 @@ -39,6 +39,7 @@ #include <arpa/inet.h> #include <getopt.h> @@ -8,3 +8,12 @@ extern "C" { #include "selfpipe.h" +@@ -127,7 +128,7 @@ + && (strcmp( argv[ 1 ], "new" ) == 0) ) { + /* new option syntax */ + int opt; +- while ( (opt = getopt( argc, argv, "i:p:c:s" )) != -1 ) { ++ while ( (opt = getopt( argc - 1, argv + 1, "i:p:c:s" )) != -1 ) { + switch ( opt ) { + case 'i': + desired_ip = optarg; diff --git a/net/mosh/files/patch-src__terminal__terminaldispatcher.cc b/net/mosh/files/patch-src__terminal__terminaldispatcher.cc new file mode 100644 index 000000000000..e54d680f5ef7 --- /dev/null +++ b/net/mosh/files/patch-src__terminal__terminaldispatcher.cc @@ -0,0 +1,20 @@ +--- ./src/terminal/terminaldispatcher.cc.orig 2012-04-11 06:57:23.000000000 -0400 ++++ ./src/terminal/terminaldispatcher.cc 2012-04-11 06:58:05.000000000 -0400 +@@ -85,7 +85,7 @@ + if ( endptr == segment_begin ) { + val = -1; + } +- if ( errno == 0 ) { ++ if ( errno == 0 || segment_begin == endptr ) { + parsed_params.push_back( val ); + } + +@@ -99,7 +99,7 @@ + if ( endptr == segment_begin ) { + val = -1; + } +- if ( errno == 0 ) { ++ if ( errno == 0 || segment_begin == endptr ) { + parsed_params.push_back( val ); + } + |