Update to devede-3.22.0.

multimedia/devede/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.31 2011/12/31 08:14:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2012/05/23 07:50:59 ajacoutot Exp $
 
 COMMENT=	video DVDs and CDs creation tool
 
-DISTNAME=	devede-3.21.0
+DISTNAME=	devede-3.22.0
 
 CATEGORIES=	multimedia x11
 
@@ -24,20 +24,16 @@ RUN_DEPENDS=	x11/py-gtk2 \
 		multimedia/dvdauthor \
 		graphics/vcdimager \
 		sysutils/cdrtools \
-		graphics/ffmpeg \
+		x11/mplayer \
 		devel/xdg-utils \
 		devel/desktop-file-utils
 
-.if ${MACHINE_ARCH} == "i386"
-RUN_DEPENDS+=	devel/py-psyco
-PKG_ARCH=	${MACHINE_ARCH},${ARCH}
-.else
 PKG_ARCH=	*
-.endif
-
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
 
+MODPY_ADJ_FILES=devede
+
 SUBST_VARS=	^MODPY_SITEPKG
 
 pre-configure:

multimedia/devede/distinfo

@@ -1,5 +1,5 @@
-MD5 (devede-3.21.0.tar.bz2) = kqrs/WmLXAp5cRZJ0b3dOw==
-RMD160 (devede-3.21.0.tar.bz2) = ux1GU14fESTAqs5D3sC6T/qPls0=
-SHA1 (devede-3.21.0.tar.bz2) = zWiLGa3xZhU2iMZsmKgBmj0L2u8=
-SHA256 (devede-3.21.0.tar.bz2) = qJLyV6woTcbzsPz+VoE+JqjIbGJ3R6JwRpkYksGXBKw=
-SIZE (devede-3.21.0.tar.bz2) = 2536646
+MD5 (devede-3.22.0.tar.bz2) = Cf/r7+iQP42fKo8UJUXndQ==
+RMD160 (devede-3.22.0.tar.bz2) = qm88MiC6xXTjvYLNTk5jwlLTt+Y=
+SHA1 (devede-3.22.0.tar.bz2) = ZzU09/KQZqFptCGUckmj7coiYp4=
+SHA256 (devede-3.22.0.tar.bz2) = eWbkbHb2wYDq0z7FeETvLvt6gTkSPaWeDMMETI67RXI=
+SIZE (devede-3.22.0.tar.bz2) = 2559428

multimedia/devede/patches/patch-devede

@@ -1,30 +1,16 @@
-$OpenBSD: patch-devede_py,v 1.19 2011/12/31 08:14:33 ajacoutot Exp $
---- devede.py.orig	Fri Dec 30 11:27:44 2011
-+++ devede.py	Sat Dec 31 09:06:51 2011
-@@ -19,6 +19,13 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
-+try:
-+  import psyco
-+  import re
-+  psyco.cannotcompile(re.compile)
-+  psyco.profile()
-+except ImportError:
-+  pass
- 
- import sys
- import os
-@@ -35,7 +42,7 @@ import pickle
+$OpenBSD: patch-devede,v 1.1 2012/05/23 07:51:00 ajacoutot Exp $
+--- devede.orig	Wed May 23 00:19:49 2012
++++ devede	Wed May 23 09:49:39 2012
+@@ -35,7 +35,7 @@ import pickle
  import cairo
  
- print "DeVeDe 3.21.0"
+ print "DeVeDe 3.22.0"
 -if (sys.platform!="win32") and (sys.platform!="win64"):
 +if (sys.platform!="win32") and (sys.platform!="win64") and not sys.platform.startswith('openbsd'):
  	try:
  		print "Locale: "+str(os.environ["LANG"])
  	except:
-@@ -79,13 +86,13 @@ if tipo==0:
+@@ -79,13 +79,13 @@ if tipo==0:
  	#arbol=gtk.Builder("/usr/share/devede/devede.glade",domain="devede")
  	# append the directories where we install the devede's own modules