Index: branches/2018Q4/net/x2goclient/Makefile
===================================================================
--- branches/2018Q4/net/x2goclient/Makefile	(revision 484277)
+++ branches/2018Q4/net/x2goclient/Makefile	(revision 484278)
@@ -1,72 +1,70 @@
 # Created by: arved
 # $FreeBSD$
 
 PORTNAME=	x2goclient
 PORTVERSION=	4.1.0.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
 
-BROKEN=		fails to build
-
 # Avoid clash with libssh from base
 BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:security/libssh
 LIB_DEPENDS=	libcups.so:print/cups \
 		libssh.so:security/libssh
 RUN_DEPENDS=	nxproxy:net/nxproxy \
 		x2goclient-cli:net/x2goclient-cli
 
 USES=		qmake qt:4
-USE_XORG=	xpm
-USE_QT=		gui network svg \
+USE_XORG=	x11 xpm
+USE_QT=		corelib gui network svg \
 		linguisttools_build moc_build rcc_build uic_build
 QMAKE_ARGS=	QMAKE_LRELEASE="${LRELEASE}"
 
 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|^|//| ; \
 		 s|/usr/local/bin|${LOCALBASE}/bin|'
 
 pre-build:
 	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} compiler_TSQM_make_all)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/x2goclient ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/man1/x2goclient.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/desktop/x2goclient.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 .for i in 16x16 32x32 48x48 64x64 128x128
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps
 	${INSTALL_DATA} ${WRKSRC}/res/img/icons/${i}/x2goclient.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/res/img/icons/x2goclient.xpm \
 		${STAGEDIR}${DATADIR}/icons
 .for i in x2goclient.png x2gosession.png
 	${INSTALL_DATA} ${WRKSRC}/res/img/icons/128x128/${i} \
 		${STAGEDIR}${DATADIR}/icons
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp
===================================================================
--- branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp	(revision 484277)
+++ branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp	(revision 484278)
@@ -1,30 +1,39 @@
---- src/sshprocess.cpp.orig	2016-03-24 20:39:27 UTC
+--- src/sshprocess.cpp.orig	2018-11-04 13:15:51 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
+@@ -140,7 +143,7 @@ void SshProcess::tunnelLoop()
+     address.sin_family=AF_INET;
+     address.sin_addr.s_addr=INADDR_ANY;
+     address.sin_port=htons(localPort);
+-    if (bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0)
++    if (::bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0)
+     {
+         QString err=tr("Error binding ")+localHost+":"+QString::number(localPort);
+         x2goDebug<<err<<endl;
 @@ -200,7 +203,7 @@ void SshProcess::startNormal(const QStri
  // #endif
      if(!masterCon->useKerberos())
      {
 -        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 -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 = "";
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 484277)
+++ branches/2018Q4	(revision 484278)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r484262