update to 1.5.1

changes:
-many UI refinements
-New, faster python mpd interface
-bugfixes

5 files changed, 57 insertions, 21 deletions

diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index a3f2fb3fed5..f3409f09223 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/04/25 20:39:06 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/05 10:41:21 drochner Exp $
 #
 
-DISTNAME=	sonata-1.4.2
+DISTNAME=	sonata-1.5.1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/sonata/
 EXTRACT_SUFX=	.tar.bz2
@@ -28,5 +28,6 @@ BUILDLINK_ABI_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.12.1nb1
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../net/py-soappy/buildlink3.mk"
 .include "../../textproc/py-elementtree/buildlink3.mk"
+.include "../../audio/py-mpd/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sonata/PLIST b/audio/sonata/PLIST
index cb155d6f929..d31806e29d6 100644
--- a/audio/sonata/PLIST
+++ b/audio/sonata/PLIST
@@ -1,22 +1,40 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/14 14:24:22 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/05/05 10:41:21 drochner Exp $
 bin/sonata
-${PYSITELIB}/audioscrobbler.py
-${PYSITELIB}/audioscrobbler.pyc
-${PYSITELIB}/audioscrobbler.pyo
 ${PYSITELIB}/mmkeys.so
-${PYSITELIB}/mpdclient3.py
-${PYSITELIB}/mpdclient3.pyc
-${PYSITELIB}/mpdclient3.pyo
-${PYSITELIB}/sonata.py
-${PYSITELIB}/sonata.pyc
-${PYSITELIB}/sonata.pyo
+${PYSITELIB}/sonata/__init__.py
+${PYSITELIB}/sonata/__init__.pyc
+${PYSITELIB}/sonata/__init__.pyo
+${PYSITELIB}/sonata/audioscrobbler.py
+${PYSITELIB}/sonata/audioscrobbler.pyc
+${PYSITELIB}/sonata/audioscrobbler.pyo
+${PYSITELIB}/sonata/img.py
+${PYSITELIB}/sonata/img.pyc
+${PYSITELIB}/sonata/img.pyo
+${PYSITELIB}/sonata/main.py
+${PYSITELIB}/sonata/main.pyc
+${PYSITELIB}/sonata/main.pyo
+${PYSITELIB}/sonata/misc.py
+${PYSITELIB}/sonata/misc.pyc
+${PYSITELIB}/sonata/misc.pyo
+${PYSITELIB}/sonata/mpdhelper.py
+${PYSITELIB}/sonata/mpdhelper.pyc
+${PYSITELIB}/sonata/mpdhelper.pyo
+${PYSITELIB}/sonata/tray.py
+${PYSITELIB}/sonata/tray.pyc
+${PYSITELIB}/sonata/tray.pyo
+${PYSITELIB}/sonata/ui.py
+${PYSITELIB}/sonata/ui.pyc
+${PYSITELIB}/sonata/ui.pyo
 man/man1/sonata.1
 share/applications/sonata.desktop
+share/locale/ar/LC_MESSAGES/sonata.mo
 share/locale/be@latin/LC_MESSAGES/sonata.mo
+share/locale/ca/LC_MESSAGES/sonata.mo
 share/locale/cs/LC_MESSAGES/sonata.mo
 share/locale/da/LC_MESSAGES/sonata.mo
 share/locale/de/LC_MESSAGES/sonata.mo
 share/locale/es/LC_MESSAGES/sonata.mo
+share/locale/et/LC_MESSAGES/sonata.mo
 share/locale/fi/LC_MESSAGES/sonata.mo
 share/locale/fr/LC_MESSAGES/sonata.mo
 share/locale/it/LC_MESSAGES/sonata.mo
@@ -29,6 +47,7 @@ share/locale/uk/LC_MESSAGES/sonata.mo
 share/locale/zh_CN/LC_MESSAGES/sonata.mo
 share/pixmaps/sonata-album.png
 share/pixmaps/sonata-artist.png
+share/pixmaps/sonata-case.png
 share/pixmaps/sonata-stock_volume-max.png
 share/pixmaps/sonata-stock_volume-med.png
 share/pixmaps/sonata-stock_volume-min.png
