Date: Tue, 15 Sep 2015 13:23:08 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396959 - in head/multimedia/freevo: . files Message-ID: <201509151323.t8FDN8p8092333@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Tue Sep 15 13:23:07 2015 New Revision: 396959 URL: https://svnweb.freebsd.org/changeset/ports/396959 Log: multimedia/freevo: fix runtime with newer twisted lib - add patch to fix runtime with modern twisted.web - remove useless dependency on py-xml - it was successfully tested by maintainer with stock python xml package While here: - add NO_ARCH - limit python version to 2.x - modernize pkg-plist Submitted by: J.R. Oldroyd <fbsd@opal.com> (maintainer) MFH: 2015Q3 Added: head/multimedia/freevo/files/patch-src-util-marmalade.py (contents, props changed) Modified: head/multimedia/freevo/Makefile head/multimedia/freevo/pkg-plist Modified: head/multimedia/freevo/Makefile ============================================================================== --- head/multimedia/freevo/Makefile Tue Sep 15 13:09:32 2015 (r396958) +++ head/multimedia/freevo/Makefile Tue Sep 15 13:23:07 2015 (r396959) @@ -3,7 +3,7 @@ PORTNAME= freevo PORTVERSION= 1.9.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/Freevo%20releases/${PORTVERSION} @@ -17,7 +17,6 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multime aumix:${PORTSDIR}/audio/aumix \ tv_cat:${PORTSDIR}/textproc/p5-xmltv \ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:${PORTSDIR}/devel/py-zope.interface \ - ${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 \ ${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:${PORTSDIR}/multimedia/py-kaa-metadata \ @@ -38,7 +37,8 @@ SUB_LIST+= PYTHON_VERSION=${PYTHON_DEFAU FREEVO_HOME=${FREEVO_HOME} SUB_FILES= pkg-message pkg-deinstall -USES= python twisted:web +NO_ARCH= yes +USES= python:2 twisted:web USE_PYTHON= distutils noegginfo PYDISTUTILS_INSTALLNOSINGLE= yes PYDISTUTILS_SETUP= ${PYSETUP} Added: head/multimedia/freevo/files/patch-src-util-marmalade.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/freevo/files/patch-src-util-marmalade.py Tue Sep 15 13:23:07 2015 (r396959) @@ -0,0 +1,9 @@ +--- src/util/marmalade.py.orig 2007-11-07 18:53:47 UTC ++++ src/util/marmalade.py +@@ -448,4 +448,5 @@ def unjellyFromXML(stringOrFile): + return unjellyFromDOM(document) + + +-from twisted.web.microdom import Text, Element, Node, Document, parse, parseString, CDATASection, NodeList ++from twisted.web.microdom import Text, Element, Node, Document, parse, parseString, CDATASection ++from types import ListType as Nodelist Modified: head/multimedia/freevo/pkg-plist ============================================================================== --- head/multimedia/freevo/pkg-plist Tue Sep 15 13:09:32 2015 (r396958) +++ head/multimedia/freevo/pkg-plist Tue Sep 15 13:23:07 2015 (r396959) @@ -2343,140 +2343,6 @@ etc/freevo/local_conf.py.example %%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 -%%NLS%%@dirrm share/locale/nn_NO/LC_MESSAGES -%%NLS%%@dirrm share/locale/nn_NO -@dirrmtry etc/freevo -@dirrm %%PYTHON_SITELIBDIR%%/freevo/animation -@dirrm %%PYTHON_SITELIBDIR%%/freevo/audio/plugins -@dirrm %%PYTHON_SITELIBDIR%%/freevo/audio -@dirrm %%PYTHON_SITELIBDIR%%/freevo/dialog/plugins -@dirrm %%PYTHON_SITELIBDIR%%/freevo/dialog -@dirrm %%PYTHON_SITELIBDIR%%/freevo/games -@dirrm %%PYTHON_SITELIBDIR%%/freevo/gui -@dirrm %%PYTHON_SITELIBDIR%%/freevo/helpers -@dirrm %%PYTHON_SITELIBDIR%%/freevo/image/plugins -@dirrm %%PYTHON_SITELIBDIR%%/freevo/image -@dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins/idlebar -@dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver -@dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins -@dirrm %%PYTHON_SITELIBDIR%%/freevo/skin/widgets -@dirrm %%PYTHON_SITELIBDIR%%/freevo/skin -@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/main -@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/osd -@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/plugins -@dirrm %%PYTHON_SITELIBDIR%%/freevo/skins -@dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/dvbstreamer -@dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/display -@dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause -@dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins -@dirrm %%PYTHON_SITELIBDIR%%/freevo/tv -@dirrm %%PYTHON_SITELIBDIR%%/freevo/util -@dirrm %%PYTHON_SITELIBDIR%%/freevo/video/plugins -@dirrm %%PYTHON_SITELIBDIR%%/freevo/video -@dirrm %%PYTHON_SITELIBDIR%%/freevo/www -@dirrm %%PYTHON_SITELIBDIR%%/freevo -@dirrm %%DOCSDIR%%/installation -@dirrm %%DOCSDIR%%/plugin_writing -@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/contrib/fbcon -@dirrm %%DATADIR%%/contrib -@dirrm %%DATADIR%%/fonts -@dirrm %%DATADIR%%/fxd/examples -@dirrm %%DATADIR%%/fxd -@dirrm %%DATADIR%%/htdocs/help/wiki -@dirrm %%DATADIR%%/htdocs/help -@dirrm %%DATADIR%%/htdocs/icons -@dirrm %%DATADIR%%/htdocs/images/config -@dirrm %%DATADIR%%/htdocs/images/library -@dirrm %%DATADIR%%/htdocs/images/tab -@dirrm %%DATADIR%%/htdocs/images -@dirrm %%DATADIR%%/htdocs/scripts -@dirrm %%DATADIR%%/htdocs/styles -@dirrm %%DATADIR%%/htdocs/videolan/img -@dirrm %%DATADIR%%/htdocs/videolan -@dirrm %%DATADIR%%/htdocs -@dirrm %%DATADIR%%/icons/holidays -@dirrm %%DATADIR%%/icons/misc -@dirrm %%DATADIR%%/icons/popup -@dirrm %%DATADIR%%/icons/status -@dirrm %%DATADIR%%/icons/themes/AquaFusion/mimetypes -@dirrm %%DATADIR%%/icons/themes/AquaFusion -@dirrm %%DATADIR%%/icons/themes/Crystal/mimetypes -@dirrm %%DATADIR%%/icons/themes/Crystal/misc -@dirrm %%DATADIR%%/icons/themes/Crystal/popup -@dirrm %%DATADIR%%/icons/themes/Crystal/status -@dirrm %%DATADIR%%/icons/themes/Crystal -@dirrm %%DATADIR%%/icons/themes/Noia/mimetypes -@dirrm %%DATADIR%%/icons/themes/Noia/misc -@dirrm %%DATADIR%%/icons/themes/Noia -@dirrm %%DATADIR%%/icons/themes/Panorama/mimetypes -@dirrm %%DATADIR%%/icons/themes/Panorama/status -@dirrm %%DATADIR%%/icons/themes/Panorama -@dirrm %%DATADIR%%/icons/themes/Rain/mimetypes -@dirrm %%DATADIR%%/icons/themes/Rain/misc -@dirrm %%DATADIR%%/icons/themes/Rain/popup -@dirrm %%DATADIR%%/icons/themes/Rain/status -@dirrm %%DATADIR%%/icons/themes/Rain -@dirrm %%DATADIR%%/icons/themes/atlantice/mimetypes -@dirrm %%DATADIR%%/icons/themes/atlantice/status -@dirrm %%DATADIR%%/icons/themes/atlantice -@dirrm %%DATADIR%%/icons/themes/bluestar/mimetypes -@dirrm %%DATADIR%%/icons/themes/bluestar/popup -@dirrm %%DATADIR%%/icons/themes/bluestar/status -@dirrm %%DATADIR%%/icons/themes/bluestar -@dirrm %%DATADIR%%/icons/themes/blurr/mimetypes -@dirrm %%DATADIR%%/icons/themes/blurr/misc -@dirrm %%DATADIR%%/icons/themes/blurr/status -@dirrm %%DATADIR%%/icons/themes/blurr -@dirrm %%DATADIR%%/icons/themes/geexbox/mimetypes -@dirrm %%DATADIR%%/icons/themes/geexbox/status -@dirrm %%DATADIR%%/icons/themes/geexbox -@dirrm %%DATADIR%%/icons/themes/mediaportal/mimetypes -@dirrm %%DATADIR%%/icons/themes/mediaportal/misc -@dirrm %%DATADIR%%/icons/themes/mediaportal/popup -@dirrm %%DATADIR%%/icons/themes/mediaportal/status -@dirrm %%DATADIR%%/icons/themes/mediaportal -@dirrm %%DATADIR%%/icons/themes/tuxntosh/mainmenu/54x54 -@dirrm %%DATADIR%%/icons/themes/tuxntosh/mainmenu -@dirrm %%DATADIR%%/icons/themes/tuxntosh/mimetypes -@dirrm %%DATADIR%%/icons/themes/tuxntosh -@dirrm %%DATADIR%%/icons/themes/tuxntosh2/mainmenu/54x54 -@dirrm %%DATADIR%%/icons/themes/tuxntosh2/mainmenu -@dirrm %%DATADIR%%/icons/themes/tuxntosh2/mimetypes -@dirrm %%DATADIR%%/icons/themes/tuxntosh2 -@dirrm %%DATADIR%%/icons/themes -@dirrm %%DATADIR%%/icons/weather -@dirrm %%DATADIR%%/icons -@dirrm %%DATADIR%%/images/TuxnTosh -@dirrm %%DATADIR%%/images/atlantice -@dirrm %%DATADIR%%/images/barbieri -@dirrm %%DATADIR%%/images/fxd/webradio/somafm -@dirrm %%DATADIR%%/images/fxd/webradio -@dirrm %%DATADIR%%/images/fxd -@dirrm %%DATADIR%%/images/gant -@dirrm %%DATADIR%%/images/geexbox -@dirrm %%DATADIR%%/images/mediaportal -@dirrm %%DATADIR%%/images/mplayervis -@dirrm %%DATADIR%%/images/newmarks -@dirrm %%DATADIR%%/images/osd/base -@dirrm %%DATADIR%%/images/osd -@dirrm %%DATADIR%%/images/panorama -@dirrm %%DATADIR%%/images/watermarks -@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 -@dirrm %%DATADIR%%/skins/plugins -@dirrm %%DATADIR%%/skins -@dirrm %%DATADIR%% -@owner freevo -@group freevo -@unexec rmdir /var/log/freevo 2>/dev/null || true -@exec install -d -o freevo -g freevo -m 0755 /var/log/freevo -@unexec rmdir /var/run/freevo 2>/dev/null || true -@exec install -d -o freevo -g freevo -m 0755 /var/run/freevo -@owner -@group +@dir etc/freevo +@dir(freevo,freevo,0755) /var/log/freevo +@dir(freevo,freevo,0755) /var/run/freevo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509151323.t8FDN8p8092333>