Update to 1.4.

PR:		98126
Submitted by:	Peter Johnson <johnson.peter@gmail.com>
Approved by:	maintainer
		arved (mentor)

4 files changed, 26 insertions, 20 deletions

diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index 7bf18e2bfff2..3d458e06643a 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	mutagen
-PORTVERSION=	1.2
+PORTVERSION=	1.4
 CATEGORIES=	audio python
 MASTER_SITES=	http://www.sacredchao.net/~piman/software/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,17 +17,10 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
+MAN1=		mutagen-inspect.1 mutagen-pony.1 mid3v2.1 moggsplit.1 \
+		mid3iconv.1
 
-OPTIONS=	VORBIS	"Support to tag Vorbis Files"	on
+post-patch:
+	${REINPLACE_CMD} -e "s,share/man/man1,man/man1,g" ${WRKSRC}/setup.py
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_VORBIS)
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
-SUB_LIST+=	VORBIS=
-.else
-SUB_LIST+=	VORBIS="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/py-mutagen/distinfo b/audio/py-mutagen/distinfo
index 1991ca368708..6ff9cfaed182 100644
--- a/audio/py-mutagen/distinfo
+++ b/audio/py-mutagen/distinfo
@@ -1,3 +1,3 @@
-MD5 (mutagen-1.2.tar.gz) = a9b6434d90fe080bcc754cf0d255f9ba
-SHA256 (mutagen-1.2.tar.gz) = 55939672e7d91f8fc668d1349cbe53afa2216c1296cf2265f35390c4d181771b
-SIZE (mutagen-1.2.tar.gz) = 113419
+MD5 (mutagen-1.4.tar.gz) = 4a5f656d803ea371e06eaff3fbc1dfbb
+SHA256 (mutagen-1.4.tar.gz) = 93af1dc651a96813ed5644f858a72d036877f4de19818b7308bb40e28d4cff4c
+SIZE (mutagen-1.4.tar.gz) = 203777
diff --git a/audio/py-mutagen/pkg-descr b/audio/py-mutagen/pkg-descr
index dc75df56846c..8693f3f17d14 100644
--- a/audio/py-mutagen/pkg-descr
+++ b/audio/py-mutagen/pkg-descr
@@ -1,6 +1,8 @@
-Mutagen is an audio metadata tag reader and writer implemented in
-pure Python. It supports reading ID3v1.1, ID3v2.2, ID3v2.3, ID3v2.4,
-APEv2, and FLAC, and writing ID3v1.1, ID3v2.4, APEv2, and FLAC. It
-can also read MPEG audio and Xing headers.
+Mutagen is a Python module to handle audio metadata.  It supports
+reading ID3 (all versions), APEv2, Ogg Vorbis, FLAC, and Ogg FLAC,
+and writing ID3v1.1, ID3v2.4, APEv2, Ogg Vorbis, FLAC, and Ogg FLAC.
+It can also read MPEG audio and Xing headers, FLAC stream info
+blocks, and Ogg Vorbis and Ogg FLAC stream headers. Finally, it
+includes a module to handle generic Ogg bitstreams.
 
 WWW: http://www.sacredchao.net/quodlibet/wiki/Development/Mutagen
diff --git a/audio/py-mutagen/pkg-plist b/audio/py-mutagen/pkg-plist
index 1c159b8118e2..dab662ea71ed 100644
--- a/audio/py-mutagen/pkg-plist
+++ b/audio/py-mutagen/pkg-plist
@@ -1,3 +1,8 @@
+bin/mid3v2
+bin/mutagen-inspect
+bin/mutagen-pony
+bin/moggsplit
+bin/mid3iconv
 %%PYTHON_SITELIBDIR%%/mutagen/__init__.py
 %%PYTHON_SITELIBDIR%%/mutagen/__init__.pyc
 %%PYTHON_SITELIBDIR%%/mutagen/__init__.pyo
@@ -25,6 +30,12 @@
 %%PYTHON_SITELIBDIR%%/mutagen/mp3.py
 %%PYTHON_SITELIBDIR%%/mutagen/mp3.pyc
 %%PYTHON_SITELIBDIR%%/mutagen/mp3.pyo
+%%PYTHON_SITELIBDIR%%/mutagen/ogg.py
+%%PYTHON_SITELIBDIR%%/mutagen/ogg.pyc
+%%PYTHON_SITELIBDIR%%/mutagen/ogg.pyo
+%%PYTHON_SITELIBDIR%%/mutagen/oggflac.py
+%%PYTHON_SITELIBDIR%%/mutagen/oggflac.pyc
+%%PYTHON_SITELIBDIR%%/mutagen/oggflac.pyo
 %%PYTHON_SITELIBDIR%%/mutagen/oggvorbis.py
 %%PYTHON_SITELIBDIR%%/mutagen/oggvorbis.pyc
 %%PYTHON_SITELIBDIR%%/mutagen/oggvorbis.pyo