Showing with 30 additions and 10 deletions.
  1. +2 −1 graphics/gifsicle/Makefile
  2. +2 −2 graphics/gifsicle/distinfo
  3. +5 −4 net/x2goclient/Makefile
  4. +2 −2 net/x2goclient/distinfo
  5. +19 −1 net/x2goclient/files/patch-sshprocess.cpp
3 graphics/gifsicle/Makefile
View file
@@ -2,14 +2,15 @@
# $FreeBSD$

PORTNAME= gifsicle
PORTVERSION= 1.87
PORTVERSION= 1.88
CATEGORIES= graphics
MASTER_SITES= http://www.lcdf.org/gifsicle/

MAINTAINER= ports@FreeBSD.org
COMMENT= Manipulates GIF images and animations

LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

GNU_CONFIGURE= yes

4 graphics/gifsicle/distinfo
View file
@@ -1,2 +1,2 @@
SHA256 (gifsicle-1.87.tar.gz) = 470abe3cacaa40cd98ea0d4dc37574148700b50cbf58bbb0ecd120fc0e8c191d
SIZE (gifsicle-1.87.tar.gz) = 565438
SHA256 (gifsicle-1.88.tar.gz) = 4585d2e683d7f68eb8fcb15504732d71d7ede48ab5963e61915201f9e68305be
SIZE (gifsicle-1.88.tar.gz) = 564670
9 net/x2goclient/Makefile
View file
@@ -2,14 +2,15 @@
# $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
@@ -38,11 +39,11 @@ post-patch:
${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 \
4 net/x2goclient/distinfo
View file
@@ -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
20 net/x2goclient/files/patch-sshprocess.cpp
View file
@@ -1,4 +1,4 @@
--- 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 @@

@@ -10,3 +10,21 @@
#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 = "";