5 files changed, 144 insertions, 25 deletions

diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index c203745f3cce..64434f881ab3 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	xpra
-# Date created:		2011-01-11
-# Whom:			Steve Wills <swills@FreeBSD.org>
-#
+# Created by: Steve Wills <swills@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xpra
-PORTVERSION=	0.7.4
-PORTREVISION=	1
+PORTVERSION=	0.8.8
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
diff --git a/x11/xpra/distinfo b/x11/xpra/distinfo
index 5a112d2c96f4..9ce0c673d528 100644
--- a/x11/xpra/distinfo
+++ b/x11/xpra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpra-0.7.4.tar.bz2) = 93d12df6e764195c57a769b4740b9018073369a46ce9626ce430c657e475942c
-SIZE (xpra-0.7.4.tar.bz2) = 470237
+SHA256 (xpra-0.8.8.tar.bz2) = 248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683
+SIZE (xpra-0.8.8.tar.bz2) = 581029
diff --git a/x11/xpra/files/patch-setup.py b/x11/xpra/files/patch-setup.py
index 425caf23389f..314e5be08d8d 100644
--- a/x11/xpra/files/patch-setup.py
+++ b/x11/xpra/files/patch-setup.py
@@ -1,11 +1,11 @@
---- setup.py.orig	2012-11-08 10:32:55.726940413 -0500
-+++ setup.py	2012-11-08 10:33:07.064940881 -0500
-@@ -436,7 +436,7 @@
- #*******************************************************************************
- else:
+--- setup.py.orig	2013-02-21 15:27:40.000000000 +0000
++++ setup.py	2013-03-24 18:51:02.000000000 +0000
+@@ -568,7 +568,7 @@
+     scripts = ["scripts/xpra", "scripts/xpra_launcher"]
+     man_pages = ["man/xpra.1", "man/xpra_launcher.1"]
      data_files += [
--                    ("share/man/man1", ["man/xpra.1", "man/xpra_launcher.1", "man/parti.1"]),
-+                    ("man/man1", ["man/xpra.1", "man/xpra_launcher.1", "man/parti.1"]),
-                     ("share/parti", ["README", "parti.README"]),
+-                    ("share/man/man1", man_pages),
++                    ("man/man1", man_pages),
                      ("share/xpra", ["xpra.README", "COPYING"]),
                      ("share/wimpiggy", ["wimpiggy.README"]),
+                     ("share/xpra/icons", glob.glob("icons/*")),
diff --git a/x11/xpra/files/patch-x264lib.c b/x11/xpra/files/patch-x264lib.c
new file mode 100644
index 000000000000..5f2d6fd2b829
--- /dev/null
+++ b/x11/xpra/files/patch-x264lib.c
@@ -0,0 +1,20 @@
+--- xpra/x264/x264lib.c.orig	2013-03-24 18:53:16.000000000 +0000
++++ xpra/x264/x264lib.c	2013-03-24 19:29:09.000000000 +0000
+@@ -7,6 +7,8 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
++#include <inttypes.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -447,7 +449,7 @@
+ 		ctx->yuv2rgb = NULL;
+ 	}
+         if (ctx->frame) {
+-		avcodec_free_frame(&ctx->frame);
++		av_freep(&ctx->frame);
+ 		ctx->frame = NULL;
+ 	}
+ }
diff --git a/x11/xpra/pkg-plist b/x11/xpra/pkg-plist
index 0deb7e92694a..765778bd063f 100644
--- a/x11/xpra/pkg-plist
+++ b/x11/xpra/pkg-plist
@@ -82,6 +82,9 @@ etc/xpra/xpra.conf
 %%PYTHON_SITELIBDIR%%/wimpiggy/selection.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/selection.pyc
 %%PYTHON_SITELIBDIR%%/wimpiggy/selection.pyo
