Update to 0.15.0.

Approved by:	swills (maintainer)

5 files changed, 123 insertions, 68 deletions

diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index e42c28af3202..49f20ef8213e 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xpra
-PORTVERSION=	0.14.25
-PORTREVISION=	1
+PORTVERSION=	0.15.0
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
@@ -14,14 +13,22 @@ 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}/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 \
-		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
-		xauth:${PORTSDIR}/x11/xauth \
+		${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 \
-		pulseaudio:${PORTSDIR}/audio/pulseaudio \
-		ssh-askpass:${PORTSDIR}/security/openssh-askpass
+		xauth:${PORTSDIR}/x11/xauth \
+		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 \
@@ -35,10 +42,14 @@ 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/xpra.conf \
+	${INSTALL_DATA} ${WRKSRC}/build/etc/xpra/xpra.conf \
 	    ${STAGEDIR}${ETCDIR}/xpra.conf.sample
 
 .include <bsd.port.mk>
diff --git a/x11/xpra/distinfo b/x11/xpra/distinfo
index b6a9e28da984..929cd7d65919 100644
--- a/x11/xpra/distinfo
+++ b/x11/xpra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpra-0.14.25.tar.xz) = a8618a2258bb71f029ac57374ce1dfc37ca15bf222de5f6f4102176cf560f1bb
-SIZE (xpra-0.14.25.tar.xz) = 1123272
+SHA256 (xpra-0.15.0.tar.xz) = bfa12806b245697b799a157f7882d0fa6abcb242a9937c3b0837cc779c0c519c
+SIZE (xpra-0.15.0.tar.xz) = 1191104
diff --git a/x11/xpra/files/patch-setup.py b/x11/xpra/files/patch-setup.py
index 3a65b46f8a52..4c0f9f5cb156 100644
--- a/x11/xpra/files/patch-setup.py
+++ b/x11/xpra/files/patch-setup.py
@@ -1,11 +1,25 @@
---- setup.py.orig	2015-02-17 19:57:07.000000000 -0500
-+++ setup.py	2015-03-11 14:49:57.342199000 -0400
-@@ -1416,7 +1416,7 @@
+--- setup.py.orig	2015-05-11 14:15:11 UTC
++++ setup.py
+@@ -1546,11 +1546,11 @@ if WIN32:
  else:
      #OSX and *nix:
      scripts += ["scripts/xpra", "scripts/xpra_launcher"]
 -    add_data_files("share/man/man1",      ["man/xpra.1", "man/xpra_launcher.1"])
-+    add_data_files("man/man1",      ["man/xpra.1", "man/xpra_launcher.1"])
++    add_data_files("man/man1",            ["man/xpra.1", "man/xpra_launcher.1"])
      add_data_files("share/xpra",          ["README", "COPYING"])
      add_data_files("share/xpra/icons",    glob.glob("icons/*"))
      add_data_files("share/applications",  ["xdg/xpra_launcher.desktop", "xdg/xpra.desktop"])
+-    add_data_files("share/icons",         ["xdg/xpra.png"])
++    add_data_files("share/pixmaps",       ["xdg/xpra.png"])
+     add_data_files("share/appdata",       ["xdg/xpra.appdata.xml"])
+     html5_dir = "share/xpra/www"
+ 
+@@ -1673,7 +1673,7 @@ if html5_ENABLED:
+ 
+ if printing_ENABLED and os.name=="posix":
+     #"/usr/lib/cups/backend":
+-    cups_backend_dir = os.path.join(sys.prefix, "lib", "cups", "backend")
++    cups_backend_dir = os.path.join(sys.prefix, "libexec", "cups", "backend")
+     add_data_files(cups_backend_dir, ["cups/xpraforwarder"])
+ 
+ 
diff --git a/x11/xpra/files/patch-xpra_net_net__util.py b/x11/xpra/files/patch-xpra_net_net__util.py
new file mode 100644
index 000000000000..22c9c8ee24cb
--- /dev/null
+++ b/x11/xpra/files/patch-xpra_net_net__util.py
@@ -0,0 +1,11 @@
+--- xpra/net/net_util.py.orig	2015-04-30 14:59:58 UTC
++++ xpra/net/net_util.py
+@@ -127,7 +127,7 @@ if not sys.platform.startswith("win"):
+ 	elif sys.platform.startswith("sunos"):
+ 		library = "libsocket.so.1"
+ 	elif sys.platform.startswith("freebsd"):
+-		library = "/usr/lib/libc.so"
++		library = "/lib/libc.so.7"
+ 	elif sys.platform.startswith("openbsd"):
+ 		library = "libc.so"
+ 	try:
diff --git a/x11/xpra/pkg-plist b/x11/xpra/pkg-plist
index 554b82c0fb90..305e7c0d1dd9 100644
--- a/x11/xpra/pkg-plist
+++ b/x11/xpra/pkg-plist
@@ -1,7 +1,6 @@
 bin/xpra
 bin/xpra_Xdummy
 bin/xpra_launcher
