3 files changed, 35 insertions, 25 deletions

diff --git a/audio/beets/Makefile b/audio/beets/Makefile
index 86e76c397d77..6c99c4b1b1c5 100644
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	beets
-PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTVERSION=	1.3.2
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	A media library management system for obsessive-compulsive music geeks
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.21:${PORTSDIR}/audio/py-mutagen \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.22:${PORTSDIR}/audio/py-mutagen \
 		${PYTHON_PKGNAMEPREFIX}unidecode>=0:${PORTSDIR}/converters/py-unidecode \
 		${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0:${PORTSDIR}/audio/py-musicbrainzngs \
 		${PYTHON_PKGNAMEPREFIX}munkres>=0:${PORTSDIR}/math/py-munkres \
@@ -20,19 +19,24 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.21:${PORTSDIR}/audio/py-mutagen \
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
-OPTIONS_DEFINE=	BEATPORT CHROMA DISCOGS LASTFM FFMPEG REPLAYGAIN WEB
+OPTIONS_DEFINE=	BEATPORT BPD CHROMA DISCOGS ECHONEST LASTFM FFMPEG REPLAYGAIN WEB
 OPTIONS_DEFAULT=
 
 CHROMA_DESC=	Audio Fingerprinting Plugin
+BPD_DESC=	MPD Compatible Music Player Plugin
 BEATPORT_DESC=	Beatport Catalog Autotagging Support
 DISCOGS_DESC=	Discogs Search Plugin
+ECHONEST_DESC=	Echo Nest Plugin
 LASTFM_DESC=	LastGenre Plugin
 REPLAYGAIN_DESC=	Normalize Audio Loudness
 WEB_DESC=	Webserver Music Player Plugin
 
 CHROMA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:${PORTSDIR}/audio/py-pyacoustid
+BPD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:${PORTSDIR}/multimedia/py-gstreamer
+BPD_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
 BEATPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests1>=0:${PORTSDIR}/www/py-requests1
 DISCOGS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discogs-client>=0:${PORTSDIR}/audio/py-discogs-client
+ECHONEST_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyechonest>=8.0.1:${PORTSDIR}/devel/py-pyechonest
 FFMPEG_RUN_DEPENDS=	ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
 LASTFM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylast>=0:${PORTSDIR}/audio/py-pylast
 REPLAYGAIN_RUN_DEPENDS=	mp3gain>=0:${PORTSDIR}/audio/mp3gain
diff --git a/audio/beets/distinfo b/audio/beets/distinfo
index 62c2f4f57e5b..e09e8d539ffc 100644
--- a/audio/beets/distinfo
+++ b/audio/beets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (beets-1.3.1.tar.gz) = 62ff54ad0f5cb224df2a9bed84d1281f27dd956cafe916b09318776a4b3ca308
-SIZE (beets-1.3.1.tar.gz) = 648456
+SHA256 (beets-1.3.2.tar.gz) = 8a0c1970f52cdfa5402721299c0c230b464a44c4ea6a11bdc59d07161591388a
+SIZE (beets-1.3.2.tar.gz) = 663525
diff --git a/audio/beets/pkg-plist b/audio/beets/pkg-plist
index f5e55bf856ba..22b1d1644241 100644
--- a/audio/beets/pkg-plist
+++ b/audio/beets/pkg-plist
@@ -16,6 +16,9 @@ man/man5/beetsconfig.5.gz
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/the.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/the.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/the.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/smartplaylist.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/smartplaylist.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/smartplaylist.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/scrub.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/scrub.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/scrub.py
@@ -25,12 +28,21 @@ man/man5/beetsconfig.5.gz
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/replaygain.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/replaygain.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/replaygain.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/random.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/random.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/random.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mpdupdate.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mpdupdate.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mpdupdate.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mpdstats.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mpdstats.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mpdstats.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/missing.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/missing.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/missing.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mbsync.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mbsync.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mbsync.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mbcollection.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mbcollection.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/mbcollection.py
@@ -54,6 +66,9 @@ man/man5/beetsconfig.5.gz
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/ihate.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/ihate.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/ihate.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/fuzzy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/fuzzy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/fuzzy.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/ftintitle.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/ftintitle.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/ftintitle.py
@@ -69,6 +84,9 @@ man/man5/beetsconfig.5.gz
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/echonest_tempo.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/echonest_tempo.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/echonest_tempo.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/echonest.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/echonest.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/echonest.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/duplicates.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/duplicates.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/duplicates.py
@@ -108,6 +126,9 @@ man/man5/beetsconfig.5.gz
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/enumeration.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/enumeration.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/enumeration.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/confit.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/confit.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/confit.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/bluelet.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/bluelet.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/bluelet.py
@@ -117,6 +138,9 @@ man/man5/beetsconfig.5.gz
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/util/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/ui/migrate.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/ui/migrate.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/ui/migrate.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/ui/commands.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/ui/commands.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/ui/commands.py
@@ -135,6 +159,7 @@ man/man5/beetsconfig.5.gz
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/importer.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/importer.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/importer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/config_default.yaml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/autotag/mb.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/autotag/mb.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beets/autotag/mb.py
@@ -158,25 +183,6 @@ man/man5/beetsconfig.5.gz
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/smartplaylist.pyo
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/smartplaylist.pyc
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/smartplaylist.py
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/random.pyo
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/random.pyc
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/random.py
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/mbsync.pyo
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/mbsync.pyc
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/mbsync.py
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/fuzzy.pyo
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/fuzzy.pyc
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beetsplug/fuzzy.py
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beets/util/confit.pyo
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beets/util/confit.pyc
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beets/util/confit.py
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beets/ui/migrate.pyo
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beets/ui/migrate.pyc
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beets/ui/migrate.py
-%%PYTHON_LIBDIR%%/site-packages/%%PYEASYINSTALL_EGG%%/beets/config_default.yaml
 @dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/web/templates
 @dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/web/static
 @dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beetsplug/web