Update to 3.0.1.

6 files changed, 31 insertions, 34 deletions

diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index e38d38c63586..71f9272dae4f 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pytone
-PORTVERSION=	2.3.1
+PORTVERSION=	3.0.1
 CATEGORIES=	audio python
 MASTER_SITES=	http://www.luga.de/pytone/download/ \
 		http://redundancy.redundancy.org/mirror/
@@ -16,7 +16,8 @@ MAINTAINER=	lx@FreeBSD.org
 COMMENT=	A music jukebox written in Python with a curses GUI
 
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_sqlite.so:${PORTSDIR}/databases/py-pysqlite23 \
+		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
@@ -68,6 +69,7 @@ post-patch:
 		${WRKSRC}/pytonectl
 
 post-install:
+	@${CP} ${WRKSRC}/conf/pytonerc ${PREFIX}/etc/pytonerc.sample
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/audio/pytone/distinfo b/audio/pytone/distinfo
index 8f9161f2fea0..d88d6e818a89 100644
--- a/audio/pytone/distinfo
+++ b/audio/pytone/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyTone-2.3.1.tar.gz) = 9c25e5ce553f30110c382d1b912f8567
-SHA256 (PyTone-2.3.1.tar.gz) = a5bbe47480a60f8b0d943b2a156a3d963a35c8e817dd52c8c52b538391e35e65
-SIZE (PyTone-2.3.1.tar.gz) = 162369
+MD5 (PyTone-3.0.1.tar.gz) = 719c2db53d0702460ae4d19c76846b7b
+SHA256 (PyTone-3.0.1.tar.gz) = 3f4db79f66196fb32ea05c1be47a3c42680756af8871a51309273582176d6430
+SIZE (PyTone-3.0.1.tar.gz) = 156983
diff --git a/audio/pytone/files/patch-pytone b/audio/pytone/files/patch-pytone
new file mode 100644
index 000000000000..c89489061ef4
--- /dev/null
+++ b/audio/pytone/files/patch-pytone
@@ -0,0 +1,6 @@
+--- pytone.orig	2007-12-14 10:42:55.000000000 -0800
++++ pytone	2007-12-14 10:44:18.000000000 -0800
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-python2.4 src/pytone.py "$@"
++python src/pytone.py "$@"
diff --git a/audio/pytone/files/patch-setup.py b/audio/pytone/files/patch-setup.py
deleted file mode 100644
index 045ff802f4f4..000000000000
--- a/audio/pytone/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	Sun May 27 19:36:23 2007
-+++ setup.py	Sun May 27 19:36:44 2007
-@@ -45,7 +45,7 @@
- #
- mo_files = ["locale/%s/LC_MESSAGES/PyTone.mo" % locale for locale in locales]
- data_files=[('share/locale/de/LC_MESSAGES', mo_files),
--            ('/etc', ['conf/pytonerc'])]
-+            ('etc', ['conf/pytonerc'])]
- 
- #
- # list of scripts to be installed
diff --git a/audio/pytone/pkg-message b/audio/pytone/pkg-message
index 2a45bdff4062..924d7838a14a 100644
--- a/audio/pytone/pkg-message
+++ b/audio/pytone/pkg-message
@@ -1,7 +1,7 @@
 
 ###############################################################
 
-To use pytone, you should copy ${LOCALBASE}/etc/pytonerc to:
+To use pytone, you should copy ${LOCALBASE}/etc/pytonerc.sample to:
 
 ~/.pytone/pytonerc
 
diff --git a/audio/pytone/pkg-plist b/audio/pytone/pkg-plist
index 8edb67e00ba2..9747da6eb45a 100644
--- a/audio/pytone/pkg-plist
+++ b/audio/pytone/pkg-plist
@@ -1,10 +1,10 @@
 bin/pytone
 bin/pytonectl
-etc/pytonerc
+etc/pytonerc.sample
 lib/%%PYTHON_VERSION%%/site-packages/pytone/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/config.py
-lib/%%PYTHON_VERSION%%/site-packages/pytone/dbitem.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/decoder.py
+lib/%%PYTHON_VERSION%%/site-packages/pytone/encoding.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/errors.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/events.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/filelist.py
@@ -18,11 +18,11 @@ lib/%%PYTHON_VERSION%%/site-packages/pytone/item.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/iteminfowin.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/log.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/logwin.py
+lib/%%PYTHON_VERSION%%/site-packages/pytone/lyricswin.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/mainscreen.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/messagewin.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/metadata.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/mixerwin.py
-lib/%%PYTHON_VERSION%%/site-packages/pytone/MP3Info.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/network.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/playerwin.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/playlist.py
@@ -59,14 +59,14 @@ lib/%%PYTHON_VERSION%%/site-packages/pytone/services/players/mpg123.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/players/remote.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/players/xmmsplayer.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/local.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/remote.py
+lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/sqlite.py
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/local.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/remote.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/sqlite.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/local.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/remote.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs/sqlite.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/player.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/services/playlist.pyc
@@ -102,26 +102,26 @@ lib/%%PYTHON_VERSION%%/site-packages/pytone/pcm.so
 lib/%%PYTHON_VERSION%%/site-packages/pytone/bufferedao.so
 lib/%%PYTHON_VERSION%%/site-packages/pytone/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/config.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pytone/dbitem.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/decoder.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pytone/encoding.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/errors.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/events.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/filelist.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pytone/hub.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/filelistwin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/help.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/helper.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/helpwin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pytone/hub.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/inputwin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/item.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/iteminfowin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/log.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/logwin.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pytone/lyricswin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/mainscreen.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/messagewin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/metadata.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/mixerwin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pytone/MP3Info.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/network.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/playerwin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/playlist.pyc
@@ -139,8 +139,8 @@ lib/%%PYTHON_VERSION%%/site-packages/pytone/version.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/window.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pytone/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/config.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pytone/dbitem.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/decoder.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pytone/encoding.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/errors.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/events.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/filelist.pyo
@@ -154,11 +154,11 @@ lib/%%PYTHON_VERSION%%/site-packages/pytone/item.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/iteminfowin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/log.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/logwin.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pytone/lyricswin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/mainscreen.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/messagewin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/metadata.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/mixerwin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pytone/MP3Info.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/network.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/playerwin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/playlist.pyo
@@ -175,9 +175,9 @@ lib/%%PYTHON_VERSION%%/site-packages/pytone/statusbar.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/version.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pytone/window.pyo
 share/locale/de/LC_MESSAGES/PyTone.mo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pytone/services/players
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pytone/services
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pytone/plugins/audioscrobbler
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pytone/plugins
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pytone
+@dirrmtry lib/%%PYTHON_VERSION%%/site-packages/pytone/services/songdbs
+@dirrmtry lib/%%PYTHON_VERSION%%/site-packages/pytone/services/players
+@dirrmtry lib/%%PYTHON_VERSION%%/site-packages/pytone/services
+@dirrmtry lib/%%PYTHON_VERSION%%/site-packages/pytone/plugins/audioscrobbler
+@dirrmtry lib/%%PYTHON_VERSION%%/site-packages/pytone/plugins
+@dirrmtry lib/%%PYTHON_VERSION%%/site-packages/pytone