-share/appdata/xpra.appdata.xml
 @sample %%ETCDIR%%/xorg.conf.sample
 @sample %%ETCDIR%%/xpra.conf.sample
 %%PYTHON_SITELIBDIR%%/xpra/__init__.py
@@ -10,6 +9,9 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/build_info.py
 %%PYTHON_SITELIBDIR%%/xpra/build_info.pyc
 %%PYTHON_SITELIBDIR%%/xpra/build_info.pyo
+%%PYTHON_SITELIBDIR%%/xpra/child_reaper.py
+%%PYTHON_SITELIBDIR%%/xpra/child_reaper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/child_reaper.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/client/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/__init__.pyo
@@ -34,15 +36,24 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_check.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_check.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_check.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_client_window.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_client_window.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_client_window.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_colorspace_conversions.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_colorspace_conversions.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_colorspace_conversions.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing_base.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gl_window_backing_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_client_window.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_client_window.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_client_window.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_window_backing.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_window_backing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk2/gl_window_backing.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk_compat.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk_compat.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gl/gtk_compat.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gobject_client_base.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gobject_client_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gobject_client_base.pyo
@@ -52,6 +63,9 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/border_client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/border_client_window.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/border_client_window.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/cairo_backing.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/cairo_backing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/cairo_backing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client.pyo
@@ -91,9 +105,9 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/bug_report.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/bug_report.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/bug_report.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing_base.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/cairo_backing_base.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/client_launcher.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/client_launcher.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/client_launcher.pyo
@@ -109,15 +123,15 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_tray_menu_base.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_tray_menu_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_tray_menu_base.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_version_info.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_version_info.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_version_info.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_window_backing_base.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_window_backing_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/gtk_window_backing_base.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/session_info.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/session_info.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/session_info.pyo
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/start_new_command.py
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/start_new_command.pyc
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/start_new_command.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/statusicon_tray.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/statusicon_tray.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk_base/statusicon_tray.pyo
@@ -202,6 +216,9 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/codecs/loader.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyo
@@ -219,15 +236,9 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/cyxor.so
-%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/numpyxor.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/numpyxor.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/numpyxor.pyo
 %%PYTHON_SITELIBDIR%%/xpra/daemon_thread.py
 %%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyc
 %%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyo
-%%PYTHON_SITELIBDIR%%/xpra/deque.py
-%%PYTHON_SITELIBDIR%%/xpra/deque.pyc
-%%PYTHON_SITELIBDIR%%/xpra/deque.pyo
 %%PYTHON_SITELIBDIR%%/xpra/dotxpra.py
 %%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyc
 %%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyo
@@ -250,9 +261,6 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/graph.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/graph.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/graph.pyo
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk2common.py
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk2common.pyc
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk2common.pyo
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_spinner.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_spinner.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_spinner.pyo
@@ -329,13 +337,9 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/net/protocol.py
 %%PYTHON_SITELIBDIR%%/xpra/net/protocol.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/protocol.pyo
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode.so
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode_orig.py
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode_orig.pyc
-%%PYTHON_SITELIBDIR%%/xpra/net/rencode/rencode_orig.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/subprocess_wrapper.py
+%%PYTHON_SITELIBDIR%%/xpra/net/subprocess_wrapper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/subprocess_wrapper.pyo
 %%PYTHON_SITELIBDIR%%/xpra/os_util.py
 %%PYTHON_SITELIBDIR%%/xpra/os_util.pyc
 %%PYTHON_SITELIBDIR%%/xpra/os_util.pyo
@@ -366,6 +370,12 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/platform/paths.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/paths.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/paths.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/printing.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/printing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/printing.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/pycups_printing.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/pycups_printing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/pycups_printing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/shadow_server.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/shadow_server.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/shadow_server.pyo
@@ -396,6 +406,9 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/paths.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/paths.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/paths.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/printing.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/printing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/printing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/shadow_server.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/shadow_server.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/shadow_server.pyo
@@ -459,6 +472,7 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.py
 %%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/cystats.so
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.py
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.pyo
@@ -480,9 +494,7 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.py
 %%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/region.py
-%%PYTHON_SITELIBDIR%%/xpra/server/region.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/region.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/region.so
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.py
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyo
@@ -501,16 +513,6 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/server/source_stats.py
 %%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/__init__.py
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/cymaths.so
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/maths.py
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/maths.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/maths.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/pymaths.py
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/pymaths.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/stats/pymaths.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.py
 %%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.pyo
