6 files changed, 78 insertions, 75 deletions

diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index d13d954c2c29..a1d2401b10ed 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freevo
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freevo
@@ -17,7 +17,7 @@ COMMENT=	Open source digital jukebox
 NO_BUILD=	yes
 
 RUN_DEPENDS=	aumix:${PORTSDIR}/audio/aumix \
-		${PYTHON_SITELIBDIR}/osd/__init__.py:${PORTSDIR}/misc/py-osd \
+		${PYTHON_SITELIBDIR}/pyosd/__init__.py:${PORTSDIR}/misc/py-osd \
 		${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
 		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted \
diff --git a/multimedia/freevo/distinfo b/multimedia/freevo/distinfo
index 97f0cbcc3063..01fadd209b15 100644
--- a/multimedia/freevo/distinfo
+++ b/multimedia/freevo/distinfo
@@ -1,2 +1,2 @@
-MD5 (freevo-1.5.0.tar.gz) = 2ee13c4469aae34b54943acd4fe83fe9
-SIZE (freevo-1.5.0.tar.gz) = 4125468
+MD5 (freevo-1.5.3.tar.gz) = 20263d2a4de1fc5948391c6b2ca04b0d
+SIZE (freevo-1.5.3.tar.gz) = 4378836
diff --git a/multimedia/freevo/files/patch-local_conf.py.example b/multimedia/freevo/files/patch-local_conf.py.example
index 4a6270d182c6..3866cec397ab 100644
--- a/multimedia/freevo/files/patch-local_conf.py.example
+++ b/multimedia/freevo/files/patch-local_conf.py.example
@@ -1,5 +1,5 @@
---- local_conf.py.example.orig	Tue Nov 23 22:21:52 2004
-+++ local_conf.py.example	Tue Nov 23 22:23:43 2004
+--- local_conf.py.example	Mon Jan 24 00:04:02 2005
++++ local_conf.py.example	Tue Sep 20 20:24:12 2005
 @@ -92,6 +92,15 @@
  # ENABLE_SHUTDOWN_SYS = 0
  
diff --git a/multimedia/freevo/files/patch-src-plugins-rom_drives.py b/multimedia/freevo/files/patch-src-plugins-rom_drives.py
index 415e37d77ff4..9a8dae6bbf7c 100644
--- a/multimedia/freevo/files/patch-src-plugins-rom_drives.py
+++ b/multimedia/freevo/files/patch-src-plugins-rom_drives.py
@@ -1,6 +1,6 @@
---- src/plugins/rom_drives.py	Tue Aug 17 21:51:52 2004
-+++ src/plugins/rom_drives.py	Tue Aug 17 21:50:55 2004
-@@ -409,9 +409,19 @@
+--- src/plugins/rom_drives.py.orig	Sun Jan 23 20:40:19 2005
++++ src/plugins/rom_drives.py	Tue Sep 20 20:26:48 2005
+@@ -415,9 +415,19 @@
                      data = array.array('c', '\000'*4096)
                      (address, length) = data.buffer_info()
                      buf = pack('BBHP', CD_MSF_FORMAT, 0, length, address)
diff --git a/multimedia/freevo/pkg-message b/multimedia/freevo/pkg-message
index dd9b0458b13c..5a420b77e3c2 100644
--- a/multimedia/freevo/pkg-message
+++ b/multimedia/freevo/pkg-message
@@ -1,7 +1,7 @@
 ***********************************************************************
 
   Freevo is now installed.  It might be a good idea to read the docs
-  in %%PREFIX%%/share/doc/freevo-1.5-rc4
+  in %%PREFIX%%/share/doc/freevo-1.5.3
 
   By default Freevo is configured with a single VFS in /var/db/cache.
   You can use this by adding users to the freevo group.
diff --git a/multimedia/freevo/pkg-plist b/multimedia/freevo/pkg-plist
index 2e4a6eea1993..ef3207ad17e2 100644
--- a/multimedia/freevo/pkg-plist
+++ b/multimedia/freevo/pkg-plist
@@ -1,67 +1,3 @@
-@dirrm etc/freevo
-@dirrm %%PYTHON_SITELIBDIR%%/freevo
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/animation
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/audio
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/audio/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/games
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/gui
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/helpers
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/image
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/image/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins/idlebar
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/main
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/tv
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/util
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/video
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/video/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/freevo/www
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/installation
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/plugin_writing
-@dirrm %%DATADIR%%
-@dirrm %%DATADIR%%/contrib
-@dirrm %%DATADIR%%/contrib/fbcon
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/fxd
-@dirrm %%DATADIR%%/fxd/examples
-@dirrm %%DATADIR%%/htdocs
-@dirrm %%DATADIR%%/htdocs/help
-@dirrm %%DATADIR%%/htdocs/help/wiki
-@dirrm %%DATADIR%%/htdocs/images
-@dirrm %%DATADIR%%/htdocs/images/library
-@dirrm %%DATADIR%%/htdocs/images/tab
-@dirrm %%DATADIR%%/htdocs/scripts
-@dirrm %%DATADIR%%/htdocs/styles
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/icons/holidays
-@dirrm %%DATADIR%%/icons/misc
-@dirrm %%DATADIR%%/icons/popup
-@dirrm %%DATADIR%%/icons/status
-@dirrm %%DATADIR%%/icons/themes
-@dirrm %%DATADIR%%/icons/themes/AquaFusion
-@dirrm %%DATADIR%%/icons/themes/AquaFusion/mimetypes
-@dirrm %%DATADIR%%/icons/themes/Noia
-@dirrm %%DATADIR%%/icons/themes/Noia/mimetypes
-@dirrm %%DATADIR%%/icons/themes/Noia/misc
-@dirrm %%DATADIR%%/icons/themes/blurr
-@dirrm %%DATADIR%%/icons/themes/blurr/mimetypes
-@dirrm %%DATADIR%%/icons/themes/blurr/status
-@dirrm %%DATADIR%%/icons/themes/tuxntosh
-@dirrm %%DATADIR%%/icons/themes/tuxntosh/mainmenu
-@dirrm %%DATADIR%%/icons/themes/tuxntosh/mainmenu/54x54
-@dirrm %%DATADIR%%/icons/themes/tuxntosh/mimetypes
-@dirrm %%DATADIR%%/icons/weather
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/images/barbieri
-@dirrm %%DATADIR%%/images/gant
-@dirrm %%DATADIR%%/images/watermarks
-@dirrm %%DATADIR%%/skins
-@dirrm %%DATADIR%%/skins/main
-@dirrm %%DATADIR%%/skins/plugins
 bin/freevo
 etc/freevo/local_conf.py.example
 etc/rc.d/freevo.sh.sample
@@ -665,7 +601,6 @@ etc/rc.d/freevo.sh.sample
 %%PYTHON_SITELIBDIR%%/freevo/www/web_types.py
 %%PYTHON_SITELIBDIR%%/freevo/www/web_types.pyc
 %%PYTHON_SITELIBDIR%%/freevo/www/web_types.pyo
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -784,6 +719,7 @@ etc/rc.d/freevo.sh.sample
 %%DATADIR%%/htdocs/index.rpy
 %%DATADIR%%/htdocs/library.rpy
 %%DATADIR%%/htdocs/manualrecord.rpy
+%%DATADIR%%/htdocs/proginfo.rpy
 %%DATADIR%%/htdocs/record.rpy
 %%DATADIR%%/htdocs/scripts/display_prog-head.js
 %%DATADIR%%/htdocs/search.rpy
@@ -1001,6 +937,8 @@ etc/rc.d/freevo.sh.sample
 %%DATADIR%%/skins/main/noia.jpg
 %%DATADIR%%/skins/plugins/video_details.fxd
 share/fxd/webradio.fxd
+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
@@ -1023,3 +961,68 @@ share/locale/pt_BR/LC_MESSAGES/freevo.mo
 share/locale/pt_BR/LC_MESSAGES/freevo.po
 share/locale/sv/LC_MESSAGES/freevo.mo
 share/locale/sv/LC_MESSAGES/freevo.po
+@dirrm share/fxd
+@dirrm %%DATADIR%%/skins/plugins
+@dirrm %%DATADIR%%/skins/main
+@dirrm %%DATADIR%%/skins
+@dirrm %%DATADIR%%/images/watermarks
+@dirrm %%DATADIR%%/images/gant
+@dirrm %%DATADIR%%/images/barbieri
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/icons/weather
+@dirrm %%DATADIR%%/icons/themes/tuxntosh/mimetypes
+@dirrm %%DATADIR%%/icons/themes/tuxntosh/mainmenu/54x54
+@dirrm %%DATADIR%%/icons/themes/tuxntosh/mainmenu
+@dirrm %%DATADIR%%/icons/themes/tuxntosh
+@dirrm %%DATADIR%%/icons/themes/blurr/status
+@dirrm %%DATADIR%%/icons/themes/blurr/mimetypes
+@dirrm %%DATADIR%%/icons/themes/blurr
+@dirrm %%DATADIR%%/icons/themes/Noia/misc
+@dirrm %%DATADIR%%/icons/themes/Noia/mimetypes
+@dirrm %%DATADIR%%/icons/themes/Noia
+@dirrm %%DATADIR%%/icons/themes/AquaFusion/mimetypes
+@dirrm %%DATADIR%%/icons/themes/AquaFusion
+@dirrm %%DATADIR%%/icons/themes
+@dirrm %%DATADIR%%/icons/status
+@dirrm %%DATADIR%%/icons/popup
+@dirrm %%DATADIR%%/icons/misc
+@dirrm %%DATADIR%%/icons/holidays
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/htdocs/styles
+@dirrm %%DATADIR%%/htdocs/scripts
+@dirrm %%DATADIR%%/htdocs/images/tab
+@dirrm %%DATADIR%%/htdocs/images/library
+@dirrm %%DATADIR%%/htdocs/images
+@dirrm %%DATADIR%%/htdocs/help/wiki
+@dirrm %%DATADIR%%/htdocs/help
+@dirrm %%DATADIR%%/htdocs
+@dirrm %%DATADIR%%/fxd/examples
+@dirrm %%DATADIR%%/fxd
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/contrib/fbcon
+@dirrm %%DATADIR%%/contrib
+@dirrm %%DATADIR%%
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/plugin_writing
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/installation
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/www
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/video/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/video
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/util
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/tv
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/main
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins/idlebar
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/image/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/image
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/helpers
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/gui
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/games
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/audio/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/audio
+@dirrm %%PYTHON_SITELIBDIR%%/freevo/animation
+@dirrm %%PYTHON_SITELIBDIR%%/freevo
+@dirrm etc/freevo