View | Details | Raw Unified | Return to bug 202853
Collapse All | Expand All

(-)net/x2goclient/Makefile (-4 / +5 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/net/x2goclient/Makefile 391073 2015-07-01 15:12:24Z amdmi3 $
2
# $FreeBSD: head/net/x2goclient/Makefile 391073 2015-07-01 15:12:24Z amdmi3 $
3
3
4
PORTNAME=	x2goclient
4
PORTNAME=	x2goclient
5
PORTVERSION=	4.0.4.0
5
PORTVERSION=	4.0.5.0
6
CATEGORIES=	net
6
CATEGORIES=	net
7
MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/
7
MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/
8
8
Lines 10-15 Link Here
10
COMMENT=	Qt client for the X2Go system
10
COMMENT=	Qt client for the X2Go system
11
11
12
LICENSE=	GPLv2
12
LICENSE=	GPLv2
13
#LICENSE_FILE=	${WRKSRC}/COPYING
13
14
14
# Avoid clash with libssh from base
15
# Avoid clash with libssh from base
15
BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
16
BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
Lines 38-48 Link Here
38
		${REINPLACE_CMD} -e \
39
		${REINPLACE_CMD} -e \
39
		's|Q_OS_LINUX|Q_OS_UNIX| ; \
40
		's|Q_OS_LINUX|Q_OS_UNIX| ; \
40
		 /<linux\/fs.h>/s|^|//| ; \
41
		 /<linux\/fs.h>/s|^|//| ; \
41
		 /#define USELDAP/s|^|//|'
42
		 /#define USELDAP/s|^|//| ; \
43
		 s|/usr/local/bin|${LOCALBASE}/bin|'
42
44
43
pre-build:
45
pre-build:
44
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
46
	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} compiler_TSQM_make_all)
45
		${MAKEFILE} compiler_TSQM_make_all)
46
47
47
do-install:
48
do-install:
48
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} x2goclient \
49
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} x2goclient \
(-)net/x2goclient/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (x2goclient-4.0.4.0.tar.gz) = 86d05ce10039fe0a965cdc55086e00f4f3abc573a96f128b92f87081b7251657
1
SHA256 (x2goclient-4.0.5.0.tar.gz) = 242e91720c1e5830f64a632c111ac3c4b6f6690d5005454c8e025b00bfbe42a1
2
SIZE (x2goclient-4.0.4.0.tar.gz) = 1571218
2
SIZE (x2goclient-4.0.5.0.tar.gz) = 1577271
(-)net/x2goclient/files/patch-sshprocess.cpp (-1 / +19 lines)
Lines 1-4 Link Here
1
--- src/sshprocess.cpp.orig	2015-05-26 19:13:12 UTC
1
--- src/sshprocess.cpp.orig	2015-07-28 02:50:36 UTC
2
+++ src/sshprocess.cpp
2
+++ src/sshprocess.cpp
3
@@ -24,6 +24,9 @@
3
@@ -24,6 +24,9 @@
4
 
4
 
Lines 10-12 Link Here
10
 #include <arpa/inet.h>
10
 #include <arpa/inet.h>
11
 #include <netinet/tcp.h>
11
 #include <netinet/tcp.h>
12
 #endif
12
 #endif
13
@@ -200,7 +203,7 @@ void SshProcess::startNormal(const QStri
14
 // #endif
15
     if(!masterCon->useKerberos())
16
     {
17
-        QString shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
18
+        QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
19
         x2goDebug << "Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');";
20
         masterCon->addChannelConnection(this, uuidStr, shcmd);
21
         connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray)));
22
@@ -222,7 +225,7 @@ void SshProcess::startNormal(const QStri
23
          * as there is no preceding "outer double quote" the whole argument
24
          * is wrapped in.
25
          */
26
-        shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
27
+        shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
28
 
29
         proc=new QProcess(this);
30
         QString local_cmd = "";

Return to bug 202853