@@ -544,6 +546,9 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/sound/src.py
 %%PYTHON_SITELIBDIR%%/xpra/sound/src.pyc
 %%PYTHON_SITELIBDIR%%/xpra/sound/src.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/wrapper.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/wrapper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/wrapper.pyo
 %%PYTHON_SITELIBDIR%%/xpra/src_info.py
 %%PYTHON_SITELIBDIR%%/xpra/src_info.pyc
 %%PYTHON_SITELIBDIR%%/xpra/src_info.pyo
@@ -562,6 +567,7 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/core_bindings.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/display_source.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/keyboard_bindings.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/posix_display_source.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/randr_bindings.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/wait_for_x_server.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/window_bindings.so
@@ -635,11 +641,13 @@ share/appdata/xpra.appdata.xml
 %%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
 %%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
+libexec/cups/backend/xpraforwarder
 man/man1/xpra.1.gz
 man/man1/xpra_launcher.1.gz
+share/appdata/xpra.appdata.xml
 share/applications/xpra.desktop
 share/applications/xpra_launcher.desktop
-share/icons/xpra.png
+share/pixmaps/xpra.png
 %%DATADIR%%/COPYING
 %%DATADIR%%/README
 %%DATADIR%%/icons/browse.png
@@ -651,10 +659,15 @@ share/icons/xpra.png
 %%DATADIR%%/icons/download.png
 %%DATADIR%%/icons/encoding.png
 %%DATADIR%%/icons/features.png
+%%DATADIR%%/icons/forward.png
+%%DATADIR%%/icons/freebsd.png
 %%DATADIR%%/icons/information.png
 %%DATADIR%%/icons/keyboard.png
+%%DATADIR%%/icons/linux.png
 %%DATADIR%%/icons/microphone.png
+%%DATADIR%%/icons/openbsd.png
 %%DATADIR%%/icons/opengl.png
+%%DATADIR%%/icons/osx.png
 %%DATADIR%%/icons/package.png
 %%DATADIR%%/icons/quit.png
 %%DATADIR%%/icons/raise.png
@@ -665,28 +678,34 @@ share/icons/xpra.png
 %%DATADIR%%/icons/statistics.png
 %%DATADIR%%/icons/ticked-small.png
 %%DATADIR%%/icons/unticked-small.png
+%%DATADIR%%/icons/win32.png
 %%DATADIR%%/icons/xpra.png
+%%DATADIR%%/www/connect.html
+%%DATADIR%%/www/css/bootstrap.min.css
+%%DATADIR%%/www/css/signin.css
 %%DATADIR%%/www/favicon.ico
 %%DATADIR%%/www/favicon.png
+%%DATADIR%%/www/include/aurora/aurora-xpra.js
+%%DATADIR%%/www/include/aurora/aurora.js
+%%DATADIR%%/www/include/aurora/mp3.js
 %%DATADIR%%/www/include/bencode.js
+%%DATADIR%%/www/include/broadway/AUTHORS
+%%DATADIR%%/www/include/broadway/Decoder.js
+%%DATADIR%%/www/include/broadway/LICENSE
 %%DATADIR%%/www/include/close.png
 %%DATADIR%%/www/include/deflate.min.js
 %%DATADIR%%/www/include/inflate.min.js
 %%DATADIR%%/www/include/jquery.min.js
+%%DATADIR%%/www/include/jquery.throttle-debounce.min.js
 %%DATADIR%%/www/include/jqueryui.min.js
 %%DATADIR%%/www/include/keycodes.js
+%%DATADIR%%/www/include/lz4.min.js
 %%DATADIR%%/www/include/maximize.png
 %%DATADIR%%/www/include/minimize.png
-%%DATADIR%%/www/include/protocol.js
-%%DATADIR%%/www/include/protocol_host.js
-%%DATADIR%%/www/include/protocol_worker.js
-%%DATADIR%%/www/include/shapes.js
-%%DATADIR%%/www/include/util.js
-%%DATADIR%%/www/include/web-socket-js/README.txt
-%%DATADIR%%/www/include/web-socket-js/WebSocketMain.swf
-%%DATADIR%%/www/include/web-socket-js/swfobject.js
-%%DATADIR%%/www/include/web-socket-js/web_socket.js
 %%DATADIR%%/www/include/websock.js
-%%DATADIR%%/www/include/webutil.js
-%%DATADIR%%/www/include/window.js
+%%DATADIR%%/www/include/wsworker_check.js
+%%DATADIR%%/www/include/xpra-logo.png
+%%DATADIR%%/www/include/xpra_client.js
+%%DATADIR%%/www/include/xpra_protocol.js
+%%DATADIR%%/www/include/xpra_window.js
 %%DATADIR%%/www/index.html