4 files changed, 31 insertions, 19 deletions

diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 9b38479f0f0b..195a17395b60 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sonata
-PORTVERSION=	1.2.3
+PORTVERSION=	1.3
 #PORTREVISION=	0
 CATEGORIES=	audio python
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
@@ -24,12 +24,16 @@ PYDISTUTILS_PKGNAME=	Sonata
 
 OPTIONS=	MPD	"Install Music Player Daemon" on \
 		TAGLIB	"Install support for editing metadata" off \
-		SOAPPY	"Install support for automatic lyrics fetching" off
+		ZSI	"Install support for automatic lyrics fetching" off
 
 REINPLACE_ARGS=	-i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
 
+.if !defined(NO_INSTALL_MANPAGES)
+MAN1=	${PORTNAME}.1
+.endif
+
 post-patch:
-	${REINPLACE_CMD} ${WRKSRC}/${PYSETUP}
+	@${REINPLACE_CMD} ${WRKSRC}/${PYSETUP}
 
 .include <bsd.port.pre.mk>
 
@@ -41,8 +45,8 @@ RUN_DEPENDS+=	mpd:${PORTSDIR}/audio/musicpd
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/tagpy/__init__.py:${PORTSDIR}/audio/py-tagpy
 .endif
 
-.if defined (WITH_SOAPPY)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/SOAPpy/__init__.py:${PORTSDIR}/net/py-soappy
+.if defined (WITH_ZSI)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ZSI/ServiceProxy.py:${PORTSDIR}/net/py-zsi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/sonata/distinfo b/audio/sonata/distinfo
index 1f83ace1eb9e..6290f6c0a06d 100644
--- a/audio/sonata/distinfo
+++ b/audio/sonata/distinfo
@@ -1,3 +1,3 @@
-MD5 (sonata-1.2.3.tar.gz) = 6ade55b8e3aabf24975ec09db83bb21b
-SHA256 (sonata-1.2.3.tar.gz) = 16f8bfc9ca00f06da17723130835bd02df9bf22281dbe9766cc1b452b3c0b70c
-SIZE (sonata-1.2.3.tar.gz) = 296806
+MD5 (sonata-1.3.tar.gz) = 0feb095adb7033409ce9fbdbf8d8d192
+SHA256 (sonata-1.3.tar.gz) = 1c076a9e5de9e5cfb81c20b28881ab4216f0131cde81d159bb48864ca92031ef
+SIZE (sonata-1.3.tar.gz) = 260664
diff --git a/audio/sonata/files/patch-setup.py b/audio/sonata/files/patch-setup.py
index dd91e5eaa6e1..944626e96ca9 100644
--- a/audio/sonata/files/patch-setup.py
+++ b/audio/sonata/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py	2007-08-24 06:35:16.000000000 +0200
-+++ setup.py.port	2007-09-08 18:59:14.000000000 +0200
-@@ -43,6 +43,24 @@
+--- setup.py	2007-10-30 02:41:45.000000000 +0100
++++ setup.py.port	2008-01-10 14:01:07.000000000 +0100
+@@ -43,6 +43,29 @@
  	print "generating", mofile
  	os.system("msgfmt %s -o %s" % (pofile, mofile))
  
@@ -16,22 +16,28 @@
 +                    ('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/cz/LC_MESSAGES', ['mo/cz/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/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])]
 +
 +if not os.getenv("NOPORTDOCS"):
-+	port_data_files.append(('%%DOCSDIR%%', ['README']))
++	port_data_files.append(('/usr/local/share/doc/sonata', ['README']))
++
++if not os.getenv("NO_INSTALL_MANPAGES"):
++	port_data_files.append(('man/man1', ['sonata.1']))
 +
  setup(name='Sonata',
-         version='1.2.3',
+         version='1.3',
          description='GTK+ client for the Music Player Daemon (MPD).',
-@@ -65,21 +83,7 @@
+@@ -65,24 +88,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']),
 -                    ('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']),
+-                    ('man/man1', ['sonata.1']),
 -                    ('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']),
@@ -42,7 +48,9 @@
 -                    ('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/cz/LC_MESSAGES', ['mo/cz/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/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])],
 +	data_files = port_data_files,
          )
diff --git a/audio/sonata/pkg-plist b/audio/sonata/pkg-plist
index e75ffb21b21d..4448d0704179 100644
--- a/audio/sonata/pkg-plist
+++ b/audio/sonata/pkg-plist
@@ -12,7 +12,8 @@ bin/sonata
 %%PYTHON_SITELIBDIR%%/sonata.pyo
 share/applications/sonata.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/locale/cz/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/fi/LC_MESSAGES/sonata.mo
@@ -20,6 +21,7 @@ share/locale/fr/LC_MESSAGES/sonata.mo
 share/locale/it/LC_MESSAGES/sonata.mo
 share/locale/nl/LC_MESSAGES/sonata.mo
 share/locale/pl/LC_MESSAGES/sonata.mo
+share/locale/pt_BR/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
@@ -38,6 +40,4 @@ share/pixmaps/sonata_play.png
 share/pixmaps/sonatacd.png
 share/pixmaps/sonatacd_large.png
 @dirrmtry share/applications
-@dirrmtry share/locale/cz/LC_MESSAGES
-@dirrmtry share/locale/cz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%