Hi.

This diff updates audio/sonata to the latest available version: 1.5.
It needs the 'net/py-zsi' and 'audio/py-mpd' ports which I just sent to 
ports@

Tested under amd64 and macppc.
Comments/OK?

Enjoy!

-- 
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/sonata/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile    19 Mar 2008 15:52:31 -0000      1.8
+++ Makefile    19 Apr 2008 10:15:34 -0000
@@ -2,7 +2,8 @@
 
 COMMENT=       elegant music player for MPD
 
-DISTNAME=      sonata-1.4.2
+MODPY_EGG_VERSION=1.5
+DISTNAME=      sonata-${MODPY_EGG_VERSION}
 CATEGORIES=    audio
 
 HOMEPAGE=      http://sonata.berlios.de/
@@ -12,6 +13,7 @@
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=  Yes
+
 WANTLIB=       X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
                Xcomposite Xdamage \
                Xrender atk-1.0 cairo expat fontconfig freetype gdk-x11-2.0 \
@@ -25,7 +27,8 @@
 
 BUILD_DEPENDS= ::x11/py-gtk2
 RUN_DEPENDS=   ::devel/desktop-file-utils \
-               ::devel/py-SOAPpy \
+               ::net/py-zsi \
+               ::audio/py-mpd \
                ::x11/py-gtk2
 
 USE_X11=       Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/sonata/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo    19 Mar 2008 15:52:31 -0000      1.6
+++ distinfo    19 Apr 2008 10:15:34 -0000
@@ -1,5 +1,5 @@
-MD5 (sonata-1.4.2.tar.gz) = A1Pl2MzEgVjjsSf259gmmQ==
-RMD160 (sonata-1.4.2.tar.gz) = pWRX5JNvHJePz9fB4L4u0JullLE=
-SHA1 (sonata-1.4.2.tar.gz) = ReJXcfjG3VwFDDIOzmmXH740eHU=
-SHA256 (sonata-1.4.2.tar.gz) = H56rHpFEVEo2c2O4cVraKt7BKQKHHgVAH2qSdNe+zIE=
-SIZE (sonata-1.4.2.tar.gz) = 400015
+MD5 (sonata-1.5.tar.gz) = 84X1crnNZIPjG0AobemsEw==
+RMD160 (sonata-1.5.tar.gz) = A/fLiFiUU9pIRZ3LtC0AxGKxb9Q=
+SHA1 (sonata-1.5.tar.gz) = /GqqupnPhYEu86QLOqqzpl5PAIQ=
+SHA256 (sonata-1.5.tar.gz) = bOCuqIAAbIuz0Cr1U4ueFe8dcBH16fCnv9sKdjCx678=
+SIZE (sonata-1.5.tar.gz) = 329991
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/audio/sonata/patches/patch-setup_py,v
retrieving revision 1.3
diff -u -r1.3 patch-setup_py
--- patches/patch-setup_py      19 Feb 2008 16:14:13 -0000      1.3
+++ patches/patch-setup_py      19 Apr 2008 10:15:34 -0000
@@ -1,14 +1,14 @@
 $OpenBSD: patch-setup_py,v 1.3 2008/02/19 16:14:13 merdely Exp $
---- setup.py.orig      Sat Feb  2 23:31:14 2008
-+++ setup.py   Wed Feb 13 17:41:10 2008
-@@ -65,10 +65,9 @@ setup(name='Sonata',
+--- setup.py.orig      Sat Apr 19 10:42:39 2008
++++ setup.py   Sat Apr 19 10:43:53 2008
+@@ -70,10 +70,9 @@ setup(name='Sonata',
          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']),
 +        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', glob.glob('sonata/pixmaps/*')),
 -                    ('share/man/man1', ['sonata.1']),
 +                    ('man/man1', ['sonata.1']),
                      ('share/locale/de/LC_MESSAGES', ['mo/de/sonata.mo']),
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/sonata/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST   19 Mar 2008 15:52:31 -0000      1.5
+++ pkg/PLIST   19 Apr 2008 10:15:34 -0000
@@ -1,13 +1,24 @@
 @comment $OpenBSD: PLIST,v 1.5 2008/03/19 15:52:31 winiger Exp $
 bin/sonata
-lib/python${MODPY_VERSION}/site-packages/Sonata-1.4.2-py${MODPY_VERSION}.egg-info
-lib/python${MODPY_VERSION}/site-packages/audioscrobbler.py
-lib/python${MODPY_VERSION}/site-packages/audioscrobbler.pyc
+lib/python${MODPY_VERSION}/site-packages/Sonata-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/mmkeys.so
-lib/python${MODPY_VERSION}/site-packages/mpdclient3.py
-lib/python${MODPY_VERSION}/site-packages/mpdclient3.pyc
-lib/python${MODPY_VERSION}/site-packages/sonata.py
-lib/python${MODPY_VERSION}/site-packages/sonata.pyc
+lib/python${MODPY_VERSION}/site-packages/sonata/
+lib/python${MODPY_VERSION}/site-packages/sonata/__init__.py
+lib/python${MODPY_VERSION}/site-packages/sonata/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/sonata/audioscrobbler.py
+lib/python${MODPY_VERSION}/site-packages/sonata/audioscrobbler.pyc
+lib/python${MODPY_VERSION}/site-packages/sonata/img.py
+lib/python${MODPY_VERSION}/site-packages/sonata/img.pyc
+lib/python${MODPY_VERSION}/site-packages/sonata/main.py
+lib/python${MODPY_VERSION}/site-packages/sonata/main.pyc
+lib/python${MODPY_VERSION}/site-packages/sonata/misc.py
+lib/python${MODPY_VERSION}/site-packages/sonata/misc.pyc
+lib/python${MODPY_VERSION}/site-packages/sonata/mpdhelper.py
+lib/python${MODPY_VERSION}/site-packages/sonata/mpdhelper.pyc
+lib/python${MODPY_VERSION}/site-packages/sonata/tray.py
+lib/python${MODPY_VERSION}/site-packages/sonata/tray.pyc
+lib/python${MODPY_VERSION}/site-packages/sonata/ui.py
+lib/python${MODPY_VERSION}/site-packages/sonata/ui.pyc
 @man man/man1/sonata.1
 share/applications/sonata.desktop
 share/locale/[EMAIL PROTECTED]/LC_MESSAGES/sonata.mo
@@ -15,6 +26,7 @@
 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
@@ -28,6 +40,7 @@
 share/pixmaps/
 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

Reply via email to