- Update to 1.2.2

5 files changed, 68 insertions, 23 deletions

diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 5b4f8c3210cb..e7450f46e8ab 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	sonata
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
+#PORTREVISION=	0
 CATEGORIES=	audio python
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,12 +22,15 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Sonata
 
-RM_OPTS=	-R
-
 OPTIONS=	MPD	"Install Music Player Daemon" on \
 		TAGLIB	"Install support for editing metadata" off \
 		SOAPPY	"Install support for automatic lyrics fetching" off
 
+REINPLACE_ARGS=	-i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
+
+post-patch:
+	${REINPLACE_CMD} ${WRKSRC}/${PYSETUP}
+
 .include <bsd.port.pre.mk>
 
 .if defined (WITH_MPD)
@@ -42,9 +45,4 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/tagpy/__init__.py:${PORTSDIR}/audio/py-tagpy
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/SOAPpy/__init__.py:${PORTSDIR}/net/py-soappy
 .endif
 
-.if defined (NOPORTDOCS)
-post-install:
-	${RM} ${RM_OPTS} ${DOCSDIR}
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/audio/sonata/distinfo b/audio/sonata/distinfo
index 9c8c0d97b8bc..021fcfc56336 100644
--- a/audio/sonata/distinfo
+++ b/audio/sonata/distinfo
@@ -1,3 +1,3 @@
-MD5 (sonata-1.0.1.tar.gz) = 6a1cac6d7992ad94a9e261e351073020
-SHA256 (sonata-1.0.1.tar.gz) = 78e208bbdae17ac91e3477b54e1901c8b16e5586e284a371bafd98daa6c64995
-SIZE (sonata-1.0.1.tar.gz) = 189034
+MD5 (sonata-1.2.2.tar.gz) = d617b099d03202c09e687d58a3743569
+SHA256 (sonata-1.2.2.tar.gz) = 718b9781b5446dc34dec354366ab393070f33493dde00c2aa8d120f6fa075a0a
+SIZE (sonata-1.2.2.tar.gz) = 221230
diff --git a/audio/sonata/files/patch-setup.py b/audio/sonata/files/patch-setup.py
index 717a599c8f21..03e4d332ccb3 100644
--- a/audio/sonata/files/patch-setup.py
+++ b/audio/sonata/files/patch-setup.py
@@ -1,11 +1,44 @@
---- setup.py	Mon Jan 22 00:26:11 2007
-+++ setup.py.port	Mon Jan 22 10:48:16 2007
-@@ -38,7 +38,7 @@
+--- setup.py	Mon Jul 23 04:15:09 2007
++++ setup.py.port	Thu Aug  2 18:55:36 2007
+@@ -43,6 +43,21 @@
+ 	print "generating", mofile
+ 	os.system("msgfmt %s -o %s" % (pofile, mofile))
+ 
++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/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])]
++
++if not os.getenv("NOPORTDOCS"):
++	port_data_files.append(('%%DOCSDIR%%', ['README']))
++
+ setup(name='Sonata',
+         version='1.2.2',
+         description='GTK+ client for the Music Player Daemon (MPD).',
+@@ -65,18 +80,7 @@
          extra_link_args=capture("pkg-config --libs gtk+-2.0 pygtk-2.0").split()
           ),],
          scripts = ['sonata'],
 -        data_files=[('share/sonata', ['README', 'CHANGELOG', 'TODO', 'TRANSLATORS']),
-+        data_files=[('share/doc/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']),
-                     ('share/locale/de/LC_MESSAGES', ['locale/de/LC_MESSAGES/sonata.mo']),
+-                    ('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/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])],
++        data_files = port_data_files,
+         )
+ 
+ # Cleanup (remove /build, /mo, and *.pyc files:
diff --git a/audio/sonata/pkg-descr b/audio/sonata/pkg-descr
index e85fc5929bed..9b55e464c14d 100644
--- a/audio/sonata/pkg-descr
+++ b/audio/sonata/pkg-descr
@@ -3,6 +3,7 @@ It aims to be efficient (no toolbar, main menu, or statusbar), user-friendly,
 and clean.
 
 FEATURES:
+
 	+ Expanded and collapsed views
 	+ Automatic remote or local album art
 	+ Automatic fetching of lyrics
@@ -10,7 +11,9 @@ FEATURES:
 	+ Support for editing song tags
 	+ System tray icon with tooltip
 	+ Popup notification
-	+ Library searching by artist, song, etc.
+	+ Library searching and playlist filtering
+	+ Audioscrobbler (last.fm) support
+	+ Multiple MPD profiles
 	+ Keyboard friendly
 	+ Support for multimedia keys
 	+ Commandline control
diff --git a/audio/sonata/pkg-plist b/audio/sonata/pkg-plist
index 463b8669cf16..e1fa26e2a572 100644
--- a/audio/sonata/pkg-plist
+++ b/audio/sonata/pkg-plist
@@ -1,5 +1,8 @@
 @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
@@ -8,19 +11,27 @@ bin/sonata
 %%PYTHON_SITELIBDIR%%/sonata.pyc
 %%PYTHON_SITELIBDIR%%/sonata.pyo
 share/applications/sonata.desktop
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TRANSLATORS
 share/locale/de/LC_MESSAGES/sonata.mo
+share/locale/es/LC_MESSAGES/sonata.mo
+share/locale/fi/LC_MESSAGES/sonata.mo
 share/locale/fr/LC_MESSAGES/sonata.mo
 share/locale/pl/LC_MESSAGES/sonata.mo
 share/locale/ru/LC_MESSAGES/sonata.mo
+share/locale/sv/LC_MESSAGES/sonata.mo
 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-stock_volume-max.png
+share/pixmaps/sonata-stock_volume-med.png
+share/pixmaps/sonata-stock_volume-min.png
+share/pixmaps/sonata-stock_volume-mute.png
 share/pixmaps/sonata.png
+share/pixmaps/sonata_disconnect.png
 share/pixmaps/sonata_large.png
+share/pixmaps/sonata_pause.png
+share/pixmaps/sonata_play.png
 share/pixmaps/sonatacd.png
 share/pixmaps/sonatacd_large.png
 @dirrmtry share/applications