The Helix Player is the Helix Community's open source media player for

consumers. It is being developed to have a rich and usable graphical
interface and support a variety of open media formats like Ogg Vorbis,
Theora etc.

Adopted by:	Shaun Amott <shaun (at) inerd.com>

39 files changed, 1003 insertions, 0 deletions

diff --git a/multimedia/helixplayer/Makefile b/multimedia/helixplayer/Makefile
new file mode 100644
index 000000000000..e4414964eca0
--- /dev/null
+++ b/multimedia/helixplayer/Makefile
@@ -0,0 +1,83 @@
+# New ports collection makefile for:	hxplay
+# Date created:		21 May 2004
+# Whom:			Thierry Thomas <thierry@pompo.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	hxplay
+PORTVERSION=	1.0.7
+CATEGORIES=	multimedia
+MASTER_SITES=	https://helixcommunity.org/download.php/1950/
+
+MAINTAINER=	shaun@inerd.com
+COMMENT=	The Helix Community's open source media player
+
+LIB_DEPENDS=	theora.[1-9]:${PORTSDIR}/multimedia/libtheora		\
+		esd.2:${PORTSDIR}/audio/esound
+
+USE_BZIP2=	yes
+USE_PYTHON=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	gtk20
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/HelixPlayer/lib
+
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+
+CF2FIX=		gcc.cf freebsd.cf freebsd-5.0-i586.cf freebsd-4.0-i386.cf	\
+		freebsd-4.0-i586.cf freebsd-6.0-i586.cf
+
+pre-patch:
+	${CP} ${WRKSRC}/build/umakecf/freebsd-6.0-i586.cf			\
+		${WRKSRC}/build/umakecf/freebsd-7.0-i586.cf
+	# Add support for AudioOutLinux
+	${CP} ${WRKSRC}/audio/device/linux2.pcf					\
+		${WRKSRC}/audio/device/freebsd.pcf
+
+pre-configure:
+.if !defined(WITH_DEBUG)
+	${REINPLACE_CMD} -e 's|# project.AddBuildOption("release")|project.AddBuildOption("release")|'	\
+		${WRKSRC}/build/umakecf/freebsd.cf
+	${REINPLACE_CMD} -e 's|gtk_release|gtk_release -t release|'		\
+		${WRKSRC}/Makefile
+.endif
+.for cf in ${CF2FIX}
+	${REINPLACE_CMD} -e "s|%%CC%%|${CC}|;s|%%CFLAGS%%|${CFLAGS}|"		\
+		-e "s|%%CXX%%|${CXX}|;s|%%CXXFLAGS%%|${CXXFLAGS}|"		\
+		-e "s|/usr/X11R6|${X11BASE}|;s|/usr/local|${LOCALBASE}|"	\
+		-e "s|%%PREFIX%%|${PREFIX}|"					\
+		-e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|"			\
+		-e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|"			\
+		${WRKSRC}/build/umakecf/${cf}
+.endfor
+	${SED} -e "s|/usr/local|${LOCALBASE}|" < ${FILESDIR}/buildrc		\
+		> ${WRKSRC}/buildrc
+	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|"				\
+		${WRKSRC}/player/app/gtk/hxplay
+
+post-build:
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If anything failed, please examine or report the file"
+	@${ECHO_MSG} "${WRKSRC}/build.out"
+	@${ECHO_MSG}
+
+do-install:
+	${MKDIR} ${PREFIX}/HelixPlayer
+	(cd ${PREFIX}/HelixPlayer &&	\
+	${TAR} -xjf ${WRKSRC}/player/installer/archive/install.bz2)
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/HelixPlayer
+.if !defined(WITH_DEBUG)
+	@${STRIP_CMD} ${PREFIX}/HelixPlayer/hxplay.bin
+.endif
+	${LN} -sf ${PREFIX}/HelixPlayer/hxplay ${PREFIX}/bin/hxplay
+	${LN} -sf ${PREFIX}/HelixPlayer/lib/libgtkhx.so	\
+		${PREFIX}/HelixPlayer/lib/libgtkhx.so.0
+	${MKDIR} ${DESKTOPDIR}
+	${LN} -sf ${PREFIX}/HelixPlayer/share/hxplay.desktop ${DESKTOPDIR}
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/multimedia/helixplayer/distinfo b/multimedia/helixplayer/distinfo
new file mode 100644
index 000000000000..ecdeb8c213c3
--- /dev/null
+++ b/multimedia/helixplayer/distinfo
@@ -0,0 +1,3 @@
+MD5 (hxplay-1.0.7.tar.bz2) = d461d9983a98e8baf2893ac635512519
+SHA256 (hxplay-1.0.7.tar.bz2) = 14ea9226ca6f7775fd920d1680be330ad22d939c3fc53a46de6648a9baeb5c05
+SIZE (hxplay-1.0.7.tar.bz2) = 14221132
diff --git a/multimedia/helixplayer/files/buildrc b/multimedia/helixplayer/files/buildrc
new file mode 100644
index 000000000000..3e437f5f5bfd
--- /dev/null
+++ b/multimedia/helixplayer/files/buildrc
@@ -0,0 +1 @@
+SetSDKPath("oggvorbissdk", "/usr/local")
diff --git a/multimedia/helixplayer/files/patch-audio_device_pub_platform_unix_audlinux_oss.h b/multimedia/helixplayer/files/patch-audio_device_pub_platform_unix_audlinux_oss.h
new file mode 100644
index 000000000000..15799fbc2500
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-audio_device_pub_platform_unix_audlinux_oss.h
@@ -0,0 +1,11 @@
+--- ./audio/device/pub/platform/unix/audlinux_oss.h.orig	Wed Sep 24 22:35:32 2003
++++ ./audio/device/pub/platform/unix/audlinux_oss.h	Fri May 21 16:43:25 2004
+@@ -46,7 +46,7 @@
+ #elif defined _NETBSD
+ #include "soundcard.h"
+ #elif defined _FREEBSD || defined __alpha || defined __sparc__
+-#include "machine/soundcard.h"
++#include <sys/soundcard.h>
+ #else 
+ #include "machine/soundcard.h"
+ #endif
diff --git a/multimedia/helixplayer/files/patch-audio_resampler_allresamplers.h b/multimedia/helixplayer/files/patch-audio_resampler_allresamplers.h
new file mode 100644
index 000000000000..a05b18a2fec3
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-audio_resampler_allresamplers.h
@@ -0,0 +1,11 @@
+--- ./audio/resampler/allresamplers.h.orig	Fri Jul  9 04:01:17 2004
++++ ./audio/resampler/allresamplers.h	Sun Aug 15 22:07:50 2004
+@@ -125,7 +125,7 @@
+ 
+ #ifndef _AIX
+ typedef unsigned char uchar;
+-#if !defined(_HPUX) && !defined(_LINUX) && !defined(_MAC_MACHO)
++#if !defined(_HPUX) && !defined(_LINUX) && !defined(_MAC_MACHO) && !defined(_FREEBSD4)
+ typedef unsigned int uint;
+ #endif
+ #endif
diff --git a/multimedia/helixplayer/files/patch-build_lib_sysinfo.py b/multimedia/helixplayer/files/patch-build_lib_sysinfo.py
new file mode 100644
index 000000000000..9d7e5b536a53
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-build_lib_sysinfo.py
@@ -0,0 +1,16 @@
+--- build/lib/sysinfo.py.orig	Wed May 11 20:39:02 2005
++++ build/lib/sysinfo.py	Tue Jul 19 18:45:03 2005
+@@ -170,6 +170,13 @@
+     family_list = ['unix', 'freebsd', 'freebsd6', 'freebsd-6.0', 'freebsd-6.0-i586'] ))
+ 
+ AddPlatform(Platform(
++    id = 'freebsd-7.0-i586',
++    platform = 'freebsd7',
++    arch = 'i386',
++    distribution_id = 'freebsd-7.0-i586',
++    family_list = ['unix', 'freebsd', 'freebsd7', 'freebsd-7.0', 'freebsd-7.0-i586'] ))
++
++AddPlatform(Platform(
+     id = 'openbsd-3.3-i586',
+     platform = 'openbsd33',
+     arch = 'i386',
diff --git a/multimedia/helixplayer/files/patch-build_umakecf_freebsd-4.0-i386.cf b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-4.0-i386.cf
new file mode 100644
index 000000000000..7d790954d214
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-4.0-i386.cf
@@ -0,0 +1,13 @@
+--- build/umakecf/freebsd-4.0-i386.cf.orig	Thu Jul  8 00:00:05 2004
++++ build/umakecf/freebsd-4.0-i386.cf	Sun Aug 15 21:38:16 2004
+@@ -55,7 +55,7 @@
+ ## list of PCF files to run
+ platform.pcf_prefix_list = ['unix', 'freebsd', 'freebsd4']
+ 
+-project.AddDefines("_FREEBSD4", "_LITTLE_ENDIAN")
++project.AddDefines("_FREEBSD4", "_LITTLE_ENDIAN", "HELIX_CONFIG_DISABLE_ATOMIC_OPERATORS", "HAVE_DECL_GETOPT")
+ 
+-platform.cc.args['default'] = '--permissive -pipe -fsigned-char'
+-platform.cxx.args['default'] = '--permissive -pipe -fsigned-char'
++platform.cc.args['default']  = '--permissive %%CFLAGS%% -fsigned-char %%PTHREAD_CFLAGS%%'
++platform.cxx.args['default'] = '--permissive %%CXXFLAGS%% -fsigned-char %%PTHREAD_CFLAGS%%'
diff --git a/multimedia/helixplayer/files/patch-build_umakecf_freebsd-4.0-i586.cf b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-4.0-i586.cf
new file mode 100644
index 000000000000..f71ce62d9979
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-4.0-i586.cf
@@ -0,0 +1,14 @@
+--- build/umakecf/freebsd-4.0-i586.cf.orig	Thu Jul  8 00:00:05 2004
++++ build/umakecf/freebsd-4.0-i586.cf	Sun Aug 15 21:27:07 2004
+@@ -55,8 +55,8 @@
+ ## list of PCF files to run
+ platform.pcf_prefix_list = ['unix', 'freebsd', 'freebsd4']
+ 
+-project.AddDefines("_FREEBSD4", "_LITTLE_ENDIAN")
++project.AddDefines("_FREEBSD4", "_LITTLE_ENDIAN", "HELIX_CONFIG_DISABLE_ATOMIC_OPERATORS", "HAVE_DECL_GETOPT")
+ 
+-platform.cc.args['default']  = '--permissive -pipe -fsigned-char -march=pentium -D__pentium__'
+-platform.cxx.args['default'] = '--permissive -pipe -fsigned-char -march=pentium -D__pentium__'
++platform.cc.args['default']  = '--permissive %%CFLAGS%% -fsigned-char -D__pentium__ %%PTHREAD_CFLAGS%%'
++platform.cxx.args['default'] = '--permissive %%CXXFLAGS%% -fsigned-char -D__pentium__ %%PTHREAD_CFLAGS%%'
+ 
diff --git a/multimedia/helixplayer/files/patch-build_umakecf_freebsd-5.0-i586.cf b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-5.0-i586.cf
new file mode 100644
index 000000000000..dd11c9cc77a1
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-5.0-i586.cf
@@ -0,0 +1,11 @@
+--- build/umakecf/freebsd-5.0-i586.cf.orig	Wed May 28 07:12:48 2003
++++ build/umakecf/freebsd-5.0-i586.cf	Sat May 29 16:58:53 2004
+@@ -43,6 +43,6 @@
+ 
+ project.AddDefines("_FREEBSD5", "_LITTLE_ENDIAN")
+ 
+-platform.cc.args['default']  = '-pipe -fsigned-char -march=pentium -D__pentium__'
+-platform.cxx.args['default'] = '-pipe -fsigned-char -march=pentium -D__pentium__'
++platform.cc.args['default']  = '%%CFLAGS%% -fsigned-char -D__pentium__ %%PTHREAD_CFLAGS%%'
++platform.cxx.args['default'] = '%%CXXFLAGS%% -fsigned-char -D__pentium__ %%PTHREAD_CFLAGS%%'
+ 
diff --git a/multimedia/helixplayer/files/patch-build_umakecf_freebsd-6.0-i586.cf b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-6.0-i586.cf
new file mode 100644
index 000000000000..8873213b84ca
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-6.0-i586.cf
@@ -0,0 +1,11 @@
+--- build/umakecf/freebsd-6.0-i586.cf.orig	Wed May 11 20:35:52 2005
++++ build/umakecf/freebsd-6.0-i586.cf	Tue Jul 19 19:16:30 2005
+@@ -57,6 +57,6 @@
+ 
+ project.AddDefines("_FREEBSD6", "_LITTLE_ENDIAN")
+ 
+-platform.cc.args['default']  = '-pipe -fsigned-char -march=pentium -D__pentium__'
+-platform.cxx.args['default'] = '-pipe -fsigned-char -march=pentium -D__pentium__'
++platform.cc.args['default']  = '%%CFLAGS%% -fsigned-char -march=pentium -D__pentium__ %%PTHREAD_CFLAGS%%'
++platform.cxx.args['default'] = '%%CFLAGS%% -fsigned-char -march=pentium -D__pentium__ %%PTHREAD_CFLAGS%%'
+ 
diff --git a/multimedia/helixplayer/files/patch-build_umakecf_freebsd-7.0-i586.cf b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-7.0-i586.cf
new file mode 100644
index 000000000000..7e007c33f919
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-build_umakecf_freebsd-7.0-i586.cf
@@ -0,0 +1,23 @@
+--- build/umakecf/freebsd-7.0-i586.cf.orig	Tue Jul 19 19:18:09 2005
++++ build/umakecf/freebsd-7.0-i586.cf	Tue Jul 19 19:20:28 2005
+@@ -48,15 +48,15 @@
+ # 
+ # ***** END LICENSE BLOCK *****
+ # 
+-"""FreeBSD 6.x using gcc 3.4 with pentium optimizations."""
++"""FreeBSD 7.x using gcc 3.4 with pentium optimizations."""
+ 
+ exec_config_file('freebsd.cf')
+ 
+ ## list of PCF files to run
+-platform.pcf_prefix_list = ['unix', 'freebsd', 'freebsd6']
++platform.pcf_prefix_list = ['unix', 'freebsd', 'freebsd7']
+ 
+-project.AddDefines("_FREEBSD6", "_LITTLE_ENDIAN")
++project.AddDefines("_FREEBSD7", "_LITTLE_ENDIAN")
+ 
+-platform.cc.args['default']  = '-pipe -fsigned-char -march=pentium -D__pentium__'
+-platform.cxx.args['default'] = '-pipe -fsigned-char -march=pentium -D__pentium__'
++platform.cc.args['default']  = '%%CFLAGS%%  -fsigned-char -march=pentium -D__pentium__ %%PTHREAD_CFLAGS%%'
++platform.cxx.args['default'] = '%%CFLAGS%%  -fsigned-char -march=pentium -D__pentium__ %%PTHREAD_CFLAGS%%'
+ 
diff --git a/multimedia/helixplayer/files/patch-build_umakecf_freebsd.cf b/multimedia/helixplayer/files/patch-build_umakecf_freebsd.cf
new file mode 100644
index 000000000000..b59cc831377c
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-build_umakecf_freebsd.cf
@@ -0,0 +1,160 @@
+--- build/umakecf/freebsd.cf.orig	Sun Jul 18 20:43:14 2004
++++ build/umakecf/freebsd.cf	Sun Sep 12 19:24:00 2004
+@@ -1,9 +1,9 @@
+-# 
++#
+ # ***** BEGIN LICENSE BLOCK *****
+ # Source last modified: $Id: freebsd.cf,v 1.3 2004/07/18 18:43:14 dcollins Exp $
+-# 
++#
+ # Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
+-# 
++#
+ # The contents of this file, and the files included with this file,
+ # are subject to the current version of the RealNetworks Public
+ # Source License (the "RPSL") available at
+@@ -17,7 +17,7 @@
+ # to this file, the RCSL.  Please see the applicable RPSL or RCSL for
+ # the rights, obligations and limitations governing use of the
+ # contents of the file.
+-# 
++#
+ # Alternatively, the contents of this file may be used under the
+ # terms of the GNU General Public License Version 2 or later (the
+ # "GPL") in which case the provisions of the GPL are applicable
+@@ -29,25 +29,25 @@
+ # the GPL. If you do not delete the provisions above, a recipient may
+ # use your version of this file under the terms of any one of the
+ # RPSL, the RCSL or the GPL.
+-# 
++#
+ # This file is part of the Helix DNA Technology. RealNetworks is the
+ # developer of the Original Code and owns the copyrights in the
+ # portions it created.
+-# 
++#
+ # This file, and the files included with this file, is distributed
+ # and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY
+ # KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS
+ # ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES
+ # OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
+ # ENJOYMENT OR NON-INFRINGEMENT.
+-# 
++#
+ # Technology Compatibility Kit Test Suite(s) Location:
+ #    http://www.helixcommunity.org/content/tck
+-# 
++#
+ # Contributor(s):
+-# 
++#
+ # ***** END LICENSE BLOCK *****
+-# 
++#
+ """Basic FreeBSD cf file, inherited by other freebsd-x.y-z.cf files."""
+ 
+ exec_config_file('unix.cf')
+@@ -57,6 +57,7 @@
+ platform.pcf_prefix_list = ['unix', 'freebsd']
+ 
+ project.AddDefines("_FREEBSD")
++# project.AddBuildOption("release")
+ 
+ make_toc = platform.make_toc
+ make_toc.cmd = 'ranlib'
+@@ -66,8 +67,8 @@
+ make_lib.cmd = 'ar cr '
+ make_lib.make_var = 'MAKE_LIB'
+ make_lib.make_flags = 'MAKE_LIB_FLAGS'
+-platform.cc.args['default']  = '-pipe -fsigned-char'
+-platform.cxx.args['default'] = '-pipe -fsigned-char'
++platform.cc.args['default']  = '%%CFLAGS%% -fsigned-char %%PTHREAD_CFLAGS%%'
++platform.cxx.args['default'] = '%%CXXFLAGS%% -fsigned-char %%PTHREAD_CFLAGS%%'
+ DisableRTTIIfNecessary()
+ 
+ 
+@@ -80,7 +81,7 @@
+ 
+     def add_argument(self, arg):
+         self.extra_arguments.append(arg)
+-    
++
+     def link_paths(self):
+         return string.join(platform.system_paths +
+                            project.system_paths)
+@@ -91,7 +92,7 @@
+     def armerge_lib_path(self):
+         libname = "%s_libs.%s" % (project.target_name, platform.library_suffix)
+         return os.path.join(project.output_dir, libname)
+-    
++
+     def armerge_tmp_path(self):
+         return os.path.join(project.object_dir, "lib")
+ 
+@@ -99,7 +100,7 @@
+         ## if there are no exported functions, die here
+         if len(project.exported_func) == 0:
+             umake_lib.fatal("dll target without exported functions") 
+-        
++
+         ## create a gcc link script
+         fil = open(path, "w")
+         fil.write("VERSION\n")
+@@ -118,7 +119,7 @@
+ 
+     def LinkLIB(self, target_path, objects):
+         cmd_list = []
+-        
++
+         cmd = "%s %s %s" % (make_lib.cmd, target_path, objects)
+         cmd_list.append(cmd)
+ 
+@@ -147,7 +148,7 @@
+         else:
+             undefinedSymbols=""
+ 
+-        cmd = "g++ -shared %s -o %s %s %s %s %s %s -lgcc" % (
++        cmd = "%%CXX%% -shared %s -o %s %s %s %s %s %s -lgcc" % (
+             lspath, target_path,
+             undefinedSymbols,
+             objects, libpath,
+@@ -175,8 +176,8 @@
+         cmd = "%s -d %s %s %s" % (armerge_cmd, tmp_path, libpath, static_libs)
+         cmd_list.append(cmd)
+ 
+-        # Link using g++ for proper handling of C++
+-        cmd = "g++ -Wl,-export-dynamic -o %s %s %s %s %s" % (
++        # Link using %%CXX%% for proper handling of C++
++        cmd = "%%CXX%% -Wl,-export-dynamic -o %s %s %s %s %s" % (
+             target_path, objects, libpath, self.link_paths(), dynamic_libs)
+         cmd_list.append(cmd)
+ 
+@@ -184,21 +185,24 @@
+         cmd_list.append(cmd)
+ 
+         return cmd_list
+-    
++
+     def CleanEXE(self, target_path):
+         list = []
+         list.append(target_path)
+         list.append(self.armerge_tmp_path())
+         list.append(self.armerge_lib_path())
+         return list
+-    
++
+     def make_lib_static(self, lib):
+         return "-Wl,-Bstatic %s -Wl,-Bdynamic" % lib
+-    
++
+ 
+ platform.link = FreeBSDLinker()
+-platform.link.ldargs = '-L/usr/X11R6/lib --export-dynamic'
++platform.link.ldargs = '-L/usr/X11R6/lib -L/usr/local/lib --export-dynamic  %%PTHREAD_LIBS%%'
++project.includes.append('../../../../datatype/image/common/pub')
+ project.includes.append('/usr/X11R6/include')
++project.includes.append('/usr/local/include')
++project.AddSystemPaths('-L/usr/X11R6/lib')
+ 
+ 
+ ## LessTif/Motif root defined with environment variable XMROOT
diff --git a/multimedia/helixplayer/files/patch-build_umakecf_gcc.cf b/multimedia/helixplayer/files/patch-build_umakecf_gcc.cf
new file mode 100644
index 000000000000..3ba55faad26b
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-build_umakecf_gcc.cf
@@ -0,0 +1,47 @@
+--- build/umakecf/gcc.cf.orig	Wed Oct 19 06:07:04 2005
++++ build/umakecf/gcc.cf	Sat May  6 17:53:25 2006
+@@ -54,14 +54,14 @@
+ 
+ ## Set up the C compiler
+ platform.cc = cc = Compiler()
+-cc.cmd = 'gcc'
+-cc.args['default'] = '-pipe'
++cc.cmd = '%%CC%%'
++cc.args['default'] = '%%CFLAGS%%'
+ cc.args['debug'] = '-O0 -g -DDEBUG -D_DEBUG'
+ 
+ if project.IsDefined('HELIX_CONFIG_MINIMIZE_SIZE'):
+     cc.args['release'] = '-Os -fomit-frame-pointer -finline-functions -finline-limit=50'
+ else:
+-    cc.args['release'] = '-O2 '
++    cc.args['release'] = '%%CFLAGS%% '
+ 
+ if not project.BuildOption("nopic"):
+     cc.args['dll'] = '-fPIC -DPIC'
+@@ -77,14 +77,14 @@
+ 
+ ## Set up the C++ Compiler
+ platform.cxx = cxx = Compiler()
+-cxx.cmd = 'g++'
+-cxx.args['default'] = '-pipe'
++cxx.cmd = '%%CXX%%'
++cxx.args['default'] = '%%CXXFLAGS%%'
+ cxx.args['debug'] = '-O0 -g -DDEBUG -D_DEBUG'
+ 
+ if project.IsDefined('HELIX_CONFIG_MINIMIZE_SIZE'):
+     cxx.args['release'] = '-Os -fomit-frame-pointer  -finline-functions -finline-limit=50'
+ else:
+-    cxx.args['release'] = '-O2 '
++    cxx.args['release'] = '%%CXXFLAGS%% '
+ 
+ if project.BuildOption("symbols"):
+     cc.args['release'] = cc.args['release'] + ' -g '
+@@ -119,7 +119,7 @@
+         self.args['profile'] = '-pg'
+         self.args['static'] = '-static'
+         self.target_arg = '-o'
+-        self.ldcmd = 'g++'
++        self.ldcmd = '%%CXX%%'
+         self.ldargs = ''
+ 
+     def crti_path(self):
diff --git a/multimedia/helixplayer/files/patch-client_core_asm_hxsmstr.cpp b/multimedia/helixplayer/files/patch-client_core_asm_hxsmstr.cpp
new file mode 100644
index 000000000000..d518797adc3e
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-client_core_asm_hxsmstr.cpp
@@ -0,0 +1,17 @@
+--- ./client/core/asm/hxsmstr.cpp.orig	Fri Jul  9 04:05:30 2004
++++ ./client/core/asm/hxsmstr.cpp	Sat May  6 21:32:22 2006
+@@ -278,10 +278,12 @@
+ 	IHXValues* pHeader = 0;
+ 
+ 	HX_VERIFY(pHeader = pStream->GetHeader());
++	/*
+ 	HX_VERIFY(HXR_OK == pHeader->GetPropertyULONG32("AvgBitRate",
+ 	    m_ulFixedBandwidth));
+-	
+-	m_ulCurrentBandwidth = m_ulFixedBandwidth; 
++	*/
++	pHeader->GetPropertyULONG32("AvgBitRate", m_ulFixedBandwidth);
++	m_ulCurrentBandwidth = m_ulFixedBandwidth;
+ 
+ 	pHeader->Release();
+     }
diff --git a/multimedia/helixplayer/files/patch-common_netio_pub_platform_unix_sockio.h b/multimedia/helixplayer/files/patch-common_netio_pub_platform_unix_sockio.h
new file mode 100644
index 000000000000..dc0546b230b8
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-common_netio_pub_platform_unix_sockio.h
@@ -0,0 +1,11 @@
+--- ./common/netio/pub/platform/unix/sockio.h.orig	Fri Jul  9 03:46:54 2004
++++ ./common/netio/pub/platform/unix/sockio.h	Fri Sep 10 21:59:06 2004
+@@ -92,7 +92,7 @@
+ 
+ #if defined (_AIX42)
+ #define HX_SOCKLEN_T size_t
+-#elif defined(_AIX43) || defined(_FREEBSD5) || defined(_FREEBSD4) || defined(_OPENBSD) ||defined(_NETBSD) || defined(_LINUX) || (defined (__GNUC__) && defined(_SOLARIS))
++#elif defined(_AIX43) || defined(_FREEBSD7) || defined(_FREEBSD6) || defined(_FREEBSD5) || defined(_FREEBSD4) || defined(_OPENBSD) ||defined(_NETBSD) || defined(_LINUX) || (defined (__GNUC__) && defined(_SOLARIS))
+ #define HX_SOCKLEN_T socklen_t
+ #else
+ #define HX_SOCKLEN_T int
diff --git a/multimedia/helixplayer/files/patch-common_runtime_pub_hlxclib_malloc.h b/multimedia/helixplayer/files/patch-common_runtime_pub_hlxclib_malloc.h
new file mode 100644
index 000000000000..c0ea725f8208
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-common_runtime_pub_hlxclib_malloc.h
@@ -0,0 +1,11 @@
+--- ./common/runtime/pub/hlxclib/malloc.h.orig	Fri Jul  9 03:45:31 2004
++++ ./common/runtime/pub/hlxclib/malloc.h	Fri Sep 10 21:56:56 2004
+@@ -51,7 +51,7 @@
+ #define HLXSYS_MALLOC_H
+ 
+ #if !defined(_SYMBIAN) && !defined(_MACINTOSH) && !defined(_VXWORKS) \
+-	&& !defined(_OPENWAVE) && !defined(_MAC_UNIX) && !defined(_FREEBSD5)
++	&& !defined(_OPENWAVE) && !defined(_MAC_UNIX) && !defined(_FREEBSD5) && !defined(_FREEBSD6) && !defined(_FREEBSD7)
+ #include <malloc.h>
+ #endif
+ 
diff --git a/multimedia/helixplayer/files/patch-common_system_dllpath.cpp b/multimedia/helixplayer/files/patch-common_system_dllpath.cpp
new file mode 100644
index 000000000000..357302a4b798
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-common_system_dllpath.cpp
@@ -0,0 +1,20 @@
+--- common/system/dllpath.cpp.orig	Sun Jul 25 17:00:35 2004
++++ common/system/dllpath.cpp	Sun Jul 25 17:03:40 2004
+@@ -243,7 +243,7 @@
+ 	    strResultPath += strPathEnvVar;
+ 	}
+ 
+-#if defined (_AIX) || defined (_LINUX)
++#if defined (_AIX) || defined (_LINUX) || defined (_FREEBSD)
+ 	{
+ 	  char *ptr = (char *) ((const char *)strResultPath);
+ 	  if(putenv(ptr))
+@@ -270,7 +270,7 @@
+ #if !defined(_MACINTOSH) && !defined(WIN32_PLATFORM_PSPC)
+     if(!m_strPathEnvVar.IsEmpty())
+     {
+-#if defined(_AIX) || defined(_LINUX)
++#if defined(_AIX) || defined(_LINUX) || defined(_FREEBSD)
+       char *ptr = (char *)((const char *)m_strPathEnvVar);
+ 	if(putenv(ptr))
+ 	    theError = HXR_FAILED;
diff --git a/multimedia/helixplayer/files/patch-datatype_h263_codec_include_os.h b/multimedia/helixplayer/files/patch-datatype_h263_codec_include_os.h
new file mode 100644
index 000000000000..4fc981eee564
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-datatype_h263_codec_include_os.h
@@ -0,0 +1,11 @@
+--- datatype/h263/codec/include/os.h.orig	Sun Jul 25 04:27:00 2004
++++ datatype/h263/codec/include/os.h	Sun Jul 25 04:29:57 2004
+@@ -98,8 +98,6 @@
+ 
+ #define strcmpi strcasecmp
+ #define _fmemset memset
+-#define min(a,b) (((a) < (b) ? (a) : (b)))
+-#define max(a,b) (((a) > (b) ? (a) : (b)))
+ 
+ #define TRACE0
+ 
diff --git a/multimedia/helixplayer/files/patch-datatype_h263_codec_video_hvdecode.c b/multimedia/helixplayer/files/patch-datatype_h263_codec_video_hvdecode.c
new file mode 100644
index 000000000000..d45e13ead6f9
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-datatype_h263_codec_video_hvdecode.c
@@ -0,0 +1,11 @@
+--- datatype/h263/codec/video/hvdecode.c.orig	Wed Feb 19 14:47:48 2003
++++ datatype/h263/codec/video/hvdecode.c	Sat May 22 00:27:16 2004
+@@ -38,7 +38,7 @@
+ #include <stdio.h>
+ #include <stddef.h>
+ #include <string.h>
+-#ifdef FOR_MAC
++#if defined (FOR_MAC)  || defined (_FREEBSD)
+ #include <stdlib.h>
+ #else
+ #include <malloc.h>
diff --git a/multimedia/helixplayer/files/patch-datatype_h263_codec_video_vdecopcl.c b/multimedia/helixplayer/files/patch-datatype_h263_codec_video_vdecopcl.c
new file mode 100644
index 000000000000..c94231e278a2
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-datatype_h263_codec_video_vdecopcl.c
@@ -0,0 +1,11 @@
+--- datatype/h263/codec/video/vdecopcl.c.orig	Fri Oct 18 03:55:31 2002
++++ datatype/h263/codec/video/vdecopcl.c	Sat May 22 00:24:50 2004
+@@ -37,7 +37,7 @@
+ //#include <stdio.h>
+ //#include <stddef.h>
+ #include "machine.h"
+-#ifdef FOR_MAC
++#if defined (FOR_MAC)  || defined (_FREEBSD)
+ #include <stdlib.h>
+ #else
+ #include <malloc.h>
diff --git a/multimedia/helixplayer/files/patch-datatype_image_png_common_pxpngdec.cpp b/multimedia/helixplayer/files/patch-datatype_image_png_common_pxpngdec.cpp
new file mode 100644
index 000000000000..a2e1929b5e90
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-datatype_image_png_common_pxpngdec.cpp
@@ -0,0 +1,11 @@
+--- datatype/image/png/common/pxpngdec.cpp.orig	Wed Jul  9 21:13:55 2003
++++ datatype/image/png/common/pxpngdec.cpp	Sun May 23 00:50:47 2004
+@@ -63,6 +63,8 @@
+ #include "errdbg.h"
+ #include "hxperf.h"
+ 
++void PNGAPI png_clear_invert_alpha(png_structp png_ptr);
++
+ PXPNGDecode::PXPNGDecode()
+ {
+     m_lRefCount = 0;
diff --git a/multimedia/helixplayer/files/patch-datatype_image_realpix_codec_jpg_pxcjpgfa.cpp b/multimedia/helixplayer/files/patch-datatype_image_realpix_codec_jpg_pxcjpgfa.cpp
new file mode 100644
index 000000000000..77c2a8353eb1
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-datatype_image_realpix_codec_jpg_pxcjpgfa.cpp
@@ -0,0 +1,11 @@
+--- ./datatype/image/realpix/codec/jpg/pxcjpgfa.cpp.orig	Fri Jul  9 03:51:18 2004
++++ ./datatype/image/realpix/codec/jpg/pxcjpgfa.cpp	Mon Sep 13 12:07:39 2004
+@@ -70,7 +70,7 @@
+ // pxcomlib
+ #include "pxffmcod.h"
+ #include "pxrndcod.h"
+-#include "glist.h"
++#include "../../../common/pub/glist.h" // May conflict with HDF's <glist.h>
+ #include "gstring.h"
+ #include "pxmapmgr.h"
+ #include "pxparse.h"
diff --git a/multimedia/helixplayer/files/patch-datatype_image_realpix_codec_jpg_pxcjpgrn.cpp b/multimedia/helixplayer/files/patch-datatype_image_realpix_codec_jpg_pxcjpgrn.cpp
new file mode 100644
index 000000000000..73f1bd2f0651
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-datatype_image_realpix_codec_jpg_pxcjpgrn.cpp
@@ -0,0 +1,11 @@
+--- ./datatype/image/realpix/codec/jpg/pxcjpgrn.cpp.orig	Fri Jul  9 03:51:18 2004
++++ ./datatype/image/realpix/codec/jpg/pxcjpgrn.cpp	Mon Sep 13 11:43:45 2004
+@@ -71,7 +71,7 @@
+ // pxcomlib
+ #include "rpcodec.h"
+ #include "gstring.h"
+-#include "glist.h"
++#include "../../../common/pub/glist.h" // May conflict with HDF's <glist.h>
+ #include "pxrndcod.h"
+ #include "pxutil.h"
+ #include "pxmapmgr.h"
diff --git a/multimedia/helixplayer/files/patch-datatype_theora_renderer_theoravidfmt.cpp b/multimedia/helixplayer/files/patch-datatype_theora_renderer_theoravidfmt.cpp
new file mode 100644
index 000000000000..5b4eda639f99
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-datatype_theora_renderer_theoravidfmt.cpp
@@ -0,0 +1,29 @@
+--- datatype/theora/renderer/theoravidfmt.cpp.orig	Wed Nov 24 19:29:04 2004
++++ datatype/theora/renderer/theoravidfmt.cpp	Sat Mar 26 15:46:37 2005
+@@ -244,7 +244,7 @@
+ }
+ 
+ static
+-void CopyPixelData(REF(UINT8*) pDest, char* pSrc, UINT32 width, UINT32 height, 
++void CopyPixelData(REF(UINT8*) pDest, unsigned char* pSrc, UINT32 width, UINT32 height, 
+ 		   int stride)
+ {
+     for (int i = 0; i < height; i++)
+@@ -256,7 +256,7 @@
+ }
+ 
+ static
+-void CopyAndStretchX(REF(UINT8*) pDest, const char* pSrc, 
++void CopyAndStretchX(REF(UINT8*) pDest, unsigned char* pSrc, 
+                      UINT32 uWidth, UINT32 uHeight, int stride,
+                      UINT32 uAspectNum, UINT32 uAspectDen,
+                      UINT32 uAdjustedWidth,
+@@ -303,7 +303,7 @@
+ }
+ 
+ static
+-void CopyAndStretchY(REF(UINT8*) pDest, const char* pSrc, 
++void CopyAndStretchY(REF(UINT8*) pDest, unsigned char* pSrc, 
+                      UINT32 uWidth, UINT32 uHeight, int stride,
+                      UINT32 uAspectNum, UINT32 uAspectDen,
+                      UINT32 uAdjustedHeight,
diff --git a/multimedia/helixplayer/files/patch-player_app_gtk_Umakefil b/multimedia/helixplayer/files/patch-player_app_gtk_Umakefil
new file mode 100644
index 000000000000..690f7e0a55b4
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_app_gtk_Umakefil
@@ -0,0 +1,50 @@
+--- player/app/gtk/Umakefil.orig	Thu Feb 10 19:39:00 2005
++++ player/app/gtk/Umakefil	Sun Mar 27 11:54:01 2005
+@@ -65,11 +65,11 @@
+ # package = "."
+ 
+ # Uncomment this for something more standard:
+-project_defs =[ ( "PACKAGE_DATA_DIR",    "/usr/share" ),
+-        ( "LIBDIR",     "/usr/lib" ),
+-        ( "SYSCONFDIR", "/etc" ),
+-        ( "PREFIX",     "/usr" ),
+-        ( "LOCALEDIR",  "/usr/share/locale" ),
++project_defs =[ ( "PACKAGE_DATA_DIR",    "/usr/local/share" ),
++        ( "LIBDIR",     "%%PREFIX%%/lib" ),
++        ( "SYSCONFDIR", "%%PREFIX%%/etc" ),
++        ( "PREFIX",     "%%PREFIX%%" ),
++        ( "LOCALEDIR",  "%%PREFIX%%/locale" ),
+ 	( "PLATFORM_BUILD_STATUS", platform_build_status ) ]
+ 
+ if project.IsDefined('HELIX_FEATURE_REAL_BRANDING'):
+@@ -127,12 +127,12 @@
+ # together at the libgtkhx.a level.
+ project.AddModuleLibraries("common/runtime[runtlib]",
+                            "common/system[syslib]",
++                           "player/mime/util[mimelib]",
+                            "common/container[contlib]",
+                            "common/runtime[runtlib]",
+                            "common/dbgtool[debuglib]",
+                            "common/util[utillib]",
+-                           "player/hxclientkit[hxclientlib]",
+-                           "player/mime/util[mimelib]")
++                           "player/hxclientkit[hxclientlib]")
+ 
+ 
+ # project.AddDefines('HELIX_FEATURE_RP_SIGN_IN')
+@@ -148,13 +148,14 @@
+                                    "common/lang/xml/pub")
+         project.AddSources("signin.cpp")
+ 
+-        
++
+         if not project.IsDefined('HELIX_FEATURE_LIBGLADE'):
+                 project.AddSources("signin_interface.c")
+ 
+ # Add includes
+ project.AddModuleIncludes("common/include",
+                           "player/common/gtk/pub",
++                          "common/container/pub",
+                           "player/app/gtk/pub")
+ 
+ # Includes needed by guids.cpp
diff --git a/multimedia/helixplayer/files/patch-player_app_gtk_commonapp.cpp b/multimedia/helixplayer/files/patch-player_app_gtk_commonapp.cpp
new file mode 100644
index 000000000000..0a58e97a34f8
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_app_gtk_commonapp.cpp
@@ -0,0 +1,23 @@
+--- ./player/app/gtk/commonapp.cpp.orig	Thu Nov 25 00:00:23 2004
++++ ./player/app/gtk/commonapp.cpp	Sat Mar 26 14:43:51 2005
+@@ -1868,7 +1868,19 @@
+     {
+         /* g_error will call abort */
+ 	g_error("Unable to open display");
+-    }    
++    }
++
++#ifdef G_OS_UNIX
++    if(strcmp(hxplayer_x_init_threads, "delayed") == 0)
++    {
++        Status status;
++        status = XInitThreads();
++        if(!status)
++        {
++            g_warning("X libraries appear to have been compiled without multithreaded support.");
++        }
++    }
++#endif
+ 
+ #ifdef G_OS_UNIX
+     if(strcmp(hxplayer_x_init_threads, "after") == 0)
diff --git a/multimedia/helixplayer/files/patch-player_app_gtk_embeddedapp.cpp b/multimedia/helixplayer/files/patch-player_app_gtk_embeddedapp.cpp
new file mode 100644
index 000000000000..3da1e5d27b22
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_app_gtk_embeddedapp.cpp
@@ -0,0 +1,12 @@
+--- player/app/gtk/embeddedapp.cpp.orig	Mon May 17 23:04:00 2004
++++ player/app/gtk/embeddedapp.cpp	Sat May 22 22:44:45 2004
+@@ -56,6 +56,9 @@
+ #include <unistd.h>
+ 
+ #include <glib.h>
++#if GLIB_CHECK_VERSION (2, 4, 0)
++# define g_value_set_string_take_ownership	g_value_take_string
++#endif
+ 
+ /* This file contains functions with several different prefixes.
+  * They include:
diff --git a/multimedia/helixplayer/files/patch-player_app_gtk_hxplay b/multimedia/helixplayer/files/patch-player_app_gtk_hxplay
new file mode 100644
index 000000000000..c7cf866ce105
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_app_gtk_hxplay
@@ -0,0 +1,38 @@
+--- player/app/gtk/hxplay.orig	Thu Apr 29 19:35:24 2004
++++ player/app/gtk/hxplay	Thu May 27 23:05:02 2004
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ # If you don't have readlink, fill in the path to hxplay.bin here.
+-# HELIX_LIBS="/usr/local/HelixPlayer" ; export HELIX_LIBS
++HELIX_LIBS="%%PREFIX%%/HelixPlayer" ; export HELIX_LIBS
+ 
+ # To install this script, create a symlink to it from somewhere in your
+ # path.  Do *not* move the script out of the HelixPlayer directory, since
+@@ -28,7 +28,7 @@
+             HXPLAYSCRIPT=`$PERL -e 'print readlink($ARGV[0])' -- $HXPLAYSYMLINK`            
+         elif [ -x "$PYTHON" ] ; then
+             # echo "Using python"
+-            HXPLAYSCRIPT=`echo 'import os; print os.readlink("/usr/local/bin/hxplay")' | $PYTHON -`
++            HXPLAYSCRIPT=`echo 'import os; print os.readlink("%%PREFIX%%/HelixPlayer/hxplay")' | $PYTHON -`
+         else
+             # echo "Using ls (directory name cannot contain spaces)"
+             HXPLAYSCRIPT=`ls -l $HXPLAYSYMLINK | sed -e 's/.* //'`
+@@ -44,7 +44,7 @@
+     fi
+ 
+     # if HXPLAYDIR detection doesn't work, hardcode the directory here
+-    HXPLAYDIR=`dirname $HXPLAYSCRIPT`
++    HXPLAYDIR=%%PREFIX%%/HelixPlayer
+ 
+     # setup environment
+     # find our common, plugin and codec dlls
+@@ -66,7 +66,7 @@
+ if [ -n "$DEBUG" -a -x "$CATCHSEGV" ]; then
+     $CATCHSEGV $HXPLAYBIN ${1+"$@"}
+ else
+-    while /bin/true; do
++    while /usr/bin/true; do
+         # Restart the player if exit code is 10
+         $HXPLAYBIN "$@"
+         if [ $? -ne 10 ]; then
diff --git a/multimedia/helixplayer/files/patch-player_app_gtk_preferences_interface.c b/multimedia/helixplayer/files/patch-player_app_gtk_preferences_interface.c
new file mode 100644
index 000000000000..2b168eb290b9
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_app_gtk_preferences_interface.c
@@ -0,0 +1,13 @@
+--- player/app/gtk/preferences_interface.c.orig	Mon May 17 23:18:17 2004
++++ player/app/gtk/preferences_interface.c	Fri May 21 23:18:33 2004
+@@ -12,6 +12,10 @@
+ #include <string.h>
+ #include <stdio.h>
+ 
++#ifdef GTK_DISABLE_DEPRECATED
++# undef GTK_DISABLE_DEPRECATED
++#endif
++
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
diff --git a/multimedia/helixplayer/files/patch-player_app_gtk_realplay b/multimedia/helixplayer/files/patch-player_app_gtk_realplay
new file mode 100644
index 000000000000..8976f0e1e4c4
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_app_gtk_realplay
@@ -0,0 +1,11 @@
+--- ./player/app/gtk/realplay.orig	Tue May  4 18:30:10 2004
++++ ./player/app/gtk/realplay	Wed May 26 21:17:27 2004
+@@ -65,7 +65,7 @@
+ if [ -n "$DEBUG" -a -x "$CATCHSEGV" ]; then
+     $CATCHSEGV $REALPLAYBIN ${1+"$@"}
+ else
+-    while /bin/true; do
++    while /usr/bin/true; do
+         # Restart the player if exit code is 10
+         $REALPLAYBIN "$@"
+         if [ $? -ne 10 ]; then
diff --git a/multimedia/helixplayer/files/patch-player_app_gtk_statistics_interface.c b/multimedia/helixplayer/files/patch-player_app_gtk_statistics_interface.c
new file mode 100644
index 000000000000..bd1347ba3400
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_app_gtk_statistics_interface.c
@@ -0,0 +1,13 @@
+--- player/app/gtk/statistics_interface.c.orig	Tue May  4 18:30:10 2004
++++ player/app/gtk/statistics_interface.c	Fri May 21 23:26:07 2004
+@@ -12,6 +12,10 @@
+ #include <string.h>
+ #include <stdio.h>
+ 
++#ifdef GTK_DISABLE_DEPRECATED
++# undef GTK_DISABLE_DEPRECATED
++#endif
++
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
diff --git a/multimedia/helixplayer/files/patch-player_app_gtk_uri_interface.c b/multimedia/helixplayer/files/patch-player_app_gtk_uri_interface.c
new file mode 100644
index 000000000000..077f91f71470
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_app_gtk_uri_interface.c
@@ -0,0 +1,13 @@
+--- player/app/gtk/uri_interface.c.orig	Fri May 14 20:49:15 2004
++++ player/app/gtk/uri_interface.c	Fri May 21 23:20:47 2004
+@@ -12,6 +12,10 @@
+ #include <string.h>
+ #include <stdio.h>
+ 
++#ifdef GTK_DISABLE_DEPRECATED
++# undef GTK_DISABLE_DEPRECATED
++#endif
++
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
diff --git a/multimedia/helixplayer/files/patch-player_common_gtk_hxplayer.cpp b/multimedia/helixplayer/files/patch-player_common_gtk_hxplayer.cpp
new file mode 100644
index 000000000000..aad79ffdce71
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_common_gtk_hxplayer.cpp
@@ -0,0 +1,18 @@
+--- player/common/gtk/hxplayer.cpp.orig	Mon May 17 19:28:16 2004
++++ player/common/gtk/hxplayer.cpp	Fri May 21 21:20:13 2004
+@@ -47,7 +47,15 @@
+ #include <X11/Xatom.h>
+ #endif
+ 
++#ifdef GTK_DISABLE_DEPRECATED
++# undef GTK_DISABLE_DEPRECATED
++#endif
+ #include <gtk/gtkmain.h>
++#if GLIB_CHECK_VERSION (2, 4, 0)
++# define g_value_set_boxed_take_ownership	g_value_take_boxed
++# define g_value_set_string_take_ownership	g_value_take_string
++#endif
++
+ #include <memory.h>
+ #include <stdlib.h>
+ #include <stdio.h>
diff --git a/multimedia/helixplayer/files/patch-player_common_gtk_hxstatisticsobserver.cpp b/multimedia/helixplayer/files/patch-player_common_gtk_hxstatisticsobserver.cpp
new file mode 100644
index 000000000000..e9ee4d95797f
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_common_gtk_hxstatisticsobserver.cpp
@@ -0,0 +1,13 @@
+--- player/common/gtk/hxstatisticsobserver.cpp.orig	Thu Apr 29 22:08:12 2004
++++ player/common/gtk/hxstatisticsobserver.cpp	Fri May 21 21:22:19 2004
+@@ -41,6 +41,10 @@
+ #include "HXClientCFuncs.h"
+ #include "HXClientConstants.h"
+ 
++#if GLIB_CHECK_VERSION (2, 4, 0)
++# define g_value_set_boxed_take_ownership	g_value_take_boxed
++# define g_value_set_string_take_ownership	g_value_take_string
++#endif
+ 
+ enum {
+     STATISTIC_ADDED_SIGNAL,
diff --git a/multimedia/helixplayer/files/patch-player_installer_stage1_Umakefil b/multimedia/helixplayer/files/patch-player_installer_stage1_Umakefil
new file mode 100644
index 000000000000..af4c7a0b7cce
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_installer_stage1_Umakefil
@@ -0,0 +1,12 @@
+--- player/installer/stage1/Umakefil.orig	Wed Apr 21 00:34:38 2004
++++ player/installer/stage1/Umakefil	Tue May 25 23:18:55 2004
+@@ -55,8 +55,8 @@
+     "player/installer/common/pub")
+ 
+ project.AddModuleLibraries("common/util[utillib]",
+-    "installer/common/util[instutil]",
+     "installer/common[prodinstlib]",
++    "installer/common/util[instutil]",
+     "common/container[contlib]",
+     "common/system[syslib]",
+     "common/dbgtool[debuglib]",
diff --git a/multimedia/helixplayer/files/patch-player_installer_stage1_unix.pcf b/multimedia/helixplayer/files/patch-player_installer_stage1_unix.pcf
new file mode 100644
index 000000000000..9dc262166a93
--- /dev/null
+++ b/multimedia/helixplayer/files/patch-player_installer_stage1_unix.pcf
@@ -0,0 +1,9 @@
+--- player/installer/stage1/unix.pcf.orig	Wed Apr 21 00:34:39 2004
++++ player/installer/stage1/unix.pcf	Mon May 24 22:36:15 2004
+@@ -41,5 +41,5 @@
+ 
+ project.AddSources("platform/unix/stage1app.cpp")
+ 
+-project.AddSystemLibraries("dl")
++#project.AddSystemLibraries("dl")
+ 
diff --git a/multimedia/helixplayer/files/pkg-message.in b/multimedia/helixplayer/files/pkg-message.in
new file mode 100644
index 000000000000..d749736860d1
--- /dev/null
+++ b/multimedia/helixplayer/files/pkg-message.in
@@ -0,0 +1,19 @@
+
+================================================================================
+    To use the HelixPlayer player with Mozilla you must create a
+    symbolic link from
+
+ %%PREFIX%%/HelixPlayer/mozilla/nphelix.so
+
+    to your Mozilla plugins directory, which is usually found at
+
+ %%X11BASE%%/lib/mozilla/plugins
+
+    To use it with Firefox, create the symbolic link to
+    %%X11BASE%%/lib/firefox/plugins
+
+E.g.
+ln -sf %%PREFIX%%/HelixPlayer/mozilla/nphelix.so %%X11BASE%%/lib/firefox/plugins
+
+================================================================================
+
diff --git a/multimedia/helixplayer/pkg-descr b/multimedia/helixplayer/pkg-descr
new file mode 100644
index 000000000000..c8d3ed924907
--- /dev/null
+++ b/multimedia/helixplayer/pkg-descr
@@ -0,0 +1,6 @@
+The Helix Player is the Helix Community's open source media player for
+consumers. It is being developed to have a rich and usable graphical
+interface and support a variety of open media formats like Ogg Vorbis,
+Theora etc.
+
+WWW: https://player.helixcommunity.org/
diff --git a/multimedia/helixplayer/pkg-plist b/multimedia/helixplayer/pkg-plist
new file mode 100644
index 000000000000..4aded4a39631
--- /dev/null
+++ b/multimedia/helixplayer/pkg-plist
@@ -0,0 +1,195 @@
+HelixPlayer/Bin/setup
+HelixPlayer/LICENSE
+HelixPlayer/README
+HelixPlayer/codecs/colorcvt.so
+HelixPlayer/codecs/cvt1.so
+HelixPlayer/common/clntcore.so
+HelixPlayer/common/clntxres.so
+HelixPlayer/hxplay
+HelixPlayer/hxplay.bin
+HelixPlayer/lib/libgtkhx.so
+HelixPlayer/lib/libgtkhx.so.0
+HelixPlayer/mozilla/nphelix.so
+HelixPlayer/mozilla/nphelix.xpt
+HelixPlayer/plugins/audplin.so
+HelixPlayer/plugins/aufformat.so
+HelixPlayer/plugins/authmgr.so
+HelixPlayer/plugins/clbascauth.so
+HelixPlayer/plugins/giffformat.so
+HelixPlayer/plugins/gifrender.so
+HelixPlayer/plugins/h263render.so
+HelixPlayer/plugins/httpfsys.so
+HelixPlayer/plugins/hxsdp.so
+HelixPlayer/plugins/hxxml.so
+HelixPlayer/plugins/jpgfformat.so
+HelixPlayer/plugins/jpgrender.so
+HelixPlayer/plugins/memfsys.so
+HelixPlayer/plugins/oggfformat.so
+HelixPlayer/plugins/pcmrend.so
+HelixPlayer/plugins/pngfformat.so
+HelixPlayer/plugins/pngrender.so
+HelixPlayer/plugins/ramfformat.so
+HelixPlayer/plugins/ramrender.so
+HelixPlayer/plugins/rn5auth.so
+HelixPlayer/plugins/rpfformat.so
+HelixPlayer/plugins/rpgifplin.so
+HelixPlayer/plugins/rpjpgplin.so
+HelixPlayer/plugins/rppngplin.so
+HelixPlayer/plugins/rprender.so
+HelixPlayer/plugins/rtfformat.so
+HelixPlayer/plugins/rtrender.so
+HelixPlayer/plugins/sdpplin.so
+HelixPlayer/plugins/smlfformat.so
+HelixPlayer/plugins/smlrender.so
+HelixPlayer/plugins/smplfsys.so
+HelixPlayer/plugins/theorarend.so
+HelixPlayer/plugins/vidsite.so
+HelixPlayer/plugins/vorbisrend.so
+HelixPlayer/plugins/wbmpfformat.so
+HelixPlayer/plugins/wbmprend.so
+HelixPlayer/postinst/confscript.sh
+HelixPlayer/postinst/postinst.sh
+HelixPlayer/share/default/clipinfo.png
+HelixPlayer/share/default/congestion.png
+HelixPlayer/share/default/fastforward.png
+HelixPlayer/share/default/next.png
+HelixPlayer/share/default/pause.png
+HelixPlayer/share/default/play.png
+HelixPlayer/share/default/prefs_advanced.png
+HelixPlayer/share/default/prefs_connection.png
+HelixPlayer/share/default/prefs_content.png
+HelixPlayer/share/default/prefs_hardware.png
+HelixPlayer/share/default/prefs_internet.png
+HelixPlayer/share/default/prefs_mediatypes.png
+HelixPlayer/share/default/prefs_playback.png
+HelixPlayer/share/default/prefs_proxy.png
+HelixPlayer/share/default/prefs_raw.png
+HelixPlayer/share/default/prefs_transport.png
+HelixPlayer/share/default/previous.png
+HelixPlayer/share/default/rewind.png
+HelixPlayer/share/default/stop.png
+HelixPlayer/share/default/tactoggle.png
+HelixPlayer/share/default/volume_high.png
+HelixPlayer/share/default/volume_low.png
+HelixPlayer/share/default/volume_mid.png
+HelixPlayer/share/default/volume_mute.png
+HelixPlayer/share/default/volume_off.png
+HelixPlayer/share/default/volume_popup_high.png
+HelixPlayer/share/default/volume_popup_low.png
+HelixPlayer/share/default/volume_popup_mid.png
+HelixPlayer/share/default/volume_popup_mute.png
+HelixPlayer/share/default/volume_popup_off.png
+HelixPlayer/share/hxplay.applications
+HelixPlayer/share/hxplay.desktop
+HelixPlayer/share/hxplay.keys
+HelixPlayer/share/hxplay.mime
+HelixPlayer/share/hxplay.png
+HelixPlayer/share/hxplay.xml
+HelixPlayer/share/hxplay/embedded_logo.png
+HelixPlayer/share/hxplay/icon.png
+HelixPlayer/share/hxplay/logo.png
+HelixPlayer/share/hxplay/prefs_general.png
+HelixPlayer/share/hxplay/setup_title.png
+HelixPlayer/share/hxplay/setup_welcome.png
+HelixPlayer/share/hxplay_help.html
+HelixPlayer/share/icons/hxplay_16x16.png
+HelixPlayer/share/icons/hxplay_192x192.png
+HelixPlayer/share/icons/hxplay_32x32.png
+HelixPlayer/share/icons/hxplay_48x48.png
+HelixPlayer/share/icons/mime-application-generic_192x192.png
+HelixPlayer/share/icons/mime-application-generic_48x48.png
+HelixPlayer/share/icons/mime-application-ogg_192x192.png
+HelixPlayer/share/icons/mime-application-ogg_48x48.png
+HelixPlayer/share/icons/mime-application-ram_192x192.png
+HelixPlayer/share/icons/mime-application-ram_48x48.png
+HelixPlayer/share/icons/mime-application-rpm_192x192.png
+HelixPlayer/share/icons/mime-application-rpm_48x48.png
+HelixPlayer/share/icons/mime-application-smil_192x192.png
+HelixPlayer/share/icons/mime-application-smil_48x48.png
+HelixPlayer/share/icons/mime-audio-aiff_192x192.png
+HelixPlayer/share/icons/mime-audio-aiff_48x48.png
+HelixPlayer/share/icons/mime-audio-au_192x192.png
+HelixPlayer/share/icons/mime-audio-au_48x48.png
+HelixPlayer/share/icons/mime-audio-generic_192x192.png
+HelixPlayer/share/icons/mime-audio-generic_48x48.png
+HelixPlayer/share/icons/mime-audio-ogg_192x192.png
+HelixPlayer/share/icons/mime-audio-ogg_48x48.png
+HelixPlayer/share/icons/mime-audio-wav_192x192.png
+HelixPlayer/share/icons/mime-audio-wav_48x48.png
+HelixPlayer/share/icons/mime-text-realtext_192x192.png
+HelixPlayer/share/icons/mime-text-realtext_48x48.png
+HelixPlayer/share/icons/mime-video-generic_192x192.png
+HelixPlayer/share/icons/mime-video-generic_48x48.png
+HelixPlayer/share/icons/mime-video-ogg_192x192.png
+HelixPlayer/share/icons/mime-video-ogg_48x48.png
+HelixPlayer/share/locale/de/LICENSE
+HelixPlayer/share/locale/de/README
+HelixPlayer/share/locale/de/player.mo
+HelixPlayer/share/locale/de/widget.mo
+HelixPlayer/share/locale/es/LICENSE
+HelixPlayer/share/locale/es/README
+HelixPlayer/share/locale/es/player.mo
+HelixPlayer/share/locale/es/widget.mo
+HelixPlayer/share/locale/fr/LICENSE
+HelixPlayer/share/locale/fr/README
+HelixPlayer/share/locale/fr/player.mo
+HelixPlayer/share/locale/fr/widget.mo
+HelixPlayer/share/locale/hi/README
+HelixPlayer/share/locale/hi/player.mo
+HelixPlayer/share/locale/hi/widget.mo
+HelixPlayer/share/locale/it/LICENSE
+HelixPlayer/share/locale/it/README
+HelixPlayer/share/locale/it/player.mo
+HelixPlayer/share/locale/it/widget.mo
+HelixPlayer/share/locale/ja/LICENSE
+HelixPlayer/share/locale/ja/README
+HelixPlayer/share/locale/ja/player.mo
+HelixPlayer/share/locale/ja/widget.mo
+HelixPlayer/share/locale/ko/LICENSE
+HelixPlayer/share/locale/ko/README
+HelixPlayer/share/locale/ko/player.mo
+HelixPlayer/share/locale/ko/widget.mo
+HelixPlayer/share/locale/pl/README
+HelixPlayer/share/locale/pl/player.mo
+HelixPlayer/share/locale/pl/widget.mo
+HelixPlayer/share/locale/pt_BR/LICENSE
+HelixPlayer/share/locale/pt_BR/README
+HelixPlayer/share/locale/pt_BR/player.mo
+HelixPlayer/share/locale/pt_BR/widget.mo
+HelixPlayer/share/locale/zh_CN/LICENSE
+HelixPlayer/share/locale/zh_CN/README
+HelixPlayer/share/locale/zh_CN/player.mo
+HelixPlayer/share/locale/zh_CN/widget.mo
+HelixPlayer/share/locale/zh_TW/LICENSE
+HelixPlayer/share/locale/zh_TW/README
+HelixPlayer/share/locale/zh_TW/player.mo
+HelixPlayer/share/locale/zh_TW/widget.mo
+HelixPlayer/share/tigris.css
+bin/hxplay
+share/applications/hxplay.desktop
+@dirrm HelixPlayer/share/locale/zh_TW
+@dirrm HelixPlayer/share/locale/zh_CN
+@dirrm HelixPlayer/share/locale/pt_BR
+@dirrm HelixPlayer/share/locale/pl
+@dirrm HelixPlayer/share/locale/ko
+@dirrm HelixPlayer/share/locale/ja
+@dirrm HelixPlayer/share/locale/it
+@dirrm HelixPlayer/share/locale/hi
+@dirrm HelixPlayer/share/locale/fr
+@dirrm HelixPlayer/share/locale/es
+@dirrm HelixPlayer/share/locale/de
+@dirrm HelixPlayer/share/locale
+@dirrm HelixPlayer/share/icons
+@dirrm HelixPlayer/share/hxplay
+@dirrm HelixPlayer/share/default
+@dirrm HelixPlayer/share
+@dirrm HelixPlayer/postinst
+@dirrm HelixPlayer/plugins
+@dirrm HelixPlayer/mozilla
+@dirrm HelixPlayer/lib
+@dirrm HelixPlayer/doc
+@dirrm HelixPlayer/common
+@dirrm HelixPlayer/codecs
+@dirrm HelixPlayer/Bin
+@dirrm HelixPlayer
+@dirrmtry share/applications