--- Makefile.orig	Wed May 24 14:00:52 2006
+++ Makefile	Mon May 29 22:40:00 2006
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/audio/py-mutagen/Makefile,v 1.1 2006/05/24 21:00:52 itetcu Exp $
 
 PORTNAME=	mutagen
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	audio python
 MASTER_SITES=	http://www.sacredchao.net/~piman/software/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,17 +17,4 @@
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
-
-OPTIONS=	VORBIS	"Support to tag Vorbis Files"	on
-
-.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>
--- distinfo.orig	Wed May 24 14:00:52 2006
+++ distinfo	Mon May 29 22:43:15 2006
@@ -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.3.tar.gz) = e42b65a94624bcfc03614291be6cb690
+SHA256 (mutagen-1.3.tar.gz) = 079f2b9c9a0f02d843bc1960d4dfcbe2c981e490e84b1f3ca395580237baa537
+SIZE (mutagen-1.3.tar.gz) = 131053
--- pkg-descr.orig	Wed May 24 14:00:52 2006
+++ pkg-descr	Mon May 29 22:45:58 2006
@@ -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
--- pkg-plist.orig	Wed May 24 14:00:52 2006
+++ pkg-plist	Mon May 29 22:48:25 2006
@@ -25,6 +25,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