ports/154718: [Patch] Update audio/cymbaline to version 1.3e

Sat Feb 12 21:10:09 UTC 2011

>Number:         154718
>Category:       ports
>Synopsis:       [Patch] Update audio/cymbaline to version 1.3e
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 12 21:10:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Herbert J. Skuhra
>Release:        FreeBSD 8.2-PRERELEASE i386
>Organization:
>Environment:
FreeBSD oslo.ath.cx 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #3 r218069: Sat Jan 29 18:32:13 CET 2011     herbert at oslo.ath.cx:/usr/obj/usr/src/sys/PC1  i386
>Description:
The attached patch 

* updates audio/cymbaline to version 1.3e.
* removes uneeded dependencies (mpg123/aumix)
* removes pkg-plist (auto-generated)
* fixes description/homepage

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN audio/cymbaline.bak/Makefile audio/cymbaline/Makefile

--- audio/cymbaline.bak/Makefile	2008-07-10 20:56:28.000000000 +0200
+++ audio/cymbaline/Makefile	2011-02-12 21:41:29.000000000 +0100
@@ -6,17 +6,14 @@
 #
 
 PORTNAME=	cymbaline
-PORTVERSION=	1.3b
-PORTREVISION=	2
+PORTVERSION=	1.3e
 CATEGORIES=	audio python
 MASTER_SITES=	http://www.silmarill.org/files/
 
 MAINTAINER=	novel at FreeBSD.org
