Changes 1.38:

* Note: New release tarballs are now hosted on github:
  https://github.com/quodlibet/mutagen/releases
* ID3:
  * Add iTunes grouping frame `id3.GRP1`
  * Fix exposing text frames where the text can't be encoded with the
    reported encoding due to merging of frames
* OGG: Fix wrong StreamInfo.length (small negative value) for all
  ogg based formats in rare cases.

5 files changed, 26 insertions, 54 deletions

diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index 9aad87debf0..f140e02357b 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2017/05/09 13:14:32 leot Exp $
+# $NetBSD: Makefile,v 1.19 2017/06/20 12:38:42 adam Exp $
 
-DISTNAME=	mutagen-1.37
+DISTNAME=	mutagen-1.38
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/mutagen/}
@@ -12,5 +12,11 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
 
+SUBST_CLASSES+=		manpath
+SUBST_STAGE.manpath=	pre-configure
+SUBST_MESSAGE.manpath=	Fixing man paths.
+SUBST_FILES.manpath=	setup.py
+SUBST_SED.manpath=	-e 's,share/man,${PKGMANDIR},'
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-mutagen/PLIST b/audio/py-mutagen/PLIST
index 8b3b6bff933..2629ddab964 100644
--- a/audio/py-mutagen/PLIST
+++ b/audio/py-mutagen/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2017/05/09 13:14:32 leot Exp $
+@comment $NetBSD: PLIST,v 1.13 2017/06/20 12:38:42 adam Exp $
+bin/mid3cp
+bin/mid3iconv
+bin/mid3v2
+bin/moggsplit
+bin/mutagen-inspect
+bin/mutagen-pony
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/mutagen/__init__.py
 ${PYSITELIB}/mutagen/__init__.pyc
@@ -186,3 +192,9 @@ ${PYSITELIB}/mutagen/trueaudio.pyo
 ${PYSITELIB}/mutagen/wavpack.py
 ${PYSITELIB}/mutagen/wavpack.pyc
 ${PYSITELIB}/mutagen/wavpack.pyo
+man/man1/mid3cp.1
+man/man1/mid3iconv.1
+man/man1/mid3v2.1
+man/man1/moggsplit.1
+man/man1/mutagen-inspect.1
+man/man1/mutagen-pony.1
diff --git a/audio/py-mutagen/buildlink3.mk b/audio/py-mutagen/buildlink3.mk
deleted file mode 100644
index 986b0442b81..00000000000
--- a/audio/py-mutagen/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:58 joerg Exp $
-
-BUILDLINK_TREE+=	py-mutagen
-
-.if !defined(PY_MUTAGEN_BUILDLINK3_MK)
-PY_MUTAGEN_BUILDLINK3_MK:=
-
-.  include "../../lang/python/pyversion.mk"
-
-BUILDLINK_API_DEPENDS.py-mutagen+=	${PYPKGPREFIX}-mutagen>=1.9
-BUILDLINK_PKGSRCDIR.py-mutagen?=	../../audio/py-mutagen
-.endif # PY_MUTAGEN_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-py-mutagen
diff --git a/audio/py-mutagen/distinfo b/audio/py-mutagen/distinfo
index fb405ef7b3a..af5b896aa61 100644
--- a/audio/py-mutagen/distinfo
+++ b/audio/py-mutagen/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2017/05/09 13:14:32 leot Exp $
+$NetBSD: distinfo,v 1.13 2017/06/20 12:38:42 adam Exp $
 
-SHA1 (mutagen-1.37.tar.gz) = 973e29c3b27f2b99ac5b18899ef07c2c8c9b035e
-RMD160 (mutagen-1.37.tar.gz) = 8a8bce64ed57d7637a590e163a7e27f329a6a297
-SHA512 (mutagen-1.37.tar.gz) = f1bdd3d56526be718642d6599e7353879dc7e16f3d8758ff0221224310f5952cdc097dd70202be4b93c3a661f83b4f0d3e7730464f077d89614883571b80b180
-Size (mutagen-1.37.tar.gz) = 912600 bytes
-SHA1 (patch-aa) = a43b06c204080283674a4afacafbc356fbaab021
+SHA1 (mutagen-1.38.tar.gz) = bc37d508c5c1513e3118c669da85552478629387
+RMD160 (mutagen-1.38.tar.gz) = cc0637f35bdfb217617bdad5a0190e44726a6ba7
+SHA512 (mutagen-1.38.tar.gz) = 1430901539cddc7f58978f59125b793228c611cee9cc19535142e3095a7caaeee7a2431c244054affa33fb6518123b46cd187715d8353fd1b165496bd358a995
+Size (mutagen-1.38.tar.gz) = 913243 bytes
diff --git a/audio/py-mutagen/patches/patch-aa b/audio/py-mutagen/patches/patch-aa
deleted file mode 100644
index 1f27a8817af..00000000000
--- a/audio/py-mutagen/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2017/05/09 13:14:32 leot Exp $
-
-Do not install the command line tools. The tools are provided separately by
-mutagen-tools package.
-
---- setup.py.orig	2017-02-24 13:15:32.000000000 +0000
-+++ setup.py
-@@ -267,14 +267,14 @@ if __name__ == "__main__":
-             "mutagen._senf",
-             "mutagen._tools",
-           ],
--          data_files=data_files,
--          scripts=[os.path.join("tools", name) for name in [
--            "mid3cp",
--            "mid3iconv",
--            "mid3v2",
--            "moggsplit",
--            "mutagen-inspect",
--            "mutagen-pony",
--          ]],
-+#         data_files=data_files,
-+#         scripts=[os.path.join("tools", name) for name in [
-+#           "mid3cp",
-+#           "mid3iconv",
-+#           "mid3v2",
-+#           "moggsplit",
-+#           "mutagen-inspect",
-+#           "mutagen-pony",
-+#         ]],
-           long_description=long_description,
-     )