4 files changed, 21 insertions, 14 deletions

diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 195a17395b60..7f37e7f5657f 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sonata
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 #PORTREVISION=	0
 CATEGORIES=	audio python
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
diff --git a/audio/sonata/distinfo b/audio/sonata/distinfo
index 6290f6c0a06d..72afc41a0773 100644
--- a/audio/sonata/distinfo
+++ b/audio/sonata/distinfo
@@ -1,3 +1,3 @@
-MD5 (sonata-1.3.tar.gz) = 0feb095adb7033409ce9fbdbf8d8d192
-SHA256 (sonata-1.3.tar.gz) = 1c076a9e5de9e5cfb81c20b28881ab4216f0131cde81d159bb48864ca92031ef
-SIZE (sonata-1.3.tar.gz) = 260664
+MD5 (sonata-1.4.tar.gz) = 66e93e1c8df9c0f9c3054911811473c9
+SHA256 (sonata-1.4.tar.gz) = ff81a41db09ba561a46d8fc6fec1a514ce155587266fdc15b44083160e1fc25d
+SIZE (sonata-1.4.tar.gz) = 278644
diff --git a/audio/sonata/files/patch-setup.py b/audio/sonata/files/patch-setup.py
index 944626e96ca9..795759f3d5cc 100644
--- a/audio/sonata/files/patch-setup.py
+++ b/audio/sonata/files/patch-setup.py
@@ -1,11 +1,11 @@
---- 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 @@
+--- 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))
  
 +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/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']),
@@ -19,25 +19,26 @@
 +                    ('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'])]
 +
 +if not os.getenv("NOPORTDOCS"):
-+	port_data_files.append(('/usr/local/share/doc/sonata', ['README']))
++	port_data_files.append(('%%DOCSDIR%%', ['README']))
 +
 +if not os.getenv("NO_INSTALL_MANPAGES"):
 +	port_data_files.append(('man/man1', ['sonata.1']))
 +
  setup(name='Sonata',
-         version='1.3',
+         version='1.4',
          description='GTK+ client for the Music Player Daemon (MPD).',
-@@ -65,24 +88,7 @@
+@@ -65,27 +89,9 @@
          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/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']),
@@ -51,8 +52,13 @@
 -                    ('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'])],
+-        )
+-
 +	data_files = port_data_files,
-         )
- 
++	)
++	
  # Cleanup (remove /build, /mo, and *.pyc files:
+ print "Cleaning up..."
+ try:
diff --git a/audio/sonata/pkg-plist b/audio/sonata/pkg-plist
index 4448d0704179..631672720ad4 100644
--- a/audio/sonata/pkg-plist
+++ b/audio/sonata/pkg-plist
@@ -12,6 +12,7 @@ bin/sonata
 %%PYTHON_SITELIBDIR%%/sonata.pyo
 share/applications/sonata.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
+share/locale/be@latin/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