5 files changed, 196 insertions, 114 deletions

diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index 6ef12b760108..ec49630e240e 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	freevo
-PORTVERSION=	1.8.3
+PORTVERSION=	1.9.0
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	freevo
 
 MAINTAINER=	fbsd@opal.com
 COMMENT=	Open source digital jukebox
@@ -17,6 +18,7 @@ RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
 		mencoder:${PORTSDIR}/multimedia/mencoder \
 		aumix:${PORTSDIR}/audio/aumix \
 		tv_cat:${PORTSDIR}/textproc/p5-xmltv \
+		${PYTHON_PKGNAMEPREFIX}zopeInterface>=3.3.0_1:${PORTSDIR}/devel/py-zopeInterface \
 		${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml \
 		${PYTHON_SITELIBDIR}/kaa/__init__.py:${PORTSDIR}/multimedia/py-kaa-base \
 		${PYTHON_SITELIBDIR}/kaa/imlib2/__init__.py:${PORTSDIR}/multimedia/py-kaa-imlib2 \
@@ -33,7 +35,6 @@ FREEVO_UID=	523
 FREEVO_GID=	${FREEVO_UID}
 FREEVO_HOME=	/var/db/${FREEVO_USER}
 
-NO_BUILD=	yes
 SUB_LIST+=	PORTVERSION=${PORTVERSION} \
 		FREEVO_USER=${FREEVO_USER} \
 		FREEVO_GROUP=${FREEVO_GROUP} \
@@ -48,10 +49,22 @@ USE_PYDISTUTILS=	yes
 USE_RC_SUBR=	${PORTNAME}
 RC_SCRIPT=	${PREFIX}/etc/rc.d/${PORTNAME}
 
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
 CONFDIR=	${PREFIX}/etc/${PORTNAME}
+DATADIR=	${PREFIX}/share/${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+
+.if defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 post-patch:
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} -e  '451d' ${WRKSRC}/${PORTNAME}
+.endif
+
 	@${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/freevo_config.py
 	@${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/local_conf.py.example
 
diff --git a/multimedia/freevo/distinfo b/multimedia/freevo/distinfo
index 45df09202b05..149902366a91 100644
--- a/multimedia/freevo/distinfo
+++ b/multimedia/freevo/distinfo
@@ -1,3 +1,3 @@
-MD5 (freevo-1.8.3.tar.gz) = 817ae34cca78b57970ce1bbb58e19ce3
-SHA256 (freevo-1.8.3.tar.gz) = ef9491f0d6c40ba4027266ef577f05cb77be49e68e307b67d1f917e9430eefa4
-SIZE (freevo-1.8.3.tar.gz) = 26713301
+MD5 (freevo-1.9.0.tar.gz) = aeb05e52f996258386af2951688bf6e3
+SHA256 (freevo-1.9.0.tar.gz) = e3c97e1404bc5a171350d0c0edf8decaa6d4eb3eaa9e42112a903d375aaf8722
+SIZE (freevo-1.9.0.tar.gz) = 27182867
diff --git a/multimedia/freevo/files/freevo.in b/multimedia/freevo/files/freevo.in
index 67c752654dbc..15129eafe94d 100644
--- a/multimedia/freevo/files/freevo.in
+++ b/multimedia/freevo/files/freevo.in
@@ -34,22 +34,22 @@ cd ${freevo_dir}
 
 case "$1" in
 start)
-	[ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} recordserver start"
-	[ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} webserver start"
-	[ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command}  start"
+	[ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --daemon recordserver"
+	[ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --daemon webserver"
+	[ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command} --daemon"
 	;;
 stop)
-	[ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} recordserver stop"
-	[ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} webserver stop"
-	[ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command}  stop"
+	[ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop recordserver"
+	[ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop webserver"
+	[ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop"
 	;;
 restart)
-	[ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} recordserver stop"
-	[ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} webserver stop"
-	[ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command}  stop"
-	[ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} recordserver start"
-	[ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} webserver start"
-	[ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command}  start"
+	[ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop recordserver"
+	[ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop webserver"
+	[ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop"
+	[ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --daemon recordserver"
+	[ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --daemon webserver"
+	[ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command} --daemon"
 	;;
 esac
 
diff --git a/multimedia/freevo/files/patch-freevo b/multimedia/freevo/files/patch-freevo
index c32689fdb96a..6d7e3ef60751 100644
--- a/multimedia/freevo/files/patch-freevo
+++ b/multimedia/freevo/files/patch-freevo
@@ -1,15 +1,15 @@
---- freevo.orig	2009-01-11 15:50:59.000000000 -0500
-+++ freevo	2009-01-13 21:39:10.000000000 -0500
-@@ -156,7 +156,7 @@
+--- freevo.orig	2009-05-12 08:59:13.000000000 -0400
++++ freevo	2009-05-12 08:58:04.000000000 -0400
+@@ -232,7 +232,7 @@
      get pid of running 'name'
      """
-     _debug_('getpid(name=%r, arg=%r)' % (name, arg))
+     _debug_('getpid(name=%r, args=%r)' % (name, args))
 -    for fname in ('/var/run/' + name  + '-%s.pid' % os.getuid(),
 +    for fname in ('/var/run/freevo/' + name  + '-%s.pid' % os.getuid(),
                    '/tmp/' + name + '-%s.pid' % os.getuid()):
          if os.path.isfile(fname):
              f = open(fname)
-@@ -259,7 +259,7 @@
+@@ -329,7 +329,7 @@
      if pid:
          if store:
              try:
diff --git a/multimedia/freevo/pkg-plist b/multimedia/freevo/pkg-plist
index 5280642e166e..5b2a91a8fdef 100644
--- a/multimedia/freevo/pkg-plist
+++ b/multimedia/freevo/pkg-plist
@@ -63,12 +63,12 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/fxmms.py
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/fxmms.pyc
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/fxmms.pyo
+%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/icecast.py
+%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/icecast.pyc
+%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/icecast.pyo
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/lastfm.py
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/lastfm.pyc
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/lastfm.pyo
-%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/lastfm2.py
-%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/lastfm2.pyc
-%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/lastfm2.pyo
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/logger.py
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/logger.pyc
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/logger.pyo
@@ -87,12 +87,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayer.py
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayer.pyc
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayer.pyo
-%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayervis1.py
-%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayervis1.pyc
-%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayervis1.pyo
-%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayervis2.py
-%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayervis2.pyc
-%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayervis2.pyo
+%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayervis.py
+%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayervis.pyc
+%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/mplayervis.pyo
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/musicip.py
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/musicip.pyc
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/musicip.pyo
@@ -105,6 +102,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/radioplayer.py
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/radioplayer.pyc
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/radioplayer.pyo
+%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/shoutcast.py
+%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/shoutcast.pyc
+%%PYTHON_SITELIBDIR%%/freevo/audio/plugins/shoutcast.pyo
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/vux.py
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/vux.pyc
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/vux.pyo
@@ -114,6 +114,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/xmradio.py
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/xmradio.pyc
 %%PYTHON_SITELIBDIR%%/freevo/audio/plugins/xmradio.pyo
+%%PYTHON_SITELIBDIR%%/freevo/benchmark.py
+%%PYTHON_SITELIBDIR%%/freevo/benchmark.pyc
+%%PYTHON_SITELIBDIR%%/freevo/benchmark.pyo
 %%PYTHON_SITELIBDIR%%/freevo/childapp.py
 %%PYTHON_SITELIBDIR%%/freevo/childapp.pyc
 %%PYTHON_SITELIBDIR%%/freevo/childapp.pyo
@@ -144,6 +147,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/dialog/plugins/x11_overlay_display.py
 %%PYTHON_SITELIBDIR%%/freevo/dialog/plugins/x11_overlay_display.pyc
 %%PYTHON_SITELIBDIR%%/freevo/dialog/plugins/x11_overlay_display.pyo
+%%PYTHON_SITELIBDIR%%/freevo/dialog/utils.py
+%%PYTHON_SITELIBDIR%%/freevo/dialog/utils.pyc
+%%PYTHON_SITELIBDIR%%/freevo/dialog/utils.pyo
 %%PYTHON_SITELIBDIR%%/freevo/dialog/widgets.py
 %%PYTHON_SITELIBDIR%%/freevo/dialog/widgets.pyc
 %%PYTHON_SITELIBDIR%%/freevo/dialog/widgets.pyo
@@ -282,6 +288,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/helpers/convert_favorites.py
 %%PYTHON_SITELIBDIR%%/freevo/helpers/convert_favorites.pyc
 %%PYTHON_SITELIBDIR%%/freevo/helpers/convert_favorites.pyo
+%%PYTHON_SITELIBDIR%%/freevo/helpers/convert_favorites_txt.py
+%%PYTHON_SITELIBDIR%%/freevo/helpers/convert_favorites_txt.pyc
+%%PYTHON_SITELIBDIR%%/freevo/helpers/convert_favorites_txt.pyo
 %%PYTHON_SITELIBDIR%%/freevo/helpers/daemon.py
 %%PYTHON_SITELIBDIR%%/freevo/helpers/daemon.pyc
 %%PYTHON_SITELIBDIR%%/freevo/helpers/daemon.pyo
@@ -294,6 +303,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/helpers/install.py
 %%PYTHON_SITELIBDIR%%/freevo/helpers/install.pyc
 %%PYTHON_SITELIBDIR%%/freevo/helpers/install.pyo
+%%PYTHON_SITELIBDIR%%/freevo/helpers/livepauseserver.py
+%%PYTHON_SITELIBDIR%%/freevo/helpers/livepauseserver.pyc
+%%PYTHON_SITELIBDIR%%/freevo/helpers/livepauseserver.pyo
 %%PYTHON_SITELIBDIR%%/freevo/helpers/makelinuxevent.py
 %%PYTHON_SITELIBDIR%%/freevo/helpers/makelinuxevent.pyc
 %%PYTHON_SITELIBDIR%%/freevo/helpers/makelinuxevent.pyo
@@ -309,6 +321,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/helpers/mkimagemrss.py
 %%PYTHON_SITELIBDIR%%/freevo/helpers/mkimagemrss.pyc
 %%PYTHON_SITELIBDIR%%/freevo/helpers/mkimagemrss.pyo
+%%PYTHON_SITELIBDIR%%/freevo/helpers/osddesigner.py
+%%PYTHON_SITELIBDIR%%/freevo/helpers/osddesigner.pyc
+%%PYTHON_SITELIBDIR%%/freevo/helpers/osddesigner.pyo
 %%PYTHON_SITELIBDIR%%/freevo/helpers/passwd.py
 %%PYTHON_SITELIBDIR%%/freevo/helpers/passwd.pyc
 %%PYTHON_SITELIBDIR%%/freevo/helpers/passwd.pyo
@@ -327,9 +342,6 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/helpers/schedulefavorites.py
 %%PYTHON_SITELIBDIR%%/freevo/helpers/schedulefavorites.pyc
 %%PYTHON_SITELIBDIR%%/freevo/helpers/schedulefavorites.pyo
-%%PYTHON_SITELIBDIR%%/freevo/helpers/svgtodialog.py
-%%PYTHON_SITELIBDIR%%/freevo/helpers/svgtodialog.pyc
-%%PYTHON_SITELIBDIR%%/freevo/helpers/svgtodialog.pyo
 %%PYTHON_SITELIBDIR%%/freevo/helpers/tv_grab.py
 %%PYTHON_SITELIBDIR%%/freevo/helpers/tv_grab.pyc
 %%PYTHON_SITELIBDIR%%/freevo/helpers/tv_grab.pyo
@@ -531,6 +543,12 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver/bouncing_freevo.py
 %%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver/bouncing_freevo.pyc
 %%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver/bouncing_freevo.pyo
+%%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver/flames.py
+%%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver/flames.pyc
+%%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver/flames.pyo
+%%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver/life.py
+%%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver/life.pyc
+%%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver/life.pyo
 %%PYTHON_SITELIBDIR%%/freevo/plugins/shoppingcart.py
 %%PYTHON_SITELIBDIR%%/freevo/plugins/shoppingcart.pyc
 %%PYTHON_SITELIBDIR%%/freevo/plugins/shoppingcart.pyo
@@ -549,6 +567,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/plugins/tiny_xosd.py
 %%PYTHON_SITELIBDIR%%/freevo/plugins/tiny_xosd.pyc
 %%PYTHON_SITELIBDIR%%/freevo/plugins/tiny_xosd.pyo
+%%PYTHON_SITELIBDIR%%/freevo/plugins/torrent.py
+%%PYTHON_SITELIBDIR%%/freevo/plugins/torrent.pyc
+%%PYTHON_SITELIBDIR%%/freevo/plugins/torrent.pyo
 %%PYTHON_SITELIBDIR%%/freevo/plugins/udpremote.py
 %%PYTHON_SITELIBDIR%%/freevo/plugins/udpremote.pyc
 %%PYTHON_SITELIBDIR%%/freevo/plugins/udpremote.pyo
@@ -570,6 +591,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/plugins/yac.py
 %%PYTHON_SITELIBDIR%%/freevo/plugins/yac.pyc
 %%PYTHON_SITELIBDIR%%/freevo/plugins/yac.pyo
+%%PYTHON_SITELIBDIR%%/freevo/plugins/zoneminder.py
+%%PYTHON_SITELIBDIR%%/freevo/plugins/zoneminder.pyc
+%%PYTHON_SITELIBDIR%%/freevo/plugins/zoneminder.pyo
 %%PYTHON_SITELIBDIR%%/freevo/pylcd.py
 %%PYTHON_SITELIBDIR%%/freevo/pylcd.pyc
 %%PYTHON_SITELIBDIR%%/freevo/pylcd.pyo
@@ -654,6 +678,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/skins/osd/__init__.py
 %%PYTHON_SITELIBDIR%%/freevo/skins/osd/__init__.pyc
 %%PYTHON_SITELIBDIR%%/freevo/skins/osd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/freevo/skins/osd/designer.py
+%%PYTHON_SITELIBDIR%%/freevo/skins/osd/designer.pyc
+%%PYTHON_SITELIBDIR%%/freevo/skins/osd/designer.pyo
 %%PYTHON_SITELIBDIR%%/freevo/skins/osd/skin.py
 %%PYTHON_SITELIBDIR%%/freevo/skins/osd/skin.pyc
 %%PYTHON_SITELIBDIR%%/freevo/skins/osd/skin.pyo
@@ -669,6 +696,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/tv/channels.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/channels.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/channels.pyo
+%%PYTHON_SITELIBDIR%%/freevo/tv/dialogs.py
+%%PYTHON_SITELIBDIR%%/freevo/tv/dialogs.pyc
+%%PYTHON_SITELIBDIR%%/freevo/tv/dialogs.pyo
 %%PYTHON_SITELIBDIR%%/freevo/tv/edit_favorite.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/edit_favorite.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/edit_favorite.pyo
@@ -690,6 +720,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/categories.py
+%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/categories.pyc
+%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/categories.pyo
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/dvbstreamer/__init__.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/dvbstreamer/__init__.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/dvbstreamer/__init__.pyo
@@ -741,9 +774,9 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/__init__.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/__init__.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/__init__.pyo
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/chunk_buffer.py
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/chunk_buffer.pyc
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/chunk_buffer.pyo
+%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/backend.py
+%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/backend.pyc
+%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/backend.pyo
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/controllers.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/controllers.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/controllers.pyo
@@ -765,27 +798,12 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/events.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/events.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/events.pyo
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/fillers.py
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/fillers.pyc
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/fillers.pyo
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/players.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/players.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/players.pyo
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/record.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/record.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/record.pyo
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/ring_buffer.py
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/ring_buffer.pyc
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/ring_buffer.pyo
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/rwlock.py
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/rwlock.pyc
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/rwlock.pyo
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/test.py
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/test.pyc
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/test.pyo
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/testosd.py
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/testosd.pyc
-%%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/testosd.pyo
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/manual_record.py
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/manual_record.pyc
 %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/manual_record.pyo
@@ -861,9 +879,6 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/util/audioscrobbler.py
 %%PYTHON_SITELIBDIR%%/freevo/util/audioscrobbler.pyc
 %%PYTHON_SITELIBDIR%%/freevo/util/audioscrobbler.pyo
-%%PYTHON_SITELIBDIR%%/freevo/util/benchmark.py
-%%PYTHON_SITELIBDIR%%/freevo/util/benchmark.pyc
-%%PYTHON_SITELIBDIR%%/freevo/util/benchmark.pyo
 %%PYTHON_SITELIBDIR%%/freevo/util/dbutil.py
 %%PYTHON_SITELIBDIR%%/freevo/util/dbutil.pyc
 %%PYTHON_SITELIBDIR%%/freevo/util/dbutil.pyo
@@ -912,9 +927,15 @@ etc/freevo/local_conf.py.example
 %%PYTHON_SITELIBDIR%%/freevo/util/pymetar.py
 %%PYTHON_SITELIBDIR%%/freevo/util/pymetar.pyc
 %%PYTHON_SITELIBDIR%%/freevo/util/pymetar.pyo
+%%PYTHON_SITELIBDIR%%/freevo/util/qp_xml.py
+%%PYTHON_SITELIBDIR%%/freevo/util/qp_xml.pyc
+%%PYTHON_SITELIBDIR%%/freevo/util/qp_xml.pyo
 %%PYTHON_SITELIBDIR%%/freevo/util/tv_util.py
 %%PYTHON_SITELIBDIR%%/freevo/util/tv_util.pyc
 %%PYTHON_SITELIBDIR%%/freevo/util/tv_util.pyo
+%%PYTHON_SITELIBDIR%%/freevo/util/unescape.py
+%%PYTHON_SITELIBDIR%%/freevo/util/unescape.pyc
+%%PYTHON_SITELIBDIR%%/freevo/util/unescape.pyo
 %%PYTHON_SITELIBDIR%%/freevo/util/vfs.py
 %%PYTHON_SITELIBDIR%%/freevo/util/vfs.pyc
 %%PYTHON_SITELIBDIR%%/freevo/util/vfs.pyo
@@ -1060,34 +1081,37 @@ etc/freevo/local_conf.py.example
 %%DOCSDIR%%/README
 %%DOCSDIR%%/RELEASE_NOTES
 %%DOCSDIR%%/installation/a353.html
-%%DOCSDIR%%/installation/c169.html
 %%DOCSDIR%%/installation/c19.html
+%%DOCSDIR%%/installation/c63.html
+%%DOCSDIR%%/installation/c169.html
 %%DOCSDIR%%/installation/c205.html
 %%DOCSDIR%%/installation/c222.html
 %%DOCSDIR%%/installation/c248.html
 %%DOCSDIR%%/installation/c302.html
 %%DOCSDIR%%/installation/c322.html
-%%DOCSDIR%%/installation/c63.html
 %%DOCSDIR%%/installation/index.html
+%%DOCSDIR%%/installation/x25.html
+%%DOCSDIR%%/installation/x28.html
+%%DOCSDIR%%/installation/x32.html
+%%DOCSDIR%%/installation/x38.html
+%%DOCSDIR%%/installation/x59.html
+%%DOCSDIR%%/installation/x71.html
+%%DOCSDIR%%/installation/x90.html
 %%DOCSDIR%%/installation/x183.html
 %%DOCSDIR%%/installation/x216.html
 %%DOCSDIR%%/installation/x228.html
 %%DOCSDIR%%/installation/x233.html
 %%DOCSDIR%%/installation/x244.html
-%%DOCSDIR%%/installation/x25.html
 %%DOCSDIR%%/installation/x255.html
 %%DOCSDIR%%/installation/x262.html
 %%DOCSDIR%%/installation/x273.html
-%%DOCSDIR%%/installation/x28.html
 %%DOCSDIR%%/installation/x288.html
-%%DOCSDIR%%/installation/x32.html
 %%DOCSDIR%%/installation/x333.html
 %%DOCSDIR%%/installation/x343.html
 %%DOCSDIR%%/installation/x348.html
 %%DOCSDIR%%/installation/x363.html
 %%DOCSDIR%%/installation/x375.html
 %%DOCSDIR%%/installation/x379.html
-%%DOCSDIR%%/installation/x38.html
 %%DOCSDIR%%/installation/x385.html
 %%DOCSDIR%%/installation/x424.html
 %%DOCSDIR%%/installation/x430.html
@@ -1096,15 +1120,17 @@ etc/freevo/local_conf.py.example
 %%DOCSDIR%%/installation/x442.html
 %%DOCSDIR%%/installation/x445.html
 %%DOCSDIR%%/installation/x449.html
-%%DOCSDIR%%/installation/x59.html
-%%DOCSDIR%%/installation/x71.html
-%%DOCSDIR%%/installation/x90.html
+%%DOCSDIR%%/plugin_writing/c27.html
+%%DOCSDIR%%/plugin_writing/c50.html
 %%DOCSDIR%%/plugin_writing/c145.html
 %%DOCSDIR%%/plugin_writing/c223.html
-%%DOCSDIR%%/plugin_writing/c27.html
 %%DOCSDIR%%/plugin_writing/c314.html
-%%DOCSDIR%%/plugin_writing/c50.html
 %%DOCSDIR%%/plugin_writing/index.html
+%%DOCSDIR%%/plugin_writing/x33.html
+%%DOCSDIR%%/plugin_writing/x36.html
+%%DOCSDIR%%/plugin_writing/x41.html
+%%DOCSDIR%%/plugin_writing/x55.html
+%%DOCSDIR%%/plugin_writing/x69.html
 %%DOCSDIR%%/plugin_writing/x105.html
 %%DOCSDIR%%/plugin_writing/x109.html
 %%DOCSDIR%%/plugin_writing/x153.html
@@ -1116,11 +1142,6 @@ etc/freevo/local_conf.py.example
 %%DOCSDIR%%/plugin_writing/x245.html
 %%DOCSDIR%%/plugin_writing/x276.html
 %%DOCSDIR%%/plugin_writing/x301.html
-%%DOCSDIR%%/plugin_writing/x33.html
-%%DOCSDIR%%/plugin_writing/x36.html
-%%DOCSDIR%%/plugin_writing/x41.html
-%%DOCSDIR%%/plugin_writing/x55.html
-%%DOCSDIR%%/plugin_writing/x69.html
 %%DATADIR%%/contrib/fbcon/fbset.db
 %%DATADIR%%/contrib/fbcon/mgafb
 %%DATADIR%%/fonts/DejaVuSans-Oblique.ttf
@@ -1291,6 +1312,7 @@ etc/freevo/local_conf.py.example
 %%DATADIR%%/icons/holidays/christmas.png
 %%DATADIR%%/icons/holidays/freevo_bday.png
 %%DATADIR%%/icons/holidays/ghost.png
+%%DATADIR%%/icons/holidays/newyear.png
 %%DATADIR%%/icons/holidays/pumpkin.png
 %%DATADIR%%/icons/holidays/snowman.png
 %%DATADIR%%/icons/holidays/usa_flag.png
@@ -1305,6 +1327,18 @@ etc/freevo/local_conf.py.example
 %%DATADIR%%/icons/misc/greenbutton.png
 %%DATADIR%%/icons/misc/memory.png
 %%DATADIR%%/icons/misc/osd_busy.png
+%%DATADIR%%/icons/misc/osd_busy00.png
+%%DATADIR%%/icons/misc/osd_busy01.png
+%%DATADIR%%/icons/misc/osd_busy02.png
+%%DATADIR%%/icons/misc/osd_busy03.png
+%%DATADIR%%/icons/misc/osd_busy04.png
+%%DATADIR%%/icons/misc/osd_busy05.png
+%%DATADIR%%/icons/misc/osd_busy06.png
+%%DATADIR%%/icons/misc/osd_busy07.png
+%%DATADIR%%/icons/misc/osd_busy08.png
+%%DATADIR%%/icons/misc/osd_busy09.png
+%%DATADIR%%/icons/misc/osd_busy10.png
+%%DATADIR%%/icons/misc/osd_busy11.png
 %%DATADIR%%/icons/misc/radio.png
 %%DATADIR%%/icons/misc/redbutton.png
 %%DATADIR%%/icons/misc/reminder_off.png
@@ -1359,6 +1393,7 @@ etc/freevo/local_conf.py.example
 %%DATADIR%%/icons/status/television_keep.png
 %%DATADIR%%/icons/status/television_keep_watched.png
 %%DATADIR%%/icons/status/television_near_expired.png
+%%DATADIR%%/icons/status/television_soon.png
 %%DATADIR%%/icons/status/television_unwatched.png
 %%DATADIR%%/icons/status/television_watched.png
 %%DATADIR%%/icons/status/volbar1.png
@@ -1700,6 +1735,7 @@ etc/freevo/local_conf.py.example
 %%DATADIR%%/icons/themes/bluestar/weather_off.png
 %%DATADIR%%/icons/themes/bluestar/weather_on.png
 %%DATADIR%%/icons/themes/blurr/down.png
+%%DATADIR%%/icons/themes/blurr/lastfm.png
 %%DATADIR%%/icons/themes/blurr/left.png
 %%DATADIR%%/icons/themes/blurr/mimetypes/audiocd.png
 %%DATADIR%%/icons/themes/blurr/mimetypes/cdrom.png
@@ -1734,6 +1770,7 @@ etc/freevo/local_conf.py.example
 %%DATADIR%%/icons/themes/blurr/status/television_inactive.png
 %%DATADIR%%/icons/themes/blurr/status/television_keep.png
 %%DATADIR%%/icons/themes/blurr/status/television_keep_watched.png
+%%DATADIR%%/icons/themes/blurr/status/television_soon.png
 %%DATADIR%%/icons/themes/blurr/status/television_unwatched.png
 %%DATADIR%%/icons/themes/blurr/status/television_watched.png
 %%DATADIR%%/icons/themes/blurr/up.png
@@ -1937,6 +1974,7 @@ etc/freevo/local_conf.py.example
 %%DATADIR%%/images/TuxnTosh/tuxntosh_audio.png
 %%DATADIR%%/images/TuxnTosh/tuxntosh_movies.png
 %%DATADIR%%/images/TuxnTosh/tuxntosh_photo.png
+%%DATADIR%%/images/album_tree_watermark.png
 %%DATADIR%%/images/atlantice/Coverback.png
 %%DATADIR%%/images/atlantice/back.png
 %%DATADIR%%/images/atlantice/back_black.jpg
@@ -2056,18 +2094,22 @@ etc/freevo/local_conf.py.example
 %%DATADIR%%/images/newmarks/tv.png
 %%DATADIR%%/images/osd/base/bar.png
 %%DATADIR%%/images/osd/base/bboptionsmenubg.png
+%%DATADIR%%/images/osd/base/bufferpos_bg.png
 %%DATADIR%%/images/osd/base/button_active_bg.png
 %%DATADIR%%/images/osd/base/button_normal_bg.png
 %%DATADIR%%/images/osd/base/button_pressed_bg.png
 %%DATADIR%%/images/osd/base/details_bg.png
 %%DATADIR%%/images/osd/base/dialog_bg.png
 %%DATADIR%%/images/osd/base/fastforward.png
+%%DATADIR%%/images/osd/base/livepause_state_bar.png
+%%DATADIR%%/images/osd/base/livepause_state_bg.png
 %%DATADIR%%/images/osd/base/menu_active.png
 %%DATADIR%%/images/osd/base/menu_bg.png
 %%DATADIR%%/images/osd/base/menu_down.png
 %%DATADIR%%/images/osd/base/menu_normal.png
 %%DATADIR%%/images/osd/base/menu_pressed.png
 %%DATADIR%%/images/osd/base/menu_up.png
+%%DATADIR%%/images/osd/base/message_bg.png
 %%DATADIR%%/images/osd/base/muted.png
 %%DATADIR%%/images/osd/base/pause.png
 %%DATADIR%%/images/osd/base/percent_bar.png
@@ -2197,6 +2239,27 @@ etc/freevo/local_conf.py.example
 %%DATADIR%%/images/weather/weather_frame.png
 %%DATADIR%%/images/weather/weather_watermark.png
 %%DATADIR%%/images/weather/weathertypes.dat
+%%DATADIR%%/osddesigner/color.png
+%%DATADIR%%/osddesigner/dialog.png
+%%DATADIR%%/osddesigner/font.png
+%%DATADIR%%/osddesigner/image.png
+%%DATADIR%%/osddesigner/menu.png
+%%DATADIR%%/osddesigner/osddesigner.glade
+%%DATADIR%%/osddesigner/percent.png
+%%DATADIR%%/osddesigner/selector.png
+%%DATADIR%%/osddesigner/state.png
+%%DATADIR%%/osddesigner/style.png
+%%DATADIR%%/osddesigner/text.png
+%%DATADIR%%/osddesigner/theme.png
+%%DATADIR%%/osddesigner/widget-gtk-button.png
+%%DATADIR%%/osddesigner/widget-gtk-colorselectiondialog.png
+%%DATADIR%%/osddesigner/widget-gtk-dialog.png
+%%DATADIR%%/osddesigner/widget-gtk-fontselection.png
+%%DATADIR%%/osddesigner/widget-gtk-fontselectiondialog.png
+%%DATADIR%%/osddesigner/widget-gtk-image.png
+%%DATADIR%%/osddesigner/widget-gtk-menu.png
+%%DATADIR%%/osddesigner/widget-gtk-progressbar.png
+%%DATADIR%%/osddesigner/widget.png
 %%DATADIR%%/skins/freevo-osd.dtd
 %%DATADIR%%/skins/freevo-skin.dtd
 %%DATADIR%%/skins/main/Panorama.fxd
@@ -2228,54 +2291,59 @@ etc/freevo/local_conf.py.example
 %%DATADIR%%/skins/main/rain.fxd
 %%DATADIR%%/skins/main/rain.jpg
 %%DATADIR%%/skins/osd/base.fxd
+%%DATADIR%%/skins/plugins/album_tree.fxd
+%%DATADIR%%/skins/plugins/lastfm.fxd
+%%DATADIR%%/skins/plugins/lastfm.png
 %%DATADIR%%/skins/plugins/mpd.fxd
 %%DATADIR%%/skins/plugins/oneclick.fxd
 %%DATADIR%%/skins/plugins/osd/livepause.fxd
 %%DATADIR%%/skins/plugins/reminder.fxd
 %%DATADIR%%/skins/plugins/video_details.fxd
 %%DATADIR%%/skins/plugins/weather.fxd
-share/locale/af/LC_MESSAGES/freevo.mo
-share/locale/af/LC_MESSAGES/freevo.po
-share/locale/ca/LC_MESSAGES/freevo.mo
-share/locale/ca/LC_MESSAGES/freevo.po
-share/locale/cs/LC_MESSAGES/freevo.mo
-share/locale/cs/LC_MESSAGES/freevo.po
-share/locale/da/LC_MESSAGES/freevo.mo
-share/locale/da/LC_MESSAGES/freevo.po
-share/locale/de/LC_MESSAGES/freevo.mo
-share/locale/de/LC_MESSAGES/freevo.po
-share/locale/el/LC_MESSAGES/freevo.mo
-share/locale/el/LC_MESSAGES/freevo.po
-share/locale/en_GB/LC_MESSAGES/freevo.mo
-share/locale/en_GB/LC_MESSAGES/freevo.po
-share/locale/es/LC_MESSAGES/freevo.mo
-share/locale/es/LC_MESSAGES/freevo.po
-share/locale/fi/LC_MESSAGES/freevo.mo
-share/locale/fi/LC_MESSAGES/freevo.po
-share/locale/fr/LC_MESSAGES/freevo.mo
-share/locale/fr/LC_MESSAGES/freevo.po
-share/locale/hu/LC_MESSAGES/freevo.mo
-share/locale/hu/LC_MESSAGES/freevo.po
-share/locale/it/LC_MESSAGES/freevo.mo
-share/locale/it/LC_MESSAGES/freevo.po
-share/locale/nl/LC_MESSAGES/freevo.mo
-share/locale/nl/LC_MESSAGES/freevo.po
-share/locale/no/LC_MESSAGES/freevo.mo
-share/locale/no/LC_MESSAGES/freevo.po
-share/locale/pl/LC_MESSAGES/freevo.mo
-share/locale/pl/LC_MESSAGES/freevo.po
-share/locale/pt/LC_MESSAGES/freevo.mo
-share/locale/pt/LC_MESSAGES/freevo.po
-share/locale/pt_BR/LC_MESSAGES/freevo.mo
-share/locale/pt_BR/LC_MESSAGES/freevo.po
-share/locale/ro/LC_MESSAGES/freevo.mo
-share/locale/ro/LC_MESSAGES/freevo.po
-share/locale/ru/LC_MESSAGES/freevo.mo
-share/locale/ru/LC_MESSAGES/freevo.po
-share/locale/sv/LC_MESSAGES/freevo.mo
-share/locale/sv/LC_MESSAGES/freevo.po
-share/locale/zh_CN/LC_MESSAGES/freevo.mo
-share/locale/zh_CN/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/af/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/af/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/ca/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/cs/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/da/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/da/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/de/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/de/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/el/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/el/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/en_GB/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/es/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/es/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/fi/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/fr/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/hu/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/it/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/it/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/nl/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/nn_NO/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/nn_NO/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/pl/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/pt/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/ro/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/ru/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/sv/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/freevo.po
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/freevo.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/freevo.po
+@dirrm %%NLS%%share/locale/nn_NO/LC_MESSAGES
+@dirrm %%NLS%%share/locale/nn_NO
 @dirrmtry etc/freevo
 @dirrm %%PYTHON_SITELIBDIR%%/freevo/animation
 @dirrm %%PYTHON_SITELIBDIR%%/freevo/audio/plugins
@@ -2396,6 +2464,7 @@ share/locale/zh_CN/LC_MESSAGES/freevo.po
 @dirrm %%DATADIR%%/images/weather/mediaportal
 @dirrm %%DATADIR%%/images/weather
 @dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/osddesigner
 @dirrm %%DATADIR%%/skins/main
 @dirrm %%DATADIR%%/skins/osd
 @dirrm %%DATADIR%%/skins/plugins/osd