Index: audio/mythplugin-mythmusic/Makefile
===================================================================
--- audio/mythplugin-mythmusic/Makefile
+++ audio/mythplugin-mythmusic/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mythmusic
-PORTVERSION=	0.27.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+DISTVERSION=	29.1
 CATEGORIES=	audio
 PKGNAMEPREFIX=	mythplugin-
 
@@ -14,36 +13,43 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
-		libFLAC.so:audio/flac \
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libmp3lame.so:audio/lame \
+		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
-		libtag.so:audio/taglib \
-		libfftw3f.so:math/fftw3-float
-BUILD_DEPENDS=	mythfrontend:multimedia/mythtv
+		libmyth-29.so:multimedia/mythtv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 GH_PROJECT=	mythtv
+USE_LDCONFIG=	yes
+USE_QT5=	buildtools_build core gui qmake_build sql xml
 
-WRKSRC_SUBDIR=	mythplugins
-
-USE_QT4=	linguist_build moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/mythtv/plugins
+CONFIGURE_ARGS=	--prefix="${PREFIX}" --disable-all \
+		--enable-mythmusic
 DESTDIRNAME=	INSTALL_ROOT
-
 PLIST_SUB=	MYTHSHARE="share/mythtv"
+WRKSRC_SUBDIR=	mythplugins
 
-QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
+OPTIONS_DEFINE=	CDIO FFTW
 
-CONFIGURE_ARGS=	--prefix="${PREFIX}" --disable-all \
-		--enable-mythmusic --enable-fftw --enable-opengl
+CDIO_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
+			libcdio_paranoia.so:sysutils/libcdio-paranoia
+CDIO_CONFIGURE_ENABLE=	cdio
 
+FFTW_DESC=		FFTW3-based visualizations
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
+FFTW_CONFIGURE_ENABLE=	fftw
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/mythmusic/mythmusic/mythmusic.pro
 	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \
 		${WRKSRC}/configure
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mythtv/plugins/libmythmusic.so
 
 .include <bsd.port.mk>
