Update sonata to 1.6.2.1.

In addition to PR#45023 by ISIHARA Takanori,
* LICENSE=gnu-gpl-v3
* register egg
* convert some buildlink to simple DEPENDS, because no contents to buildlink.
* drop dependency on py-elementtree, it's py24 way.
* honor PKGMANDIR.

v1.6.2.1 - September 21, 2009
        + Library artwork caching/displaying improvements
        + Lyricwiki screen scraping workaround
        + Replace Amazon.com cover art fetching with Rhapsody.com
        + Bug: Fix library sorting when adding, e.g., albums to playlist
        + Bug: Fix window positioning weirdness when unwithdrawing from systray
        + Bug: Fix album being labeled various artists when a duplicate exists
        + Bug: Fix album tracks in the info tab being out of order sometimes
        + Bug: Show songs with a missing date in info album listing
        + Bug: Library icons change after adding stream to playlist
        + Bug: Cpu spike, tooltips missing in library search results with gtk 2.16.2

4 files changed, 23 insertions, 18 deletions

diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index f56ee38febf..c205cde601f 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2011/05/29 00:38:59 obache Exp $
+# $NetBSD: Makefile,v 1.21 2011/06/08 13:03:34 obache Exp $
 #
 
-DISTNAME=	sonata-1.6.2
-PKGREVISION=	6
+EGG_NAME=	Sonata-1.6.2.1
+DISTNAME=	${EGG_NAME:tl}
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/sonata/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,24 +10,28 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	jfranz@bsdprojects.net
 HOMEPAGE=	http://sonata.berlios.de/
 COMMENT=	Elegant GTK2 client for the Music Player Daemon
+LICENSE=	gnu-gpl-v3
+
+DEPENDS+=	${PYPKGPREFIX}-SOAPpy-[0-9]*:../../net/py-soappy
+DEPENDS+=	${PYPKGPREFIX}-mpd-[0-9]*:../../audio/py-mpd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYTHON_VERSIONS_ACCEPTED=	27 26 25
-PY_PATCHPLIST=	yes
-PYDISTUTILSPKG=	yes
 USE_TOOLS+=	pkg-config msgfmt
 
+SUBST_CLASSES+=		mandir
+SUBST_STAGE.mandir=	pre-configure
+SUBST_VARS.mandir=	PKGMANDIR
+SUBST_FILES.mandir=	setup.py
+
 # gtk threading bugfix
 BUILDLINK_ABI_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.12.1nb1
 
-.include "../../devel/py-gobject/buildlink3.mk"
-.include "../../lang/python/extension.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.12.0
 .include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../net/py-soappy/buildlink3.mk"
-.include "../../textproc/py-elementtree/buildlink3.mk"
-.include "../../audio/py-mpd/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sonata/PLIST b/audio/sonata/PLIST
index 8777cfef1d7..a0f2204e6f1 100644
--- a/audio/sonata/PLIST
+++ b/audio/sonata/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:32:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/06/08 13:03:34 obache Exp $
 bin/sonata
+${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/mmkeys.so
 ${PYSITELIB}/sonata/__init__.py
 ${PYSITELIB}/sonata/__init__.pyc
diff --git a/audio/sonata/distinfo b/audio/sonata/distinfo
index 09a1e70ee0a..8b80ce3ffee 100644
--- a/audio/sonata/distinfo
+++ b/audio/sonata/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/05/26 18:24:58 drochner Exp $
+$NetBSD: distinfo,v 1.5 2011/06/08 13:03:34 obache Exp $
 
-SHA1 (sonata-1.6.2.tar.bz2) = 33cb3458014b4901eb312bff76c24be125ed7d0a
-RMD160 (sonata-1.6.2.tar.bz2) = 418eef732cc171d21e301261aa0c6b7751d03ab3
-Size (sonata-1.6.2.tar.bz2) = 315918 bytes
-SHA1 (patch-aa) = 0c323085df89557ef9bdc96f03e0997ddb1644f7
+SHA1 (sonata-1.6.2.1.tar.bz2) = 609452c1672ae01c44988a21f7cc94f0637bad82
+RMD160 (sonata-1.6.2.1.tar.bz2) = 4ca257c0c860804ae3e4cd343d953084b81ea471
+Size (sonata-1.6.2.1.tar.bz2) = 314333 bytes
+SHA1 (patch-aa) = a9920a7c03d63390499415bcc1d1b7bdd55bf399
diff --git a/audio/sonata/patches/patch-aa b/audio/sonata/patches/patch-aa
index 75a2795e44e..02ec4a87fbb 100644
--- a/audio/sonata/patches/patch-aa
+++ b/audio/sonata/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2008/05/05 10:41:22 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2011/06/08 13:03:34 obache Exp $
 
 --- setup.py.orig	2008-05-04 02:30:45.000000000 +0200
 +++ setup.py
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2008/05/05 10:41:22 drochner Exp $
                      ('share/applications', ['sonata.desktop']),
                      ('share/pixmaps', glob.glob('sonata/pixmaps/*')),
 -                    ('share/man/man1', ['sonata.1']),
-+                    ('man/man1', ['sonata.1']),
++                    ('@PKGMANDIR@/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']),