+%%PYTHON_SITELIBDIR%%/wimpiggy/tray.py
+%%PYTHON_SITELIBDIR%%/wimpiggy/tray.pyc
+%%PYTHON_SITELIBDIR%%/wimpiggy/tray.pyo
 %%PYTHON_SITELIBDIR%%/wimpiggy/util.py
 %%PYTHON_SITELIBDIR%%/wimpiggy/util.pyc
 %%PYTHON_SITELIBDIR%%/wimpiggy/util.pyo
@@ -121,6 +124,15 @@ etc/xpra/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/client_window.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client_window.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codec_constants.py
+%%PYTHON_SITELIBDIR%%/xpra/codec_constants.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codec_constants.pyo
+%%PYTHON_SITELIBDIR%%/xpra/cursor_names.py
+%%PYTHON_SITELIBDIR%%/xpra/cursor_names.pyc
+%%PYTHON_SITELIBDIR%%/xpra/cursor_names.pyo
+%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.py
+%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyc
+%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyo
 %%PYTHON_SITELIBDIR%%/xpra/dbus_notifications_forwarder.py
 %%PYTHON_SITELIBDIR%%/xpra/dbus_notifications_forwarder.pyc
 %%PYTHON_SITELIBDIR%%/xpra/dbus_notifications_forwarder.pyo
@@ -130,6 +142,21 @@ etc/xpra/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/dotxpra.py
 %%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyc
 %%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyo
+%%PYTHON_SITELIBDIR%%/xpra/gl/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/gl/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gl/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_check.py
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_check.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_check.pyo
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_client_window.py
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_client_window.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_client_window.pyo
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_colorspace_conversions.py
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_colorspace_conversions.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_colorspace_conversions.pyo
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_window_backing.py
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_window_backing.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gl/gl_window_backing.pyo
 %%PYTHON_SITELIBDIR%%/xpra/gl_client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/gl_client_window.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gl_client_window.pyo
@@ -160,6 +187,9 @@ etc/xpra/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/platform/client_extras_base.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/client_extras_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/client_extras_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/client_tray.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/client_tray.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/client_tray.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/clipboard_base.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/clipboard_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/clipboard_base.pyo
@@ -172,6 +202,12 @@ etc/xpra/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/platform/gui.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/gui.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/gui.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/keyboard_layouts.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/keyboard_layouts.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/keyboard_layouts.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/session_info.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/session_info.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/session_info.pyo
 %%PYTHON_SITELIBDIR%%/xpra/protocol.py
 %%PYTHON_SITELIBDIR%%/xpra/protocol.pyc
 %%PYTHON_SITELIBDIR%%/xpra/protocol.pyo
@@ -188,6 +224,9 @@ etc/xpra/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/scripts/client_launcher.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/client_launcher.pyc
 %%PYTHON_SITELIBDIR%%/xpra/scripts/client_launcher.pyo
+%%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.py
+%%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.pyo
 %%PYTHON_SITELIBDIR%%/xpra/scripts/main.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyc
 %%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyo
@@ -197,9 +236,52 @@ etc/xpra/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/server.py
 %%PYTHON_SITELIBDIR%%/xpra/server.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server_base.py
+%%PYTHON_SITELIBDIR%%/xpra/server_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server_keyboard_config.py
+%%PYTHON_SITELIBDIR%%/xpra/server_keyboard_config.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server_keyboard_config.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server_source.py
 %%PYTHON_SITELIBDIR%%/xpra/server_source.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server_source.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server_uuid.py
