Index: head/x11/xpra/Makefile
===================================================================
--- head/x11/xpra/Makefile	(revision 396109)
+++ head/x11/xpra/Makefile	(revision 396110)
@@ -1,57 +1,57 @@
 # Created by: Steve Wills <swills@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xpra
-PORTVERSION=	0.15.4
+PORTVERSION=	0.15.5
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Xpra gives you persistent remote applications for X
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/lz4.so:${PORTSDIR}/archivers/py-lz4 \
 		pulseaudio:${PORTSDIR}/audio/pulseaudio \
 		${PYTHON_SITELIBDIR}/rencode/__init__.py:${PORTSDIR}/converters/py-rencode \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
 		${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:${PORTSDIR}/graphics/py-opengl-accelerate \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi \
 		${PYTHON_SITELIBDIR}/netifaces.so:${PORTSDIR}/net/py-netifaces \
 		${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \
 		ssh-askpass:${PORTSDIR}/security/openssh-askpass \
 		setxkbmap:${PORTSDIR}/x11/setxkbmap \
 		xauth:${PORTSDIR}/x11/xauth \
 		xkbcomp:${PORTSDIR}/x11/xkbcomp \
 		${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
 		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
 LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libvpx.so:${PORTSDIR}/multimedia/libvpx \
 		libx264.so:${PORTSDIR}/multimedia/libx264 \
 		libx265.so:${PORTSDIR}/multimedia/x265
 
 USES=		pkgconfig python tar:xz
 USE_PYTHON=	distutils
 USE_XORG=	x11 xcomposite xdamage xfixes xkbfile xrandr xtst
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}
 
 PYDISTUTILS_PKGNAME=	xpra_all
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \
 	    ${WRKSRC}/xpra/platform/pycups_printing.py
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/xpra/xorg.conf \
 	    ${STAGEDIR}${ETCDIR}/xorg.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/build/etc/xpra/xpra.conf \
 	    ${STAGEDIR}${ETCDIR}/xpra.conf.sample
 
 .include <bsd.port.mk>
Index: head/x11/xpra/distinfo
===================================================================
--- head/x11/xpra/distinfo	(revision 396109)
+++ head/x11/xpra/distinfo	(revision 396110)
@@ -1,2 +1,2 @@
-SHA256 (xpra-0.15.4.tar.xz) = 29be80b8987dd131058aab0a1c8d456a7ac67ad56c54d2b5e72472ff003799a2
-SIZE (xpra-0.15.4.tar.xz) = 1194484
+SHA256 (xpra-0.15.5.tar.xz) = bcd258e8a0af4d074da09c898f0b80b5ea09513782184e06c6003f31365dfb9a
+SIZE (xpra-0.15.5.tar.xz) = 1195776
Index: head/x11/xpra/files/patch-xpra_net_compression.py
===================================================================
--- head/x11/xpra/files/patch-xpra_net_compression.py	(revision 396109)
+++ head/x11/xpra/files/patch-xpra_net_compression.py	(revision 396110)
@@ -1,26 +1,26 @@
---- xpra/net/compression.py.orig	2015-07-27 14:25:13 UTC
+--- xpra/net/compression.py.orig	2015-08-25 09:32:59 UTC
 +++ xpra/net/compression.py
 @@ -23,7 +23,9 @@ try:
          return level | LZ4_FLAG, LZ4_compress(packet)
      #try to figure out the version number:
      if hasattr(lz4, "VERSION"):
 -        lz4_version = str(lz4.VERSION)
 +        lz4_version = lz4.VERSION
 +        if hasattr(lz4, "LZ4_VERSION"):
 +            lz4_version.append(lz4.LZ4_VERSION)
      elif hasattr(lz4, "__file__"):
          #hack it..
          import os.path
 @@ -44,10 +46,8 @@ try:
                  #we want at least two numbers first:
                  if len(tmpv)>=2:
                      #ie: (0, 7, 0)
--                    lz4_version = ".".join(tmpv)
+-                    lz4_version = ".".join([str(x) for x in tmpv])
 -    assert lz4_version>="0.7", "versions older than 0.7.0 are vulnerable and should not be used, see CVE-2014-4715"
 -    if hasattr(lz4, "LZ4_VERSION"):
 -        lz4_version += "."+str(lz4.LZ4_VERSION)
 +                    lz4_version = tuple(tmpv)
 +                    assert lz4_version>=(0, 7), "versions older than 0.7.0 are vulnerable and should not be used, see CVE-2014-4715"
  except Exception as e:
      log("lz4 not found: %s", e)
      LZ4_uncompress = None