svn commit: r396959 - in head/multimedia/freevo: . files

[Ruslan Makhmatkhanov]

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 at 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
- at dirrmtry etc/freevo
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/animation
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/audio/plugins
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/audio
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/dialog/plugins
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/dialog
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/games
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/gui
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/helpers
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/image/plugins
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/image
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins/idlebar
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins/screensaver
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/plugins
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/skin/widgets
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/skin
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/main
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/osd
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/skins/plugins
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/skins
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/dvbstreamer
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause/display
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins/livepause
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/tv/plugins
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/tv
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/util
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/video/plugins
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/video
- at dirrm %%PYTHON_SITELIBDIR%%/freevo/www
- at dirrm %%PYTHON_SITELIBDIR%%/freevo
- at dirrm %%DOCSDIR%%/installation
- at dirrm %%DOCSDIR%%/plugin_writing
- at dirrm %%DOCSDIR%%
- at dirrm %%DATADIR%%/contrib/fbcon
- at dirrm %%DATADIR%%/contrib
- at dirrm %%DATADIR%%/fonts
- at dirrm %%DATADIR%%/fxd/examples
- at dirrm %%DATADIR%%/fxd
- at dirrm %%DATADIR%%/htdocs/help/wiki
- at dirrm %%DATADIR%%/htdocs/help
- at dirrm %%DATADIR%%/htdocs/icons
- at dirrm %%DATADIR%%/htdocs/images/config
- at dirrm %%DATADIR%%/htdocs/images/library
- at dirrm %%DATADIR%%/htdocs/images/tab
- at dirrm %%DATADIR%%/htdocs/images
- at dirrm %%DATADIR%%/htdocs/scripts
- at dirrm %%DATADIR%%/htdocs/styles
- at dirrm %%DATADIR%%/htdocs/videolan/img
- at dirrm %%DATADIR%%/htdocs/videolan
- at dirrm %%DATADIR%%/htdocs
- at dirrm %%DATADIR%%/icons/holidays
- at dirrm %%DATADIR%%/icons/misc
- at dirrm %%DATADIR%%/icons/popup
- at dirrm %%DATADIR%%/icons/status
- at dirrm %%DATADIR%%/icons/themes/AquaFusion/mimetypes
- at dirrm %%DATADIR%%/icons/themes/AquaFusion
- at dirrm %%DATADIR%%/icons/themes/Crystal/mimetypes
- at dirrm %%DATADIR%%/icons/themes/Crystal/misc
- at dirrm %%DATADIR%%/icons/themes/Crystal/popup
- at dirrm %%DATADIR%%/icons/themes/Crystal/status
- at dirrm %%DATADIR%%/icons/themes/Crystal
- at dirrm %%DATADIR%%/icons/themes/Noia/mimetypes
- at dirrm %%DATADIR%%/icons/themes/Noia/misc
- at dirrm %%DATADIR%%/icons/themes/Noia
- at dirrm %%DATADIR%%/icons/themes/Panorama/mimetypes
- at dirrm %%DATADIR%%/icons/themes/Panorama/status
- at dirrm %%DATADIR%%/icons/themes/Panorama
- at dirrm %%DATADIR%%/icons/themes/Rain/mimetypes
- at dirrm %%DATADIR%%/icons/themes/Rain/misc
- at dirrm %%DATADIR%%/icons/themes/Rain/popup
- at dirrm %%DATADIR%%/icons/themes/Rain/status
- at dirrm %%DATADIR%%/icons/themes/Rain
- at dirrm %%DATADIR%%/icons/themes/atlantice/mimetypes
- at dirrm %%DATADIR%%/icons/themes/atlantice/status
- at dirrm %%DATADIR%%/icons/themes/atlantice
- at dirrm %%DATADIR%%/icons/themes/bluestar/mimetypes
- at dirrm %%DATADIR%%/icons/themes/bluestar/popup
- at dirrm %%DATADIR%%/icons/themes/bluestar/status
- at dirrm %%DATADIR%%/icons/themes/bluestar
- at dirrm %%DATADIR%%/icons/themes/blurr/mimetypes
- at dirrm %%DATADIR%%/icons/themes/blurr/misc
- at dirrm %%DATADIR%%/icons/themes/blurr/status
- at dirrm %%DATADIR%%/icons/themes/blurr
- at dirrm %%DATADIR%%/icons/themes/geexbox/mimetypes
- at dirrm %%DATADIR%%/icons/themes/geexbox/status
- at dirrm %%DATADIR%%/icons/themes/geexbox
- at dirrm %%DATADIR%%/icons/themes/mediaportal/mimetypes
- at dirrm %%DATADIR%%/icons/themes/mediaportal/misc
- at dirrm %%DATADIR%%/icons/themes/mediaportal/popup
- at dirrm %%DATADIR%%/icons/themes/mediaportal/status
- at dirrm %%DATADIR%%/icons/themes/mediaportal
- at dirrm %%DATADIR%%/icons/themes/tuxntosh/mainmenu/54x54
- at dirrm %%DATADIR%%/icons/themes/tuxntosh/mainmenu
- at dirrm %%DATADIR%%/icons/themes/tuxntosh/mimetypes
- at dirrm %%DATADIR%%/icons/themes/tuxntosh
- at dirrm %%DATADIR%%/icons/themes/tuxntosh2/mainmenu/54x54
- at dirrm %%DATADIR%%/icons/themes/tuxntosh2/mainmenu
- at dirrm %%DATADIR%%/icons/themes/tuxntosh2/mimetypes
- at dirrm %%DATADIR%%/icons/themes/tuxntosh2
- at dirrm %%DATADIR%%/icons/themes
- at dirrm %%DATADIR%%/icons/weather
- at dirrm %%DATADIR%%/icons
- at dirrm %%DATADIR%%/images/TuxnTosh
- at dirrm %%DATADIR%%/images/atlantice
- at dirrm %%DATADIR%%/images/barbieri
- at dirrm %%DATADIR%%/images/fxd/webradio/somafm
- at dirrm %%DATADIR%%/images/fxd/webradio
- at dirrm %%DATADIR%%/images/fxd
- at dirrm %%DATADIR%%/images/gant
- at dirrm %%DATADIR%%/images/geexbox
- at dirrm %%DATADIR%%/images/mediaportal
- at dirrm %%DATADIR%%/images/mplayervis
- at dirrm %%DATADIR%%/images/newmarks
- at dirrm %%DATADIR%%/images/osd/base
- at dirrm %%DATADIR%%/images/osd
- at dirrm %%DATADIR%%/images/panorama
- at dirrm %%DATADIR%%/images/watermarks
- at dirrm %%DATADIR%%/images/weather/mediaportal
- at dirrm %%DATADIR%%/images/weather
- at dirrm %%DATADIR%%/images
- at dirrm %%DATADIR%%/osddesigner
- at dirrm %%DATADIR%%/skins/main
- at dirrm %%DATADIR%%/skins/osd
- at dirrm %%DATADIR%%/skins/plugins/osd
- at dirrm %%DATADIR%%/skins/plugins
- at dirrm %%DATADIR%%/skins
- at dirrm %%DATADIR%%
- at owner freevo
- at group freevo
- at unexec rmdir /var/log/freevo 2>/dev/null || true
- at exec install -d -o freevo -g freevo -m 0755 /var/log/freevo
- at unexec rmdir /var/run/freevo 2>/dev/null || true
- at exec install -d -o freevo -g freevo -m 0755 /var/run/freevo
- at owner
- at group
+ at dir etc/freevo
+ at dir(freevo,freevo,0755) /var/log/freevo
+ at dir(freevo,freevo,0755) /var/run/freevo