sync w/ base pkg

pkgsrc note: at least the "mid3v2" tool doesn't work correctly
(probably due to the unicode string type mess), so I left
the "INCOMPATIBLE" there

4 files changed, 23 insertions, 21 deletions

diff --git a/audio/mutagen-tools/Makefile b/audio/mutagen-tools/Makefile
index 5d601e0c584..22603a5a853 100644
--- a/audio/mutagen-tools/Makefile
+++ b/audio/mutagen-tools/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2014/05/09 07:36:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/10/17 16:01:15 drochner Exp $
 
-DISTNAME=	mutagen-1.22
-PKGNAME=	mutagen-tools-1.22
+DISTNAME=	mutagen-1.25.1
+PKGNAME=	mutagen-tools-1.25.1
 CATEGORIES=	audio
-MASTER_SITES=	http://mutagen.googlecode.com/files/
+MASTER_SITES=	https://bitbucket.org/lazka/mutagen/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/mutagen/
+HOMEPAGE=	https://bitbucket.org/lazka/mutagen
 COMMENT=	Audio metadata handling for Python
 LICENSE=	gnu-gpl-v2
 
@@ -14,7 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
 
 USE_LANGUAGES=	# none
 PY_NO_EGG=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.22
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # string type problems
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mutagen-tools/PLIST b/audio/mutagen-tools/PLIST
index 641cfc11af0..adb94f0905b 100644
--- a/audio/mutagen-tools/PLIST
+++ b/audio/mutagen-tools/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/02 10:50:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/10/17 16:01:15 drochner Exp $
+bin/mid3cp
 bin/mid3iconv
 bin/mid3v2
 bin/moggsplit
 bin/mutagen-inspect
 bin/mutagen-pony
+man/man1/mid3cp.1
 man/man1/mid3iconv.1
 man/man1/mid3v2.1
 man/man1/moggsplit.1
diff --git a/audio/mutagen-tools/distinfo b/audio/mutagen-tools/distinfo
index 446a03ef5a5..64021a66792 100644
--- a/audio/mutagen-tools/distinfo
+++ b/audio/mutagen-tools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2013/12/04 16:48:21 drochner Exp $
+$NetBSD: distinfo,v 1.3 2014/10/17 16:01:15 drochner Exp $
 
-SHA1 (mutagen-1.22.tar.gz) = 4338be32a7fcdbc9063ce58277c144a143a856be
-RMD160 (mutagen-1.22.tar.gz) = 7b537e21c4c0681374106cbde2f21e99cfb55253
-Size (mutagen-1.22.tar.gz) = 813763 bytes
-SHA1 (patch-aa) = 1eef6b55a1c170b45e264173ff93f0cc84ef6f5b
+SHA1 (mutagen-1.25.1.tar.gz) = ac5c193f783ed69d0d3173110e602ea3c29e8169
+RMD160 (mutagen-1.25.1.tar.gz) = 4b21a39e2bbe72005e07069105394eecbfb31e10
+Size (mutagen-1.25.1.tar.gz) = 850800 bytes
+SHA1 (patch-aa) = 7efef8d024210841a16fcf1f96960654bc91aacb
diff --git a/audio/mutagen-tools/patches/patch-aa b/audio/mutagen-tools/patches/patch-aa
index 7c8ea8fa44e..df922320c99 100644
--- a/audio/mutagen-tools/patches/patch-aa
+++ b/audio/mutagen-tools/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2013/12/04 16:48:21 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2014/10/17 16:01:15 drochner Exp $
 
---- setup.py.orig	2013-09-06 09:11:46.000000000 +0000
+--- setup.py.orig	2014-10-04 21:18:16.000000000 +0000
 +++ setup.py
-@@ -171,7 +171,7 @@ class coverage_cmd(Command):
-             raise SystemExit("Coverage percentage went up; change setup.py.")
+@@ -216,7 +216,7 @@ class coverage_cmd(Command):
+ 
  
  if os.name == "posix":
 -    data_files = [('share/man/man1', glob.glob("man/*.1"))]
@@ -11,12 +11,12 @@ $NetBSD: patch-aa,v 1.2 2013/12/04 16:48:21 drochner Exp $
  else:
      data_files = []
  
-@@ -202,7 +202,7 @@ if __name__ == "__main__":
+@@ -252,7 +252,7 @@ if __name__ == "__main__":
              'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
              'Topic :: Multimedia :: Sound/Audio',
            ],
--          packages=["mutagen"],
-+#          packages=["mutagen"],
+-          packages=["mutagen", "mutagen.id3"],
++#          packages=["mutagen", "mutagen.id3"],
            data_files=data_files,
-           scripts=glob.glob("tools/m*[!~]"),
-           long_description="""\
+           scripts=[os.path.join("tools", name) for name in [
+             "mid3cp",