4 files changed, 47 insertions, 40 deletions

diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index a687109cdf92..c8f89738dfb2 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	picard
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.2
 CATEGORIES=	audio python
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
-		http://ftp.uk.musicbrainz.org/pub/musicbrainz/picard/ \
 		http://ftp.osuosl.org/pub/musicbrainz/picard/
 
 MAINTAINER=	jhale@FreeBSD.org
@@ -15,9 +13,7 @@ COMMENT=	Next generation MusicBrainz Tagger
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	ofa:${PORTSDIR}/audio/libofa \
-		avcodec:${PORTSDIR}/multimedia/ffmpeg \
-		discid:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
@@ -25,11 +21,28 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
 
 USES=		gettext
-NO_STAGE=	yes
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
 INSTALLS_ICONS=	yes
 
+OPTIONS_DEFINE=	ACOUSTID REPLAYGAIN
+
+ACOUSTID_DESC=	AcoustID audio fingerprinting support
+REPLAYGAIN_DESC=ReplayGain audio normalization support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MACOUSTID}
+RUN_DEPENDS+=	fpcalc:${PORTSDIR}/audio/chromaprint
+.endif
+
+.if ${PORT_OPTIONS:MREPLAYGAIN}
+RUN_DEPENDS+=	metaflac:${PORTSDIR}/audio/flac \
+		mp3gain:${PORTSDIR}/audio/mp3gain \
+		vorbisgain:${PORTSDIR}/audio/vorbisgain \
+		wvgain:${PORTSDIR}/audio/wavpack
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|'picard.plugins',|'picard.plugins', 'picard.plugins.lastfm', 'picard.plugins.lastfmplus', 'picard.plugins.replaygain',|" \
 		${WRKSRC}/setup.py
diff --git a/audio/picard/distinfo b/audio/picard/distinfo
index cbf6716dae1e..289566c44320 100644
--- a/audio/picard/distinfo
+++ b/audio/picard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (picard-1.1.tar.gz) = 31d61aaf54c582b93f4195fa137552575d16ca7622a3b12303744485d33bce4e
-SIZE (picard-1.1.tar.gz) = 1679228
+SHA256 (picard-1.2.tar.gz) = a6f66bf4933521270e1f0e586ac7e067563a04aba6e98da5b5acc3fe21727a69
+SIZE (picard-1.2.tar.gz) = 1679532
diff --git a/audio/picard/pkg-descr b/audio/picard/pkg-descr
index 0a0474857e77..217e26d855cd 100644
--- a/audio/picard/pkg-descr
+++ b/audio/picard/pkg-descr
@@ -1,13 +1,13 @@
-MusicBrainz Picard is a cross-platform application written in Python and is the
-official MusicBrainz tagger.
+MusicBrainz Picard is a cross-platform application written in Python
+and is the official MusicBrainz tagger.
 
-Picard supports the majority of audio file formats, is capable of using audio
-fingerprints (PUIDs), performing CD lookups and disc ID submissions, and it has
-excellent Unicode support. Additionally, there are several plugins available
-that extend Picard's features.
+Picard supports the majority of audio file formats, is capable of
+using audio fingerprints (AcoustIDs), performing CD lookups and
+disc ID submissions, and it has excellent Unicode support. Additionally,
+there are several plugins available that extend Picard's features.
 
-When tagging files, Picard uses an album-oriented approach.  This approach
-allows it to utilize the MusicBrainz data as effectively as possible and
-correctly tag your music.
+When tagging files, Picard uses an album-oriented approach.  This
+approach allows it to utilize the MusicBrainz data as effectively
+as possible and correctly tag your music.
 
-WWW:	http://musicbrainz.org/doc/MusicBrainz_Picard
+WWW: http://musicbrainz.org/doc/MusicBrainz_Picard
diff --git a/audio/picard/pkg-plist b/audio/picard/pkg-plist
index fca074b8280c..34bb3aea8a13 100644
--- a/audio/picard/pkg-plist
+++ b/audio/picard/pkg-plist
@@ -11,9 +11,6 @@ bin/picard
 %%PYTHON_SITELIBDIR%%/picard/album.py
 %%PYTHON_SITELIBDIR%%/picard/album.pyc
 %%PYTHON_SITELIBDIR%%/picard/album.pyo
-%%PYTHON_SITELIBDIR%%/picard/artist.py
-%%PYTHON_SITELIBDIR%%/picard/artist.pyc
-%%PYTHON_SITELIBDIR%%/picard/artist.pyo
 %%PYTHON_SITELIBDIR%%/picard/browser/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/browser/__init__.pyc
 %%PYTHON_SITELIBDIR%%/picard/browser/__init__.pyo
@@ -26,12 +23,21 @@ bin/picard
 %%PYTHON_SITELIBDIR%%/picard/cluster.py
 %%PYTHON_SITELIBDIR%%/picard/cluster.pyc
 %%PYTHON_SITELIBDIR%%/picard/cluster.pyo
+%%PYTHON_SITELIBDIR%%/picard/collection.py
+%%PYTHON_SITELIBDIR%%/picard/collection.pyc
+%%PYTHON_SITELIBDIR%%/picard/collection.pyo
 %%PYTHON_SITELIBDIR%%/picard/config.py
 %%PYTHON_SITELIBDIR%%/picard/config.pyc
 %%PYTHON_SITELIBDIR%%/picard/config.pyo
 %%PYTHON_SITELIBDIR%%/picard/const.py
 %%PYTHON_SITELIBDIR%%/picard/const.pyc
 %%PYTHON_SITELIBDIR%%/picard/const.pyo