+%%PYTHON_SITELIBDIR%%/xpra/server_uuid.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server_uuid.pyo
+%%PYTHON_SITELIBDIR%%/xpra/shadow_server.py
+%%PYTHON_SITELIBDIR%%/xpra/shadow_server.pyc
+%%PYTHON_SITELIBDIR%%/xpra/shadow_server.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/sink.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/sink.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/sink.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/sound_pipeline.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/sound_pipeline.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/sound_pipeline.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/src.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/src.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/src.pyo
+%%PYTHON_SITELIBDIR%%/xpra/stats/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/stats/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/stats/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/stats/base.py
+%%PYTHON_SITELIBDIR%%/xpra/stats/base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/stats/base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/stats/cymaths.so
+%%PYTHON_SITELIBDIR%%/xpra/stats/maths.py
+%%PYTHON_SITELIBDIR%%/xpra/stats/maths.pyc
+%%PYTHON_SITELIBDIR%%/xpra/stats/maths.pyo
+%%PYTHON_SITELIBDIR%%/xpra/stats/pymaths.py
+%%PYTHON_SITELIBDIR%%/xpra/stats/pymaths.pyc
+%%PYTHON_SITELIBDIR%%/xpra/stats/pymaths.pyo
 %%PYTHON_SITELIBDIR%%/xpra/version_util.py
 %%PYTHON_SITELIBDIR%%/xpra/version_util.pyc
 %%PYTHON_SITELIBDIR%%/xpra/version_util.pyo
@@ -236,6 +318,13 @@ etc/xpra/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/xkbhelper.py
 %%PYTHON_SITELIBDIR%%/xpra/xkbhelper.pyc
 %%PYTHON_SITELIBDIR%%/xpra/xkbhelper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/xor/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/xor/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/xor/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/xor/cyxor.so
+%%PYTHON_SITELIBDIR%%/xpra/xor/numpyxor.py
+%%PYTHON_SITELIBDIR%%/xpra/xor/numpyxor.pyc
+%%PYTHON_SITELIBDIR%%/xpra/xor/numpyxor.pyo
 %%PYTHON_SITELIBDIR%%/xpra/xposix/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/xposix/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/xposix/__init__.pyo
@@ -258,30 +347,44 @@ share/parti/parti.README
 share/wimpiggy/wimpiggy.README
 share/xpra/xpra.README
 share/xpra/COPYING
+share/xpra/icons/browse.png
+share/xpra/icons/clipboard.png
+share/xpra/icons/close.png
+share/xpra/icons/compressed.png
+share/xpra/icons/connect.png
+share/xpra/icons/encoding.png
+share/xpra/icons/features.png
+share/xpra/icons/information.png
+share/xpra/icons/keyboard.png
+share/xpra/icons/microphone.png
+share/xpra/icons/opengl.png
+share/xpra/icons/package.png
 share/xpra/icons/quit.png
+share/xpra/icons/raise.png
 share/xpra/icons/retry.png
-share/xpra/icons/xpra.ico
 share/xpra/icons/slider.png
-share/xpra/icons/keyboard.png
-share/xpra/icons/compressed.png
-share/xpra/icons/raise.png
-share/xpra/icons/clipboard.png
-share/xpra/icons/close.png
+share/xpra/icons/speaker.png
+share/xpra/icons/speed.png
 share/xpra/icons/statistics.png
+share/xpra/icons/ticked-small.png
+share/xpra/icons/unticked-small.png
+share/xpra/icons/xpra.ico
 share/xpra/icons/xpra.png
-share/xpra/icons/information.png
-share/xpra/icons/encoding.png
 share/xpra/webm/LICENSE
 @dirrm %%PYTHON_SITELIBDIR%%/parti/trays
 @dirrm %%PYTHON_SITELIBDIR%%/parti/addons
 @dirrm %%PYTHON_SITELIBDIR%%/parti/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/parti
+@dirrm %%PYTHON_SITELIBDIR%%/xpra/gl
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/platform
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/rencode
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/xpra/sound
+@dirrm %%PYTHON_SITELIBDIR%%/xpra/stats
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/vpx
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/webm
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/x264
+@dirrm %%PYTHON_SITELIBDIR%%/xpra/xor
 @dirrm %%PYTHON_SITELIBDIR%%/xpra/xposix
 @dirrm %%PYTHON_SITELIBDIR%%/xpra
 @dirrm %%PYTHON_SITELIBDIR%%/wimpiggy/lowlevel