Index: audio/mythplugin-mythmusic/distinfo
===================================================================
--- audio/mythplugin-mythmusic/distinfo
+++ audio/mythplugin-mythmusic/distinfo
@@ -1,2 +1,3 @@
-SHA256 (MythTV-mythtv-v0.27.5_GH0.tar.gz) = 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b
-SIZE (MythTV-mythtv-v0.27.5_GH0.tar.gz) = 85652939
+TIMESTAMP = 1520813358
+SHA256 (MythTV-mythtv-v29.1_GH0.tar.gz) = 04a84eb0ded2d2b123624ab2b2e1b8cf824ff4bf8216e452b2516deb929082b2
+SIZE (MythTV-mythtv-v29.1_GH0.tar.gz) = 105616234
Index: audio/mythplugin-mythmusic/files/patch-configure
===================================================================
--- audio/mythplugin-mythmusic/files/patch-configure
+++ audio/mythplugin-mythmusic/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2015-06-16 16:03:30 UTC
+--- configure.orig	2018-02-01 11:15:37 UTC
 +++ configure
 @@ -227,6 +227,10 @@ add_cxxflags(){
      append ECXXFLAGS "$@"
@@ -11,22 +11,27 @@
  check_cxx(){
      log check_cxx "$@"
      cat > $TMPCXX
-@@ -561,6 +565,10 @@ OPENGLV=$(cat mythconfig.mak | grep -e "
- EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
- EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
+@@ -559,6 +563,10 @@ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}
+ OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes")
+ OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes")
  
 +add_cppflags "-I${prefix}/include"
 +add_cxxflags "-I${prefix}/include"
 +add_ldflags "-L${prefix}/lib"
 +
- if is_qmake4 $qmake || is_qmake4 qmake-qt4; then
-     if is_qmake4 qmake-qt4; then
-         qmake=qmake-qt4
-@@ -657,6 +665,7 @@ if enabled music ; then
+ EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
+ EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
+ 
+@@ -689,8 +697,10 @@ if enabled music ; then
          echo "MythMusic requires FLAC."
      fi
  
-+    enable cdio
-     if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
-         disable cdio
+-    if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
+-        disable cdio
++    if enabled cdio; then
++       if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
++         disable cdio
++       fi
      fi
+ 
+     if ! check_lib lame/lame.h lame_init -lmp3lame ; then
Index: audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.h
===================================================================
--- /dev/null
+++ audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.h
@@ -0,0 +1,15 @@
+libcdio-paranoia header location changed after moving to separate project circa 2012
+
+--- mythmusic/mythmusic/cddecoder.h.orig	2018-02-01 11:15:37 UTC
++++ mythmusic/mythmusic/cddecoder.h
+@@ -11,8 +11,8 @@ using std::vector;
+ #endif
+ 
+ #ifdef HAVE_CDIO
+-# include <cdio/cdda.h>
+-# include <cdio/paranoia.h>
++# include <cdio/paranoia/cdda.h>
++# include <cdio/paranoia/paranoia.h>
+ #endif
+ 
+ class MusicMetadata;
Index: audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.cpp
===================================================================
--- /dev/null
+++ audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cddecoder.cpp
@@ -0,0 +1,13 @@
+libcdio-paranoia header location changed after moving to separate project circa 2012
+
+--- mythmusic/mythmusic/cddecoder.cpp.orig	2018-02-01 11:15:37 UTC
++++ mythmusic/mythmusic/cddecoder.cpp
+@@ -14,7 +14,7 @@
+ #include <QString>
+ 
+ // libcdio
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #include <cdio/logging.h>
+ 
+ // MythTV
Index: audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cdrip.cpp
===================================================================
--- /dev/null
+++ audio/mythplugin-mythmusic/files/patch-mythmusic_mythmusic_cdrip.cpp
@@ -0,0 +1,25 @@
+libcdio-paranoia header location changed after moving to separate project circa 2012
+Fix warning: logical not is only applied to the left hand side of comparison
+
+--- mythmusic/mythmusic/cdrip.cpp.orig	2018-02-01 11:15:37 UTC
++++ mythmusic/mythmusic/cdrip.cpp
+@@ -8,8 +8,8 @@
+ 
+ #include "config.h"
+ #ifdef HAVE_CDIO
+-# include <cdio/cdda.h>
+-# include <cdio/paranoia.h>
++# include <cdio/paranoia/cdda.h>
++# include <cdio/paranoia/paranoia.h>
+ #endif //def HAVE_CDIO
+ 
+ // C++ includes
+@@ -219,7 +219,7 @@ void CDRipperThread::run(void)
+ {
+     RunProlog();
+ 
+-    if (!m_tracks->size() > 0)
++    if (!(m_tracks->size() > 0))
+     {
+         RunEpilog();
+         return;
Index: audio/mythplugin-mythmusic/files/patch-settings.pro
===================================================================
--- /dev/null
+++ audio/mythplugin-mythmusic/files/patch-settings.pro
@@ -0,0 +1,12 @@
+Prevent linking to unneccessary libraries
+
+--- settings.pro.orig	2018-02-25 02:52:28 UTC
++++ settings.pro
+@@ -34,6 +34,7 @@ QMAKE_CXXFLAGS += $$ARCHFLAGS
+ QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
+ QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
+ QMAKE_CXXFLAGS += $$ECXXFLAGS
++QMAKE_LFLAGS +=	-Wl,--as-needed
+ 
+ profile:!win32:!macx:CONFIG += debug
+ 
Index: audio/mythplugin-mythmusic/pkg-plist
===================================================================
--- audio/mythplugin-mythmusic/pkg-plist
+++ audio/mythplugin-mythmusic/pkg-plist
@@ -25,7 +25,6 @@
 %%MYTHSHARE%%/i18n/mythmusic_sv.qm
 %%MYTHSHARE%%/music_settings.xml
 %%MYTHSHARE%%/musicmenu.xml
-%%MYTHSHARE%%/mythmusic/streams.xml
 %%MYTHSHARE%%/themes/default-wide/mm-titlelines.png
 %%MYTHSHARE%%/themes/default-wide/mm_blackhole_border.png
 %%MYTHSHARE%%/themes/default-wide/mm_volume_background.png
Index: multimedia/mythtv-frontend/Makefile
===================================================================
--- multimedia/mythtv-frontend/Makefile
+++ multimedia/mythtv-frontend/Makefile
@@ -1,88 +1,14 @@
 # Created by: Bernhard Froehlich <decke@bluelife.at>
 # $FreeBSD$
 
-PORTNAME=	mythtv-frontend
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.27.5
-PORTEPOCH=	1
-CATEGORIES=	multimedia
+PORTREVISION=	0
+PKGNAMESUFFIX=	-${SLAVEPORT}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	MythTV is a homebrew PVR project
+COMMENT=	MythTV is a homebrew PVR project (frontend only)
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+MASTERDIR=	${.CURDIR}/../../multimedia/mythtv
+SLAVEPORT=	frontend
+PLIST=		${.CURDIR}/pkg-plist
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
-		yasm:devel/yasm
-LIB_DEPENDS=	libmp3lame.so:audio/lame \
-		libfreetype.so:print/freetype2 \
-		libtag.so:audio/taglib \
-		libxml2.so:textproc/libxml2
-
-CONFLICTS=	mythtv-[0-9]*
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	MythTV
-GH_PROJECT=	mythtv
-
-WRKSRC_SUBDIR=	${GH_PROJECT}
-
-ONLY_FOR_ARCHS=	i386 amd64
-NOPRECIOUSMAKEVARS=	# don't override $(ARCH) in ffmpeg makefiles
-USES=		gmake libtool pkgconfig
-USE_QT4=	gui sql network script linguist_build l10n sql-mysql_run \
-		moc_build qmake_build rcc_build uic_build
-QT_NONSTANDARD=	yes
-HAS_CONFIGURE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/mythtv/filters
-REINPLACE_ARGS=	-i ""
-DESTDIRNAME=	INSTALL_ROOT
-
-DATADIR=	${PREFIX}/share/mythtv
-
-MAKE_ENV=	QTDIR="${PREFIX}" \
-		QMAKESPEC="${QMAKESPEC}"
-
-CPPFLAGS+=	${QTCPPFLAGS}
-CONFIGURE_ENV+=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
-		QTDIR="${PREFIX}" \
-		PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" --libxml2-path="${LOCALBASE}/include/libxml2" \
-		--disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa --disable-mythlogserver \
-		--disable-firewire --disable-hdhomerun --disable-v4l2 --disable-ivtv --disable-hdpvr \
-		--disable-dvb --enable-opengl-video --without-bindings=perl,python,php
-
-QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
-
-DESKTOP_ENTRIES="MythTV Frontend" "MythTV is a homebrew PVR project" "" \
-		"mythfrontend" "AudioVideo;Video;" false
-
-OPTIONS_DEFINE=	OPENGL JACK PULSEAUDIO VDPAU
-OPTIONS_DEFAULT=	OPENGL
-
-JACK_LIB_DEPENDS=	libjack.so:audio/jack
-JACK_CONFIGURE_ENABLE=	audio-jack
-
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_CONFIGURE_ENABLE=	audio-pulseoutput
-
-VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
-VDPAU_CONFIGURE_ENABLE=	vdpau
-
-OPENGL_CONFIGURE_ENABLE=	opengl-video
-OPENGL_USE=	QT4=opengl
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/libs/libmythtv/libmythtv.pro \
-		${WRKSRC}/bindings/perl/MythTV/Recording.pm \
-		${WRKSRC}/programs/mythtranscode/replex/Makefile.standalone \
-		${WRKSRC}/programs/scripts/database/mythconverg_backup.pl \
-		${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \
-		${WRKSRC}/programs/mythcommflag/mythcommflag-analyze
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: multimedia/mythtv-frontend/distinfo
===================================================================
--- multimedia/mythtv-frontend/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1513802652
-SHA256 (MythTV-mythtv-v0.27.5_GH0.tar.gz) = 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b
-SIZE (MythTV-mythtv-v0.27.5_GH0.tar.gz) = 85652939
Index: multimedia/mythtv-frontend/files/patch-configure
===================================================================
--- multimedia/mythtv-frontend/files/patch-configure
+++ /dev/null
@@ -1,78 +0,0 @@
---- configure.orig	2013-09-18 20:06:08.000000000 +0000
-+++ configure	2013-10-18 11:11:10.000000000 +0000
-@@ -846,28 +846,28 @@
-     log check_cc "$@"
-     cat > $TMPC
-     log_file $TMPC
--    check_cmd $cc $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPC
-+    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $CC_C $(cc_o $TMPO) $TMPC
- }
- 
- check_cxx(){
-     log check_cxx "$@"
-     cat > $TMPCPP
-     log_file $TMPCPP
--    check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
-+    check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP
- }
- 
- check_ecxx(){
-     log check_cxx "$@"
-     cat > $TMPCPP
-     log_file $TMPCPP
--    check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
-+    check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP
- }
- 
- check_cpp(){
-     log check_cpp "$@"
-     cat > $TMPC
-     log_file $TMPC
--    check_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC
-+    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $(cc_e $TMPO) $TMPC
- }
- 
- as_o(){
-@@ -2539,7 +2539,7 @@
- 
- # machine
- arch_default=$(uname -m)
--cpu="generic"
-+cpu="i686"
- processor=`uname -p 2>/dev/null`
- processor_flags=""
- tune="generic"
-@@ -3931,7 +3931,7 @@
-         i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*)
-             cpuflags="-march=$cpu"
-             enable cmov
--            enable fast_cmov
-+            disable fast_cmov
-         ;;
-         # targets that do support conditional mov but on which it's slow
-         pentium4|pentium4m|prescott|nocona)
-@@ -4102,7 +4102,6 @@
-         append CCONFIG "freebsd"
-         # Workaround compile errors from missing u_int/uint def
-         CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
--        disable ivtv
-         enable backend
-         ;;
-     bsd/os)
-@@ -6383,6 +6382,7 @@
- QMAKE_LIBDIR_QT-=${sysroot}${libdir}
- QMAKE_LIBDIR-=${sysroot}${libdir}
- LATE_LIBS+=-L${sysroot}${libdir}
-+FREETYPE_CFLAGS-= -I/usr/local/include
- EOF
- 
- #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK
-@@ -6435,7 +6435,7 @@
- BINDIR=\$(INSTALL_ROOT)$bindir
- DATADIR=\$(INSTALL_ROOT)$datadir
- MANDIR=\$(INSTALL_ROOT)$mandir
--CFLAGS=${CFLAGS} -w
-+CFLAGS=${CFLAGS} -I/usr/local/include -w
- endif # FFMPEG_CONFIG_MAK
- EOF
- 
Index: multimedia/mythtv-frontend/files/patch-external__FFmpeg__configure
===================================================================
--- multimedia/mythtv-frontend/files/patch-external__FFmpeg__configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- external/FFmpeg/configure.orig	2010-08-23 18:54:20.000000000 +0200
-+++ external/FFmpeg/configure	2010-11-01 21:13:19.000000000 +0100
-@@ -1528,8 +1528,8 @@
- nm_opts='-g'
- 
- # machine
--arch_default=$(uname -m)
--cpu="generic"
-+arch_default=$(uname -p)
-+cpu="i686"
- 
- # OS
- target_os_default=$(tolower $(uname -s))
-@@ -2108,7 +2108,7 @@
-         i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|core2|amdfam10|barcelona)
-             cpuflags="-march=$cpu"
-             enable cmov
--            enable fast_cmov
-+            disable fast_cmov
-         ;;
-         # targets that do support conditional mov but on which it's slow
-         pentium4|pentium4m|prescott|nocona)
Index: multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c
===================================================================
--- multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig	2013-09-18 20:06:08.000000000 +0000
-+++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c	2013-10-18 11:58:01.000000000 +0000
-@@ -51,7 +51,7 @@
- extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs);
- extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);
- 
--#if ARCH_X86_32 && defined(__INTEL_COMPILER)
-+#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__))
- #       undef HAVE_7REGS
- #       define HAVE_7REGS 0
- #endif
Index: multimedia/mythtv-frontend/files/patch-external__zeromq__src__Makefile.am
===================================================================
--- multimedia/mythtv-frontend/files/patch-external__zeromq__src__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- external/zeromq/src/Makefile.am.orig	2015-11-16 14:31:23.735432710 +0000
-+++ external/zeromq/src/Makefile.am	2015-11-16 14:28:48.465433398 +0000
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libmythzmq.la
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(PKG_CONFIG_PATH)
- pkgconfig_DATA = libmythzmq.pc
- 
- include_HEADERS = ../include/zmq.h ../include/zmq.hpp ../include/zmq_utils.h
Index: multimedia/mythtv-frontend/files/patch-libs__libmyth__remoteutil.h
===================================================================
--- multimedia/mythtv-frontend/files/patch-libs__libmyth__remoteutil.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/libmyth/remoteutil.h.orig	2013-09-18 16:06:08.000000000 -0400
-+++ libs/libmyth/remoteutil.h	2014-01-22 08:26:34.000000000 -0500
-@@ -8,6 +8,7 @@
- using namespace std;
- 
- #include "mythexp.h"
-+#include <sys/types.h>
- 
- class ProgramInfo;
- class MythEvent;
-
Index: multimedia/mythtv-frontend/files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c
===================================================================
--- multimedia/mythtv-frontend/files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/libmythdvdnav/dvdnav/dvdnav.c.orig	2012-03-18 12:13:45.805789048 +0100
-+++ libs/libmythdvdnav/dvdnav/dvdnav.c	2012-03-18 12:12:47.166812027 +0100
-@@ -33,7 +33,7 @@
- #include <limits.h>
- #include <string.h>
- #include <sys/time.h>
--#include "dvdnav/dvdnav.h"
-+#include "dvdnav.h"
- #include <dvdread/dvd_reader.h>
- #include <dvdread/nav_types.h>
- #include <dvdread/ifo_types.h> /* For vm_cmd_t */
Index: multimedia/mythtv-frontend/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp
===================================================================
--- multimedia/mythtv-frontend/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- libs/libmythtv/recorders/dvbstreamhandler.cpp.orig	2012-03-05 03:31:31.000000000 +0100
-+++ libs/libmythtv/recorders/dvbstreamhandler.cpp	2012-03-18 11:24:44.309770699 +0100
-@@ -614,7 +614,7 @@
-     {
-         struct dmx_pes_filter_params pesFilterParams;
-         memset(&pesFilterParams, 0, sizeof(struct dmx_pes_filter_params));
--        pesFilterParams.pid      = (__u16) _pid;
-+        pesFilterParams.pid      = (uint16_t) _pid;
-         pesFilterParams.input    = DMX_IN_FRONTEND;
-         pesFilterParams.output   = DMX_OUT_TS_TAP;
-         pesFilterParams.flags    = DMX_IMMEDIATE_START;
-@@ -634,7 +634,7 @@
-     {
-         struct dmx_sct_filter_params sctFilterParams;
-         memset(&sctFilterParams, 0, sizeof(struct dmx_sct_filter_params));
--        switch ( (__u16) _pid )
-+        switch ( (uint16_t) _pid )
-         {
-             case 0x0: // PAT
-                 sctFilterParams.filter.filter[0] = 0;
-@@ -670,7 +670,7 @@
-                 sctFilterParams.filter.mask[0]   = 0x00;
-                 break;
-         }
--        sctFilterParams.pid            = (__u16) _pid;
-+        sctFilterParams.pid            = (uint16_t) _pid;
-         sctFilterParams.timeout        = 0;
-         sctFilterParams.flags          = DMX_IMMEDIATE_START;
- 
Index: multimedia/mythtv-frontend/files/patch-libs__libmythtv__videoout_vdpau.cpp
===================================================================
--- multimedia/mythtv-frontend/files/patch-libs__libmythtv__videoout_vdpau.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/libmythtv/videoout_vdpau.cpp.orig	2010-02-27 06:58:11.000000000 +0100
-+++ libs/libmythtv/videoout_vdpau.cpp	2010-04-06 17:40:50.000000000 +0200
-@@ -395,7 +395,7 @@
-     if (frame)
-     {
-         // FIXME for 0.23. This should be triggered from AFD by a seek
--        if ((abs(frame->frameNumber - framesPlayed) > 8))
-+        if ((labs(frame->frameNumber - framesPlayed) > 8))
-             ClearReferenceFrames();
-         new_frame = (framesPlayed != frame->frameNumber + 1);
-         framesPlayed = frame->frameNumber + 1;
Index: multimedia/mythtv-frontend/files/patch-libs__libmythui__mythgesture.cpp
===================================================================
--- multimedia/mythtv-frontend/files/patch-libs__libmythui__mythgesture.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- libs/libmythui/mythgesture.cpp.orig	2013-09-18 16:06:08.000000000 -0400
-+++ libs/libmythui/mythgesture.cpp	2014-01-22 08:20:33.000000000 -0500
-@@ -28,6 +28,7 @@
- 
- #include "mythgesture.h"
- 
-+#include <cstdlib>
- #include <cmath>
- #include <algorithm>
- 
-@@ -283,7 +284,7 @@
-     int dely = p.y() - points.back().y();
- 
-     /* step by the greatest delta direction */
--    if (abs(delx) > abs(dely))
-+    if (std::abs(delx) > std::abs(dely))
-     {
-         float iy = points.back().y();
- 
Index: multimedia/mythtv-frontend/files/patch-libs__libmythui__mythpainter.cpp
===================================================================
--- multimedia/mythtv-frontend/files/patch-libs__libmythui__mythpainter.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- libs/libmythui/mythpainter.cpp.orig	2013-09-18 16:06:08.000000000 -0400
-+++ libs/libmythui/mythpainter.cpp	2014-01-22 08:18:40.000000000 -0500
-@@ -1,5 +1,6 @@
- #include <stdint.h>
- #include <algorithm>
-+#include <cstdlib>
- 
- // QT headers
- #include <QRect>
Index: multimedia/mythtv-frontend/files/patch-libs__libmythupnp__mmulticastsocketdevice.h
===================================================================
--- multimedia/mythtv-frontend/files/patch-libs__libmythupnp__mmulticastsocketdevice.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/libmythupnp/mmulticastsocketdevice.h.orig	2013-09-18 16:06:08.000000000 -0400
-+++ libs/libmythupnp/mmulticastsocketdevice.h	2014-01-22 08:24:26.000000000 -0500
-@@ -18,6 +18,7 @@
- #  include <ws2tcpip.h>
- # endif
- #else
-+# include <sys/types.h>
- # include <sys/socket.h>
- # include <netinet/in.h>
- # include <netinet/ip.h>
-
Index: multimedia/mythtv-frontend/files/patch-programs__programs.pro
===================================================================
--- multimedia/mythtv-frontend/files/patch-programs__programs.pro
+++ /dev/null
@@ -1,12 +0,0 @@
---- programs/programs.pro.orig	2012-03-19 06:39:10.000000000 +0100
-+++ programs/programs.pro	2012-03-21 23:55:00.883069453 +0100
-@@ -11,9 +11,4 @@
-     !mingw: SUBDIRS += mythtranscode/replex
- }
- 
--using_backend {
--    SUBDIRS += mythbackend mythfilldatabase mythtv-setup scripts
--    SUBDIRS += mythmetadatalookup
--}
--
- using_mythtranscode: SUBDIRS += mythtranscode
Index: multimedia/mythtv-frontend/pkg-descr
===================================================================
--- multimedia/mythtv-frontend/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-MythTV is a "Personal Video Recorder", i.e. a computer-based video
-recorder.  It supports pausing and rewinding live TV, multiple tuner
-cards, hardware or software video compression, onscreen program guides
-and a distributed architecture.
-
-WWW: http://www.mythtv.org/
Index: multimedia/mythtv-frontend/pkg-plist
===================================================================
--- multimedia/mythtv-frontend/pkg-plist
+++ multimedia/mythtv-frontend/pkg-plist
@@ -15,21 +15,14 @@
 bin/mythtranscode
 bin/mythutil
 bin/mythwelcome
-include/mythtv/QJson/Parser
-include/mythtv/QJson/QObjectHelper
-include/mythtv/QJson/Serializer
-include/mythtv/QJson/parser.h
-include/mythtv/QJson/parserrunnable.h
-include/mythtv/QJson/qjson_export.h
-include/mythtv/QJson/qobjecthelper.h
-include/mythtv/QJson/serializer.h
-include/mythtv/QJson/serializerrunnable.h
 include/mythtv/audioconvert.h
 include/mythtv/audiooutput.h
 include/mythtv/audiooutputsettings.h
 include/mythtv/audiooutpututil.h
 include/mythtv/audiosettings.h
 include/mythtv/autodeletedeque.h
+include/mythtv/blockinput.h
+include/mythtv/bluray/array.h
 include/mythtv/bluray/attributes.h
 include/mythtv/bluray/bdid_parse.h
 include/mythtv/bluray/bdparse.h
@@ -37,10 +30,11 @@
 include/mythtv/bluray/bluray.h
 include/mythtv/bluray/clpi_data.h
 include/mythtv/bluray/clpi_parse.h
+include/mythtv/bluray/dirs.h
 include/mythtv/bluray/dl.h
+include/mythtv/bluray/event_queue.h
 include/mythtv/bluray/extdata_parse.h
 include/mythtv/bluray/file.h
-include/mythtv/bluray/file_mythiowrapper.h
 include/mythtv/bluray/filesystem.h
 include/mythtv/bluray/hdmv_insn.h
 include/mythtv/bluray/hdmv_vm.h
@@ -50,12 +44,17 @@
 include/mythtv/bluray/macro.h
 include/mythtv/bluray/meta_data.h
 include/mythtv/bluray/meta_parse.h
+include/mythtv/bluray/mobj_data.h
 include/mythtv/bluray/mobj_parse.h
+include/mythtv/bluray/mobj_print.h
+include/mythtv/bluray/mount.h
 include/mythtv/bluray/mpls_parse.h
 include/mythtv/bluray/mutex.h
 include/mythtv/bluray/navigation.h
+include/mythtv/bluray/refcnt.h
 include/mythtv/bluray/sound_parse.h
 include/mythtv/bluray/strutl.h
+include/mythtv/bluray/time.h
 include/mythtv/bluray/uo_mask_table.h
 include/mythtv/bonjourregister.h
 include/mythtv/bswap.h
@@ -80,18 +79,24 @@
 include/mythtv/langsettings.h
 include/mythtv/lcddevice.h
 include/mythtv/libavcodec/avcodec.h
+include/mythtv/libavcodec/avdct.h
 include/mythtv/libavcodec/avfft.h
+include/mythtv/libavcodec/d3d11va.h
+include/mythtv/libavcodec/dirac.h
+include/mythtv/libavcodec/dv_profile.h
 include/mythtv/libavcodec/dxva2.h
-include/mythtv/libavcodec/old_codec_ids.h
+include/mythtv/libavcodec/jni.h
+include/mythtv/libavcodec/mediacodec.h
+include/mythtv/libavcodec/qsv.h
 include/mythtv/libavcodec/vaapi.h
 include/mythtv/libavcodec/vda.h
 include/mythtv/libavcodec/vdpau.h
 include/mythtv/libavcodec/version.h
+include/mythtv/libavcodec/videotoolbox.h
+include/mythtv/libavcodec/vorbis_parser.h
 include/mythtv/libavcodec/xvmc.h
 include/mythtv/libavdevice/avdevice.h
 include/mythtv/libavdevice/version.h
-include/mythtv/libavfilter/asrc_abuffer.h
-include/mythtv/libavfilter/avcodec.h
 include/mythtv/libavfilter/avfilter.h
 include/mythtv/libavfilter/avfiltergraph.h
 include/mythtv/libavfilter/buffersink.h
@@ -102,9 +107,9 @@
 include/mythtv/libavformat/version.h
 include/mythtv/libavutil/adler32.h
 include/mythtv/libavutil/aes.h
+include/mythtv/libavutil/aes_ctr.h
 include/mythtv/libavutil/attributes.h
 include/mythtv/libavutil/audio_fifo.h
-include/mythtv/libavutil/audioconvert.h
 include/mythtv/libavutil/avassert.h
 include/mythtv/libavutil/avconfig.h
 include/mythtv/libavutil/avstring.h
@@ -113,38 +118,65 @@
 include/mythtv/libavutil/blowfish.h
 include/mythtv/libavutil/bprint.h
 include/mythtv/libavutil/bswap.h
+include/mythtv/libavutil/buffer.h
+include/mythtv/libavutil/camellia.h
+include/mythtv/libavutil/cast5.h
 include/mythtv/libavutil/channel_layout.h
 include/mythtv/libavutil/common.h
 include/mythtv/libavutil/cpu.h
 include/mythtv/libavutil/crc.h
+include/mythtv/libavutil/des.h
 include/mythtv/libavutil/dict.h
+include/mythtv/libavutil/display.h
+include/mythtv/libavutil/downmix_info.h
 include/mythtv/libavutil/error.h
 include/mythtv/libavutil/eval.h
+include/mythtv/libavutil/ffversion.h
 include/mythtv/libavutil/fifo.h
 include/mythtv/libavutil/file.h
+include/mythtv/libavutil/frame.h
+include/mythtv/libavutil/hash.h
 include/mythtv/libavutil/hmac.h
+include/mythtv/libavutil/hwcontext.h
+include/mythtv/libavutil/hwcontext_cuda.h
+include/mythtv/libavutil/hwcontext_dxva2.h
+include/mythtv/libavutil/hwcontext_qsv.h
+include/mythtv/libavutil/hwcontext_vaapi.h
+include/mythtv/libavutil/hwcontext_vdpau.h
 include/mythtv/libavutil/imgutils.h
 include/mythtv/libavutil/intfloat.h
-include/mythtv/libavutil/intfloat_readwrite.h
 include/mythtv/libavutil/intreadwrite.h
 include/mythtv/libavutil/lfg.h
 include/mythtv/libavutil/log.h
 include/mythtv/libavutil/lzo.h
+include/mythtv/libavutil/macros.h
+include/mythtv/libavutil/mastering_display_metadata.h
 include/mythtv/libavutil/mathematics.h
 include/mythtv/libavutil/md5.h
 include/mythtv/libavutil/mem.h
-include/mythtv/libavutil/old_pix_fmts.h
+include/mythtv/libavutil/motion_vector.h
+include/mythtv/libavutil/murmur3.h
 include/mythtv/libavutil/opt.h
 include/mythtv/libavutil/parseutils.h
 include/mythtv/libavutil/pixdesc.h
+include/mythtv/libavutil/pixelutils.h
 include/mythtv/libavutil/pixfmt.h
 include/mythtv/libavutil/random_seed.h
 include/mythtv/libavutil/rational.h
+include/mythtv/libavutil/rc4.h
+include/mythtv/libavutil/replaygain.h
+include/mythtv/libavutil/ripemd.h
 include/mythtv/libavutil/samplefmt.h
 include/mythtv/libavutil/sha.h
+include/mythtv/libavutil/sha512.h
+include/mythtv/libavutil/stereo3d.h
+include/mythtv/libavutil/tea.h
+include/mythtv/libavutil/threadmessage.h
 include/mythtv/libavutil/time.h
 include/mythtv/libavutil/timecode.h
 include/mythtv/libavutil/timestamp.h
+include/mythtv/libavutil/tree.h
+include/mythtv/libavutil/twofish.h
 include/mythtv/libavutil/version.h
 include/mythtv/libavutil/xtea.h
 include/mythtv/libmyth/audioconvert.h
@@ -167,22 +199,18 @@
 include/mythtv/libmyth/mythwizard.h
 include/mythtv/libmyth/netgrabbermanager.h
 include/mythtv/libmyth/netutils.h
-include/mythtv/libmyth/oldsettings.h
 include/mythtv/libmyth/output.h
 include/mythtv/libmyth/programinfo.h
 include/mythtv/libmyth/programtypes.h
 include/mythtv/libmyth/recordingtypes.h
-include/mythtv/libmyth/remotefile.h
 include/mythtv/libmyth/remoteutil.h
 include/mythtv/libmyth/rssparse.h
 include/mythtv/libmyth/schemawizard.h
 include/mythtv/libmyth/settings.h
+include/mythtv/libmyth/standardsettings.h
 include/mythtv/libmyth/storagegroupeditor.h
-include/mythtv/libmyth/uitypes.h
-include/mythtv/libmyth/virtualkeyboard_qt.h
 include/mythtv/libmyth/visual.h
 include/mythtv/libmyth/volumebase.h
-include/mythtv/libmyth/xmlparse.h
 include/mythtv/libmythbase/autodeletedeque.h
 include/mythtv/libmythbase/bonjourregister.h
 include/mythtv/libmythbase/bswap.h
@@ -196,7 +224,6 @@
 include/mythtv/libmythbase/iso639.h
 include/mythtv/libmythbase/lcddevice.h
 include/mythtv/libmythbase/loggingserver.h
-include/mythtv/libmythbase/mcodecs.h
 include/mythtv/libmythbase/mthread.h
 include/mythtv/libmythbase/mthreadpool.h
 include/mythtv/libmythbase/mythbaseexp.h
@@ -222,6 +249,7 @@
 include/mythtv/libmythbase/mythplugin.h
 include/mythtv/libmythbase/mythpluginapi.h
 include/mythtv/libmythbase/mythqtcompat.h
+include/mythtv/libmythbase/mythsession.h
 include/mythtv/libmythbase/mythsingledownload.h
 include/mythtv/libmythbase/mythsocket.h
 include/mythtv/libmythbase/mythsocket_cb.h
@@ -245,23 +273,44 @@
 include/mythtv/libmythservicecontracts/datacontracthelper.h
 include/mythtv/libmythservicecontracts/datacontracts/artworkInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/artworkInfoList.h
+include/mythtv/libmythservicecontracts/datacontracts/backendInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/blurayInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/buildInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/captureCard.h
 include/mythtv/libmythservicecontracts/datacontracts/captureCardList.h
+include/mythtv/libmythservicecontracts/datacontracts/castMember.h
+include/mythtv/libmythservicecontracts/datacontracts/castMemberList.h
+include/mythtv/libmythservicecontracts/datacontracts/channelGroup.h
+include/mythtv/libmythservicecontracts/datacontracts/channelGroupList.h
 include/mythtv/libmythservicecontracts/datacontracts/channelInfoList.h
 include/mythtv/libmythservicecontracts/datacontracts/connectionInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/cutList.h
+include/mythtv/libmythservicecontracts/datacontracts/cutting.h
 include/mythtv/libmythservicecontracts/datacontracts/databaseInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/enum.h
+include/mythtv/libmythservicecontracts/datacontracts/enumItem.h
+include/mythtv/libmythservicecontracts/datacontracts/envInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/frontendActionList.h
 include/mythtv/libmythservicecontracts/datacontracts/frontendStatus.h
+include/mythtv/libmythservicecontracts/datacontracts/imageMetadataInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/imageMetadataInfoList.h
+include/mythtv/libmythservicecontracts/datacontracts/imageSyncInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/input.h
+include/mythtv/libmythservicecontracts/datacontracts/inputList.h
 include/mythtv/libmythservicecontracts/datacontracts/labelValue.h
 include/mythtv/libmythservicecontracts/datacontracts/lineup.h
 include/mythtv/libmythservicecontracts/datacontracts/liveStreamInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/liveStreamInfoList.h
+include/mythtv/libmythservicecontracts/datacontracts/logInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/logMessage.h
 include/mythtv/libmythservicecontracts/datacontracts/logMessageList.h
+include/mythtv/libmythservicecontracts/datacontracts/musicMetadataInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/musicMetadataInfoList.h
 include/mythtv/libmythservicecontracts/datacontracts/programAndChannel.h
 include/mythtv/libmythservicecontracts/datacontracts/programGuide.h
 include/mythtv/libmythservicecontracts/datacontracts/recRule.h
+include/mythtv/libmythservicecontracts/datacontracts/recRuleFilter.h
+include/mythtv/libmythservicecontracts/datacontracts/recRuleFilterList.h
 include/mythtv/libmythservicecontracts/datacontracts/recRuleList.h
 include/mythtv/libmythservicecontracts/datacontracts/recording.h
 include/mythtv/libmythservicecontracts/datacontracts/settingList.h
@@ -278,6 +327,7 @@
 include/mythtv/libmythservicecontracts/datacontracts/videoSource.h
 include/mythtv/libmythservicecontracts/datacontracts/videoSourceList.h
 include/mythtv/libmythservicecontracts/datacontracts/wolInfo.h
+include/mythtv/libmythservicecontracts/enums/recStatus.h
 include/mythtv/libmythservicecontracts/service.h
 include/mythtv/libmythservicecontracts/serviceexp.h
 include/mythtv/libmythservicecontracts/services/captureServices.h
@@ -286,7 +336,10 @@
 include/mythtv/libmythservicecontracts/services/dvrServices.h
 include/mythtv/libmythservicecontracts/services/frontendServices.h
 include/mythtv/libmythservicecontracts/services/guideServices.h
+include/mythtv/libmythservicecontracts/services/imageServices.h
+include/mythtv/libmythservicecontracts/services/musicServices.h
 include/mythtv/libmythservicecontracts/services/mythServices.h
+include/mythtv/libmythservicecontracts/services/rttiServices.h
 include/mythtv/libmythservicecontracts/services/videoServices.h
 include/mythtv/libmythui/mythdialogbox.h
 include/mythtv/libmythui/mythfontproperties.h
@@ -344,18 +397,20 @@
 include/mythtv/libswscale/swscale.h
 include/mythtv/libswscale/version.h
 include/mythtv/loggingserver.h
-include/mythtv/mcodecs.h
 include/mythtv/metadata/bluraymetadata.h
 include/mythtv/metadata/cleanup.h
 include/mythtv/metadata/dbaccess.h
 include/mythtv/metadata/dirscan.h
 include/mythtv/metadata/globals.h
+include/mythtv/metadata/imagemanager.h
+include/mythtv/metadata/imagemetadata.h
+include/mythtv/metadata/imagetypes.h
+include/mythtv/metadata/lyricsdata.h
 include/mythtv/metadata/metadatacommon.h
 include/mythtv/metadata/metadatadownload.h
 include/mythtv/metadata/metadatafactory.h
 include/mythtv/metadata/metadatagrabber.h
 include/mythtv/metadata/metadataimagedownload.h
-include/mythtv/metadata/metadataimagehelper.h
 include/mythtv/metadata/metaio.h
 include/mythtv/metadata/metaioavfcomment.h
 include/mythtv/metadata/metaioflacvorbis.h
@@ -364,6 +419,7 @@
 include/mythtv/metadata/metaiooggvorbis.h
 include/mythtv/metadata/metaiotaglib.h
 include/mythtv/metadata/metaiowavpack.h
+include/mythtv/metadata/musicfilescanner.h
 include/mythtv/metadata/musicmetadata.h
 include/mythtv/metadata/musicutils.h
 include/mythtv/metadata/mythmetaexp.h
@@ -376,9 +432,11 @@
 include/mythtv/metadata/videoscan.h
 include/mythtv/metadata/videoutils.h
 include/mythtv/metadataimagehelper.h
+include/mythtv/minilzo.h
 include/mythtv/mpeg2dec/mpeg2.h
 include/mythtv/mthread.h
 include/mythtv/mthreadpool.h
+include/mythtv/mythavutil.h
 include/mythtv/mythbaseexp.h
 include/mythtv/mythcdrom.h
 include/mythtv/mythcommandlineparser.h
@@ -399,6 +457,7 @@
 include/mythtv/mythdownloadmanager.h
 include/mythtv/mythevent.h
 include/mythtv/mythexp.h
+include/mythtv/mythframe.h
 include/mythtv/mythlocale.h
 include/mythtv/mythlogging.h
 include/mythtv/mythmedia.h
@@ -409,6 +468,7 @@
 include/mythtv/mythpluginapi.h
 include/mythtv/mythqtcompat.h
 include/mythtv/mythrssmanager.h
+include/mythtv/mythsession.h
 include/mythtv/mythsingledownload.h
 include/mythtv/mythsocket.h
 include/mythtv/mythsocket_cb.h
@@ -425,7 +485,6 @@
 include/mythtv/mythwizard.h
 include/mythtv/netgrabbermanager.h
 include/mythtv/netutils.h
-include/mythtv/oldsettings.h
 include/mythtv/output.h
 include/mythtv/playgroup.h
 include/mythtv/plist.h
@@ -442,10 +501,11 @@
 include/mythtv/serverpool.h
 include/mythtv/settings.h
 include/mythtv/signalhandling.h
+include/mythtv/standardsettings.h
 include/mythtv/storagegroup.h
 include/mythtv/storagegroupeditor.h
 include/mythtv/threadedfilewriter.h
-include/mythtv/uitypes.h
+include/mythtv/udfread.h
 include/mythtv/upnp/bufferedsocketdevice.h
 include/mythtv/upnp/configuration.h
 include/mythtv/upnp/eventing.h
@@ -468,6 +528,7 @@
 include/mythtv/upnp/upnpcdsobjects.h
 include/mythtv/upnp/upnpcmgr.h
 include/mythtv/upnp/upnpdevice.h
+include/mythtv/upnp/upnphelpers.h
 include/mythtv/upnp/upnpsubscription.h
 include/mythtv/upnp/upnptaskcache.h
 include/mythtv/upnp/upnptaskevent.h
@@ -476,76 +537,71 @@
 include/mythtv/upnp/upnputil.h
 include/mythtv/upnp/wsdl.h
 include/mythtv/upnp/xmlSerializer.h
+include/mythtv/upnp/xsd.h
 include/mythtv/verbosedefs.h
 include/mythtv/version.h
-include/mythtv/virtualkeyboard_qt.h
 include/mythtv/visual.h
 include/mythtv/volumebase.h
-include/mythtv/xmlparse.h
-lib/libmyth-0.27.so
-lib/libmyth-0.27.so.0
-lib/libmyth-0.27.so.0.27
-lib/libmyth-0.27.so.0.27.0
+lib/libmyth-29.so
+lib/libmyth-29.so.29
+lib/libmyth-29.so.29.0
+lib/libmyth-29.so.29.0.0
 lib/libmythavcodec.so
-lib/libmythavcodec.so.54
-lib/libmythavcodec.so.54.92.100
+lib/libmythavcodec.so.57
+lib/libmythavcodec.so.57.64.100
 lib/libmythavdevice.so
-lib/libmythavdevice.so.54
-lib/libmythavdevice.so.54.3.103
+lib/libmythavdevice.so.57
+lib/libmythavdevice.so.57.1.100
 lib/libmythavfilter.so
-lib/libmythavfilter.so.3
-lib/libmythavfilter.so.3.42.103
+lib/libmythavfilter.so.6
+lib/libmythavfilter.so.6.65.100
 lib/libmythavformat.so
-lib/libmythavformat.so.54
-lib/libmythavformat.so.54.63.104
+lib/libmythavformat.so.57
+lib/libmythavformat.so.57.56.100
 lib/libmythavutil.so
-lib/libmythavutil.so.52
-lib/libmythavutil.so.52.18.100
-lib/libmythbase-0.27.so
-lib/libmythbase-0.27.so.0
-lib/libmythbase-0.27.so.0.27
-lib/libmythbase-0.27.so.0.27.0
-lib/libmythfreemheg-0.27.so
-lib/libmythfreemheg-0.27.so.0
-lib/libmythfreemheg-0.27.so.0.27
-lib/libmythfreemheg-0.27.so.0.27.0
-lib/libmythmetadata-0.27.so
-lib/libmythmetadata-0.27.so.0
-lib/libmythmetadata-0.27.so.0.27
-lib/libmythmetadata-0.27.so.0.27.0
+lib/libmythavutil.so.55
+lib/libmythavutil.so.55.34.100
+lib/libmythbase-29.so
+lib/libmythbase-29.so.29
+lib/libmythbase-29.so.29.0
+lib/libmythbase-29.so.29.0.0
+lib/libmythfreemheg-29.so
+lib/libmythfreemheg-29.so.29
+lib/libmythfreemheg-29.so.29.0
+lib/libmythfreemheg-29.so.29.0.0
+lib/libmythmetadata-29.so
+lib/libmythmetadata-29.so.29
+lib/libmythmetadata-29.so.29.0
+lib/libmythmetadata-29.so.29.0.0
 lib/libmythpostproc.so
-lib/libmythpostproc.so.52
-lib/libmythpostproc.so.52.2.100
-lib/libmythprotoserver-0.27.so
-lib/libmythprotoserver-0.27.so.0
-lib/libmythprotoserver-0.27.so.0.27
-lib/libmythprotoserver-0.27.so.0.27.0
-lib/libmythqjson.so
-lib/libmythqjson.so.0
-lib/libmythqjson.so.0.7
-lib/libmythqjson.so.0.7.1
-lib/libmythservicecontracts-0.27.so
-lib/libmythservicecontracts-0.27.so.0
-lib/libmythservicecontracts-0.27.so.0.27
-lib/libmythservicecontracts-0.27.so.0.27.0
+lib/libmythpostproc.so.54
+lib/libmythpostproc.so.54.1.100
+lib/libmythprotoserver-29.so
+lib/libmythprotoserver-29.so.29
+lib/libmythprotoserver-29.so.29.0
+lib/libmythprotoserver-29.so.29.0.0
+lib/libmythservicecontracts-29.so
+lib/libmythservicecontracts-29.so.29
+lib/libmythservicecontracts-29.so.29.0
+lib/libmythservicecontracts-29.so.29.0.0
 lib/libmythswresample.so
-lib/libmythswresample.so.0
-lib/libmythswresample.so.0.17.102
+lib/libmythswresample.so.2
+lib/libmythswresample.so.2.3.100
 lib/libmythswscale.so
-lib/libmythswscale.so.2
-lib/libmythswscale.so.2.2.100
-lib/libmythtv-0.27.so
-lib/libmythtv-0.27.so.0
-lib/libmythtv-0.27.so.0.27
-lib/libmythtv-0.27.so.0.27.0
-lib/libmythui-0.27.so
-lib/libmythui-0.27.so.0
-lib/libmythui-0.27.so.0.27
-lib/libmythui-0.27.so.0.27.0
-lib/libmythupnp-0.27.so
-lib/libmythupnp-0.27.so.0
-lib/libmythupnp-0.27.so.0.27
-lib/libmythupnp-0.27.so.0.27.0
+lib/libmythswscale.so.4
+lib/libmythswscale.so.4.2.100
+lib/libmythtv-29.so
+lib/libmythtv-29.so.29
+lib/libmythtv-29.so.29.0
+lib/libmythtv-29.so.29.0.0
+lib/libmythui-29.so
+lib/libmythui-29.so.29
+lib/libmythui-29.so.29.0
+lib/libmythui-29.so.29.0.0
+lib/libmythupnp-29.so
+lib/libmythupnp-29.so.29
+lib/libmythupnp-29.so.29.0
+lib/libmythupnp-29.so.29.0.0
 lib/mythtv/filters/libadjust.so
 lib/mythtv/filters/libbobdeint.so
 lib/mythtv/filters/libcrop.so
@@ -595,99 +651,114 @@
 %%DATADIR%%/fonts/Tiresias Infofont.ttf
 %%DATADIR%%/fonts/texgyrechorus-mediumitalic.otf
 %%DATADIR%%/fonts/tiresias_gpl3.txt
+%%DATADIR%%/html/3rdParty/jquery/MYTH_README
+%%DATADIR%%/html/3rdParty/jquery/galleria/LICENSE
+%%DATADIR%%/html/3rdParty/jquery/galleria/galleria.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/flickr-demo.html
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/flickr-loader.gif
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/galleria.flickr.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/galleria.flickr.min.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/loader.gif
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/history/galleria.history.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/history/galleria.history.min.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/history/history-demo.html
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/picasa/galleria.picasa.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/picasa/galleria.picasa.min.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/picasa/loader.gif
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/picasa/picasa-demo.html
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/README.rst
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/classic-demo.html
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/classic-loader.gif
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/classic-map.png
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/galleria.classic.css
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/galleria.classic.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/galleria.classic.min.js
+%%DATADIR%%/html/3rdParty/jquery/jquery-2.0.3.js
+%%DATADIR%%/html/3rdParty/jquery/jquery-2.0.3.min.js
+%%DATADIR%%/html/3rdParty/jquery/jquery-2.1.4.min.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryContextMenu/js/jquery.contextmenu.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/application.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/code.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/css.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/db.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/directory.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/doc.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/file.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/film.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/flash.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/folder_open.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/html.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/java.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/linux.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/music.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/pdf.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/php.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/picture.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/ppt.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/psd.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/ruby.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/script.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/spinner.gif
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/txt.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/xls.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/zip.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/jqueryFileTree.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/jqueryFileTree.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryGrid/css/ui.jqgrid.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryGrid/js/grid.locale-en.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryGrid/js/jquery.jqGrid.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryJScroll/README.md
+%%DATADIR%%/html/3rdParty/jquery/jqueryJScroll/jquery.jscroll.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryJScroll/jscroll.jquery.json
+%%DATADIR%%/html/3rdParty/jquery/jqueryMultiSelect/css/jquery.multiselect.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryMultiSelect/css/ui.multiselect.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryMultiSelect/js/jquery.multiselect.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryMultiSelect/js/ui-multiselect-en.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_flat_30_cccccc_40x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_flat_50_5c5c5c_40x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_glass_40_ffc73d_1x400.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_hexagon_10_000000_12x10.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-hard_20_0b6a98_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-soft_33_003147_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-soft_35_222222_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-soft_44_444444_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_222222_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_4b8e0b_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_a83300_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_cccccc_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_ffffff_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/jquery-ui-1.10.3.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/jquery-ui.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/js/jquery-ui-1.10.3.js
 %%DATADIR%%/html/3rdParty/jwplayer.qsp
+%%DATADIR%%/html/backend_index.qsp
 %%DATADIR%%/html/css/Status.css
-%%DATADIR%%/html/css/images/ui-bg_flat_30_cccccc_40x100.png
-%%DATADIR%%/html/css/images/ui-bg_flat_50_5c5c5c_40x100.png
-%%DATADIR%%/html/css/images/ui-bg_glass_40_ffc73d_1x400.png
-%%DATADIR%%/html/css/images/ui-bg_hexagon_10_000000_12x10.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-hard_20_0b6a98_1x100.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-soft_33_003147_1x100.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-soft_35_222222_1x100.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-soft_44_444444_1x100.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
-%%DATADIR%%/html/css/images/ui-icons_222222_256x240.png
-%%DATADIR%%/html/css/images/ui-icons_4b8e0b_256x240.png
-%%DATADIR%%/html/css/images/ui-icons_a83300_256x240.png
-%%DATADIR%%/html/css/images/ui-icons_cccccc_256x240.png
-%%DATADIR%%/html/css/images/ui-icons_ffffff_256x240.png
-%%DATADIR%%/html/css/jquery-ui.css
-%%DATADIR%%/html/css/menustyle.css
+%%DATADIR%%/html/css/settings.css
 %%DATADIR%%/html/css/setup.css
 %%DATADIR%%/html/css/site.css
-%%DATADIR%%/html/css/ui.jqgrid.css
-%%DATADIR%%/html/css/ui.multiselect.css
 %%DATADIR%%/html/css/wsdl.css
+%%DATADIR%%/html/debug/websocket.qsp
+%%DATADIR%%/html/frontend_index.qsp
 %%DATADIR%%/html/images/blank.gif
 %%DATADIR%%/html/images/checkerboard_100x100.png
 %%DATADIR%%/html/images/favicon.ico
+%%DATADIR%%/html/images/icons/README
+%%DATADIR%%/html/images/icons/upnp_large_icon.jpg
+%%DATADIR%%/html/images/icons/upnp_large_icon.png
+%%DATADIR%%/html/images/icons/upnp_small_icon.jpg
+%%DATADIR%%/html/images/icons/upnp_small_icon.png
 %%DATADIR%%/html/images/menu-button-bg.gif
 %%DATADIR%%/html/images/mythtv.png
-%%DATADIR%%/html/images/ui-bg_flat_30_cccccc_40x100.png
-%%DATADIR%%/html/images/ui-bg_flat_50_5c5c5c_40x100.png
-%%DATADIR%%/html/images/ui-bg_glass_40_ffc73d_1x400.png
-%%DATADIR%%/html/images/ui-bg_hexagon_10_000000_12x10.png
-%%DATADIR%%/html/images/ui-bg_highlight-hard_20_0b6a98_1x100.png
-%%DATADIR%%/html/images/ui-bg_highlight-soft_33_003147_1x100.png
-%%DATADIR%%/html/images/ui-bg_highlight-soft_35_222222_1x100.png
-%%DATADIR%%/html/images/ui-bg_highlight-soft_44_444444_1x100.png
-%%DATADIR%%/html/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
-%%DATADIR%%/html/images/ui-icons_222222_256x240.png
-%%DATADIR%%/html/images/ui-icons_4b8e0b_256x240.png
-%%DATADIR%%/html/images/ui-icons_a83300_256x240.png
-%%DATADIR%%/html/images/ui-icons_cccccc_256x240.png
-%%DATADIR%%/html/images/ui-icons_ffffff_256x240.png
-%%DATADIR%%/html/index.html
-%%DATADIR%%/html/js/databaseutil.js
 %%DATADIR%%/html/js/fileutil.js
-%%DATADIR%%/html/js/galleria/LICENSE
-%%DATADIR%%/html/js/galleria/galleria-1.2.3.js
-%%DATADIR%%/html/js/galleria/galleria-1.2.3.min.js
-%%DATADIR%%/html/js/galleria/themes/classic/README.rst
-%%DATADIR%%/html/js/galleria/themes/classic/classic-demo.html
-%%DATADIR%%/html/js/galleria/themes/classic/classic-loader.gif
-%%DATADIR%%/html/js/galleria/themes/classic/classic-map.png
-%%DATADIR%%/html/js/galleria/themes/classic/galleria.classic.css
-%%DATADIR%%/html/js/galleria/themes/classic/galleria.classic.js
-%%DATADIR%%/html/js/galleria/themes/classic/galleria.classic.min.js
-%%DATADIR%%/html/js/grid.locale-en.js
 %%DATADIR%%/html/js/inspect.js
-%%DATADIR%%/html/js/jquery-ui.min.js
-%%DATADIR%%/html/js/jquery.contextmenu.js
-%%DATADIR%%/html/js/jquery.jqGrid.min.js
-%%DATADIR%%/html/js/jquery.min.js
-%%DATADIR%%/html/js/jqueryFileTree/images/application.png
-%%DATADIR%%/html/js/jqueryFileTree/images/code.png
-%%DATADIR%%/html/js/jqueryFileTree/images/css.png
-%%DATADIR%%/html/js/jqueryFileTree/images/db.png
-%%DATADIR%%/html/js/jqueryFileTree/images/directory.png
-%%DATADIR%%/html/js/jqueryFileTree/images/doc.png
-%%DATADIR%%/html/js/jqueryFileTree/images/file.png
-%%DATADIR%%/html/js/jqueryFileTree/images/film.png
-%%DATADIR%%/html/js/jqueryFileTree/images/flash.png
-%%DATADIR%%/html/js/jqueryFileTree/images/folder_open.png
-%%DATADIR%%/html/js/jqueryFileTree/images/html.png
-%%DATADIR%%/html/js/jqueryFileTree/images/java.png
-%%DATADIR%%/html/js/jqueryFileTree/images/linux.png
-%%DATADIR%%/html/js/jqueryFileTree/images/music.png
-%%DATADIR%%/html/js/jqueryFileTree/images/pdf.png
-%%DATADIR%%/html/js/jqueryFileTree/images/php.png
-%%DATADIR%%/html/js/jqueryFileTree/images/picture.png
-%%DATADIR%%/html/js/jqueryFileTree/images/ppt.png
-%%DATADIR%%/html/js/jqueryFileTree/images/psd.png
-%%DATADIR%%/html/js/jqueryFileTree/images/ruby.png
-%%DATADIR%%/html/js/jqueryFileTree/images/script.png
-%%DATADIR%%/html/js/jqueryFileTree/images/spinner.gif
-%%DATADIR%%/html/js/jqueryFileTree/images/txt.png
-%%DATADIR%%/html/js/jqueryFileTree/images/xls.png
-%%DATADIR%%/html/js/jqueryFileTree/images/zip.png
-%%DATADIR%%/html/js/jqueryFileTree/jqueryFileTree.css
-%%DATADIR%%/html/js/jqueryFileTree/jqueryFileTree.js
 %%DATADIR%%/html/js/menu.js
-%%DATADIR%%/html/js/ui-multiselect-en.js
-%%DATADIR%%/html/js/ui.multiselect.js
+%%DATADIR%%/html/js/settings.js
 %%DATADIR%%/html/js/util.qjs
+%%DATADIR%%/html/js/utility.js
+%%DATADIR%%/html/js/websocket_events.js
 %%DATADIR%%/html/menu.qsp
+%%DATADIR%%/html/misc/css/overview.css
 %%DATADIR%%/html/misc/database-backup.html
 %%DATADIR%%/html/misc/database-repair.html
 %%DATADIR%%/html/misc/databasetabs.html
@@ -697,12 +768,15 @@
 %%DATADIR%%/html/misc/js/databasetabs.js
 %%DATADIR%%/html/misc/js/hardwareprofile.js
 %%DATADIR%%/html/misc/js/messagetab.js
+%%DATADIR%%/html/misc/js/overview.js
 %%DATADIR%%/html/misc/js/viewlogs.js
 %%DATADIR%%/html/misc/message.html
 %%DATADIR%%/html/misc/messagetab.html
+%%DATADIR%%/html/misc/misc_template.html
 %%DATADIR%%/html/misc/overview.qsp
 %%DATADIR%%/html/misc/placeholder.html
 %%DATADIR%%/html/misc/viewlogs.html
+%%DATADIR%%/html/robots.txt
 %%DATADIR%%/html/samples/hlstest.qsp
 %%DATADIR%%/html/samples/js/samples.js
 %%DATADIR%%/html/samples/livestream_rec.qsp
@@ -710,9 +784,11 @@
 %%DATADIR%%/html/samples/recorded.qsp
 %%DATADIR%%/html/samples/serverside.qsp
 %%DATADIR%%/html/samples/storagegroups.qsp
+%%DATADIR%%/html/setup/ajax_backends/setting_util.qsp
 %%DATADIR%%/html/setup/channeleditor-channeldetail-multi.html
 %%DATADIR%%/html/setup/channeleditor-channeldetail.html
 %%DATADIR%%/html/setup/channeleditor.html
+%%DATADIR%%/html/setup/css/common.css
 %%DATADIR%%/html/setup/database.html
 %%DATADIR%%/html/setup/expert.html
 %%DATADIR%%/html/setup/general.html
@@ -723,28 +799,81 @@
 %%DATADIR%%/html/setup/jobqueue-jobs.qsp
 %%DATADIR%%/html/setup/jobqueue.html
 %%DATADIR%%/html/setup/js/channeleditor.js
+%%DATADIR%%/html/setup/js/common.js
 %%DATADIR%%/html/setup/js/database.js
 %%DATADIR%%/html/setup/js/general.js
 %%DATADIR%%/html/setup/js/guidedatasources.js
 %%DATADIR%%/html/setup/js/jobqueue.js
 %%DATADIR%%/html/setup/js/password.js
-%%DATADIR%%/html/setup/js/setup.js
 %%DATADIR%%/html/setup/js/storagegroups.js
 %%DATADIR%%/html/setup/js/systemevents.js
 %%DATADIR%%/html/setup/js/wizard.js
 %%DATADIR%%/html/setup/overview.html
 %%DATADIR%%/html/setup/password.html
+%%DATADIR%%/html/setup/setup_template.html
 %%DATADIR%%/html/setup/storagegroups-add-dir.html
 %%DATADIR%%/html/setup/storagegroups-add-new.html
 %%DATADIR%%/html/setup/storagegroups.html
 %%DATADIR%%/html/setup/systemevents.html
+%%DATADIR%%/html/setup/webfrontend-settings.qsp
 %%DATADIR%%/html/setup/wizard-database.html
 %%DATADIR%%/html/setup/wizard-guide_data.html
 %%DATADIR%%/html/setup/wizard-media_storage.html
 %%DATADIR%%/html/setup/wizard-network.qsp
 %%DATADIR%%/html/setup/wizard-recording_devices.html
 %%DATADIR%%/html/setup/wizard.html
+%%DATADIR%%/html/tv/ajax_backends/dvr_util.qsp
+%%DATADIR%%/html/tv/ajax_backends/program_util.qsp
+%%DATADIR%%/html/tv/css/category_colors.css
+%%DATADIR%%/html/tv/css/common.css
+%%DATADIR%%/html/tv/css/guide.css
+%%DATADIR%%/html/tv/css/icons.css
+%%DATADIR%%/html/tv/css/programsearch.css
+%%DATADIR%%/html/tv/css/recordingrules.css
+%%DATADIR%%/html/tv/css/recordings.css
+%%DATADIR%%/html/tv/css/schedule.css
+%%DATADIR%%/html/tv/css/tvplayer.css
+%%DATADIR%%/html/tv/css/upcoming.css
+%%DATADIR%%/html/tv/guide.qsp
+%%DATADIR%%/html/tv/images/blank.png
+%%DATADIR%%/html/tv/images/cat_movie.svg
+%%DATADIR%%/html/tv/images/channel_icon.svg
+%%DATADIR%%/html/tv/images/fl_autoexp.svg
+%%DATADIR%%/html/tv/images/fl_bookmark.svg
+%%DATADIR%%/html/tv/images/fl_commflag.svg
+%%DATADIR%%/html/tv/images/fl_watched.svg
+%%DATADIR%%/html/tv/images/hd_1080.svg
+%%DATADIR%%/html/tv/images/hd_720.svg
+%%DATADIR%%/html/tv/images/hd_tv.svg
+%%DATADIR%%/html/tv/images/play_arrow.png
+%%DATADIR%%/html/tv/images/play_arrow.svg
+%%DATADIR%%/html/tv/images/recording_icons_sprite.svg
+%%DATADIR%%/html/tv/images/wastebin.svg
+%%DATADIR%%/html/tv/js/common.js
+%%DATADIR%%/html/tv/js/constants.js
+%%DATADIR%%/html/tv/js/guide.js
+%%DATADIR%%/html/tv/js/programsearch.js
+%%DATADIR%%/html/tv/js/recordings.js
+%%DATADIR%%/html/tv/js/schedule.js
+%%DATADIR%%/html/tv/js/tvutil.qjs
+%%DATADIR%%/html/tv/js/upcoming.js
+%%DATADIR%%/html/tv/programsearch.qsp
+%%DATADIR%%/html/tv/recordingrules.qsp
+%%DATADIR%%/html/tv/recordings.qsp
+%%DATADIR%%/html/tv/schedule.qsp
+%%DATADIR%%/html/tv/stream.qsp
+%%DATADIR%%/html/tv/tvplayer.qsp
+%%DATADIR%%/html/tv/upcoming.qsp
+%%DATADIR%%/html/video/css/gallery.css
+%%DATADIR%%/html/video/gallery.qsp
+%%DATADIR%%/html/video/gallery_detail.qsp
+%%DATADIR%%/html/video/images/folder_icon.png
+%%DATADIR%%/html/video/images/mv_gallery_dir_up.png
+%%DATADIR%%/html/video/images/unknown.png
+%%DATADIR%%/html/video/js/gallery.js
+%%DATADIR%%/html/video/js/gallery.qjs
 %%DATADIR%%/html/xslt/class.xslt
+%%DATADIR%%/html/xslt/enum.xslt
 %%DATADIR%%/html/xslt/service.xslt
 %%DATADIR%%/i18n/mythfrontend_bg.qm
 %%DATADIR%%/i18n/mythfrontend_ca.qm
@@ -955,6 +1084,7 @@
 %%DATADIR%%/themes/MythCenter/qtlook.txt
 %%DATADIR%%/themes/MythCenter/recordings-ui.xml
 %%DATADIR%%/themes/MythCenter/schedule-ui.xml
+%%DATADIR%%/themes/MythCenter/status-ui.xml
 %%DATADIR%%/themes/MythCenter/themeinfo.xml
 %%DATADIR%%/themes/MythCenter/title/title_dvd.png
 %%DATADIR%%/themes/MythCenter/title/title_gallery.png
@@ -1222,7 +1352,6 @@
 %%DATADIR%%/themes/Terra/video/video_gallery_background_selected.png
 %%DATADIR%%/themes/Terra/watermarks/README.license
 %%DATADIR%%/themes/Terra/watermarks/aerial.png
-%%DATADIR%%/themes/Terra/watermarks/appearance.png
 %%DATADIR%%/themes/Terra/watermarks/archive.png
 %%DATADIR%%/themes/Terra/watermarks/audio.png
 %%DATADIR%%/themes/Terra/watermarks/browser.png
@@ -1264,6 +1393,7 @@
 %%DATADIR%%/themes/Terra/watermarks/select_music.png
 %%DATADIR%%/themes/Terra/watermarks/status.png
 %%DATADIR%%/themes/Terra/watermarks/stop_light.png
+%%DATADIR%%/themes/Terra/watermarks/themechooser.png
 %%DATADIR%%/themes/Terra/watermarks/tools.png
 %%DATADIR%%/themes/Terra/watermarks/tv.png
 %%DATADIR%%/themes/Terra/watermarks/vcr.png
@@ -1433,28 +1563,18 @@
 %%DATADIR%%/themes/default/htmls/notfound.html
 %%DATADIR%%/themes/default/htmls/progdetails_page1.html
 %%DATADIR%%/themes/default/htmls/progdetails_page2.html
+%%DATADIR%%/themes/default/image-ui.xml
 %%DATADIR%%/themes/default/keyboard/ar.xml
-%%DATADIR%%/themes/default/keyboard/ar_ui.xml
 %%DATADIR%%/themes/default/keyboard/da.xml
-%%DATADIR%%/themes/default/keyboard/da_ui.xml
 %%DATADIR%%/themes/default/keyboard/de.xml
-%%DATADIR%%/themes/default/keyboard/de_ui.xml
 %%DATADIR%%/themes/default/keyboard/el.xml
-%%DATADIR%%/themes/default/keyboard/el_ui.xml
 %%DATADIR%%/themes/default/keyboard/en_gb.xml
-%%DATADIR%%/themes/default/keyboard/en_gb_ui.xml
 %%DATADIR%%/themes/default/keyboard/en_us.xml
-%%DATADIR%%/themes/default/keyboard/en_us_ui.xml
 %%DATADIR%%/themes/default/keyboard/es.xml
-%%DATADIR%%/themes/default/keyboard/es_ui.xml
 %%DATADIR%%/themes/default/keyboard/fr.xml
 %%DATADIR%%/themes/default/keyboard/fr_ch.xml
-%%DATADIR%%/themes/default/keyboard/fr_ch_ui.xml
-%%DATADIR%%/themes/default/keyboard/fr_ui.xml
 %%DATADIR%%/themes/default/keyboard/he.xml
-%%DATADIR%%/themes/default/keyboard/he_ui.xml
 %%DATADIR%%/themes/default/keyboard/it.xml
-%%DATADIR%%/themes/default/keyboard/it_ui.xml
 %%DATADIR%%/themes/default/keyboard/key_down.png
 %%DATADIR%%/themes/default/keyboard/key_down_back.png
 %%DATADIR%%/themes/default/keyboard/key_down_del.png
@@ -1491,14 +1611,11 @@
 %%DATADIR%%/themes/default/keyboard/keyboard.xml
 %%DATADIR%%/themes/default/keyboard/leftarrow.png
 %%DATADIR%%/themes/default/keyboard/nb.xml
-%%DATADIR%%/themes/default/keyboard/nb_ui.xml
 %%DATADIR%%/themes/default/keyboard/returnarrow.png
 %%DATADIR%%/themes/default/keyboard/rightarrow.png
 %%DATADIR%%/themes/default/keyboard/ru.xml
-%%DATADIR%%/themes/default/keyboard/ru_ui.xml
 %%DATADIR%%/themes/default/keyboard/shiftarrow.png
 %%DATADIR%%/themes/default/keyboard/sv.xml
-%%DATADIR%%/themes/default/keyboard/sv_ui.xml
 %%DATADIR%%/themes/default/lb-arrow.png
 %%DATADIR%%/themes/default/lb-check-empty.png
 %%DATADIR%%/themes/default/lb-check-full.png
@@ -1769,6 +1886,7 @@
 %%DATADIR%%/themes/default/menu_playback.xml
 %%DATADIR%%/themes/default/menu_playback_compact.xml
 %%DATADIR%%/themes/default/mono.png
+%%DATADIR%%/themes/default/musicscanner.png
 %%DATADIR%%/themes/default/mv_browse_background.png
 %%DATADIR%%/themes/default/mv_browse_selector.png
 %%DATADIR%%/themes/default/mv_filerequest.png
@@ -1830,9 +1948,13 @@
 %%DATADIR%%/themes/default/shared/directory.png
 %%DATADIR%%/themes/default/shared/executable.png
 %%DATADIR%%/themes/default/shared/file.png
+%%DATADIR%%/themes/default/shared/folder-reg.png
+%%DATADIR%%/themes/default/shared/folder-sel.png
 %%DATADIR%%/themes/default/shared/grid_back_reg.png
 %%DATADIR%%/themes/default/shared/grid_back_sel.png
 %%DATADIR%%/themes/default/shared/grid_noimage.png
+%%DATADIR%%/themes/default/shared/movie-reg.png
+%%DATADIR%%/themes/default/shared/movie-sel.png
 %%DATADIR%%/themes/default/shared/secure.png
 %%DATADIR%%/themes/default/shared/unsecure.png
 %%DATADIR%%/themes/default/shared/updirectory.png
@@ -1840,6 +1962,7 @@
 %%DATADIR%%/themes/default/solid-container.png
 %%DATADIR%%/themes/default/solid-cr-background.png
 %%DATADIR%%/themes/default/sr-background.png
+%%DATADIR%%/themes/default/standardsetting-ui.xml
 %%DATADIR%%/themes/default/status-bar.png
 %%DATADIR%%/themes/default/status-ui.xml
 %%DATADIR%%/themes/default/stereo.png
Index: multimedia/mythtv/Makefile
===================================================================
--- multimedia/mythtv/Makefile
+++ multimedia/mythtv/Makefile
@@ -3,132 +3,173 @@
 
 PORTNAME=	mythtv
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.27.5
+DISTVERSION=	29.1
+PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	MythTV is a homebrew PVR project
+MAINTAINER?=	ports@FreeBSD.org
+COMMENT?=	MythTV is a homebrew PVR project
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 LIB_DEPENDS=	libmp3lame.so:audio/lame \
-		libfreetype.so:print/freetype2 \
 		libtag.so:audio/taglib \
-		libxml2.so:textproc/libxml2 \
-		libudf.so:sysutils/libcdio \
+		libexiv2.so:graphics/exiv2 \
 		libva.so:multimedia/libva \
 		libass.so:multimedia/libass \
-		libfftw3f.so:math/fftw3-float \
 		libfftw3_threads.so:math/fftw3 \
-		libjack.so:audio/jack
+		libfftw3f.so:math/fftw3-float \
+		libfreetype.so:print/freetype2 \
+		libxml2.so:textproc/libxml2
 BUILD_DEPENDS=	v4l_compat>=1.0.20100321:multimedia/v4l_compat \
 		yasm:devel/yasm
-RUN_DEPENDS=	tv_check:textproc/p5-xmltv \
-		wget:ftp/wget
 
-CONFLICTS=	mythtv-frontend-[0-9]*
-
+USES=		gmake iconv libtool pkgconfig pathfix ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
-
-WRKSRC_SUBDIR=	${PORTNAME}
-
-ONLY_FOR_ARCHS=	i386 amd64
-USE_PERL5=	run build
-NOPRECIOUSMAKEVARS=	# don't override $(ARCH) in ffmpeg makefiles
-USES=		gmake iconv libtool perl5 pkgconfig pathfix shebangfix ssl
-SHEBANG_FILES=	programs/scripts/database/mythconverg_backup.pl \
-		programs/scripts/database/mythconverg_restore.pl
-USE_QT4=	corelib dbus gui sql network script linguist_build l10n sql-mysql_run \
-		moc_build qmake_build rcc_build uic_build imageformats webkit xml
 USE_GL=		gl
-USE_XORG=	x11 xv xrandr xxf86vm xinerama xext
+USE_LDCONFIG=	yes
+USE_QT5=	buildtools_build core dbus gui imageformats_run \
+		linguist_build network opengl qmake_build script sql \
+		sql-mysql_run webkit widgets xml
 QT_NONSTANDARD=	yes
-HAS_CONFIGURE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/mythtv/filters
-REINPLACE_ARGS=	-i ""
-USE_RC_SUBR=	mythbackend
-DESTDIRNAME=	INSTALL_ROOT
+USE_XORG=	x11 xv xrandr xxf86vm xinerama xext xcb
 
-USERS=		mythtv
-GROUPS=		mythtv
-
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \
+		--libxml2-path="${LOCALBASE}/include/libxml2" \
+		--enable-opengl-video \
+		--disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa \
+		--disable-mythlogserver
+CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
+		QTDIR="${PREFIX}" PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
 MAKE_ENV=	QTDIR="${PREFIX}" \
 		QMAKESPEC="${QMAKESPEC}"
-
+NOPRECIOUSMAKEVARS=	# don't override ARCH in ffmpeg makefiles
+DESTDIRNAME=	INSTALL_ROOT
 CPPFLAGS+=	${QTCPPFLAGS}
-CONFIGURE_ENV+=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
-		QTDIR="${PREFIX}"
-CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" --dvb-path="${LOCALBASE}/include/libdvbv5" \
-		--libxml2-path="${LOCALBASE}/include/libxml2" --enable-v4l2 --enable-ivtv --enable-xv \
-		--disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa --disable-mythlogserver
+REINPLACE_ARGS=	-i ""
+WRKSRC_SUBDIR=	${PORTNAME}
 
-QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
+.if defined(SLAVEPORT) && ${SLAVEPORT} == "frontend"
+CONFLICTS_INSTALL=	mythtv-[0-9]*
 
-OPTIONS_DEFINE=	BINDINGS LIRC MYSQL OPENGL VDPAU
-OPTIONS_DEFAULT=	BINDINGS OPENGL VDPAU
-OPTIONS_SUB=	yes
-BINDINGS_DESC=	Perl and Python bindings
+CONFIGURE_ARGS+=--disable-dvb --disable-firewire --disable-hdhomerun \
+		--disable-hdpvr --disable-ivtv --disable-v4l2 \
+		--without-bindings=perl,python,php
 
-LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
-MYSQL_USES=	mysql:client,server
-MYSQL_USES_OFF=	mysql
+DESKTOP_ENTRIES="MythTV Frontend" "MythTV is a homebrew PVR project" "" \
+		"mythfrontend" "AudioVideo;Video;" false
 
-VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
-VDPAU_CONFIGURE_ENABLE=	vdpau
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-programs_programs.pro
 
-OPENGL_CONFIGURE_ENABLE=	opengl-video
-OPENGL_USE=	QT4=opengl
+OPTIONS_EXCLUDE+=	BINDINGS LIRC MYSQL
+.else
+CONFLICTS_INSTALL=	mythtv-frontend-[0-9]*
 
-.include <bsd.port.options.mk>
+LIB_DEPENDS+=	libjack.so:audio/jack \
+		libudf.so:sysutils/libcdio
+RUN_DEPENDS+=	tv_check:textproc/p5-xmltv \
+		wget:ftp/wget
+USES+=		perl5 python:2.7 shebangfix
+USE_PERL5=	run build
+USE_RC_SUBR=	mythbackend
+SHEBANG_FILES=	programs/scripts/database/*.pl \
+		programs/scripts/internetcontent/*.py \
+		programs/scripts/internetcontent/*.pl \
+		programs/scripts/internetcontent/nv_python_libs/*.py \
+		programs/scripts/hardwareprofile/*.py \
+		programs/scripts/metadata/Television/ttvdb.py \
+		programs/scripts/metadata/Movie/tmdb3.py
 
-SUB_FILES=	pkg-message
+CONFIGURE_ARGS+=--dvb-path="${LOCALBASE}/include" \
+		--enable-ivtv --enable-v4l2 --enable-xv
 
-.if ${PORT_OPTIONS:MBINDINGS}
-CONFIGURE_ARGS+=	--python=${PYTHON_CMD}
-USES+=		python:2.7
-PYDISTUTILS_PKGNAME=MythTV
-PYDISTUTILS_PKGVERSION=0.27._1
+USERS=		mythtv
+GROUPS=		mythtv
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber@${PY_FLAVOR} \
-		p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
-		p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined \
-		p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \
-		p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
-		p5-DBI>=0:databases/p5-DBI \
-		p5-DBD-mysql>0:databases/p5-DBD-mysql
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber@${PY_FLAVOR} \
-		p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
-		p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined \
-		p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \
-		p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
-		p5-DBI>=0:databases/p5-DBI \
-		p5-DBD-mysql>0:databases/p5-DBD-mysql
-.else
-CONFIGURE_ARGS+=--without-bindings=perl,python
+DATADIR=	${PREFIX}/share/mythtv
+SUB_FILES=	pkg-message
 .endif
 
+OPTIONS_DEFINE=		BINDINGS JACK LIRC MYSQL PULSEAUDIO VDPAU
+OPTIONS_DEFAULT=	BINDINGS VDPAU
+OPTIONS_SUB=		yes
+
+BINDINGS_DESC=		Perl and Python bindings
+BINDINGS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber@${PY_FLAVOR} \
+			p5-DBI>=0:databases/p5-DBI \
+			p5-DBD-mysql>0:databases/p5-DBD-mysql \
+			p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \
+			p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
+			p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
+			p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined
+BINDINGS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber@${PY_FLAVOR} \
+			p5-DBI>=0:databases/p5-DBI \
+			p5-DBD-mysql>0:databases/p5-DBD-mysql \
+			p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \
+			p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
+			p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
+			p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined
+BINDINGS_CONFIGURE_ON=	--python=${PYTHON_CMD}
+BINDINGS_CONFIGURE_OFF=	--without-bindings=perl,python
+
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_CONFIGURE_ENABLE=	audio-jack
+
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
+LIRC_CONFIGURE_ENABLE=	lirc
+
+MYSQL_DESC=		Install MySQL server in addition to client
+MYSQL_USES=		mysql:client,server
+MYSQL_USES_OFF=		mysql
+
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=	audio-pulseoutput
+
+VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
+VDPAU_CONFIGURE_ENABLE=	vdpau
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/libs/libmythtv/libmythtv.pro \
 		${WRKSRC}/bindings/perl/MythTV/Recording.pm \
-		${WRKSRC}/programs/mythtranscode/replex/Makefile.standalone \
+		${WRKSRC}/programs/mythtranscode/external/replex/Makefile.standalone \
 		${WRKSRC}/programs/scripts/database/mythconverg_backup.pl \
 		${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \
 		${WRKSRC}/programs/mythcommflag/mythcommflag-analyze
 
 post-install:
+.if !defined(SLAVEPORT)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mythtv/database
-	@${CP} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database
+	${INSTALL_DATA} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database
+.endif
+	${FIND} ${STAGEDIR}${PREFIX}/bin -type f -exec ${SH} -c "${FILE} -i '{}' | \
+		${GREP} -q 'x-executable; charset=binary'" \; -print | ${XARGS} ${STRIP_CMD}
+	(cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} lib/libmyth*.so lib/mythtv/filters/lib*.so)
+
+# Apply additional substitutions to pkg-plist generated by the 'makeplist' target
+create-plist: stage
+	@(cd ${.CURDIR} && ${MAKE} makeplist > pkg-plist && \
+	${REINPLACE_CMD} -E \
+		-e '1d' -e '/etc\/rc.d\/mythbackend/d' -e '/packlist/d' \
+		-e '/mythfrontend.desktop/d' \
+		-e '/(^%%PYTHON_SITELIBDIR%%|^%%SITE_PERL%%|mythpython|mythwikiscripts)/s|^|%%BINDINGS%%|g' \
+		pkg-plist)
 
 .include <bsd.port.mk>
Index: multimedia/mythtv/distinfo
===================================================================
--- multimedia/mythtv/distinfo
+++ multimedia/mythtv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513802652
-SHA256 (MythTV-mythtv-v0.27.5_GH0.tar.gz) = 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b
-SIZE (MythTV-mythtv-v0.27.5_GH0.tar.gz) = 85652939
+TIMESTAMP = 1520812634
+SHA256 (MythTV-mythtv-v29.1_GH0.tar.gz) = 04a84eb0ded2d2b123624ab2b2e1b8cf824ff4bf8216e452b2516deb929082b2
+SIZE (MythTV-mythtv-v29.1_GH0.tar.gz) = 105616234
Index: multimedia/mythtv/files/extrapatch-programs_programs.pro
===================================================================
--- /dev/null
+++ multimedia/mythtv/files/extrapatch-programs_programs.pro
@@ -0,0 +1,17 @@
+Disable backend components for multimedia/mythtv-frontend
+
+--- programs/programs.pro.orig	2018-01-11 12:39:22 UTC
++++ programs/programs.pro
+@@ -15,12 +15,4 @@ using_frontend {
+     !mingw:!win32-msvc*: SUBDIRS += mythtranscode/external/replex
+ }
+ 
+-using_backend {
+-    SUBDIRS += mythbackend mythfilldatabase mythtv-setup 
+-    SUBDIRS += mythmetadatalookup
+-
+-    !win32-msvc*:SUBDIRS += scripts
+-    !mingw:!win32-msvc*: SUBDIRS += mythfilerecorder
+-}
+-
+ using_mythtranscode: SUBDIRS += mythtranscode
Index: multimedia/mythtv/files/patch-CVE-2018-6392
===================================================================
--- /dev/null
+++ multimedia/mythtv/files/patch-CVE-2018-6392
@@ -0,0 +1,44 @@
+Fix for CVE-2018-6392
+https://security-tracker.debian.org/tracker/CVE-2018-6392
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/3f621455d62e46745453568d915badd5b1e5bcd5
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/c6939f65a116b1ffed345d29d8621ee4ffb32235
+
+--- external/FFmpeg/libavfilter/vf_transpose.c.orig	2018-02-01 11:15:37 UTC
++++ external/FFmpeg/libavfilter/vf_transpose.c
+@@ -27,6 +27,7 @@
+ 
+ #include <stdio.h>
+ 
++#include "libavutil/avassert.h"
+ #include "libavutil/imgutils.h"
+ #include "libavutil/internal.h"
+ #include "libavutil/intreadwrite.h"
+@@ -54,6 +55,7 @@ enum TransposeDir {
+ typedef struct TransContext {
+     const AVClass *class;
+     int hsub, vsub;
++    int planes;
+     int pixsteps[4];
+ 
+     int passthrough;    ///< PassthroughType, landscape passthrough mode enabled
+@@ -106,7 +108,11 @@ static int config_props_output(AVFilterLink *outlink)
+ 
+     s->hsub = desc_in->log2_chroma_w;
+     s->vsub = desc_in->log2_chroma_h;
++    s->planes = av_pix_fmt_count_planes(outlink->format);
+ 
++    av_assert0(desc_in->nb_components == desc_out->nb_components);
++
++
+     av_image_fill_max_pixsteps(s->pixsteps, NULL, desc_out);
+ 
+     outlink->w = inlink->h;
+@@ -148,7 +154,7 @@ static int filter_slice(AVFilterContext *ctx, void *ar
+     AVFrame *in = td->in;
+     int plane;
+ 
+-    for (plane = 0; out->data[plane]; plane++) {
++    for (plane = 0; plane < s->planes; plane++) {
+         int hsub    = plane == 1 || plane == 2 ? s->hsub : 0;
+         int vsub    = plane == 1 || plane == 2 ? s->vsub : 0;
+         int pixstep = s->pixsteps[plane];
Index: multimedia/mythtv/files/patch-CVE-2018-6621
===================================================================
--- /dev/null
+++ multimedia/mythtv/files/patch-CVE-2018-6621
@@ -0,0 +1,15 @@
+Fix for CVE-2018-6621
+https://security-tracker.debian.org/tracker/CVE-2018-6621
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/118e1b0b3370dd1c0da442901b486689efd1654b
+
+--- external/FFmpeg/libavcodec/utvideodec.c.orig	2018-03-01 05:12:04 UTC
++++ external/FFmpeg/libavcodec/utvideodec.c
+@@ -534,7 +534,7 @@ static int decode_frame(AVCodecContext *avctx, void *d
+             for (j = 0; j < c->slices; j++) {
+                 slice_end   = bytestream2_get_le32u(&gb);
+                 if (slice_end < 0 || slice_end < slice_start ||
+-                    bytestream2_get_bytes_left(&gb) < slice_end) {
++                    bytestream2_get_bytes_left(&gb) < slice_end + 1024LL) {
+                     av_log(avctx, AV_LOG_ERROR, "Incorrect slice size\n");
+                     return AVERROR_INVALIDDATA;
+                 }
Index: multimedia/mythtv/files/patch-configure
===================================================================
--- multimedia/mythtv/files/patch-configure
+++ multimedia/mythtv/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2015-06-16 16:03:30 UTC
+--- configure.orig	2018-01-11 12:39:22 UTC
 +++ configure
-@@ -846,28 +846,28 @@ check_cc(){
+@@ -1003,35 +1003,35 @@ check_cc(){
      log check_cc "$@"
      cat > $TMPC
      log_file $TMPC
@@ -24,6 +24,14 @@
 +    check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP
  }
  
+ check_objcc(){
+     log check_objcc "$@"
+     cat > $TMPM
+     log_file $TMPM
+-    check_cmd $objcc -Werror=missing-prototypes $CPPFLAGS $CFLAGS $OBJCFLAGS "$@" $OBJCC_C $(cc_o $TMPO) $TMPM
++    check_cmd $objcc -Werror=missing-prototypes $CPPFLAGS $CFLAGS $OBJCFLAGS -I${prefix}/include "$@" $OBJCC_C $(cc_o $TMPO) $TMPM
+ }
+ 
  check_cpp(){
      log check_cpp "$@"
      cat > $TMPC
@@ -33,46 +41,12 @@
  }
  
  as_o(){
-@@ -2539,7 +2539,7 @@ python_default="python"
- 
- # machine
- arch_default=$(uname -m)
--cpu="generic"
-+cpu="i686"
- processor=`uname -p 2>/dev/null`
- processor_flags=""
- tune="generic"
-@@ -3931,7 +3931,7 @@ elif enabled x86; then
-         i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*)
-             cpuflags="-march=$cpu"
-             enable cmov
--            enable fast_cmov
-+            disable fast_cmov
-         ;;
-         # targets that do support conditional mov but on which it's slow
-         pentium4|pentium4m|prescott|nocona)
-@@ -4102,7 +4102,6 @@ case $target_os in
-         append CCONFIG "freebsd"
-         # Workaround compile errors from missing u_int/uint def
-         CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
--        disable ivtv
-         enable backend
-         ;;
-     bsd/os)
-@@ -6389,6 +6388,7 @@ cat <<EOF >> $TMPMAK
- QMAKE_LIBDIR_QT-=${sysroot}${libdir}
- QMAKE_LIBDIR-=${sysroot}${libdir}
- LATE_LIBS+=-L${sysroot}${libdir}
-+FREETYPE_CFLAGS-= -I/usr/local/include
- EOF
- 
- #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK
-@@ -6441,7 +6441,7 @@ INCDIR=\$(INSTALL_ROOT)$incdir
+@@ -8840,7 +8840,7 @@ INCDIR=\$(INSTALL_ROOT)$incdir
  BINDIR=\$(INSTALL_ROOT)$bindir
  DATADIR=\$(INSTALL_ROOT)$datadir
  MANDIR=\$(INSTALL_ROOT)$mandir
--CFLAGS=${CFLAGS} -w
-+CFLAGS=${CFLAGS} -I/usr/local/include -w
+-CFLAGS=${CFLAGS} -DFF_API_OLD_DECODE_AUDIO=1 -w
++CFLAGS=${CFLAGS} -DFF_API_OLD_DECODE_AUDIO=1 -I${prefix}/include -w
  endif # FFMPEG_CONFIG_MAK
  EOF
  
Index: multimedia/mythtv/files/patch-external_FFmpeg_configure
===================================================================
--- multimedia/mythtv/files/patch-external_FFmpeg_configure
+++ multimedia/mythtv/files/patch-external_FFmpeg_configure
@@ -1,22 +1,29 @@
---- external/FFmpeg/configure.orig	2015-06-16 16:03:30 UTC
+Fix arch detection
+Fix runtime crashes on i386: enforce stack-alignment=16
+
+--- external/FFmpeg/configure.orig	2018-02-01 11:15:37 UTC
 +++ external/FFmpeg/configure
-@@ -2167,8 +2167,8 @@ yasmexe_default="yasm"
- nogas=":"
+@@ -3189,12 +3189,7 @@ target_os_default=$(tolower $(uname -s))
+ host_os=$target_os_default
  
  # machine
--arch_default=$(uname -m)
--cpu="generic"
+-if test "$target_os_default" = aix; then
+-    arch_default=$(uname -p)
+-    strip_default="strip -X32_64"
+-else
+-    arch_default=$(uname -m)
+-fi
 +arch_default=$(uname -p)
-+cpu="i686"
+ cpu="generic"
+ intrinsics="none"
  
- # OS
- target_os_default=$(tolower $(uname -s))
-@@ -3137,7 +3137,7 @@ elif enabled x86; then
-         i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*)
-             cpuflags="-march=$cpu"
-             enable cmov
--            enable fast_cmov
-+            disable fast_cmov
-         ;;
-         # targets that do support conditional mov but on which it's slow
-         pentium4|pentium4m|prescott|nocona)
+@@ -6217,6 +6212,9 @@ elif enabled llvm_gcc; then
+ elif enabled clang; then
+     check_cflags -mllvm -stack-alignment=16
+     check_cflags -mstack-alignment=16
++    if enabled x86_32; then
++        check_cflags -mstackrealign
++    fi
+     check_cflags -Qunused-arguments
+     check_cflags -Werror=implicit-function-declaration
+     check_cflags -Werror=missing-prototypes
Index: multimedia/mythtv/files/patch-external_FFmpeg_libavcodec_x86_ac3dsp__init.c
===================================================================
--- multimedia/mythtv/files/patch-external_FFmpeg_libavcodec_x86_ac3dsp__init.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig	2015-06-16 16:03:30 UTC
-+++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c
-@@ -51,7 +51,7 @@ extern void ff_ac3_extract_exponents_3dnow(uint8_t *ex
- extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs);
- extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);
- 
--#if ARCH_X86_32 && defined(__INTEL_COMPILER)
-+#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__))
- #       undef HAVE_7REGS
- #       define HAVE_7REGS 0
- #endif
Index: multimedia/mythtv/files/patch-external_FFmpeg_libavformat_rtsp.c
===================================================================
--- /dev/null
+++ multimedia/mythtv/files/patch-external_FFmpeg_libavformat_rtsp.c
@@ -0,0 +1,48 @@
+Fix RTP stream; FreeBSD's socket calls require the sockaddr struct length
+to agree with the address family.
+PR: 214852
+
+--- external/FFmpeg/libavformat/rtsp.c.orig	2018-02-01 11:15:37 UTC
++++ external/FFmpeg/libavformat/rtsp.c
+@@ -1614,7 +1614,12 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, con
+             }
+             if (ttl > 0)
+                 snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
+-            getnameinfo((struct sockaddr*) &addr, sizeof(addr),
++            getnameinfo((struct sockaddr*) &addr,
++#if HAVE_STRUCT_SOCKADDR_SA_LEN
++                        ((struct sockaddr*) &addr)->sa_len,
++#else
++                        sizeof(addr),
++#endif
+                         namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
+             ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
+                         port, "%s", optbuf);
+@@ -1830,8 +1835,13 @@ redirect:
+         goto fail;
+     }
+     if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
+-        getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host),
+-                    NULL, 0, NI_NUMERICHOST);
++        getnameinfo((struct sockaddr*) &peer,
++#if HAVE_STRUCT_SOCKADDR_SA_LEN
++                    ((struct sockaddr*) &peer)->sa_len,
++#else
++                    peer_len,
++#endif
++                    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
+     }
+ 
+     /* request options supported by the server; this also detects server
+@@ -2310,7 +2320,11 @@ static int sdp_read_header(AVFormatContext *s)
+             AVDictionary *opts = map_to_opts(rt);
+ 
+             err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
++#if HAVE_STRUCT_SOCKADDR_SA_LEN
++                              ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
++#else
+                               sizeof(rtsp_st->sdp_ip),
++#endif
+                               namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
+             if (err) {
+                 av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err));
Index: multimedia/mythtv/files/patch-external_FFmpeg_libavformat_tls__openssl.c
===================================================================
--- /dev/null
+++ multimedia/mythtv/files/patch-external_FFmpeg_libavformat_tls__openssl.c
@@ -0,0 +1,58 @@
+Fix build with libressl
+
+--- external/FFmpeg/libavformat/tls_openssl.c.orig	2018-02-01 11:15:37 UTC
++++ external/FFmpeg/libavformat/tls_openssl.c
+@@ -43,7 +43,7 @@ typedef struct TLSContext {
+     TLSShared tls_shared;
+     SSL_CTX *ctx;
+     SSL *ssl;
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+     BIO_METHOD* url_bio_method;
+ #endif
+ } TLSContext;
+@@ -68,7 +68,7 @@ static unsigned long openssl_thread_id(void)
+ 
+ static int url_bio_create(BIO *b)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+     BIO_set_init(b, 1);
+     BIO_set_data(b, NULL);
+     BIO_set_flags(b, 0);
+@@ -85,7 +85,7 @@ static int url_bio_destroy(BIO *b)
+     return 1;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+ #define GET_BIO_DATA(x) BIO_get_data(x);
+ #else
+ #define GET_BIO_DATA(x) (x)->ptr;
+@@ -133,7 +133,7 @@ static int url_bio_bputs(BIO *b, const char *str)
+     return url_bio_bwrite(b, str, strlen(str));
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
+ static BIO_METHOD url_bio_method = {
+     .type = BIO_TYPE_SOURCE_SINK,
+     .name = "urlprotocol bio",
+@@ -212,7 +212,7 @@ static int tls_close(URLContext *h)
+         SSL_CTX_free(c->ctx);
+     if (c->tls_shared.tcp)
+         ffurl_close(c->tls_shared.tcp);
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+     if (c->url_bio_method)
+         BIO_meth_free(c->url_bio_method);
+ #endif
+@@ -265,7 +265,7 @@ static int tls_open(URLContext *h, const char *uri, in
+         ret = AVERROR(EIO);
+         goto fail;
+     }
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
+     p->url_bio_method = BIO_meth_new(BIO_TYPE_SOURCE_SINK, "urlprotocol bio");
+     BIO_meth_set_write(p->url_bio_method, url_bio_bwrite);
+     BIO_meth_set_read(p->url_bio_method, url_bio_bread);
Index: multimedia/mythtv/files/patch-external_libmythdvdnav_dvdnav_dvdnav_dvdnav.h
===================================================================
--- /dev/null
+++ multimedia/mythtv/files/patch-external_libmythdvdnav_dvdnav_dvdnav_dvdnav.h
@@ -0,0 +1,16 @@
+--- external/libmythdvdnav/dvdnav/dvdnav/dvdnav.h.orig	2018-01-11 12:39:22 UTC
++++ external/libmythdvdnav/dvdnav/dvdnav/dvdnav.h
+@@ -33,11 +33,11 @@
+ extern "C" {
+ #endif
+ 
+-#include <dvdnav/dvd_types.h>
++#include "dvd_types.h"
+ #include <dvdread/dvd_reader.h>
+ #include <dvdread/nav_types.h>
+ #include <dvdread/ifo_types.h> /* For vm_cmd_t */
+-#include <dvdnav/dvdnav_events.h>
++#include "dvdnav_events.h"
+ 
+ #include "compat.h"
+ 
Index: multimedia/mythtv/files/patch-external_zeromq_src_Makefile.am
===================================================================
--- multimedia/mythtv/files/patch-external_zeromq_src_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- external/zeromq/src/Makefile.am.orig	2015-06-16 16:03:30 UTC
-+++ external/zeromq/src/Makefile.am
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libmythzmq.la
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(PKG_CONFIG_PATH)
- pkgconfig_DATA = libmythzmq.pc
- 
- include_HEADERS = ../include/zmq.h ../include/zmq.hpp ../include/zmq_utils.h
Index: multimedia/mythtv/files/patch-libs_libmyth_remoteutil.h
===================================================================
--- multimedia/mythtv/files/patch-libs_libmyth_remoteutil.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/libmyth/remoteutil.h.orig	2015-06-16 16:03:30 UTC
-+++ libs/libmyth/remoteutil.h
-@@ -10,6 +10,7 @@
- using namespace std;
- 
- #include "mythexp.h"
-+#include <sys/types.h>
- 
- class ProgramInfo;
- class MythEvent;
Index: multimedia/mythtv/files/patch-libs_libmythdvdnav_dvdnav_dvdnav.c
===================================================================
--- multimedia/mythtv/files/patch-libs_libmythdvdnav_dvdnav_dvdnav.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/libmythdvdnav/dvdnav/dvdnav.c.orig	2015-06-16 16:03:30 UTC
-+++ libs/libmythdvdnav/dvdnav/dvdnav.c
-@@ -33,7 +33,7 @@
- #include <limits.h>
- #include <string.h>
- #include <sys/time.h>
--#include "dvdnav/dvdnav.h"
-+#include "dvdnav.h"
- #include <dvdread/dvd_reader.h>
- #include <dvdread/nav_types.h>
- #include <dvdread/ifo_types.h> /* For vm_cmd_t */
Index: multimedia/mythtv/files/patch-libs_libmythtv_DVD_dvdringbuffer.h
===================================================================
--- /dev/null
+++ multimedia/mythtv/files/patch-libs_libmythtv_DVD_dvdringbuffer.h
@@ -0,0 +1,11 @@
+--- libs/libmythtv/DVD/dvdringbuffer.h.orig	2018-01-11 12:39:22 UTC
++++ libs/libmythtv/DVD/dvdringbuffer.h
+@@ -21,7 +21,7 @@ extern "C" {
+ #include "libavcodec/avcodec.h"
+ }
+ 
+-#include "dvdnav/dvdnav.h"
++#include "../../../external/libmythdvdnav/dvdnav/dvdnav/dvdnav.h"
+ 
+ /** \class MythDVDContext
+  *  \brief Encapsulates playback context at any given moment.
Index: multimedia/mythtv/files/patch-libs_libmythtv_dbcheck.cpp
===================================================================
--- /dev/null
+++ multimedia/mythtv/files/patch-libs_libmythtv_dbcheck.cpp
@@ -0,0 +1,64 @@
+Database schema 1347 fails to update due to bad SQL statement
+Ref: https://code.mythtv.org/trac/ticket/13155
+
+--- libs/libmythtv/dbcheck.cpp.orig	2018-02-01 11:15:37 UTC
++++ libs/libmythtv/dbcheck.cpp
+@@ -3340,25 +3340,24 @@ NULL
+ 
+     if (dbver == "1346")
+     {
+-        QString master;
++        QList<QByteArray> updates_ba;
+         // Create new MasterServerName setting
+         if (gCoreContext->IsMasterHost())
+-            master =
+-            "insert into settings (value,data,hostname) "
+-            "values('MasterServerName','"
+-                + gCoreContext->GetHostName() + "', null);";
++            updates_ba.push_back(
++                QString("INSERT INTO settings (value, data, hostname) "
++                        "VALUES ('MasterServerName', '%1', NULL);")
++                        .arg(gCoreContext->GetHostName()).toLocal8Bit());
+         else
+-            master =
+-            "insert into settings (value,data,hostname) "
+-            "select 'MasterServerName', b.hostname, null "
+-            "from settings a, settings b "
+-            "where a.value = 'MasterServerIP' "
+-            "and b.value in ('BackendServerIP','BackendServerIP6')"
+-            "and a.data = b.data;";
++            updates_ba.push_back(
++                QString("INSERT INTO settings (value,data,hostname) "
++                        "SELECT 'MasterServerName', b.hostname, NULL "
++                        "FROM settings a, settings b "
++                        "WHERE a.value = 'MasterServerIP' "
++                        "AND b.value IN ('BackendServerIP','BackendServerIP6')"
++                        "AND a.data = b.data;")
++                        .toLocal8Bit());
+ 
+-        const char *updates[] = {
+-            // Create new MasterServerName setting
+-            master.toLocal8Bit().constData(),
++        const char *post_sql[] = {
+             // Create new BackendServerAddr setting for each backend server
+             // Assume using IPV4 value.
+             "insert into settings (value,data,hostname) "
+@@ -3385,8 +3384,17 @@ NULL
+             // Delete obsolete settings
+             "delete from settings "
+                 "where value in ('WatchTVGuide');",
+-            NULL
+         };
++        
++        for (uint i = 0; i < sizeof(post_sql)/sizeof(char*); i++)
++            updates_ba.push_back(QByteArray(post_sql[i]));
++
++        // Convert update ByteArrays to NULL terminated char**
++        QList<QByteArray>::const_iterator it = updates_ba.begin();
++        vector<const char*> updates;
++        for (; it != updates_ba.end(); ++it)
++            updates.push_back((*it).constData());
++        updates.push_back(NULL);
+ 
+         if (!performActualUpdate(&updates[0], "1347", dbver))
+             return false;
Index: multimedia/mythtv/files/patch-libs_libmythtv_recorders_dvbstreamhandler.cpp
===================================================================
--- multimedia/mythtv/files/patch-libs_libmythtv_recorders_dvbstreamhandler.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- libs/libmythtv/recorders/dvbstreamhandler.cpp.orig	2015-06-16 16:03:30 UTC
-+++ libs/libmythtv/recorders/dvbstreamhandler.cpp
-@@ -620,7 +620,7 @@ bool DVBPIDInfo::Open(const QString &dvb_dev, bool use
-     {
-         struct dmx_pes_filter_params pesFilterParams;
-         memset(&pesFilterParams, 0, sizeof(struct dmx_pes_filter_params));
--        pesFilterParams.pid      = (__u16) _pid;
-+        pesFilterParams.pid      = (uint16_t) _pid;
-         pesFilterParams.input    = DMX_IN_FRONTEND;
-         pesFilterParams.output   = DMX_OUT_TS_TAP;
-         pesFilterParams.flags    = DMX_IMMEDIATE_START;
-@@ -640,7 +640,7 @@ bool DVBPIDInfo::Open(const QString &dvb_dev, bool use
-     {
-         struct dmx_sct_filter_params sctFilterParams;
-         memset(&sctFilterParams, 0, sizeof(struct dmx_sct_filter_params));
--        switch ( (__u16) _pid )
-+        switch ( (uint16_t) _pid )
-         {
-             case 0x0: // PAT
-                 sctFilterParams.filter.filter[0] = 0;
-@@ -676,7 +676,7 @@ bool DVBPIDInfo::Open(const QString &dvb_dev, bool use
-                 sctFilterParams.filter.mask[0]   = 0x00;
-                 break;
-         }
--        sctFilterParams.pid            = (__u16) _pid;
-+        sctFilterParams.pid            = (uint16_t) _pid;
-         sctFilterParams.timeout        = 0;
-         sctFilterParams.flags          = DMX_IMMEDIATE_START;
- 
Index: multimedia/mythtv/files/patch-libs_libmythtv_videoout__vdpau.cpp
===================================================================
--- multimedia/mythtv/files/patch-libs_libmythtv_videoout__vdpau.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/libmythtv/videoout_vdpau.cpp.orig	2015-06-16 16:03:30 UTC
-+++ libs/libmythtv/videoout_vdpau.cpp
-@@ -442,7 +442,7 @@ void VideoOutputVDPAU::PrepareFrame(VideoFrame *frame,
-     if (frame)
-     {
-         // FIXME for 0.23. This should be triggered from AFD by a seek
--        if ((abs(frame->frameNumber - framesPlayed) > 8))
-+        if ((labs(frame->frameNumber - framesPlayed) > 8))
-             ClearReferenceFrames();
-         new_frame = (framesPlayed != frame->frameNumber + 1);
-         framesPlayed = frame->frameNumber + 1;
Index: multimedia/mythtv/files/patch-libs_libmythui_mythgesture.cpp
===================================================================
--- multimedia/mythtv/files/patch-libs_libmythui_mythgesture.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- libs/libmythui/mythgesture.cpp.orig	2015-06-16 16:03:30 UTC
-+++ libs/libmythui/mythgesture.cpp
-@@ -28,6 +28,7 @@
- 
- #include "mythgesture.h"
- 
-+#include <cstdlib>
- #include <cmath>
- #include <algorithm>
- #include <complex>
-@@ -284,7 +285,7 @@ bool MythGesture::record(const QPoint & p)
-     int dely = p.y() - points.back().y();
- 
-     /* step by the greatest delta direction */
--    if (abs(delx) > abs(dely))
-+    if (std::abs(delx) > std::abs(dely))
-     {
-         float iy = points.back().y();
- 
Index: multimedia/mythtv/files/patch-libs_libmythui_mythpainter.cpp
===================================================================
--- multimedia/mythtv/files/patch-libs_libmythui_mythpainter.cpp
+++ multimedia/mythtv/files/patch-libs_libmythui_mythpainter.cpp
@@ -1,4 +1,4 @@
---- libs/libmythui/mythpainter.cpp.orig	2015-06-16 16:03:30 UTC
+--- libs/libmythui/mythpainter.cpp.orig	2018-01-11 12:39:22 UTC
 +++ libs/libmythui/mythpainter.cpp
 @@ -1,6 +1,7 @@
  #include <stdint.h>
Index: multimedia/mythtv/files/patch-libs_libmythui_mythrender__vdpau.h
===================================================================
--- /dev/null
+++ multimedia/mythtv/files/patch-libs_libmythui_mythrender__vdpau.h
@@ -0,0 +1,10 @@
+--- libs/libmythui/mythrender_vdpau.h.orig	2018-01-27 11:25:49 UTC
++++ libs/libmythui/mythrender_vdpau.h
+@@ -12,6 +12,7 @@
+ 
+ extern "C" {
+ #include "libavcodec/vdpau.h"
++#include <vdpau/vdpau_x11.h>
+ }
+ 
+ #define MIN_OUTPUT_SURFACES  2 // UI
Index: multimedia/mythtv/files/patch-libs_libmythupnp_mmulticastsocketdevice.h
===================================================================
--- multimedia/mythtv/files/patch-libs_libmythupnp_mmulticastsocketdevice.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/libmythupnp/mmulticastsocketdevice.h.orig	2015-06-16 16:03:30 UTC
-+++ libs/libmythupnp/mmulticastsocketdevice.h
-@@ -22,6 +22,7 @@
- #  include <ws2tcpip.h>
- # endif
- #else
-+# include <sys/types.h>
- # include <sys/socket.h>
- # include <netinet/in.h>
- # include <netinet/ip.h>
Index: multimedia/mythtv/pkg-plist
===================================================================
--- multimedia/mythtv/pkg-plist
+++ multimedia/mythtv/pkg-plist
@@ -5,6 +5,7 @@
 bin/mythffmpeg
 bin/mythffprobe
 bin/mythffserver
+bin/mythfilerecorder
 bin/mythfilldatabase
 bin/mythfrontend
 bin/mythhdhomerun_config
@@ -22,21 +23,14 @@
 bin/mythutil
 bin/mythwelcome
 %%BINDINGS%%bin/mythwikiscripts
-include/mythtv/QJson/Parser
-include/mythtv/QJson/QObjectHelper
-include/mythtv/QJson/Serializer
-include/mythtv/QJson/parser.h
-include/mythtv/QJson/parserrunnable.h
-include/mythtv/QJson/qjson_export.h
-include/mythtv/QJson/qobjecthelper.h
-include/mythtv/QJson/serializer.h
-include/mythtv/QJson/serializerrunnable.h
 include/mythtv/audioconvert.h
 include/mythtv/audiooutput.h
 include/mythtv/audiooutputsettings.h
 include/mythtv/audiooutpututil.h
 include/mythtv/audiosettings.h
 include/mythtv/autodeletedeque.h
+include/mythtv/blockinput.h
+include/mythtv/bluray/array.h
 include/mythtv/bluray/attributes.h
 include/mythtv/bluray/bdid_parse.h
 include/mythtv/bluray/bdparse.h
@@ -44,10 +38,11 @@
 include/mythtv/bluray/bluray.h
 include/mythtv/bluray/clpi_data.h
 include/mythtv/bluray/clpi_parse.h
+include/mythtv/bluray/dirs.h
 include/mythtv/bluray/dl.h
+include/mythtv/bluray/event_queue.h
 include/mythtv/bluray/extdata_parse.h
 include/mythtv/bluray/file.h
-include/mythtv/bluray/file_mythiowrapper.h
 include/mythtv/bluray/filesystem.h
 include/mythtv/bluray/hdmv_insn.h
 include/mythtv/bluray/hdmv_vm.h
@@ -57,12 +52,17 @@
 include/mythtv/bluray/macro.h
 include/mythtv/bluray/meta_data.h
 include/mythtv/bluray/meta_parse.h
+include/mythtv/bluray/mobj_data.h
 include/mythtv/bluray/mobj_parse.h
+include/mythtv/bluray/mobj_print.h
+include/mythtv/bluray/mount.h
 include/mythtv/bluray/mpls_parse.h
 include/mythtv/bluray/mutex.h
 include/mythtv/bluray/navigation.h
+include/mythtv/bluray/refcnt.h
 include/mythtv/bluray/sound_parse.h
 include/mythtv/bluray/strutl.h
+include/mythtv/bluray/time.h
 include/mythtv/bluray/uo_mask_table.h
 include/mythtv/bonjourregister.h
 include/mythtv/bswap.h
@@ -87,18 +87,24 @@
 include/mythtv/langsettings.h
 include/mythtv/lcddevice.h
 include/mythtv/libavcodec/avcodec.h
+include/mythtv/libavcodec/avdct.h
 include/mythtv/libavcodec/avfft.h
+include/mythtv/libavcodec/d3d11va.h
+include/mythtv/libavcodec/dirac.h
+include/mythtv/libavcodec/dv_profile.h
 include/mythtv/libavcodec/dxva2.h
-include/mythtv/libavcodec/old_codec_ids.h
+include/mythtv/libavcodec/jni.h
+include/mythtv/libavcodec/mediacodec.h
+include/mythtv/libavcodec/qsv.h
 include/mythtv/libavcodec/vaapi.h
 include/mythtv/libavcodec/vda.h
 include/mythtv/libavcodec/vdpau.h
 include/mythtv/libavcodec/version.h
+include/mythtv/libavcodec/videotoolbox.h
+include/mythtv/libavcodec/vorbis_parser.h
 include/mythtv/libavcodec/xvmc.h
 include/mythtv/libavdevice/avdevice.h
 include/mythtv/libavdevice/version.h
-include/mythtv/libavfilter/asrc_abuffer.h
-include/mythtv/libavfilter/avcodec.h
 include/mythtv/libavfilter/avfilter.h
 include/mythtv/libavfilter/avfiltergraph.h
 include/mythtv/libavfilter/buffersink.h
@@ -109,9 +115,9 @@
 include/mythtv/libavformat/version.h
 include/mythtv/libavutil/adler32.h
 include/mythtv/libavutil/aes.h
+include/mythtv/libavutil/aes_ctr.h
 include/mythtv/libavutil/attributes.h
 include/mythtv/libavutil/audio_fifo.h
-include/mythtv/libavutil/audioconvert.h
 include/mythtv/libavutil/avassert.h
 include/mythtv/libavutil/avconfig.h
 include/mythtv/libavutil/avstring.h
@@ -120,38 +126,65 @@
 include/mythtv/libavutil/blowfish.h
 include/mythtv/libavutil/bprint.h
 include/mythtv/libavutil/bswap.h
+include/mythtv/libavutil/buffer.h
+include/mythtv/libavutil/camellia.h
+include/mythtv/libavutil/cast5.h
 include/mythtv/libavutil/channel_layout.h
 include/mythtv/libavutil/common.h
 include/mythtv/libavutil/cpu.h
 include/mythtv/libavutil/crc.h
+include/mythtv/libavutil/des.h
 include/mythtv/libavutil/dict.h
+include/mythtv/libavutil/display.h
+include/mythtv/libavutil/downmix_info.h
 include/mythtv/libavutil/error.h
 include/mythtv/libavutil/eval.h
+include/mythtv/libavutil/ffversion.h
 include/mythtv/libavutil/fifo.h
 include/mythtv/libavutil/file.h
+include/mythtv/libavutil/frame.h
+include/mythtv/libavutil/hash.h
 include/mythtv/libavutil/hmac.h
+include/mythtv/libavutil/hwcontext.h
+include/mythtv/libavutil/hwcontext_cuda.h
+include/mythtv/libavutil/hwcontext_dxva2.h
+include/mythtv/libavutil/hwcontext_qsv.h
+include/mythtv/libavutil/hwcontext_vaapi.h
+include/mythtv/libavutil/hwcontext_vdpau.h
 include/mythtv/libavutil/imgutils.h
 include/mythtv/libavutil/intfloat.h
-include/mythtv/libavutil/intfloat_readwrite.h
 include/mythtv/libavutil/intreadwrite.h
 include/mythtv/libavutil/lfg.h
 include/mythtv/libavutil/log.h
 include/mythtv/libavutil/lzo.h
+include/mythtv/libavutil/macros.h
+include/mythtv/libavutil/mastering_display_metadata.h
 include/mythtv/libavutil/mathematics.h
 include/mythtv/libavutil/md5.h
 include/mythtv/libavutil/mem.h
-include/mythtv/libavutil/old_pix_fmts.h
+include/mythtv/libavutil/motion_vector.h
+include/mythtv/libavutil/murmur3.h
 include/mythtv/libavutil/opt.h
 include/mythtv/libavutil/parseutils.h
 include/mythtv/libavutil/pixdesc.h
+include/mythtv/libavutil/pixelutils.h
 include/mythtv/libavutil/pixfmt.h
 include/mythtv/libavutil/random_seed.h
 include/mythtv/libavutil/rational.h
+include/mythtv/libavutil/rc4.h
+include/mythtv/libavutil/replaygain.h
+include/mythtv/libavutil/ripemd.h
 include/mythtv/libavutil/samplefmt.h
 include/mythtv/libavutil/sha.h
+include/mythtv/libavutil/sha512.h
+include/mythtv/libavutil/stereo3d.h
+include/mythtv/libavutil/tea.h
+include/mythtv/libavutil/threadmessage.h
 include/mythtv/libavutil/time.h
 include/mythtv/libavutil/timecode.h
 include/mythtv/libavutil/timestamp.h
+include/mythtv/libavutil/tree.h
+include/mythtv/libavutil/twofish.h
 include/mythtv/libavutil/version.h
 include/mythtv/libavutil/xtea.h
 include/mythtv/libmyth/audioconvert.h
@@ -174,22 +207,18 @@
 include/mythtv/libmyth/mythwizard.h
 include/mythtv/libmyth/netgrabbermanager.h
 include/mythtv/libmyth/netutils.h
-include/mythtv/libmyth/oldsettings.h
 include/mythtv/libmyth/output.h
 include/mythtv/libmyth/programinfo.h
 include/mythtv/libmyth/programtypes.h
 include/mythtv/libmyth/recordingtypes.h
-include/mythtv/libmyth/remotefile.h
 include/mythtv/libmyth/remoteutil.h
 include/mythtv/libmyth/rssparse.h
 include/mythtv/libmyth/schemawizard.h
 include/mythtv/libmyth/settings.h
+include/mythtv/libmyth/standardsettings.h
 include/mythtv/libmyth/storagegroupeditor.h
-include/mythtv/libmyth/uitypes.h
-include/mythtv/libmyth/virtualkeyboard_qt.h
 include/mythtv/libmyth/visual.h
 include/mythtv/libmyth/volumebase.h
-include/mythtv/libmyth/xmlparse.h
 include/mythtv/libmythbase/autodeletedeque.h
 include/mythtv/libmythbase/bonjourregister.h
 include/mythtv/libmythbase/bswap.h
@@ -203,7 +232,6 @@
 include/mythtv/libmythbase/iso639.h
 include/mythtv/libmythbase/lcddevice.h
 include/mythtv/libmythbase/loggingserver.h
-include/mythtv/libmythbase/mcodecs.h
 include/mythtv/libmythbase/mthread.h
 include/mythtv/libmythbase/mthreadpool.h
 include/mythtv/libmythbase/mythbaseexp.h
@@ -229,6 +257,7 @@
 include/mythtv/libmythbase/mythplugin.h
 include/mythtv/libmythbase/mythpluginapi.h
 include/mythtv/libmythbase/mythqtcompat.h
+include/mythtv/libmythbase/mythsession.h
 include/mythtv/libmythbase/mythsingledownload.h
 include/mythtv/libmythbase/mythsocket.h
 include/mythtv/libmythbase/mythsocket_cb.h
@@ -252,23 +281,44 @@
 include/mythtv/libmythservicecontracts/datacontracthelper.h
 include/mythtv/libmythservicecontracts/datacontracts/artworkInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/artworkInfoList.h
+include/mythtv/libmythservicecontracts/datacontracts/backendInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/blurayInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/buildInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/captureCard.h
 include/mythtv/libmythservicecontracts/datacontracts/captureCardList.h
+include/mythtv/libmythservicecontracts/datacontracts/castMember.h
+include/mythtv/libmythservicecontracts/datacontracts/castMemberList.h
+include/mythtv/libmythservicecontracts/datacontracts/channelGroup.h
+include/mythtv/libmythservicecontracts/datacontracts/channelGroupList.h
 include/mythtv/libmythservicecontracts/datacontracts/channelInfoList.h
 include/mythtv/libmythservicecontracts/datacontracts/connectionInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/cutList.h
+include/mythtv/libmythservicecontracts/datacontracts/cutting.h
 include/mythtv/libmythservicecontracts/datacontracts/databaseInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/enum.h
+include/mythtv/libmythservicecontracts/datacontracts/enumItem.h
+include/mythtv/libmythservicecontracts/datacontracts/envInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/frontendActionList.h
 include/mythtv/libmythservicecontracts/datacontracts/frontendStatus.h
+include/mythtv/libmythservicecontracts/datacontracts/imageMetadataInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/imageMetadataInfoList.h
+include/mythtv/libmythservicecontracts/datacontracts/imageSyncInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/input.h
+include/mythtv/libmythservicecontracts/datacontracts/inputList.h
 include/mythtv/libmythservicecontracts/datacontracts/labelValue.h
 include/mythtv/libmythservicecontracts/datacontracts/lineup.h
 include/mythtv/libmythservicecontracts/datacontracts/liveStreamInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/liveStreamInfoList.h
+include/mythtv/libmythservicecontracts/datacontracts/logInfo.h
 include/mythtv/libmythservicecontracts/datacontracts/logMessage.h
 include/mythtv/libmythservicecontracts/datacontracts/logMessageList.h
+include/mythtv/libmythservicecontracts/datacontracts/musicMetadataInfo.h
+include/mythtv/libmythservicecontracts/datacontracts/musicMetadataInfoList.h
 include/mythtv/libmythservicecontracts/datacontracts/programAndChannel.h
 include/mythtv/libmythservicecontracts/datacontracts/programGuide.h
 include/mythtv/libmythservicecontracts/datacontracts/recRule.h
+include/mythtv/libmythservicecontracts/datacontracts/recRuleFilter.h
+include/mythtv/libmythservicecontracts/datacontracts/recRuleFilterList.h
 include/mythtv/libmythservicecontracts/datacontracts/recRuleList.h
 include/mythtv/libmythservicecontracts/datacontracts/recording.h
 include/mythtv/libmythservicecontracts/datacontracts/settingList.h
@@ -285,6 +335,7 @@
 include/mythtv/libmythservicecontracts/datacontracts/videoSource.h
 include/mythtv/libmythservicecontracts/datacontracts/videoSourceList.h
 include/mythtv/libmythservicecontracts/datacontracts/wolInfo.h
+include/mythtv/libmythservicecontracts/enums/recStatus.h
 include/mythtv/libmythservicecontracts/service.h
 include/mythtv/libmythservicecontracts/serviceexp.h
 include/mythtv/libmythservicecontracts/services/captureServices.h
@@ -293,7 +344,10 @@
 include/mythtv/libmythservicecontracts/services/dvrServices.h
 include/mythtv/libmythservicecontracts/services/frontendServices.h
 include/mythtv/libmythservicecontracts/services/guideServices.h
+include/mythtv/libmythservicecontracts/services/imageServices.h
+include/mythtv/libmythservicecontracts/services/musicServices.h
 include/mythtv/libmythservicecontracts/services/mythServices.h
+include/mythtv/libmythservicecontracts/services/rttiServices.h
 include/mythtv/libmythservicecontracts/services/videoServices.h
 include/mythtv/libmythui/mythdialogbox.h
 include/mythtv/libmythui/mythfontproperties.h
@@ -351,18 +405,20 @@
 include/mythtv/libswscale/swscale.h
 include/mythtv/libswscale/version.h
 include/mythtv/loggingserver.h
-include/mythtv/mcodecs.h
 include/mythtv/metadata/bluraymetadata.h
 include/mythtv/metadata/cleanup.h
 include/mythtv/metadata/dbaccess.h
 include/mythtv/metadata/dirscan.h
 include/mythtv/metadata/globals.h
+include/mythtv/metadata/imagemanager.h
+include/mythtv/metadata/imagemetadata.h
+include/mythtv/metadata/imagetypes.h
+include/mythtv/metadata/lyricsdata.h
 include/mythtv/metadata/metadatacommon.h
 include/mythtv/metadata/metadatadownload.h
 include/mythtv/metadata/metadatafactory.h
 include/mythtv/metadata/metadatagrabber.h
 include/mythtv/metadata/metadataimagedownload.h
-include/mythtv/metadata/metadataimagehelper.h
 include/mythtv/metadata/metaio.h
 include/mythtv/metadata/metaioavfcomment.h
 include/mythtv/metadata/metaioflacvorbis.h
@@ -371,6 +427,7 @@
 include/mythtv/metadata/metaiooggvorbis.h
 include/mythtv/metadata/metaiotaglib.h
 include/mythtv/metadata/metaiowavpack.h
+include/mythtv/metadata/musicfilescanner.h
 include/mythtv/metadata/musicmetadata.h
 include/mythtv/metadata/musicutils.h
 include/mythtv/metadata/mythmetaexp.h
@@ -383,9 +440,11 @@
 include/mythtv/metadata/videoscan.h
 include/mythtv/metadata/videoutils.h
 include/mythtv/metadataimagehelper.h
+include/mythtv/minilzo.h
 include/mythtv/mpeg2dec/mpeg2.h
 include/mythtv/mthread.h
 include/mythtv/mthreadpool.h
+include/mythtv/mythavutil.h
 include/mythtv/mythbaseexp.h
 include/mythtv/mythcdrom.h
 include/mythtv/mythcommandlineparser.h
@@ -406,6 +465,7 @@
 include/mythtv/mythdownloadmanager.h
 include/mythtv/mythevent.h
 include/mythtv/mythexp.h
+include/mythtv/mythframe.h
 include/mythtv/mythlocale.h
 include/mythtv/mythlogging.h
 include/mythtv/mythmedia.h
@@ -416,6 +476,7 @@
 include/mythtv/mythpluginapi.h
 include/mythtv/mythqtcompat.h
 include/mythtv/mythrssmanager.h
+include/mythtv/mythsession.h
 include/mythtv/mythsingledownload.h
 include/mythtv/mythsocket.h
 include/mythtv/mythsocket_cb.h
@@ -432,7 +493,6 @@
 include/mythtv/mythwizard.h
 include/mythtv/netgrabbermanager.h
 include/mythtv/netutils.h
-include/mythtv/oldsettings.h
 include/mythtv/output.h
 include/mythtv/playgroup.h
 include/mythtv/plist.h
@@ -449,10 +509,11 @@
 include/mythtv/serverpool.h
 include/mythtv/settings.h
 include/mythtv/signalhandling.h
+include/mythtv/standardsettings.h
 include/mythtv/storagegroup.h
 include/mythtv/storagegroupeditor.h
 include/mythtv/threadedfilewriter.h
-include/mythtv/uitypes.h
+include/mythtv/udfread.h
 include/mythtv/upnp/bufferedsocketdevice.h
 include/mythtv/upnp/configuration.h
 include/mythtv/upnp/eventing.h
@@ -475,6 +536,7 @@
 include/mythtv/upnp/upnpcdsobjects.h
 include/mythtv/upnp/upnpcmgr.h
 include/mythtv/upnp/upnpdevice.h
+include/mythtv/upnp/upnphelpers.h
 include/mythtv/upnp/upnpsubscription.h
 include/mythtv/upnp/upnptaskcache.h
 include/mythtv/upnp/upnptaskevent.h
@@ -483,19 +545,98 @@
 include/mythtv/upnp/upnputil.h
 include/mythtv/upnp/wsdl.h
 include/mythtv/upnp/xmlSerializer.h
+include/mythtv/upnp/xsd.h
 include/mythtv/verbosedefs.h
 include/mythtv/version.h
-include/mythtv/virtualkeyboard_qt.h
 include/mythtv/visual.h
 include/mythtv/volumebase.h
-include/mythtv/xmlparse.h
+lib/libmyth-29.so
+lib/libmyth-29.so.29
+lib/libmyth-29.so.29.0
+lib/libmyth-29.so.29.0.0
+lib/libmythavcodec.so
+lib/libmythavcodec.so.57
+lib/libmythavcodec.so.57.64.100
+lib/libmythavdevice.so
+lib/libmythavdevice.so.57
+lib/libmythavdevice.so.57.1.100
+lib/libmythavfilter.so
+lib/libmythavfilter.so.6
+lib/libmythavfilter.so.6.65.100
+lib/libmythavformat.so
+lib/libmythavformat.so.57
+lib/libmythavformat.so.57.56.100
+lib/libmythavutil.so
+lib/libmythavutil.so.55
+lib/libmythavutil.so.55.34.100
+lib/libmythbase-29.so
+lib/libmythbase-29.so.29
+lib/libmythbase-29.so.29.0
+lib/libmythbase-29.so.29.0.0
+lib/libmythfreemheg-29.so
+lib/libmythfreemheg-29.so.29
+lib/libmythfreemheg-29.so.29.0
+lib/libmythfreemheg-29.so.29.0.0
+lib/libmythhdhomerun-29.so
+lib/libmythhdhomerun-29.so.29
+lib/libmythhdhomerun-29.so.29.0
+lib/libmythhdhomerun-29.so.29.0.0
+lib/libmythmetadata-29.so
+lib/libmythmetadata-29.so.29
+lib/libmythmetadata-29.so.29.0
+lib/libmythmetadata-29.so.29.0.0
+lib/libmythpostproc.so
+lib/libmythpostproc.so.54
+lib/libmythpostproc.so.54.1.100
+lib/libmythprotoserver-29.so
+lib/libmythprotoserver-29.so.29
+lib/libmythprotoserver-29.so.29.0
+lib/libmythprotoserver-29.so.29.0.0
+lib/libmythservicecontracts-29.so
+lib/libmythservicecontracts-29.so.29
+lib/libmythservicecontracts-29.so.29.0
+lib/libmythservicecontracts-29.so.29.0.0
+lib/libmythswresample.so
+lib/libmythswresample.so.2
+lib/libmythswresample.so.2.3.100
+lib/libmythswscale.so
+lib/libmythswscale.so.4
+lib/libmythswscale.so.4.2.100
+lib/libmythtv-29.so
+lib/libmythtv-29.so.29
+lib/libmythtv-29.so.29.0
+lib/libmythtv-29.so.29.0.0
+lib/libmythui-29.so
+lib/libmythui-29.so.29
+lib/libmythui-29.so.29.0
+lib/libmythui-29.so.29.0.0
+lib/libmythupnp-29.so
+lib/libmythupnp-29.so.29
+lib/libmythupnp-29.so.29.0
+lib/libmythupnp-29.so.29.0.0
+lib/mythtv/filters/libadjust.so
+lib/mythtv/filters/libbobdeint.so
+lib/mythtv/filters/libcrop.so
+lib/mythtv/filters/libdenoise3d.so
+lib/mythtv/filters/libfieldorder.so
+lib/mythtv/filters/libforce.so
+lib/mythtv/filters/libgreedyhdeint.so
+lib/mythtv/filters/libinvert.so
+lib/mythtv/filters/libivtc.so
+lib/mythtv/filters/libkerneldeint.so
+lib/mythtv/filters/liblinearblend.so
+lib/mythtv/filters/libonefield.so
+lib/mythtv/filters/libpostprocess.so
+lib/mythtv/filters/libquickdnr.so
+lib/mythtv/filters/libvflip.so
+lib/mythtv/filters/libyadif.so
 %%BINDINGS%%%%SITE_PERL%%/IO/Socket/INET/MythTV.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV/Channel.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV/Program.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV/Recording.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV/StorageGroup.pm
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-0.27.0-py2.7.egg-info
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-0.28._1-py%%PYTHON_VER%%.egg-info
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__init__.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__init__.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/_conn_mysqldb.py
@@ -553,12 +694,14 @@
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/XSLT/tvdbVideo.xsl
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/__init__.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/__init__.pyc
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/cache.py
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/cache.pyc
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/requests_cache_compatability.py
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/requests_cache_compatability.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdbXslt.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdbXslt.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_api.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_api.pyc
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_create_key.py
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_create_key.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_exceptions.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_exceptions.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_ui.py
@@ -569,6 +712,8 @@
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/altdict.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dequebuffer.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dequebuffer.pyc
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dicttoxml.py
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dicttoxml.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dt.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dt.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/enum.py
@@ -583,90 +728,6 @@
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/__init__.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/wikiscripts.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/wikiscripts.pyc
-lib/libmyth-0.27.so
-lib/libmyth-0.27.so.0
-lib/libmyth-0.27.so.0.27
-lib/libmyth-0.27.so.0.27.0
-lib/libmythavcodec.so
-lib/libmythavcodec.so.54
-lib/libmythavcodec.so.54.92.100
-lib/libmythavdevice.so
-lib/libmythavdevice.so.54
-lib/libmythavdevice.so.54.3.103
-lib/libmythavfilter.so
-lib/libmythavfilter.so.3
-lib/libmythavfilter.so.3.42.103
-lib/libmythavformat.so
-lib/libmythavformat.so.54
-lib/libmythavformat.so.54.63.104
-lib/libmythavutil.so
-lib/libmythavutil.so.52
-lib/libmythavutil.so.52.18.100
-lib/libmythbase-0.27.so
-lib/libmythbase-0.27.so.0
-lib/libmythbase-0.27.so.0.27
-lib/libmythbase-0.27.so.0.27.0
-lib/libmythfreemheg-0.27.so
-lib/libmythfreemheg-0.27.so.0
-lib/libmythfreemheg-0.27.so.0.27
-lib/libmythfreemheg-0.27.so.0.27.0
-lib/libmythhdhomerun-0.27.so
-lib/libmythhdhomerun-0.27.so.0
-lib/libmythhdhomerun-0.27.so.0.27
-lib/libmythhdhomerun-0.27.so.0.27.0
-lib/libmythmetadata-0.27.so
-lib/libmythmetadata-0.27.so.0
-lib/libmythmetadata-0.27.so.0.27
-lib/libmythmetadata-0.27.so.0.27.0
-lib/libmythpostproc.so
-lib/libmythpostproc.so.52
-lib/libmythpostproc.so.52.2.100
-lib/libmythprotoserver-0.27.so
-lib/libmythprotoserver-0.27.so.0
-lib/libmythprotoserver-0.27.so.0.27
-lib/libmythprotoserver-0.27.so.0.27.0
-lib/libmythqjson.so
-lib/libmythqjson.so.0
-lib/libmythqjson.so.0.7
-lib/libmythqjson.so.0.7.1
-lib/libmythservicecontracts-0.27.so
-lib/libmythservicecontracts-0.27.so.0
-lib/libmythservicecontracts-0.27.so.0.27
-lib/libmythservicecontracts-0.27.so.0.27.0
-lib/libmythswresample.so
-lib/libmythswresample.so.0
-lib/libmythswresample.so.0.17.102
-lib/libmythswscale.so
-lib/libmythswscale.so.2
-lib/libmythswscale.so.2.2.100
-lib/libmythtv-0.27.so
-lib/libmythtv-0.27.so.0
-lib/libmythtv-0.27.so.0.27
-lib/libmythtv-0.27.so.0.27.0
-lib/libmythui-0.27.so
-lib/libmythui-0.27.so.0
-lib/libmythui-0.27.so.0.27
-lib/libmythui-0.27.so.0.27.0
-lib/libmythupnp-0.27.so
-lib/libmythupnp-0.27.so.0
-lib/libmythupnp-0.27.so.0.27
-lib/libmythupnp-0.27.so.0.27.0
-lib/mythtv/filters/libadjust.so
-lib/mythtv/filters/libbobdeint.so
-lib/mythtv/filters/libcrop.so
-lib/mythtv/filters/libdenoise3d.so
-lib/mythtv/filters/libfieldorder.so
-lib/mythtv/filters/libforce.so
-lib/mythtv/filters/libgreedyhdeint.so
-lib/mythtv/filters/libinvert.so
-lib/mythtv/filters/libivtc.so
-lib/mythtv/filters/libkerneldeint.so
-lib/mythtv/filters/liblinearblend.so
-lib/mythtv/filters/libonefield.so
-lib/mythtv/filters/libpostprocess.so
-lib/mythtv/filters/libquickdnr.so
-lib/mythtv/filters/libvflip.so
-lib/mythtv/filters/libyadif.so
 %%DATADIR%%/CDS_scpd.xml
 %%DATADIR%%/CMGR_scpd.xml
 %%DATADIR%%/MFEXML_scpd.xml
@@ -714,7 +775,6 @@
 %%DATADIR%%/fonts/Tiresias Infofont.ttf
 %%DATADIR%%/fonts/texgyrechorus-mediumitalic.otf
 %%DATADIR%%/fonts/tiresias_gpl3.txt
-%%DATADIR%%/hardwareprofile/.gitignore
 %%DATADIR%%/hardwareprofile/MultipartPostHandler.py
 %%DATADIR%%/hardwareprofile/__init__.py
 %%DATADIR%%/hardwareprofile/config.py
@@ -746,99 +806,114 @@
 %%DATADIR%%/hardwareprofile/smolt_config.py
 %%DATADIR%%/hardwareprofile/software.py
 %%DATADIR%%/hardwareprofile/uuiddb.py
+%%DATADIR%%/html/3rdParty/jquery/MYTH_README
+%%DATADIR%%/html/3rdParty/jquery/galleria/LICENSE
+%%DATADIR%%/html/3rdParty/jquery/galleria/galleria.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/flickr-demo.html
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/flickr-loader.gif
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/galleria.flickr.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/galleria.flickr.min.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/flickr/loader.gif
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/history/galleria.history.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/history/galleria.history.min.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/history/history-demo.html
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/picasa/galleria.picasa.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/picasa/galleria.picasa.min.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/picasa/loader.gif
+%%DATADIR%%/html/3rdParty/jquery/galleria/plugins/picasa/picasa-demo.html
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/README.rst
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/classic-demo.html
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/classic-loader.gif
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/classic-map.png
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/galleria.classic.css
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/galleria.classic.js
+%%DATADIR%%/html/3rdParty/jquery/galleria/themes/classic/galleria.classic.min.js
+%%DATADIR%%/html/3rdParty/jquery/jquery-2.0.3.js
+%%DATADIR%%/html/3rdParty/jquery/jquery-2.0.3.min.js
+%%DATADIR%%/html/3rdParty/jquery/jquery-2.1.4.min.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryContextMenu/js/jquery.contextmenu.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/application.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/code.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/css.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/db.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/directory.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/doc.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/file.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/film.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/flash.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/folder_open.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/html.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/java.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/linux.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/music.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/pdf.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/php.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/picture.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/ppt.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/psd.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/ruby.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/script.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/spinner.gif
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/txt.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/xls.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/images/zip.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/jqueryFileTree.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryFileTree/jqueryFileTree.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryGrid/css/ui.jqgrid.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryGrid/js/grid.locale-en.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryGrid/js/jquery.jqGrid.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryJScroll/README.md
+%%DATADIR%%/html/3rdParty/jquery/jqueryJScroll/jquery.jscroll.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryJScroll/jscroll.jquery.json
+%%DATADIR%%/html/3rdParty/jquery/jqueryMultiSelect/css/jquery.multiselect.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryMultiSelect/css/ui.multiselect.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryMultiSelect/js/jquery.multiselect.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryMultiSelect/js/ui-multiselect-en.js
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_flat_30_cccccc_40x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_flat_50_5c5c5c_40x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_glass_40_ffc73d_1x400.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_hexagon_10_000000_12x10.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-hard_20_0b6a98_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-soft_33_003147_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-soft_35_222222_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-soft_44_444444_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_222222_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_4b8e0b_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_a83300_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_cccccc_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/images/ui-icons_ffffff_256x240.png
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/jquery-ui-1.10.3.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/css/jquery-ui.css
+%%DATADIR%%/html/3rdParty/jquery/jqueryUI/js/jquery-ui-1.10.3.js
 %%DATADIR%%/html/3rdParty/jwplayer.qsp
+%%DATADIR%%/html/backend_index.qsp
 %%DATADIR%%/html/css/Status.css
-%%DATADIR%%/html/css/images/ui-bg_flat_30_cccccc_40x100.png
-%%DATADIR%%/html/css/images/ui-bg_flat_50_5c5c5c_40x100.png
-%%DATADIR%%/html/css/images/ui-bg_glass_40_ffc73d_1x400.png
-%%DATADIR%%/html/css/images/ui-bg_hexagon_10_000000_12x10.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-hard_20_0b6a98_1x100.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-soft_33_003147_1x100.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-soft_35_222222_1x100.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-soft_44_444444_1x100.png
-%%DATADIR%%/html/css/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
-%%DATADIR%%/html/css/images/ui-icons_222222_256x240.png
-%%DATADIR%%/html/css/images/ui-icons_4b8e0b_256x240.png
-%%DATADIR%%/html/css/images/ui-icons_a83300_256x240.png
-%%DATADIR%%/html/css/images/ui-icons_cccccc_256x240.png
-%%DATADIR%%/html/css/images/ui-icons_ffffff_256x240.png
-%%DATADIR%%/html/css/jquery-ui.css
-%%DATADIR%%/html/css/menustyle.css
+%%DATADIR%%/html/css/settings.css
 %%DATADIR%%/html/css/setup.css
 %%DATADIR%%/html/css/site.css
-%%DATADIR%%/html/css/ui.jqgrid.css
-%%DATADIR%%/html/css/ui.multiselect.css
 %%DATADIR%%/html/css/wsdl.css
+%%DATADIR%%/html/debug/websocket.qsp
+%%DATADIR%%/html/frontend_index.qsp
 %%DATADIR%%/html/images/blank.gif
 %%DATADIR%%/html/images/checkerboard_100x100.png
 %%DATADIR%%/html/images/favicon.ico
+%%DATADIR%%/html/images/icons/README
+%%DATADIR%%/html/images/icons/upnp_large_icon.jpg
+%%DATADIR%%/html/images/icons/upnp_large_icon.png
+%%DATADIR%%/html/images/icons/upnp_small_icon.jpg
+%%DATADIR%%/html/images/icons/upnp_small_icon.png
 %%DATADIR%%/html/images/menu-button-bg.gif
 %%DATADIR%%/html/images/mythtv.png
-%%DATADIR%%/html/images/ui-bg_flat_30_cccccc_40x100.png
-%%DATADIR%%/html/images/ui-bg_flat_50_5c5c5c_40x100.png
-%%DATADIR%%/html/images/ui-bg_glass_40_ffc73d_1x400.png
-%%DATADIR%%/html/images/ui-bg_hexagon_10_000000_12x10.png
-%%DATADIR%%/html/images/ui-bg_highlight-hard_20_0b6a98_1x100.png
-%%DATADIR%%/html/images/ui-bg_highlight-soft_33_003147_1x100.png
-%%DATADIR%%/html/images/ui-bg_highlight-soft_35_222222_1x100.png
-%%DATADIR%%/html/images/ui-bg_highlight-soft_44_444444_1x100.png
-%%DATADIR%%/html/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
-%%DATADIR%%/html/images/ui-icons_222222_256x240.png
-%%DATADIR%%/html/images/ui-icons_4b8e0b_256x240.png
-%%DATADIR%%/html/images/ui-icons_a83300_256x240.png
-%%DATADIR%%/html/images/ui-icons_cccccc_256x240.png
-%%DATADIR%%/html/images/ui-icons_ffffff_256x240.png
-%%DATADIR%%/html/index.html
-%%DATADIR%%/html/js/databaseutil.js
 %%DATADIR%%/html/js/fileutil.js
-%%DATADIR%%/html/js/galleria/LICENSE
-%%DATADIR%%/html/js/galleria/galleria-1.2.3.js
-%%DATADIR%%/html/js/galleria/galleria-1.2.3.min.js
-%%DATADIR%%/html/js/galleria/themes/classic/README.rst
-%%DATADIR%%/html/js/galleria/themes/classic/classic-demo.html
-%%DATADIR%%/html/js/galleria/themes/classic/classic-loader.gif
-%%DATADIR%%/html/js/galleria/themes/classic/classic-map.png
-%%DATADIR%%/html/js/galleria/themes/classic/galleria.classic.css
-%%DATADIR%%/html/js/galleria/themes/classic/galleria.classic.js
-%%DATADIR%%/html/js/galleria/themes/classic/galleria.classic.min.js
-%%DATADIR%%/html/js/grid.locale-en.js
 %%DATADIR%%/html/js/inspect.js
-%%DATADIR%%/html/js/jquery-ui.min.js
-%%DATADIR%%/html/js/jquery.contextmenu.js
-%%DATADIR%%/html/js/jquery.jqGrid.min.js
-%%DATADIR%%/html/js/jquery.min.js
-%%DATADIR%%/html/js/jqueryFileTree/images/application.png
-%%DATADIR%%/html/js/jqueryFileTree/images/code.png
-%%DATADIR%%/html/js/jqueryFileTree/images/css.png
-%%DATADIR%%/html/js/jqueryFileTree/images/db.png
-%%DATADIR%%/html/js/jqueryFileTree/images/directory.png
-%%DATADIR%%/html/js/jqueryFileTree/images/doc.png
-%%DATADIR%%/html/js/jqueryFileTree/images/file.png
-%%DATADIR%%/html/js/jqueryFileTree/images/film.png
-%%DATADIR%%/html/js/jqueryFileTree/images/flash.png
-%%DATADIR%%/html/js/jqueryFileTree/images/folder_open.png
-%%DATADIR%%/html/js/jqueryFileTree/images/html.png
-%%DATADIR%%/html/js/jqueryFileTree/images/java.png
-%%DATADIR%%/html/js/jqueryFileTree/images/linux.png
-%%DATADIR%%/html/js/jqueryFileTree/images/music.png
-%%DATADIR%%/html/js/jqueryFileTree/images/pdf.png
-%%DATADIR%%/html/js/jqueryFileTree/images/php.png
-%%DATADIR%%/html/js/jqueryFileTree/images/picture.png
-%%DATADIR%%/html/js/jqueryFileTree/images/ppt.png
-%%DATADIR%%/html/js/jqueryFileTree/images/psd.png
-%%DATADIR%%/html/js/jqueryFileTree/images/ruby.png
-%%DATADIR%%/html/js/jqueryFileTree/images/script.png
-%%DATADIR%%/html/js/jqueryFileTree/images/spinner.gif
-%%DATADIR%%/html/js/jqueryFileTree/images/txt.png
-%%DATADIR%%/html/js/jqueryFileTree/images/xls.png
-%%DATADIR%%/html/js/jqueryFileTree/images/zip.png
-%%DATADIR%%/html/js/jqueryFileTree/jqueryFileTree.css
-%%DATADIR%%/html/js/jqueryFileTree/jqueryFileTree.js
 %%DATADIR%%/html/js/menu.js
-%%DATADIR%%/html/js/ui-multiselect-en.js
-%%DATADIR%%/html/js/ui.multiselect.js
+%%DATADIR%%/html/js/settings.js
 %%DATADIR%%/html/js/util.qjs
+%%DATADIR%%/html/js/utility.js
+%%DATADIR%%/html/js/websocket_events.js
 %%DATADIR%%/html/menu.qsp
+%%DATADIR%%/html/misc/css/overview.css
 %%DATADIR%%/html/misc/database-backup.html
 %%DATADIR%%/html/misc/database-repair.html
 %%DATADIR%%/html/misc/databasetabs.html
@@ -848,12 +923,15 @@
 %%DATADIR%%/html/misc/js/databasetabs.js
 %%DATADIR%%/html/misc/js/hardwareprofile.js
 %%DATADIR%%/html/misc/js/messagetab.js
+%%DATADIR%%/html/misc/js/overview.js
 %%DATADIR%%/html/misc/js/viewlogs.js
 %%DATADIR%%/html/misc/message.html
 %%DATADIR%%/html/misc/messagetab.html
+%%DATADIR%%/html/misc/misc_template.html
 %%DATADIR%%/html/misc/overview.qsp
 %%DATADIR%%/html/misc/placeholder.html
 %%DATADIR%%/html/misc/viewlogs.html
+%%DATADIR%%/html/robots.txt
 %%DATADIR%%/html/samples/hlstest.qsp
 %%DATADIR%%/html/samples/js/samples.js
 %%DATADIR%%/html/samples/livestream_rec.qsp
@@ -861,9 +939,11 @@
 %%DATADIR%%/html/samples/recorded.qsp
 %%DATADIR%%/html/samples/serverside.qsp
 %%DATADIR%%/html/samples/storagegroups.qsp
+%%DATADIR%%/html/setup/ajax_backends/setting_util.qsp
 %%DATADIR%%/html/setup/channeleditor-channeldetail-multi.html
 %%DATADIR%%/html/setup/channeleditor-channeldetail.html
 %%DATADIR%%/html/setup/channeleditor.html
+%%DATADIR%%/html/setup/css/common.css
 %%DATADIR%%/html/setup/database.html
 %%DATADIR%%/html/setup/expert.html
 %%DATADIR%%/html/setup/general.html
@@ -874,28 +954,81 @@
 %%DATADIR%%/html/setup/jobqueue-jobs.qsp
 %%DATADIR%%/html/setup/jobqueue.html
 %%DATADIR%%/html/setup/js/channeleditor.js
+%%DATADIR%%/html/setup/js/common.js
 %%DATADIR%%/html/setup/js/database.js
 %%DATADIR%%/html/setup/js/general.js
 %%DATADIR%%/html/setup/js/guidedatasources.js
 %%DATADIR%%/html/setup/js/jobqueue.js
 %%DATADIR%%/html/setup/js/password.js
-%%DATADIR%%/html/setup/js/setup.js
 %%DATADIR%%/html/setup/js/storagegroups.js
 %%DATADIR%%/html/setup/js/systemevents.js
 %%DATADIR%%/html/setup/js/wizard.js
 %%DATADIR%%/html/setup/overview.html
 %%DATADIR%%/html/setup/password.html
+%%DATADIR%%/html/setup/setup_template.html
 %%DATADIR%%/html/setup/storagegroups-add-dir.html
 %%DATADIR%%/html/setup/storagegroups-add-new.html
 %%DATADIR%%/html/setup/storagegroups.html
 %%DATADIR%%/html/setup/systemevents.html
+%%DATADIR%%/html/setup/webfrontend-settings.qsp
 %%DATADIR%%/html/setup/wizard-database.html
 %%DATADIR%%/html/setup/wizard-guide_data.html
 %%DATADIR%%/html/setup/wizard-media_storage.html
 %%DATADIR%%/html/setup/wizard-network.qsp
 %%DATADIR%%/html/setup/wizard-recording_devices.html
 %%DATADIR%%/html/setup/wizard.html
+%%DATADIR%%/html/tv/ajax_backends/dvr_util.qsp
+%%DATADIR%%/html/tv/ajax_backends/program_util.qsp
+%%DATADIR%%/html/tv/css/category_colors.css
+%%DATADIR%%/html/tv/css/common.css
+%%DATADIR%%/html/tv/css/guide.css
+%%DATADIR%%/html/tv/css/icons.css
+%%DATADIR%%/html/tv/css/programsearch.css
+%%DATADIR%%/html/tv/css/recordingrules.css
+%%DATADIR%%/html/tv/css/recordings.css
+%%DATADIR%%/html/tv/css/schedule.css
+%%DATADIR%%/html/tv/css/tvplayer.css
+%%DATADIR%%/html/tv/css/upcoming.css
+%%DATADIR%%/html/tv/guide.qsp
+%%DATADIR%%/html/tv/images/blank.png
+%%DATADIR%%/html/tv/images/cat_movie.svg
+%%DATADIR%%/html/tv/images/channel_icon.svg
+%%DATADIR%%/html/tv/images/fl_autoexp.svg
+%%DATADIR%%/html/tv/images/fl_bookmark.svg
+%%DATADIR%%/html/tv/images/fl_commflag.svg
+%%DATADIR%%/html/tv/images/fl_watched.svg
+%%DATADIR%%/html/tv/images/hd_1080.svg
+%%DATADIR%%/html/tv/images/hd_720.svg
+%%DATADIR%%/html/tv/images/hd_tv.svg
+%%DATADIR%%/html/tv/images/play_arrow.png
+%%DATADIR%%/html/tv/images/play_arrow.svg
+%%DATADIR%%/html/tv/images/recording_icons_sprite.svg
+%%DATADIR%%/html/tv/images/wastebin.svg
+%%DATADIR%%/html/tv/js/common.js
+%%DATADIR%%/html/tv/js/constants.js
+%%DATADIR%%/html/tv/js/guide.js
+%%DATADIR%%/html/tv/js/programsearch.js
+%%DATADIR%%/html/tv/js/recordings.js
+%%DATADIR%%/html/tv/js/schedule.js
+%%DATADIR%%/html/tv/js/tvutil.qjs
+%%DATADIR%%/html/tv/js/upcoming.js
+%%DATADIR%%/html/tv/programsearch.qsp
+%%DATADIR%%/html/tv/recordingrules.qsp
+%%DATADIR%%/html/tv/recordings.qsp
+%%DATADIR%%/html/tv/schedule.qsp
+%%DATADIR%%/html/tv/stream.qsp
+%%DATADIR%%/html/tv/tvplayer.qsp
+%%DATADIR%%/html/tv/upcoming.qsp
+%%DATADIR%%/html/video/css/gallery.css
+%%DATADIR%%/html/video/gallery.qsp
+%%DATADIR%%/html/video/gallery_detail.qsp
+%%DATADIR%%/html/video/images/folder_icon.png
+%%DATADIR%%/html/video/images/mv_gallery_dir_up.png
+%%DATADIR%%/html/video/images/unknown.png
+%%DATADIR%%/html/video/js/gallery.js
+%%DATADIR%%/html/video/js/gallery.qjs
 %%DATADIR%%/html/xslt/class.xslt
+%%DATADIR%%/html/xslt/enum.xslt
 %%DATADIR%%/html/xslt/service.xslt
 %%DATADIR%%/i18n/mythfrontend_bg.qm
 %%DATADIR%%/i18n/mythfrontend_ca.qm
@@ -975,6 +1108,7 @@
 %%DATADIR%%/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/tedtalks.xml
 %%DATADIR%%/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/thewb.xml
 %%DATADIR%%/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml
+%%DATADIR%%/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/youtube.xml
 %%DATADIR%%/internetcontent/nv_python_libs/configs/XML/hulu_config.xml
 %%DATADIR%%/internetcontent/nv_python_libs/configs/XML/mashups_config.xml
 %%DATADIR%%/internetcontent/nv_python_libs/configs/XML/pbs_config.xml
@@ -1044,7 +1178,7 @@
 %%DATADIR%%/internetcontent/nv_python_libs/vimeo/oauth/__init__.py
 %%DATADIR%%/internetcontent/nv_python_libs/vimeo/oauth/oauth_api.py
 %%DATADIR%%/internetcontent/nv_python_libs/vimeo/vimeo_api.py
-%%DATADIR%%/internetcontent/nv_python_libs/vimeo/vimeo_data.pyc
+%%DATADIR%%/internetcontent/nv_python_libs/vimeo/vimeo_data.py
 %%DATADIR%%/internetcontent/nv_python_libs/vimeo/vimeo_exceptions.py
 %%DATADIR%%/internetcontent/nv_python_libs/xsltfunctions/__init__.py
 %%DATADIR%%/internetcontent/nv_python_libs/xsltfunctions/bliptvXSL_api.py
@@ -1065,6 +1199,7 @@
 %%DATADIR%%/internetcontent/nv_python_libs/xsltfunctions/youtubeXSL_api.py
 %%DATADIR%%/internetcontent/nv_python_libs/youtube/__init__.py
 %%DATADIR%%/internetcontent/nv_python_libs/youtube/youtube_api.py
+%%DATADIR%%/internetcontent/nv_python_libs/youtube/youtube_data.py
 %%DATADIR%%/internetcontent/nv_python_libs/youtube/youtube_exceptions.py
 %%DATADIR%%/internetcontent/pbs.py
 %%DATADIR%%/internetcontent/rev3.py
@@ -1095,7 +1230,42 @@
 %%DATADIR%%/locales/zh_hk.xml
 %%DATADIR%%/locales/zh_tw.xml
 %%DATADIR%%/metadata/Movie/tmdb3.py
+%%DATADIR%%/metadata/Music/discid/README
+%%DATADIR%%/metadata/Music/discid/__init__.py
+%%DATADIR%%/metadata/Music/discid/disc.py
+%%DATADIR%%/metadata/Music/discid/libdiscid.py
+%%DATADIR%%/metadata/Music/discid/track.py
+%%DATADIR%%/metadata/Music/discid/util.py
+%%DATADIR%%/metadata/Music/lyrics/README
+%%DATADIR%%/metadata/Music/lyrics/alsong.py
+%%DATADIR%%/metadata/Music/lyrics/baidu.py
+%%DATADIR%%/metadata/Music/lyrics/common/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/common/audiofile.py
+%%DATADIR%%/metadata/Music/lyrics/common/utilities.py
+%%DATADIR%%/metadata/Music/lyrics/darklyrics.py
+%%DATADIR%%/metadata/Music/lyrics/embedlrc.py
+%%DATADIR%%/metadata/Music/lyrics/examples/README
+%%DATADIR%%/metadata/Music/lyrics/examples/filelyrics.lrc
+%%DATADIR%%/metadata/Music/lyrics/examples/filelyrics.mp3
+%%DATADIR%%/metadata/Music/lyrics/examples/taglyrics.mp3
+%%DATADIR%%/metadata/Music/lyrics/filelyrics.py
+%%DATADIR%%/metadata/Music/lyrics/genius.py
+%%DATADIR%%/metadata/Music/lyrics/gomaudio.py
+%%DATADIR%%/metadata/Music/lyrics/letssingit.py
+%%DATADIR%%/metadata/Music/lyrics/lyricscom.py
+%%DATADIR%%/metadata/Music/lyrics/lyricsmode.py
+%%DATADIR%%/metadata/Music/lyrics/lyricswiki.py
+%%DATADIR%%/metadata/Music/lyrics/ttplayer.py
+%%DATADIR%%/metadata/Music/mbutils.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/README
+%%DATADIR%%/metadata/Music/musicbrainzngs/__init__.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/caa.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/compat.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/mbxml.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/musicbrainz.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/util.py
 %%DATADIR%%/metadata/Television/ttvdb.py
+%%DATADIR%%/metadata/Television/tvdb_test.conf
 %%DATADIR%%/mythconverg_backup.pl
 %%DATADIR%%/mythconverg_restore.pl
 %%DATADIR%%/setup.xml
@@ -1260,6 +1430,7 @@
 %%DATADIR%%/themes/MythCenter/qtlook.txt
 %%DATADIR%%/themes/MythCenter/recordings-ui.xml
 %%DATADIR%%/themes/MythCenter/schedule-ui.xml
+%%DATADIR%%/themes/MythCenter/status-ui.xml
 %%DATADIR%%/themes/MythCenter/themeinfo.xml
 %%DATADIR%%/themes/MythCenter/title/title_dvd.png
 %%DATADIR%%/themes/MythCenter/title/title_gallery.png
@@ -1527,7 +1698,6 @@
 %%DATADIR%%/themes/Terra/video/video_gallery_background_selected.png
 %%DATADIR%%/themes/Terra/watermarks/README.license
 %%DATADIR%%/themes/Terra/watermarks/aerial.png
-%%DATADIR%%/themes/Terra/watermarks/appearance.png
 %%DATADIR%%/themes/Terra/watermarks/archive.png
 %%DATADIR%%/themes/Terra/watermarks/audio.png
 %%DATADIR%%/themes/Terra/watermarks/browser.png
@@ -1569,6 +1739,7 @@
 %%DATADIR%%/themes/Terra/watermarks/select_music.png
 %%DATADIR%%/themes/Terra/watermarks/status.png
 %%DATADIR%%/themes/Terra/watermarks/stop_light.png
+%%DATADIR%%/themes/Terra/watermarks/themechooser.png
 %%DATADIR%%/themes/Terra/watermarks/tools.png
 %%DATADIR%%/themes/Terra/watermarks/tv.png
 %%DATADIR%%/themes/Terra/watermarks/vcr.png
@@ -1738,28 +1909,18 @@
 %%DATADIR%%/themes/default/htmls/notfound.html
 %%DATADIR%%/themes/default/htmls/progdetails_page1.html
 %%DATADIR%%/themes/default/htmls/progdetails_page2.html
+%%DATADIR%%/themes/default/image-ui.xml
 %%DATADIR%%/themes/default/keyboard/ar.xml
-%%DATADIR%%/themes/default/keyboard/ar_ui.xml
 %%DATADIR%%/themes/default/keyboard/da.xml
-%%DATADIR%%/themes/default/keyboard/da_ui.xml
 %%DATADIR%%/themes/default/keyboard/de.xml
-%%DATADIR%%/themes/default/keyboard/de_ui.xml
 %%DATADIR%%/themes/default/keyboard/el.xml
-%%DATADIR%%/themes/default/keyboard/el_ui.xml
 %%DATADIR%%/themes/default/keyboard/en_gb.xml
-%%DATADIR%%/themes/default/keyboard/en_gb_ui.xml
 %%DATADIR%%/themes/default/keyboard/en_us.xml
-%%DATADIR%%/themes/default/keyboard/en_us_ui.xml
 %%DATADIR%%/themes/default/keyboard/es.xml
-%%DATADIR%%/themes/default/keyboard/es_ui.xml
 %%DATADIR%%/themes/default/keyboard/fr.xml
 %%DATADIR%%/themes/default/keyboard/fr_ch.xml
-%%DATADIR%%/themes/default/keyboard/fr_ch_ui.xml
-%%DATADIR%%/themes/default/keyboard/fr_ui.xml
 %%DATADIR%%/themes/default/keyboard/he.xml
-%%DATADIR%%/themes/default/keyboard/he_ui.xml
 %%DATADIR%%/themes/default/keyboard/it.xml
-%%DATADIR%%/themes/default/keyboard/it_ui.xml
 %%DATADIR%%/themes/default/keyboard/key_down.png
 %%DATADIR%%/themes/default/keyboard/key_down_back.png
 %%DATADIR%%/themes/default/keyboard/key_down_del.png
@@ -1796,14 +1957,11 @@
 %%DATADIR%%/themes/default/keyboard/keyboard.xml
 %%DATADIR%%/themes/default/keyboard/leftarrow.png
 %%DATADIR%%/themes/default/keyboard/nb.xml
-%%DATADIR%%/themes/default/keyboard/nb_ui.xml
 %%DATADIR%%/themes/default/keyboard/returnarrow.png
 %%DATADIR%%/themes/default/keyboard/rightarrow.png
 %%DATADIR%%/themes/default/keyboard/ru.xml
-%%DATADIR%%/themes/default/keyboard/ru_ui.xml
 %%DATADIR%%/themes/default/keyboard/shiftarrow.png
 %%DATADIR%%/themes/default/keyboard/sv.xml
-%%DATADIR%%/themes/default/keyboard/sv_ui.xml
 %%DATADIR%%/themes/default/lb-arrow.png
 %%DATADIR%%/themes/default/lb-check-empty.png
 %%DATADIR%%/themes/default/lb-check-full.png
@@ -2074,6 +2232,7 @@
 %%DATADIR%%/themes/default/menu_playback.xml
 %%DATADIR%%/themes/default/menu_playback_compact.xml
 %%DATADIR%%/themes/default/mono.png
+%%DATADIR%%/themes/default/musicscanner.png
 %%DATADIR%%/themes/default/mv_browse_background.png
 %%DATADIR%%/themes/default/mv_browse_selector.png
 %%DATADIR%%/themes/default/mv_filerequest.png
@@ -2135,9 +2294,13 @@
 %%DATADIR%%/themes/default/shared/directory.png
 %%DATADIR%%/themes/default/shared/executable.png
 %%DATADIR%%/themes/default/shared/file.png
+%%DATADIR%%/themes/default/shared/folder-reg.png
+%%DATADIR%%/themes/default/shared/folder-sel.png
 %%DATADIR%%/themes/default/shared/grid_back_reg.png
 %%DATADIR%%/themes/default/shared/grid_back_sel.png
 %%DATADIR%%/themes/default/shared/grid_noimage.png
+%%DATADIR%%/themes/default/shared/movie-reg.png
+%%DATADIR%%/themes/default/shared/movie-sel.png
 %%DATADIR%%/themes/default/shared/secure.png
 %%DATADIR%%/themes/default/shared/unsecure.png
 %%DATADIR%%/themes/default/shared/updirectory.png
@@ -2145,6 +2308,7 @@
 %%DATADIR%%/themes/default/solid-container.png
 %%DATADIR%%/themes/default/solid-cr-background.png
 %%DATADIR%%/themes/default/sr-background.png
+%%DATADIR%%/themes/default/standardsetting-ui.xml
 %%DATADIR%%/themes/default/status-bar.png
 %%DATADIR%%/themes/default/status-ui.xml
 %%DATADIR%%/themes/default/stereo.png
Index: www/mythplugin-mythweb/Makefile
===================================================================
--- www/mythplugin-mythweb/Makefile
+++ www/mythplugin-mythweb/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mythweb
-PORTVERSION=	0.28.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+DISTVERSION=	29.1
 CATEGORIES=	www
 PKGNAMEPREFIX=	mythplugin-
 
@@ -14,14 +13,11 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-IGNORE_WITH_PHP=	70 71 72
-
-RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
-
-USES=		php shebangfix
+USES=		php shebangfix perl5
+USE_PERL5=	run
+USE_PHP=	json pcre posix mysqli session spl sockets
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
-USE_PHP=	json mysql pcre posix session spl
 SHEBANG_FILES=	mythweb.pl modules/_shared/lang/build_translation.pl \
 		modules/coverart/handler.pl modules/stream/*.pl
 
@@ -31,11 +27,13 @@
 SUB_FILES=	pkg-message
 REINPLACE_ARGS=	-i ""
 
-OPTIONS_DEFINE=		APACHE LIGHTTPD
+OPTIONS_DEFINE=	APACHE LIGHTTPD NGINX
 OPTIONS_DEFAULT=	APACHE
 
 APACHE_USE=		APACHE_RUN=22+
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
+NGINX_DESC=		Nginx server support
+NGINX_RUN_DEPENDS=	nginx:www/nginx
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/www/html|${WWWDIR}|' \
Index: www/mythplugin-mythweb/distinfo
===================================================================
--- www/mythplugin-mythweb/distinfo
+++ www/mythplugin-mythweb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494080463
-SHA256 (MythTV-mythweb-v0.28.1_GH0.tar.gz) = bbd82992230d3571eba55a26a91cc3f2dcddfa631d1822ce58e1bf99f2537244
-SIZE (MythTV-mythweb-v0.28.1_GH0.tar.gz) = 1705490
+TIMESTAMP = 1519575608
+SHA256 (MythTV-mythweb-v29.1_GH0.tar.gz) = 30583d7c077dbc732053d0ee7b13a46ab3ceaeb0aaa7c8e9744ef6ac959989e8
+SIZE (MythTV-mythweb-v29.1_GH0.tar.gz) = 1796312
Index: www/mythplugin-mythweb/pkg-plist
===================================================================
--- www/mythplugin-mythweb/pkg-plist
+++ www/mythplugin-mythweb/pkg-plist
@@ -49,6 +49,9 @@
 %%WWWDIR%%/includes/translate.php
 %%WWWDIR%%/includes/utils.php
 %%WWWDIR%%/js/AC_OETags.js
+%%WWWDIR%%/js/README
+%%WWWDIR%%/js/ajax/libs/jquery/3.2.1/jquery.min.js
+%%WWWDIR%%/js/ajax/libs/prototype/1.7.3.0/prototype.js
 %%WWWDIR%%/js/dialog/dialog.css
 %%WWWDIR%%/js/dialog/dialog.js
 %%WWWDIR%%/js/jquery-1.9.1.min.js