Date: Thu, 9 Dec 2010 13:58:25 -0500 (EST) From: "J.R. Oldroyd" <fbsd@opal.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/152965: port update: multimedia/freevo-1.9.0_3 to freevo-1.9.0_4 Message-ID: <201012091858.oB9IwPvk063482@homobox.opal.com> Resent-Message-ID: <201012091900.oB9J0Mvf047190@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152965 >Category: ports >Synopsis: port update: multimedia/freevo-1.9.0_3 to freevo-1.9.0_4 >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Dec 09 19:00:21 UTC 2010 >Closed-Date: >Last-Modified: >Originator: J.R. Oldroyd >Release: FreeBSD 8.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD xx.opal.com 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #5: Sat Dec 4 23:01:56 EST 2010 xx@opal.com:/usr/obj/usr/src/sys/XX i386 >Description: Port was broken following recent python updates. Attached patch fixes the problems by: - removing dependency on python 2.5 version - adding additional patches needed due to python Twisted library updates - fixes to rc.d script >How-To-Repeat: n/a >Fix: diff -ruN /usr/ports/multimedia/freevo/Makefile multimedia/freevo/Makefile --- /usr/ports/multimedia/freevo/Makefile 2010-05-31 17:38:15.000000000 -0400 +++ multimedia/freevo/Makefile 2010-12-05 00:15:41.000000000 -0500 @@ -7,7 +7,7 @@ PORTNAME= freevo PORTVERSION= 1.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/Freevo%20releases/${PORTVERSION} @@ -35,7 +35,8 @@ FREEVO_GID= ${FREEVO_UID} FREEVO_HOME= /var/db/${FREEVO_USER} -SUB_LIST+= PORTVERSION=${PORTVERSION} \ +SUB_LIST+= PYTHON_VERSION=${PYTHON_DEFAULT_VERSION} \ + PORTVERSION=${PORTVERSION} \ FREEVO_USER=${FREEVO_USER} \ FREEVO_GROUP=${FREEVO_GROUP} \ FREEVO_UID=${FREEVO_UID} \ @@ -68,6 +69,7 @@ @${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 @${MV} ${WRKSRC}/src/www/htdocs/favorites.rpy.orig ${WRKDIR} + @${MV} ${WRKSRC}/src/www/htdocs/search.rpy.orig ${WRKDIR} post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff -ruN /usr/ports/multimedia/freevo/files/freevo.in multimedia/freevo/files/freevo.in --- /usr/ports/multimedia/freevo/files/freevo.in 2009-06-01 15:56:31.000000000 -0400 +++ multimedia/freevo/files/freevo.in 2010-12-09 13:43:57.000000000 -0500 @@ -1,55 +1,78 @@ #!/bin/sh +# +# $FreeBSD$ +# # PROVIDE: freevo -# REQUIRE: DAEMON lircd +# REQUIRE: LOGIN # KEYWORD: shutdown -# + # Uses the following /etc/rc.conf variables: # freevo_enable="YES" master on/off # freevo_recordserver_enable="YES" start freevo record server # freevo_webserver_enable="YES" start freevo web server # freevo_gui_enable="YES" start freevo GUI -# . /etc/rc.subr name=freevo rcvar=`set_rcvar` -load_rc_config $name -: ${freevo_enable="NO"} -: ${freevo_recordserver_enable="NO"} -: ${freevo_webserver_enable="NO"} -: ${freevo_gui_enable="NO"} +load_rc_config ${name} +: ${freevo_enable:="NO"} +: ${freevo_recordserver_enable:="NO"} +: ${freevo_webserver_enable:="NO"} +: ${freevo_gui_enable:="NO"} freevo_user=${freevo_user:-"freevo"} freevo_group=${freevo_group:-"freevo"} freevo_uid=`pw usershow ${freevo_user} | awk -F: '{print $3}'` freevo_dir=`pw usershow ${freevo_user} | awk -F: '{print $9}'` -command=%%PREFIX%%/bin/freevo -command_interpreter="%%PREFIX%%/bin/python2.5" +command="%%PREFIX%%/bin/freevo" +command_interpreter="%%PREFIX%%/bin/%%PYTHON_VERSION%%" cd ${freevo_dir} +msg() { + case "${no_msg}" in + 1) ;; + *) echo "$@" ;; + esac +} + +freevo_start() { + [ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --daemon recordserver" && msg Starting freevo recordserver. + [ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --daemon webserver" && msg Starting freevo webserver. + [ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command} --daemon" && msg Starting freevo GUI. +} + + +freevo_stop() { + [ ${freevo_gui_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop" && msg Stopping freevo GUI. + [ ${freevo_webserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop webserver" && msg Stopping freevo webserver. + [ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop recordserver" && msg Stopping freevo recordserver. +} + +no_msg="" + case "$1" in -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" +start|faststart|onestart) + freevo_start + ;; +quietstart) + no_msg=1 + freevo_start ;; -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" +stop|faststop|onestop) + freevo_stop + ;; +quietstop) + no_msg=1 + freevo_stop ;; restart) - [ ${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" + freevo_stop + freevo_start ;; esac - diff -ruN /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-fileinfo.rpy multimedia/freevo/files/patch-src-www-htdocs-fileinfo.rpy --- /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-fileinfo.rpy 1969-12-31 19:00:00.000000000 -0500 +++ multimedia/freevo/files/patch-src-www-htdocs-fileinfo.rpy 2010-12-07 03:00:11.000000000 -0500 @@ -0,0 +1,10 @@ +--- src/www/htdocs/fileinfo.rpy.orig 2009-04-02 12:50:13.000000000 -0400 ++++ src/www/htdocs/fileinfo.rpy 2010-12-07 02:58:01.000000000 -0500 +@@ -33,7 +33,6 @@ + import time + + from www.web_types import HTMLResource, FreevoResource +-from twisted.web.woven import page + import util + import config + import kaa.metadata as metadata diff -ruN /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-guide.rpy multimedia/freevo/files/patch-src-www-htdocs-guide.rpy --- /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-guide.rpy 1969-12-31 19:00:00.000000000 -0500 +++ multimedia/freevo/files/patch-src-www-htdocs-guide.rpy 2010-12-07 03:00:11.000000000 -0500 @@ -0,0 +1,11 @@ +--- src/www/htdocs/guide.rpy.orig 2009-02-19 12:59:44.000000000 -0500 ++++ src/www/htdocs/guide.rpy 2010-12-07 02:56:47.000000000 -0500 +@@ -32,8 +32,6 @@ + import sys, string + import time + +-from twisted.web.woven import page +- + import config + import util.tv_util as tv_util + import util diff -ruN /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-guidechannel.rpy multimedia/freevo/files/patch-src-www-htdocs-guidechannel.rpy --- /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-guidechannel.rpy 1969-12-31 19:00:00.000000000 -0500 +++ multimedia/freevo/files/patch-src-www-htdocs-guidechannel.rpy 2010-12-07 03:00:11.000000000 -0500 @@ -0,0 +1,10 @@ +--- src/www/htdocs/guidechannel.rpy.orig 2009-02-19 12:59:44.000000000 -0500 ++++ src/www/htdocs/guidechannel.rpy 2010-12-07 02:58:10.000000000 -0500 +@@ -33,7 +33,6 @@ + import time + import datetime + +-from twisted.web.woven import page + from twisted.web import static + + import util.tv_util as tv_util diff -ruN /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-proginfo.rpy multimedia/freevo/files/patch-src-www-htdocs-proginfo.rpy --- /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-proginfo.rpy 1969-12-31 19:00:00.000000000 -0500 +++ multimedia/freevo/files/patch-src-www-htdocs-proginfo.rpy 2010-12-07 03:00:11.000000000 -0500 @@ -0,0 +1,10 @@ +--- src/www/htdocs/proginfo.rpy.orig 2008-02-20 15:52:22.000000000 -0500 ++++ src/www/htdocs/proginfo.rpy 2010-12-07 02:58:19.000000000 -0500 +@@ -33,7 +33,6 @@ + import time + + from www.web_types import HTMLResource, FreevoResource +-from twisted.web.woven import page + + import util.tv_util as tv_util + import util diff -ruN /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-search.rpy multimedia/freevo/files/patch-src-www-htdocs-search.rpy --- /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-search.rpy 1969-12-31 19:00:00.000000000 -0500 +++ multimedia/freevo/files/patch-src-www-htdocs-search.rpy 2010-12-04 23:25:40.000000000 -0500 @@ -0,0 +1,24 @@ +--- src/www/htdocs/search.rpy.orig 2009-02-19 12:59:44.000000000 -0500 ++++ src/www/htdocs/search.rpy 2010-04-19 20:03:02.000000000 -0400 +@@ -113,17 +113,17 @@ + if not chan: chan = 'UNKNOWN' + fv.tableCell(chan, 'class="'+status+'" colspan="1"') + +- fv.tableCell(prog.title, 'class="'+status+'" colspan="1"') ++ fv.tableCell(unicode(prog.title, 'iso-8859-1'), 'class="'+status+'" colspan="1"') + if prog.sub_title: +- fv.tableCell(prog.sub_title, 'class="'+status+'" colspan="1"') ++ fv.tableCell(unicode(prog.sub_title, 'iso-8859-1'), 'class="'+status+'" colspan="1"') + else: + fv.tableCell(' ', 'class="'+status+'" colspan="1"') + + + if prog.desc == '': +- cell = _('Sorry, the program description for %s is unavailable.') % ('<b>'+prog.title+'</b>') ++ cell = _('Sorry, the program description for %s is unavailable.') % ('<b>'+unicode(prog.title, 'iso-8859-1')+'</b>') + else: +- cell = prog.desc ++ cell = unicode(prog.desc, 'iso-8859-1') + fv.tableCell(cell, 'class="'+status+'" colspan="1"') + + if status == 'scheduled': diff -ruN /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-vlcwin.rpy multimedia/freevo/files/patch-src-www-htdocs-vlcwin.rpy --- /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-vlcwin.rpy 1969-12-31 19:00:00.000000000 -0500 +++ multimedia/freevo/files/patch-src-www-htdocs-vlcwin.rpy 2010-12-07 03:00:11.000000000 -0500 @@ -0,0 +1,10 @@ +--- src/www/htdocs/vlcwin.rpy.orig 2008-02-20 15:52:22.000000000 -0500 ++++ src/www/htdocs/vlcwin.rpy 2010-12-07 02:58:25.000000000 -0500 +@@ -33,7 +33,6 @@ + import time + + from www.web_types import HTMLResource, FreevoResource +-from twisted.web.woven import page + import util + import config + import kaa.metadata as metadata diff -ruN /usr/ports/multimedia/freevo/files/patch-src-www-web_types.py multimedia/freevo/files/patch-src-www-web_types.py --- /usr/ports/multimedia/freevo/files/patch-src-www-web_types.py 1969-12-31 19:00:00.000000000 -0500 +++ multimedia/freevo/files/patch-src-www-web_types.py 2010-12-05 10:56:11.000000000 -0500 @@ -0,0 +1,34 @@ +--- src/www/web_types.py.orig 2009-05-07 13:34:38.000000000 -0400 ++++ src/www/web_types.py 2010-12-05 10:54:51.000000000 -0500 +@@ -36,7 +36,6 @@ + import config + import socket + +-from twisted.web.woven import page + from twisted.web.resource import Resource + from tv.record_client import RecordClient + +@@ -71,23 +70,6 @@ + + + +-class FreevoPage(page.Page): +- """ +- """ +- def __init__(self, model=None, template=None): +- #print 'FreevoPage.__init__(model=%r, template=%r)' % (model, template) +- +- if not model: +- model = {'foo': 'bar'} +- if not template: +- template = '<html><head><title>ERROR</title></head>' + \ +- '<body>ERROR: no template</body></html>' +- +- page.Page.__init__(self, model, template=template) +- +- self.addSlash = 0 +- +- + class FreevoResource(Resource): + """ + Base class of webpages which handels the authentication. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012091858.oB9IwPvk063482>