5 files changed, 14 insertions, 13 deletions

diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index 588b2911eea5..0cb7df2b31b4 100644
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	x2goclient
-PORTVERSION=	4.0.5.0
-PORTREVISION=	1
+PORTVERSION=	4.0.5.1
 CATEGORIES=	net
 MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/
 
@@ -66,6 +65,8 @@ do-install:
 	(cd ${WRKSRC}/res/img/icons/128x128 && ${INSTALL_DATA} ${i} \
 		${STAGEDIR}${DATADIR}/icons)
 .endfor
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR})
 
diff --git a/net/x2goclient/distinfo b/net/x2goclient/distinfo
index 1e871f84d774..b78212adf6c5 100644
--- a/net/x2goclient/distinfo
+++ b/net/x2goclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (x2goclient-4.0.5.0.tar.gz) = 242e91720c1e5830f64a632c111ac3c4b6f6690d5005454c8e025b00bfbe42a1
-SIZE (x2goclient-4.0.5.0.tar.gz) = 1577271
+SHA256 (x2goclient-4.0.5.1.tar.gz) = 844e983fbbddfe8a626506e4140b1ad65591e14f794c735412402bee3163ed11
+SIZE (x2goclient-4.0.5.1.tar.gz) = 1657361
diff --git a/net/x2goclient/files/patch-sshmasterconnection.cpp b/net/x2goclient/files/patch-src_sshmasterconnection.cpp
index 3002808f8efc..eeb7604f01cf 100644
--- a/net/x2goclient/files/patch-sshmasterconnection.cpp
+++ b/net/x2goclient/files/patch-src_sshmasterconnection.cpp
@@ -1,4 +1,4 @@
---- src/sshmasterconnection.cpp.orig	2015-05-26 19:13:12 UTC
+--- src/sshmasterconnection.cpp.orig	2016-03-24 20:39:27 UTC
 +++ src/sshmasterconnection.cpp
 @@ -28,6 +28,9 @@
  #include <QDir>
@@ -10,7 +10,7 @@
  #include <arpa/inet.h>
  #endif
  #include <math.h>
-@@ -272,7 +275,11 @@ void SshMasterConnection::addReverseTunn
+@@ -277,7 +280,11 @@ void SshMasterConnection::addReverseTunn
          if(!reverseTunnelRequest[i].listen)
          {
              reverseTunnelRequest[i].listen=true;
diff --git a/net/x2goclient/files/patch-sshprocess.cpp b/net/x2goclient/files/patch-src_sshprocess.cpp
index 9f7244797660..6f630a3b4d63 100644
--- a/net/x2goclient/files/patch-sshprocess.cpp
+++ b/net/x2goclient/files/patch-src_sshprocess.cpp
@@ -1,4 +1,4 @@
---- src/sshprocess.cpp.orig	2015-07-28 02:50:36 UTC
+--- src/sshprocess.cpp.orig	2016-03-24 20:39:27 UTC
 +++ src/sshprocess.cpp
 @@ -24,6 +24,9 @@
  
@@ -14,17 +14,17 @@
  // #endif
      if(!masterCon->useKerberos())
      {
--        QString shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
-+        QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
-         x2goDebug << "Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');";
+-        QString shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
++        QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
+         x2goDebug << "this="<<this<<" Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');";
          masterCon->addChannelConnection(this, uuidStr, shcmd);
          connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray)));
 @@ -222,7 +225,7 @@ void SshProcess::startNormal(const QStri
           * as there is no preceding "outer double quote" the whole argument
           * is wrapped in.
           */
--        shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
-+        shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
+-        shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
++        shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
  
          proc=new QProcess(this);
          QString local_cmd = "";
diff --git a/net/x2goclient/files/patch-sshprocess.h b/net/x2goclient/files/patch-src_sshprocess.h
index 4b28165b9b59..79a73d17e45c 100644
--- a/net/x2goclient/files/patch-sshprocess.h
+++ b/net/x2goclient/files/patch-src_sshprocess.h
@@ -1,4 +1,4 @@
---- src/sshprocess.h.orig	2015-05-26 19:13:12 UTC
+--- src/sshprocess.h.orig	2016-03-24 20:39:27 UTC
 +++ src/sshprocess.h
 @@ -18,6 +18,12 @@
  #ifndef SSHPROCESS_H