+%%PYTHON_SITELIBDIR%%/picard/coverart.py
+%%PYTHON_SITELIBDIR%%/picard/coverart.pyc
+%%PYTHON_SITELIBDIR%%/picard/coverart.pyo
+%%PYTHON_SITELIBDIR%%/picard/coverartarchive.py
+%%PYTHON_SITELIBDIR%%/picard/coverartarchive.pyc
+%%PYTHON_SITELIBDIR%%/picard/coverartarchive.pyo
 %%PYTHON_SITELIBDIR%%/picard/dataobj.py
 %%PYTHON_SITELIBDIR%%/picard/dataobj.pyc
 %%PYTHON_SITELIBDIR%%/picard/dataobj.pyo
@@ -80,11 +86,6 @@ bin/picard
 %%PYTHON_SITELIBDIR%%/picard/metadata.py
 %%PYTHON_SITELIBDIR%%/picard/metadata.pyc
 %%PYTHON_SITELIBDIR%%/picard/metadata.pyo
-%%PYTHON_SITELIBDIR%%/picard/musicdns/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/musicdns/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/musicdns/__init__.pyo
-%%PYTHON_SITELIBDIR%%/picard/musicdns/avcodec.so
-%%PYTHON_SITELIBDIR%%/picard/musicdns/ofa.so
 %%PYTHON_SITELIBDIR%%/picard/parsefilename.py
 %%PYTHON_SITELIBDIR%%/picard/parsefilename.pyc
 %%PYTHON_SITELIBDIR%%/picard/parsefilename.pyo
@@ -100,9 +101,6 @@ bin/picard
 %%PYTHON_SITELIBDIR%%/picard/plugins/classicdiscnumber.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/classicdiscnumber.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/classicdiscnumber.pyo
-%%PYTHON_SITELIBDIR%%/picard/plugins/coverart.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/coverart.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/coverart.pyo
 %%PYTHON_SITELIBDIR%%/picard/plugins/cuesheet.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/cuesheet.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/cuesheet.pyo
@@ -151,9 +149,9 @@ bin/picard
 %%PYTHON_SITELIBDIR%%/picard/plugins/tracks2clipboard.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/tracks2clipboard.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/tracks2clipboard.pyo
-%%PYTHON_SITELIBDIR%%/picard/puidmanager.py
-%%PYTHON_SITELIBDIR%%/picard/puidmanager.pyc
-%%PYTHON_SITELIBDIR%%/picard/puidmanager.pyo
+%%PYTHON_SITELIBDIR%%/picard/releasegroup.py
+%%PYTHON_SITELIBDIR%%/picard/releasegroup.pyc
+%%PYTHON_SITELIBDIR%%/picard/releasegroup.pyo
 %%PYTHON_SITELIBDIR%%/picard/resources.py
 %%PYTHON_SITELIBDIR%%/picard/resources.pyc
 %%PYTHON_SITELIBDIR%%/picard/resources.pyo
@@ -175,6 +173,9 @@ bin/picard
 %%PYTHON_SITELIBDIR%%/picard/ui/cdlookup.py
 %%PYTHON_SITELIBDIR%%/picard/ui/cdlookup.pyc
 %%PYTHON_SITELIBDIR%%/picard/ui/cdlookup.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/collectionmenu.py
+%%PYTHON_SITELIBDIR%%/picard/ui/collectionmenu.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/collectionmenu.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/coverartbox.py
 %%PYTHON_SITELIBDIR%%/picard/ui/coverartbox.pyc
 %%PYTHON_SITELIBDIR%%/picard/ui/coverartbox.pyo
@@ -262,9 +263,6 @@ bin/picard
 %%PYTHON_SITELIBDIR%%/picard/ui/passworddialog.py
 %%PYTHON_SITELIBDIR%%/picard/ui/passworddialog.pyc
 %%PYTHON_SITELIBDIR%%/picard/ui/passworddialog.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/puidsubmit.py
-%%PYTHON_SITELIBDIR%%/picard/ui/puidsubmit.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/puidsubmit.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/ratingwidget.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ratingwidget.pyc
 %%PYTHON_SITELIBDIR%%/picard/ui/ratingwidget.pyo
@@ -337,9 +335,6 @@ bin/picard
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_passworddialog.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_passworddialog.pyc
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_passworddialog.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_puidsubmit.py
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_puidsubmit.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_puidsubmit.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_tagsfromfilenames.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_tagsfromfilenames.pyc
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_tagsfromfilenames.pyo
@@ -417,7 +412,6 @@ share/locale/sv/LC_MESSAGES/picard.mo
 @dirrm %%PYTHON_SITELIBDIR%%/picard/plugins/lastfmplus
 @dirrm %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm
 @dirrm %%PYTHON_SITELIBDIR%%/picard/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/picard/musicdns
 @dirrm %%PYTHON_SITELIBDIR%%/picard/formats/mutagenext
 @dirrm %%PYTHON_SITELIBDIR%%/picard/formats
 @dirrm %%PYTHON_SITELIBDIR%%/picard/browser