Index: head/net/x2goclient/Makefile
===================================================================
--- head/net/x2goclient/Makefile	(revision 398448)
+++ head/net/x2goclient/Makefile	(revision 398449)
@@ -1,70 +1,71 @@
 # Created by: arved
 # $FreeBSD$
 
 PORTNAME=	x2goclient
-PORTVERSION=	4.0.4.0
+PORTVERSION=	4.0.5.0
 CATEGORIES=	net
 MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt client for the X2Go system
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 # Avoid clash with libssh from base
 BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
 LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
 		libssh.so:${PORTSDIR}/security/libssh
 RUN_DEPENDS=	nxproxy:${PORTSDIR}/net/nxproxy \
 		x2goclient-cli:${PORTSDIR}/net/x2goclient-cli
 
 USES=		qmake
 USE_XORG=	xpm
 USE_QT4=	gui network svg \
 		linguisttools_build moc_build rcc_build uic_build
 QMAKE_ARGS=	QMAKE_LRELEASE="${LRELEASE}"
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=		DOCS LDAP
 OPTIONS_DEFAULT=	LDAP
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CFLAGS=		-DUSELDAP
 LDAP_QMAKE_ON=		LIBS+="-lX11 -lXpm -lcups -lldap"
 LDAP_QMAKE_OFF=		LIBS+="-lX11 -lXpm -lcups"
 
 post-patch:
 	@${FIND} ${WRKSRC}/src -name "*.cpp" -or -name "*.h" | ${XARGS} \
 		${REINPLACE_CMD} -e \
 		's|Q_OS_LINUX|Q_OS_UNIX| ; \
 		 /<linux\/fs.h>/s|^|//| ; \
-		 /#define USELDAP/s|^|//|'
+		 /#define USELDAP/s|^|//| ; \
+		 s|/usr/local/bin|${LOCALBASE}/bin|'
 
 pre-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
-		${MAKEFILE} compiler_TSQM_make_all)
+	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} compiler_TSQM_make_all)
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} x2goclient \
 		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} x2goclient.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} x2goclient.desktop \
 		${STAGEDIR}${DESKTOPDIR})
 .for i in 16x16 32x32 48x48 64x64 128x128
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps
 	(cd ${WRKSRC}/res/img/icons/${i} && ${INSTALL_DATA} x2goclient.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps)
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
 	(cd ${WRKSRC}/res/img/icons && ${INSTALL_DATA} x2goclient.xpm \
 		${STAGEDIR}${DATADIR}/icons)
 .for i in x2goclient.png x2gosession.png
 	(cd ${WRKSRC}/res/img/icons/128x128 && ${INSTALL_DATA} ${i} \
 		${STAGEDIR}${DATADIR}/icons)
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/net/x2goclient/distinfo
===================================================================
--- head/net/x2goclient/distinfo	(revision 398448)
+++ head/net/x2goclient/distinfo	(revision 398449)
@@ -1,2 +1,2 @@
-SHA256 (x2goclient-4.0.4.0.tar.gz) = 86d05ce10039fe0a965cdc55086e00f4f3abc573a96f128b92f87081b7251657
-SIZE (x2goclient-4.0.4.0.tar.gz) = 1571218
+SHA256 (x2goclient-4.0.5.0.tar.gz) = 242e91720c1e5830f64a632c111ac3c4b6f6690d5005454c8e025b00bfbe42a1
+SIZE (x2goclient-4.0.5.0.tar.gz) = 1577271
Index: head/net/x2goclient/files/patch-sshprocess.cpp
===================================================================
--- head/net/x2goclient/files/patch-sshprocess.cpp	(revision 398448)
+++ head/net/x2goclient/files/patch-sshprocess.cpp	(revision 398449)
@@ -1,12 +1,30 @@
---- src/sshprocess.cpp.orig	2015-05-26 19:13:12 UTC
+--- src/sshprocess.cpp.orig	2015-07-28 02:50:36 UTC
 +++ src/sshprocess.cpp
 @@ -24,6 +24,9 @@
  
  #include <QProcess>
  #ifndef Q_OS_WIN
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <netinet/in.h>
  #include <arpa/inet.h>
  #include <netinet/tcp.h>
  #endif
+@@ -200,7 +203,7 @@ void SshProcess::startNormal(const QStri
+ // #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) << "');";
+         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 + "\";'";
+ 
+         proc=new QProcess(this);
+         QString local_cmd = "";