-COMMENT=	Console frontend for mpg123
+COMMENT=	Console frontend for py-mad
 
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123 \
-		aumix:${PORTSDIR}/audio/aumix \
-		${PYTHON_SITELIBDIR}/aomodule.so:${PORTSDIR}/audio/py-ao \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/aomodule.so:${PORTSDIR}/audio/py-ao \
 		${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad
 
 USE_PYTHON=	yes
diff -ruN audio/cymbaline.bak/distinfo audio/cymbaline/distinfo
--- audio/cymbaline.bak/distinfo	2006-05-08 20:19:24.000000000 +0200
+++ audio/cymbaline/distinfo	2011-02-12 20:56:13.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (cymbaline-1.3b.tar.gz) = e66588155b65afd3ff6b609bffa8cf40
-SHA256 (cymbaline-1.3b.tar.gz) = 2e2151d2d679a581baf7fbd080c4c19cade37b4580bdf4e222f034cb2950251e
-SIZE (cymbaline-1.3b.tar.gz) = 42708
+SHA256 (cymbaline-1.3e.tar.gz) = 0c3aa52648e10a0009f7daccaf68656c828651fac73d22779663faaade51f612
+SIZE (cymbaline-1.3e.tar.gz) = 52635
diff -ruN audio/cymbaline.bak/files/patch-cypack_conf.py audio/cymbaline/files/patch-cypack_conf.py
--- audio/cymbaline.bak/files/patch-cypack_conf.py	1970-01-01 01:00:00.000000000 +0100
+++ audio/cymbaline/files/patch-cypack_conf.py	2011-02-12 21:13:52.000000000 +0100
@@ -0,0 +1,11 @@
+--- cypack/conf.py.bak	2011-02-12 21:07:24.000000000 +0100
++++ cypack/conf.py	2011-02-12 21:08:05.000000000 +0100
+@@ -17,7 +17,7 @@
+ # exit the player soon after you start it, it may hang for about 10 seconds
+ # trying to access the url.. In that case it's safe to hit ctrl-c because
+ # scores and data are already saved. TODO I'll try to do a timeout in next Cy 
+-check_for_updates   = 1
++check_for_updates   = 0
+ ConfirmDelete       = 1
+ play_on_start       = 1   
+ score_increment     = 7
diff -ruN audio/cymbaline.bak/files/patch-cypack_player.py audio/cymbaline/files/patch-cypack_player.py
--- audio/cymbaline.bak/files/patch-cypack_player.py	1970-01-01 01:00:00.000000000 +0100
+++ audio/cymbaline/files/patch-cypack_player.py	2011-02-12 21:14:25.000000000 +0100
@@ -0,0 +1,11 @@
+--- cypack/player.py.bak	2011-02-12 21:11:21.000000000 +0100
++++ cypack/player.py	2011-02-12 21:12:19.000000000 +0100
+@@ -370,7 +370,7 @@
+         import mad, ao
+         self.mf = mad.MadFile(self.path)
+         self.total = self.mf.total_time()/1000
+-        dev = ao.AudioDevice('alsa', rate=self.mf.samplerate())
++        dev = ao.AudioDevice('oss', rate=self.mf.samplerate())
+         global player
+         while 1:
+             # manually halted, set mode to stop - to make sure poll won't
diff -ruN audio/cymbaline.bak/pkg-descr audio/cymbaline/pkg-descr
--- audio/cymbaline.bak/pkg-descr	2002-08-23 11:18:11.000000000 +0200
+++ audio/cymbaline/pkg-descr	2011-02-12 21:53:30.000000000 +0100
@@ -1,4 +1,4 @@
-Cymbaline - python mpg123 console frontend
+Cymbaline - python mad console frontend
 
 Features: 
    * recurse directories
@@ -8,4 +8,4 @@
    * easy to tweak (if you know python!)
    * learns which songs you like most and plays them more often in random mode
 
-WWW: http://www.silmarill.org/cymbaline.htm
+WWW: http://www.silmarill.org/cymbaline.html
diff -ruN audio/cymbaline.bak/pkg-plist audio/cymbaline/pkg-plist
--- audio/cymbaline.bak/pkg-plist	2008-07-10 20:56:28.000000000 +0200
+++ audio/cymbaline/pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,92 +0,0 @@
-%%PYTHON_SITELIBDIR%%/cypack/ID3.py
-%%PYTHON_SITELIBDIR%%/cypack/ID3.pyc
-%%PYTHON_SITELIBDIR%%/cypack/ID3.pyo
-%%PYTHON_SITELIBDIR%%/cypack/__init__.py
-%%PYTHON_SITELIBDIR%%/cypack/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cypack/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cypack/album.py
-%%PYTHON_SITELIBDIR%%/cypack/album.pyc
-%%PYTHON_SITELIBDIR%%/cypack/album.pyo
-%%PYTHON_SITELIBDIR%%/cypack/args.py
-%%PYTHON_SITELIBDIR%%/cypack/args.pyc
-%%PYTHON_SITELIBDIR%%/cypack/args.pyo
-%%PYTHON_SITELIBDIR%%/cypack/avkutil.py
-%%PYTHON_SITELIBDIR%%/cypack/avkutil.pyc
-%%PYTHON_SITELIBDIR%%/cypack/avkutil.pyo
-%%PYTHON_SITELIBDIR%%/cypack/colors.py
-%%PYTHON_SITELIBDIR%%/cypack/colors.pyc
-%%PYTHON_SITELIBDIR%%/cypack/colors.pyo
-%%PYTHON_SITELIBDIR%%/cypack/conf.py
-%%PYTHON_SITELIBDIR%%/cypack/conf.pyc
-%%PYTHON_SITELIBDIR%%/cypack/conf.pyo
-%%PYTHON_SITELIBDIR%%/cypack/cycurses.py
-%%PYTHON_SITELIBDIR%%/cypack/cycurses.pyc
-%%PYTHON_SITELIBDIR%%/cypack/cycurses.pyo
-%%PYTHON_SITELIBDIR%%/cypack/data.py
-%%PYTHON_SITELIBDIR%%/cypack/data.pyc
-%%PYTHON_SITELIBDIR%%/cypack/data.pyo
-%%PYTHON_SITELIBDIR%%/cypack/debug.py
-%%PYTHON_SITELIBDIR%%/cypack/debug.pyc
-%%PYTHON_SITELIBDIR%%/cypack/debug.pyo
-%%PYTHON_SITELIBDIR%%/cypack/flags.py
-%%PYTHON_SITELIBDIR%%/cypack/flags.pyc
-%%PYTHON_SITELIBDIR%%/cypack/flags.pyo
-%%PYTHON_SITELIBDIR%%/cypack/help.py
-%%PYTHON_SITELIBDIR%%/cypack/help.pyc
-%%PYTHON_SITELIBDIR%%/cypack/help.pyo
-%%PYTHON_SITELIBDIR%%/cypack/id3cy.py
-%%PYTHON_SITELIBDIR%%/cypack/id3cy.pyc
-%%PYTHON_SITELIBDIR%%/cypack/id3cy.pyo
-%%PYTHON_SITELIBDIR%%/cypack/key.py
-%%PYTHON_SITELIBDIR%%/cypack/key.pyc
-%%PYTHON_SITELIBDIR%%/cypack/key.pyo
-%%PYTHON_SITELIBDIR%%/cypack/log.py
-%%PYTHON_SITELIBDIR%%/cypack/log.pyc
-%%PYTHON_SITELIBDIR%%/cypack/log.pyo
-%%PYTHON_SITELIBDIR%%/cypack/main.py
-%%PYTHON_SITELIBDIR%%/cypack/main.pyc
-%%PYTHON_SITELIBDIR%%/cypack/main.pyo
-%%PYTHON_SITELIBDIR%%/cypack/misc.py
-%%PYTHON_SITELIBDIR%%/cypack/misc.pyc
-%%PYTHON_SITELIBDIR%%/cypack/misc.pyo
-%%PYTHON_SITELIBDIR%%/cypack/modes.py
-%%PYTHON_SITELIBDIR%%/cypack/modes.pyc
-%%PYTHON_SITELIBDIR%%/cypack/modes.pyo
-%%PYTHON_SITELIBDIR%%/cypack/mp3.py
-%%PYTHON_SITELIBDIR%%/cypack/mp3.pyc
-%%PYTHON_SITELIBDIR%%/cypack/mp3.pyo
-%%PYTHON_SITELIBDIR%%/cypack/player.py
-%%PYTHON_SITELIBDIR%%/cypack/player.pyc
-%%PYTHON_SITELIBDIR%%/cypack/player.pyo
-%%PYTHON_SITELIBDIR%%/cypack/playlist.py
-%%PYTHON_SITELIBDIR%%/cypack/playlist.pyc
-%%PYTHON_SITELIBDIR%%/cypack/playlist.pyo
-%%PYTHON_SITELIBDIR%%/cypack/rand.py
-%%PYTHON_SITELIBDIR%%/cypack/rand.pyc
-%%PYTHON_SITELIBDIR%%/cypack/rand.pyo
-%%PYTHON_SITELIBDIR%%/cypack/scores.py
-%%PYTHON_SITELIBDIR%%/cypack/scores.pyc
-%%PYTHON_SITELIBDIR%%/cypack/scores.pyo
-%%PYTHON_SITELIBDIR%%/cypack/stats.py
-%%PYTHON_SITELIBDIR%%/cypack/stats.pyc
-%%PYTHON_SITELIBDIR%%/cypack/stats.pyo
-%%PYTHON_SITELIBDIR%%/cypack/status.py
-%%PYTHON_SITELIBDIR%%/cypack/status.pyc
-%%PYTHON_SITELIBDIR%%/cypack/status.pyo
-%%PYTHON_SITELIBDIR%%/cypack/testcurs.py
-%%PYTHON_SITELIBDIR%%/cypack/testcurs.pyc
-%%PYTHON_SITELIBDIR%%/cypack/testcurs.pyo
-%%PYTHON_SITELIBDIR%%/cypack/track.py
-%%PYTHON_SITELIBDIR%%/cypack/track.pyc
-%%PYTHON_SITELIBDIR%%/cypack/track.pyo
-%%PYTHON_SITELIBDIR%%/cypack/ui.py
-%%PYTHON_SITELIBDIR%%/cypack/ui.pyc
-%%PYTHON_SITELIBDIR%%/cypack/ui.pyo
-%%PYTHON_SITELIBDIR%%/cypack/update.py
-%%PYTHON_SITELIBDIR%%/cypack/update.pyc
-%%PYTHON_SITELIBDIR%%/cypack/update.pyo
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%PYTHON_SITELIBDIR%%/cypack
- at dirrm %%PYTHON_SITELIBDIR%%
- at dirrm %%PYTHON_LIBDIR%%


>Release-Note:
>Audit-Trail:
>Unformatted:

