5 files changed, 70 insertions, 51 deletions

diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 8e7679f60456..47a5ab63e65d 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sonata
-PORTVERSION=	1.4.2
+PORTVERSION=	1.5
 #PORTREVISION=	0
 CATEGORIES=	audio python
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
@@ -16,7 +16,8 @@ MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	An elegant music player for MPD
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
+		${PYTHON_SITELIBDIR}/mpd.py:${PORTSDIR}/audio/py-mpd
 
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
diff --git a/audio/sonata/distinfo b/audio/sonata/distinfo
index e60d25737f37..280928e7d85f 100644
--- a/audio/sonata/distinfo
+++ b/audio/sonata/distinfo
@@ -1,3 +1,3 @@
-MD5 (sonata-1.4.2.tar.gz) = 0353e5d8ccc48158e3b127f6e7d82699
-SHA256 (sonata-1.4.2.tar.gz) = 1f9eab1e9144544a367363b8715ada2adec12902871e05401f6a9274d7becc81
-SIZE (sonata-1.4.2.tar.gz) = 400015
+MD5 (sonata-1.5.tar.gz) = f385f572b9cd6483e31b40286de9ac13
+SHA256 (sonata-1.5.tar.gz) = 6ce0aea880006c8bb3d02af5538b9e15ef1d7011f5e9f0a7bfdb0a7630b1ebbf
+SIZE (sonata-1.5.tar.gz) = 329991
diff --git a/audio/sonata/files/patch-setup.py b/audio/sonata/files/patch-setup.py
index cac21c69aad2..12a6d4dcb369 100644
--- a/audio/sonata/files/patch-setup.py
+++ b/audio/sonata/files/patch-setup.py
@@ -1,43 +1,44 @@
---- setup.py	2008-01-16 05:25:41.000000000 +0100
-+++ setup.py.port	2008-01-16 23:09:45.000000000 +0100
-@@ -43,6 +43,30 @@
- 	print "generating", mofile
- 	os.system("msgfmt %s -o %s" % (pofile, mofile))
+--- setup.py	2008-04-04 01:28:12.000000000 +0200
++++ setup.py.port	2008-04-05 00:50:27.000000000 +0200
+@@ -47,6 +47,31 @@
+ # Copy script "sonata" file to sonata dir:
+ shutil.copyfile("sonata.py", "sonata/sonata")
  
-+port_data_files = [ ('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/locale/de/LC_MESSAGES', ['mo/de/sonata.mo']),
-+                    ('share/locale/pl/LC_MESSAGES', ['mo/pl/sonata.mo']),
-+                    ('share/locale/ru/LC_MESSAGES', ['mo/ru/sonata.mo']),
-+                    ('share/locale/fr/LC_MESSAGES', ['mo/fr/sonata.mo']),
-+                    ('share/locale/zh_CN/LC_MESSAGES', ['mo/zh_CN/sonata.mo']),
-+                    ('share/locale/sv/LC_MESSAGES', ['mo/sv/sonata.mo']),
-+                    ('share/locale/es/LC_MESSAGES', ['mo/es/sonata.mo']),
-+                    ('share/locale/fi/LC_MESSAGES', ['mo/fi/sonata.mo']),
-+                    ('share/locale/nl/LC_MESSAGES', ['mo/nl/sonata.mo']),
-+                    ('share/locale/it/LC_MESSAGES', ['mo/it/sonata.mo']),
-+                    ('share/locale/cs/LC_MESSAGES', ['mo/cs/sonata.mo']),
-+                    ('share/locale/da/LC_MESSAGES', ['mo/da/sonata.mo']),
-+                    ('share/locale/pt_BR/LC_MESSAGES', ['mo/pt_BR/sonata.mo']),
-+                    ('share/locale/be@latin/LC_MESSAGES', ['mo/be@latin/sonata.mo']),
-+                    ('share/locale/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])]
++port_data_files=[('share/applications', ['sonata.desktop']),
++            ('share/pixmaps', glob.glob('sonata/pixmaps/*')),
++            ('share/locale/de/LC_MESSAGES', ['mo/de/sonata.mo']),
++            ('share/locale/pl/LC_MESSAGES', ['mo/pl/sonata.mo']),
++            ('share/locale/ru/LC_MESSAGES', ['mo/ru/sonata.mo']),
++            ('share/locale/fr/LC_MESSAGES', ['mo/fr/sonata.mo']),
++            ('share/locale/zh_CN/LC_MESSAGES', ['mo/zh_CN/sonata.mo']),
++            ('share/locale/sv/LC_MESSAGES', ['mo/sv/sonata.mo']),
++            ('share/locale/es/LC_MESSAGES', ['mo/es/sonata.mo']),
++            ('share/locale/fi/LC_MESSAGES', ['mo/fi/sonata.mo']),
++            ('share/locale/nl/LC_MESSAGES', ['mo/nl/sonata.mo']),
++            ('share/locale/it/LC_MESSAGES', ['mo/it/sonata.mo']),
++            ('share/locale/cs/LC_MESSAGES', ['mo/cs/sonata.mo']),
++            ('share/locale/da/LC_MESSAGES', ['mo/da/sonata.mo']),
++            ('share/locale/pt_BR/LC_MESSAGES', ['mo/pt_BR/sonata.mo']),
++            ('share/locale/et/LC_MESSAGES', ['mo/et/sonata.mo']),
++            ('share/locale/be@latin/LC_MESSAGES', ['mo/be@latin/sonata.mo']),
++            ('share/locale/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])]
 +
-+if not os.environ.has_key("NOPORTDOCS"):
-+	port_data_files.append(('%%DOCSDIR%%', ['README']))
++if not os.environ.has_key('NOPORTDOCS'):
++	port_data_files.append(('share/doc/sonata', ['README',]))
 +
-+if not os.environ.has_key("NO_INSTALL_MANPAGES"):
-+	port_data_files.append(('man/man1', ['sonata.1']))
++if not os.environ.has_key('NO_INSTALL_MANPAGES'):
++        port_data_files.append(('man/man1', ['sonata.1']))
 +
  setup(name='Sonata',
-         version='1.4',
+         version='1.5',
          description='GTK+ client for the Music Player Daemon (MPD).',
-@@ -65,27 +89,9 @@
+@@ -70,27 +95,8 @@
          extra_link_args=capture("pkg-config --libs gtk+-2.0 pygtk-2.0").split()
           ),],
-         scripts = ['sonata'],
+         scripts = ['sonata/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']),
 -                    ('share/locale/de/LC_MESSAGES', ['mo/de/sonata.mo']),
 -                    ('share/locale/pl/LC_MESSAGES', ['mo/pl/sonata.mo']),
@@ -52,13 +53,12 @@
 -                    ('share/locale/cs/LC_MESSAGES', ['mo/cs/sonata.mo']),
 -                    ('share/locale/da/LC_MESSAGES', ['mo/da/sonata.mo']),
 -                    ('share/locale/pt_BR/LC_MESSAGES', ['mo/pt_BR/sonata.mo']),
+-                    ('share/locale/et/LC_MESSAGES', ['mo/et/sonata.mo']),
 -                    ('share/locale/be@latin/LC_MESSAGES', ['mo/be@latin/sonata.mo']),
 -                    ('share/locale/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])],
 -        )
--
 +	data_files = port_data_files,
-+	)
-+	
++    )
+ 
  # Cleanup (remove /build, /mo, and *.pyc files:
  print "Cleaning up..."
- try:
diff --git a/audio/sonata/pkg-descr b/audio/sonata/pkg-descr
index 9b55e464c14d..27670c876cba 100644
--- a/audio/sonata/pkg-descr
+++ b/audio/sonata/pkg-descr
@@ -6,13 +6,13 @@ FEATURES:
 
 	+ Expanded and collapsed views
 	+ Automatic remote or local album art
