Update picard to 0.16.

while here,
* convert some needless buildlink3 to simple DEPENDS.
* distutils pkg, register egg-info.

Version 0.16 - 2011-10-23
 * Added AcoustID support.
 * Fixed track metadata plugins.
 * Added new internal %_totalalbumtracks% tag field. (PICARD-16)
 * Track metadata plugins now run also on non-album tracks. (PICARD-7)
 * Fixed custom Various Artists name on the %albumartist% field. (PICARD-5)
 * Album artist is now correctly "translated". (PICARD-1)
 * Unicode punctuation is now converted to ASCII by default.
 * WavPack correction files are moved together with the main files. (PICARD-15)
 * Unicode filename normalization on OS X.
 * Original release date is now saved into %originaldate%.
 * Allow tagging with localized artist aliases (PICARD-17)
 * Added a quit confirmation dialog. (PICARD-46)
 * Standalone recordings can be tagged with relationships now. (PICARD-10)
 * Refreshing an album will refresh its "other versions" listing. (PICARD-8)
 * "Unicode punctuation to ASCII" now works on album-level metadata. (PICARD-50)
 * DJ-mix tags should only be written to the medium where they apply. (PICARD-20)
 * Support URL redirects in web service/network request module (PICARD-54)
 * Jamendo and Archive.org cover art is displayed on web page, but not loaded by Picard plugin (PICARD-52)
 * Edits to metadata in "Details..." menu not reflected in UI (PICARD-13)
 * The status bar/new metadata box is updated when a selected file/track is changed. (PICARD-14)

3 files changed, 31 insertions, 18 deletions

diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 881c9188923..cc07039e2ad 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2011/11/16 01:33:16 sbd Exp $
+# $NetBSD: Makefile,v 1.12 2011/12/11 12:39:27 obache Exp $
 #
 
-DISTNAME=	picard-0.15.1
-PKGREVISION=	1
+DISTNAME=	picard-0.16
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
 
@@ -11,21 +10,25 @@ HOMEPAGE=	http://musicbrainz.org/doc/Picard_Tagger
 COMMENT=	Audio file tagger
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=	c c++
-PYDISTUTILSPKG=	yes
+DEPENDS+=	${PYPKGPREFIX}-qt4>=4.5:../../x11/py-qt4
+DEPENDS+=	${PYPKGPREFIX}-mutagen>=1.20:../../audio/py-mutagen
+
 PKG_DESTDIR_SUPPORT= user-destdir
 
+USE_LANGUAGES=	c c++
 USE_TOOLS+=	msgfmt pkg-config
 
-do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} setup.py config)
+HAS_CONFIGURE=		yes
+CONFIG_SHELL=		${PYTHONBIN}
+CONFIGURE_SCRIPT=	setup.py
+CONFIGURE_ARGS+=	config
+
+PYTHON_VERSIONS_INCOMPATIBLE=	24
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../x11/py-qt4/buildlink3.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../audio/libofa/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../audio/py-mutagen/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/picard/PLIST b/audio/picard/PLIST
index c90317b772e..9744119e84a 100644
--- a/audio/picard/PLIST
+++ b/audio/picard/PLIST
@@ -1,8 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2011/08/06 19:29:37 gls Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/12/11 12:39:27 obache Exp $
 bin/picard
+${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/picard/__init__.py
 ${PYSITELIB}/picard/__init__.pyc
 ${PYSITELIB}/picard/__init__.pyo
+${PYSITELIB}/picard/acoustid.py
+${PYSITELIB}/picard/acoustid.pyc
+${PYSITELIB}/picard/acoustid.pyo
+${PYSITELIB}/picard/acoustidmanager.py
+${PYSITELIB}/picard/acoustidmanager.pyc
+${PYSITELIB}/picard/acoustidmanager.pyo
 ${PYSITELIB}/picard/album.py
 ${PYSITELIB}/picard/album.pyc
 ${PYSITELIB}/picard/album.pyo
@@ -83,9 +90,6 @@ ${PYSITELIB}/picard/musicdns/ofa.so
 ${PYSITELIB}/picard/parsefilename.py
 ${PYSITELIB}/picard/parsefilename.pyc
 ${PYSITELIB}/picard/parsefilename.pyo
-${PYSITELIB}/picard/playlist.py
-${PYSITELIB}/picard/playlist.pyc
-${PYSITELIB}/picard/playlist.pyo
 ${PYSITELIB}/picard/plugin.py
 ${PYSITELIB}/picard/plugin.pyc
 ${PYSITELIB}/picard/plugin.pyo
@@ -155,6 +159,9 @@ ${PYSITELIB}/picard/ui/options/cover.pyo
 ${PYSITELIB}/picard/ui/options/dialog.py
 ${PYSITELIB}/picard/ui/options/dialog.pyc
 ${PYSITELIB}/picard/ui/options/dialog.pyo
+${PYSITELIB}/picard/ui/options/fingerprinting.py
+${PYSITELIB}/picard/ui/options/fingerprinting.pyc
+${PYSITELIB}/picard/ui/options/fingerprinting.pyo
 ${PYSITELIB}/picard/ui/options/folksonomy.py
 ${PYSITELIB}/picard/ui/options/folksonomy.pyc
 ${PYSITELIB}/picard/ui/options/folksonomy.pyo
@@ -233,6 +240,9 @@ ${PYSITELIB}/picard/ui/ui_options_cdlookup_select.pyo
 ${PYSITELIB}/picard/ui/ui_options_cover.py
 ${PYSITELIB}/picard/ui/ui_options_cover.pyc
 ${PYSITELIB}/picard/ui/ui_options_cover.pyo
+${PYSITELIB}/picard/ui/ui_options_fingerprinting.py
+${PYSITELIB}/picard/ui/ui_options_fingerprinting.pyc
+${PYSITELIB}/picard/ui/ui_options_fingerprinting.pyo
 ${PYSITELIB}/picard/ui/ui_options_folksonomy.py
 ${PYSITELIB}/picard/ui/ui_options_folksonomy.pyc
 ${PYSITELIB}/picard/ui/ui_options_folksonomy.pyo
diff --git a/audio/picard/distinfo b/audio/picard/distinfo
index 7b7d6479519..af47ca83985 100644
--- a/audio/picard/distinfo
+++ b/audio/picard/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2011/08/06 19:29:37 gls Exp $
+$NetBSD: distinfo,v 1.6 2011/12/11 12:39:27 obache Exp $
 
-SHA1 (picard-0.15.1.tar.gz) = 91b461430add978f0b07ae738ce1b9de616998f4
-RMD160 (picard-0.15.1.tar.gz) = 195902699349d27af268180f45312a4d3ce1ac80
-Size (picard-0.15.1.tar.gz) = 1549887 bytes
+SHA1 (picard-0.16.tar.gz) = 274071410550ee29051bb0137d72602921a015f9
+RMD160 (picard-0.16.tar.gz) = 375610cfd8ff03825e22af726730fa85c7cb54fd
+Size (picard-0.16.tar.gz) = 1828595 bytes
 SHA1 (patch-aa) = b045a8e14f88bb242974a31d9390fd48351fd452