Index: head/net/x2goclient/Makefile =================================================================== --- head/net/x2goclient/Makefile (revision 391072) +++ head/net/x2goclient/Makefile (revision 391073) @@ -1,73 +1,70 @@ # Created by: arved # $FreeBSD$ PORTNAME= x2goclient -PORTVERSION= 4.0.3.2 +PORTVERSION= 4.0.4.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 -# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=870 -BROKEN= does not build with new libssh: undefined reference to `ssh_forward_listen' - # 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} -name "*.cpp" -or -name "*.h" | ${XARGS} \ + @${FIND} ${WRKSRC}/src -name "*.cpp" -or -name "*.h" | ${XARGS} \ ${REINPLACE_CMD} -e \ 's|Q_OS_LINUX|Q_OS_UNIX| ; \ //s|^|//| ; \ /#define USELDAP/s|^|//|' pre-build: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} 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}/icons/${i} && ${INSTALL_DATA} x2goclient.png \ + (cd ${WRKSRC}/res/img/icons/${i} && ${INSTALL_DATA} x2goclient.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps) .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/icons - (cd ${WRKSRC}/icons && ${INSTALL_DATA} x2goclient.xpm \ + (cd ${WRKSRC}/res/img/icons && ${INSTALL_DATA} x2goclient.xpm \ ${STAGEDIR}${DATADIR}/icons) .for i in x2goclient.png x2gosession.png - (cd ${WRKSRC}/icons/128x128 && ${INSTALL_DATA} ${i} \ + (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 Index: head/net/x2goclient/distinfo =================================================================== --- head/net/x2goclient/distinfo (revision 391072) +++ head/net/x2goclient/distinfo (revision 391073) @@ -1,2 +1,2 @@ -SHA256 (x2goclient-4.0.3.2.tar.gz) = f65a70463eae3d6d9fe6e4379f4ffacda50080a11f196d2792742f5b67fa0c6f -SIZE (x2goclient-4.0.3.2.tar.gz) = 1560536 +SHA256 (x2goclient-4.0.4.0.tar.gz) = 86d05ce10039fe0a965cdc55086e00f4f3abc573a96f128b92f87081b7251657 +SIZE (x2goclient-4.0.4.0.tar.gz) = 1571218 Index: head/net/x2goclient/files/patch-sshmasterconnection.cpp =================================================================== --- head/net/x2goclient/files/patch-sshmasterconnection.cpp (revision 391072) +++ head/net/x2goclient/files/patch-sshmasterconnection.cpp (revision 391073) @@ -1,12 +1,24 @@ ---- sshmasterconnection.cpp.orig 2011-11-25 21:08:10.000000000 +0900 -+++ sshmasterconnection.cpp 2011-12-20 01:50:14.000000000 +0900 -@@ -25,6 +25,9 @@ +--- src/sshmasterconnection.cpp.orig 2015-05-26 19:13:12 UTC ++++ src/sshmasterconnection.cpp +@@ -28,6 +28,9 @@ #include #include #ifndef Q_OS_WIN +#include +#include +#include #include #endif - + #include +@@ -272,7 +275,11 @@ void SshMasterConnection::addReverseTunn + if(!reverseTunnelRequest[i].listen) + { + reverseTunnelRequest[i].listen=true; ++#if LIBSSH_VERSION_MAJOR == 0 && LIBSSH_VERSION_MINOR <= 6 + int rc=ssh_forward_listen(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); ++#else ++ int rc=ssh_channel_listen_forward(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); ++#endif + if(rc==SSH_OK) + { + emit reverseTunnelOk(reverseTunnelRequest[i].creator); Index: head/net/x2goclient/files/patch-sshprocess.cpp =================================================================== --- head/net/x2goclient/files/patch-sshprocess.cpp (revision 391072) +++ head/net/x2goclient/files/patch-sshprocess.cpp (revision 391073) @@ -1,12 +1,12 @@ ---- sshprocess.cpp.orig 2011-11-25 21:08:10.000000000 +0900 -+++ sshprocess.cpp 2011-12-20 01:53:47.000000000 +0900 -@@ -21,6 +21,9 @@ - #include +--- src/sshprocess.cpp.orig 2015-05-26 19:13:12 UTC ++++ src/sshprocess.cpp +@@ -24,6 +24,9 @@ + #include #ifndef Q_OS_WIN +#include +#include +#include #include #include #endif Index: head/net/x2goclient/files/patch-sshprocess.h =================================================================== --- head/net/x2goclient/files/patch-sshprocess.h (revision 391072) +++ head/net/x2goclient/files/patch-sshprocess.h (revision 391073) @@ -1,15 +1,15 @@ ---- sshprocess.h.orig 2011-11-25 21:08:10.000000000 +0900 -+++ sshprocess.h 2011-12-20 01:56:29.000000000 +0900 -@@ -17,6 +17,12 @@ +--- src/sshprocess.h.orig 2015-05-26 19:13:12 UTC ++++ src/sshprocess.h +@@ -18,6 +18,12 @@ #ifndef SSHPROCESS_H #define SSHPROCESS_H +#ifndef Q_OS_WIN +#include +#include +#include +#include +#endif #include #include - + #include