@@ -46,4 +65,6 @@ share/sonata/TODO
 share/sonata/TRANSLATORS
 @dirrm share/sonata
 @comment in xdg-dirs: @dirrm share/pixmaps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm ${PYSITELIB}/sonata
diff --git a/audio/sonata/distinfo b/audio/sonata/distinfo
index fa21133038c..a2f776af1d4 100644
--- a/audio/sonata/distinfo
+++ b/audio/sonata/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/14 14:24:22 drochner Exp $
+$NetBSD: distinfo,v 1.2 2008/05/05 10:41:21 drochner Exp $
 
-SHA1 (sonata-1.4.2.tar.bz2) = 82af30dfd4280cd80dc87b982ac2ba0bdb959c9f
-RMD160 (sonata-1.4.2.tar.bz2) = a4667d443f5c8256ec125054a94c5f91eac323ef
-Size (sonata-1.4.2.tar.bz2) = 334142 bytes
-SHA1 (patch-aa) = 141790c7409e954535a12391ccafd7b22b53b11c
+SHA1 (sonata-1.5.1.tar.bz2) = 5217600d20c71a0bafd0899e5b38e437bcc20bd7
+RMD160 (sonata-1.5.1.tar.bz2) = 117ea6e8a8a9c478e64daa67c62df3ad98c6ab38
+Size (sonata-1.5.1.tar.bz2) = 256685 bytes
+SHA1 (patch-aa) = 0c323085df89557ef9bdc96f03e0997ddb1644f7
+SHA1 (patch-ab) = f6eced504106a407d5685ac1492e6cef2bed12e0
diff --git a/audio/sonata/patches/patch-aa b/audio/sonata/patches/patch-aa
index cc5b45d7901..75a2795e44e 100644
--- a/audio/sonata/patches/patch-aa
+++ b/audio/sonata/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/03/14 14:24:22 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2008/05/05 10:41:22 drochner Exp $
 
---- setup.py.orig	2008-03-14 14:54:33.000000000 +0100
+--- setup.py.orig	2008-05-04 02:30:45.000000000 +0200
 +++ setup.py
-@@ -68,7 +68,7 @@ setup(name='Sonata',
+@@ -73,7 +73,7 @@ setup(name='Sonata',
          data_files=[('share/sonata', ['README', 'CHANGELOG', 'TODO', 'TRANSLATORS']),
                      ('share/applications', ['sonata.desktop']),
-                     ('share/pixmaps', ['pixmaps/sonata.png', 'pixmaps/sonata_large.png', 'pixmaps/sonatacd.png', 'pixmaps/sonatacd_large.png', 'pixmaps/sonata-artist.png', 'pixmaps/sonata-album.png', 'pixmaps/sonata-stock_volume-mute.png', 'pixmaps/sonata-stock_volume-min.png', 'pixmaps/sonata-stock_volume-med.png', 'pixmaps/sonata-stock_volume-max.png', 'pixmaps/sonata_pause.png', 'pixmaps/sonata_play.png', 'pixmaps/sonata_disconnect.png']),
+                     ('share/pixmaps', glob.glob('sonata/pixmaps/*')),
 -                    ('share/man/man1', ['sonata.1']),
 +                    ('man/man1', ['sonata.1']),
                      ('share/locale/de/LC_MESSAGES', ['mo/de/sonata.mo']),
diff --git a/audio/sonata/patches/patch-ab b/audio/sonata/patches/patch-ab
new file mode 100644
index 00000000000..74051a609de
--- /dev/null
+++ b/audio/sonata/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2008/05/05 10:41:22 drochner Exp $
+
+--- sonata/main.py.orig	2008-05-04 02:30:45.000000000 +0200
++++ sonata/main.py
+@@ -4201,7 +4201,7 @@ class Base:
+ 				from xml.etree import ElementTree
+ 			except:
+ 				try: # Python 2.4, separate module:
+-					from elementtree.ElementTree import ElementTree
++					from elementtree import ElementTree
+ 				except:
+ 					sys.stderr.write("Sonata requires Python 2.5 or python-elementtree. Aborting... \n")
+ 					sys.exit(1)