+	+ User-configurable columns
 	+ Automatic fetching of lyrics
 	+ Playlist and stream support
 	+ Support for editing song tags
-	+ System tray icon with tooltip
 	+ Popup notification
 	+ Library searching and playlist filtering
-	+ Audioscrobbler (last.fm) support
+	+ Audioscrobbler (last.fm) 1.2 support
 	+ Multiple MPD profiles
 	+ Keyboard friendly
 	+ Support for multimedia keys
diff --git a/audio/sonata/pkg-plist b/audio/sonata/pkg-plist
index 631672720ad4..9720ff2a16d3 100644
--- a/audio/sonata/pkg-plist
+++ b/audio/sonata/pkg-plist
@@ -1,15 +1,30 @@
 @comment $FreeBSD$
 bin/sonata
-%%PYTHON_SITELIBDIR%%/audioscrobbler.py
-%%PYTHON_SITELIBDIR%%/audioscrobbler.pyc
-%%PYTHON_SITELIBDIR%%/audioscrobbler.pyo
 %%PYTHON_SITELIBDIR%%/mmkeys.so
-%%PYTHON_SITELIBDIR%%/mpdclient3.py
-%%PYTHON_SITELIBDIR%%/mpdclient3.pyc
-%%PYTHON_SITELIBDIR%%/mpdclient3.pyo
-%%PYTHON_SITELIBDIR%%/sonata.py
-%%PYTHON_SITELIBDIR%%/sonata.pyc
-%%PYTHON_SITELIBDIR%%/sonata.pyo
+%%PYTHON_SITELIBDIR%%/sonata/__init__.py
+%%PYTHON_SITELIBDIR%%/sonata/__init__.pyc
+%%PYTHON_SITELIBDIR%%/sonata/__init__.pyo
+%%PYTHON_SITELIBDIR%%/sonata/audioscrobbler.py
+%%PYTHON_SITELIBDIR%%/sonata/audioscrobbler.pyc
+%%PYTHON_SITELIBDIR%%/sonata/audioscrobbler.pyo
+%%PYTHON_SITELIBDIR%%/sonata/img.py
+%%PYTHON_SITELIBDIR%%/sonata/img.pyc
+%%PYTHON_SITELIBDIR%%/sonata/img.pyo
+%%PYTHON_SITELIBDIR%%/sonata/main.py
+%%PYTHON_SITELIBDIR%%/sonata/main.pyc
+%%PYTHON_SITELIBDIR%%/sonata/main.pyo
+%%PYTHON_SITELIBDIR%%/sonata/misc.py
+%%PYTHON_SITELIBDIR%%/sonata/misc.pyc
+%%PYTHON_SITELIBDIR%%/sonata/misc.pyo
+%%PYTHON_SITELIBDIR%%/sonata/mpdhelper.py
+%%PYTHON_SITELIBDIR%%/sonata/mpdhelper.pyc
+%%PYTHON_SITELIBDIR%%/sonata/mpdhelper.pyo
+%%PYTHON_SITELIBDIR%%/sonata/tray.py
+%%PYTHON_SITELIBDIR%%/sonata/tray.pyc
+%%PYTHON_SITELIBDIR%%/sonata/tray.pyo
+%%PYTHON_SITELIBDIR%%/sonata/ui.py
+%%PYTHON_SITELIBDIR%%/sonata/ui.pyc
+%%PYTHON_SITELIBDIR%%/sonata/ui.pyo
 share/applications/sonata.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/locale/be@latin/LC_MESSAGES/sonata.mo
@@ -17,6 +32,7 @@ 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 +45,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
@@ -40,5 +57,6 @@ share/pixmaps/sonata_pause.png
 share/pixmaps/sonata_play.png
 share/pixmaps/sonatacd.png
 share/pixmaps/sonatacd_large.png
-@dirrmtry share/applications
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
+@dirrm %%PYTHON_SITELIBDIR%%/sonata