Update to 2.20, changes not found. Mark as not for python-3.x.

4 files changed, 99 insertions, 89 deletions

diff --git a/audio/py-audiotools/Makefile b/audio/py-audiotools/Makefile
index 6d47f9aa414..fc410dcd07c 100644
--- a/audio/py-audiotools/Makefile
+++ b/audio/py-audiotools/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2012/10/03 22:14:00 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.8 2014/01/20 11:54:21 wiz Exp $
 
-DISTNAME=	audiotools-2.18
+DISTNAME=	audiotools-2.20
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=audiotools/2.18/}
 
@@ -12,24 +10,18 @@ HOMEPAGE=	http://audiotools.sourceforge.net/
 COMMENT=	Collection of command line audio handling programs
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=	c
+DEPENDS+=	${PYPKGPREFIX}-urwid-[0-9]*:../../devel/py-urwid
 
-REPLACE_INTERPRETER+=	python
-REPLACE.python.old=	/usr/bin/python
-REPLACE.python.new=	${PYTHONBIN}
-REPLACE_FILES.python=	audiotools/*.py
-REPLACE_FILES.python+=	audiotools/py_decoders/*.py
-REPLACE_FILES.python+=	audiotools/py_encoders/*.py
+USE_LANGUAGES=	c
 
-REPLACE_INTERPRETER+=	bin-python
-REPLACE.bin-python.old=	/usr/bin/bin
-REPLACE.bin-python.new=	${PYTHONBIN}
-REPLACE_FILES.bin-python=	audiotools/player.py
+REPLACE_PYTHON+=	audiotools/*.py
+REPLACE_PYTHON+=	audiotools/py_decoders/*.py
+REPLACE_PYTHON+=	audiotools/py_encoders/*.py
 
 EGG_NAME=	Python_Audio_Tools-${PKGVERSION_NOREV}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.20
 
-DEPENDS+=	${PYPKGPREFIX}-urwid-[0-9]*:../../devel/py-urwid
-
+.include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../misc/libcdio/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-audiotools/PLIST b/audio/py-audiotools/PLIST
index 8085cf20a19..b54d1369a23 100644
--- a/audio/py-audiotools/PLIST
+++ b/audio/py-audiotools/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2012/07/01 01:56:16 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/01/20 11:54:21 wiz Exp $
 bin/audiotools-config
 bin/cd2track
 bin/cdinfo
 bin/cdplay
 bin/coverdump
+bin/covertag
 bin/coverview
 bin/dvda2track
 bin/dvdainfo
@@ -20,72 +21,21 @@ bin/tracksplit
 bin/tracktag
 bin/trackverify
 ${PYSITELIB}/${EGG_FILE}
-${PYSITELIB}/audiotools/__accuraterip__.py
-${PYSITELIB}/audiotools/__accuraterip__.pyc
-${PYSITELIB}/audiotools/__accuraterip__.pyo
-${PYSITELIB}/audiotools/__aiff__.py
-${PYSITELIB}/audiotools/__aiff__.pyc
-${PYSITELIB}/audiotools/__aiff__.pyo
-${PYSITELIB}/audiotools/__ape__.py
-${PYSITELIB}/audiotools/__ape__.pyc
-${PYSITELIB}/audiotools/__ape__.pyo
-${PYSITELIB}/audiotools/__au__.py
-${PYSITELIB}/audiotools/__au__.pyc
-${PYSITELIB}/audiotools/__au__.pyo
-${PYSITELIB}/audiotools/__dvda__.py
-${PYSITELIB}/audiotools/__dvda__.pyc
-${PYSITELIB}/audiotools/__dvda__.pyo
-${PYSITELIB}/audiotools/__flac__.py
-${PYSITELIB}/audiotools/__flac__.pyc
-${PYSITELIB}/audiotools/__flac__.pyo
-${PYSITELIB}/audiotools/__freedb__.py
-${PYSITELIB}/audiotools/__freedb__.pyc
-${PYSITELIB}/audiotools/__freedb__.pyo
-${PYSITELIB}/audiotools/__id3__.py
-${PYSITELIB}/audiotools/__id3__.pyc
-${PYSITELIB}/audiotools/__id3__.pyo
-${PYSITELIB}/audiotools/__id3v1__.py
-${PYSITELIB}/audiotools/__id3v1__.pyc
-${PYSITELIB}/audiotools/__id3v1__.pyo
-${PYSITELIB}/audiotools/__image__.py
-${PYSITELIB}/audiotools/__image__.pyc
-${PYSITELIB}/audiotools/__image__.pyo
 ${PYSITELIB}/audiotools/__init__.py
 ${PYSITELIB}/audiotools/__init__.pyc
 ${PYSITELIB}/audiotools/__init__.pyo
-${PYSITELIB}/audiotools/__m4a__.py
-${PYSITELIB}/audiotools/__m4a__.pyc
-${PYSITELIB}/audiotools/__m4a__.pyo
-${PYSITELIB}/audiotools/__m4a_atoms__.py
-${PYSITELIB}/audiotools/__m4a_atoms__.pyc
-${PYSITELIB}/audiotools/__m4a_atoms__.pyo
-${PYSITELIB}/audiotools/__mp3__.py
-${PYSITELIB}/audiotools/__mp3__.pyc
-${PYSITELIB}/audiotools/__mp3__.pyo
-${PYSITELIB}/audiotools/__musepack__.py
-${PYSITELIB}/audiotools/__musepack__.pyc
-${PYSITELIB}/audiotools/__musepack__.pyo
-${PYSITELIB}/audiotools/__musicbrainz__.py
-${PYSITELIB}/audiotools/__musicbrainz__.pyc
-${PYSITELIB}/audiotools/__musicbrainz__.pyo
-${PYSITELIB}/audiotools/__ogg__.py
-${PYSITELIB}/audiotools/__ogg__.pyc
-${PYSITELIB}/audiotools/__ogg__.pyo
-${PYSITELIB}/audiotools/__shn__.py
-${PYSITELIB}/audiotools/__shn__.pyc
-${PYSITELIB}/audiotools/__shn__.pyo
-${PYSITELIB}/audiotools/__vorbis__.py
-${PYSITELIB}/audiotools/__vorbis__.pyc
-${PYSITELIB}/audiotools/__vorbis__.pyo
-${PYSITELIB}/audiotools/__vorbiscomment__.py
-${PYSITELIB}/audiotools/__vorbiscomment__.pyc
-${PYSITELIB}/audiotools/__vorbiscomment__.pyo
-${PYSITELIB}/audiotools/__wav__.py
-${PYSITELIB}/audiotools/__wav__.pyc
-${PYSITELIB}/audiotools/__wav__.pyo
-${PYSITELIB}/audiotools/__wavpack__.py
-${PYSITELIB}/audiotools/__wavpack__.pyc
-${PYSITELIB}/audiotools/__wavpack__.pyo
+${PYSITELIB}/audiotools/accuraterip.py
+${PYSITELIB}/audiotools/accuraterip.pyc
+${PYSITELIB}/audiotools/accuraterip.pyo
+${PYSITELIB}/audiotools/aiff.py
+${PYSITELIB}/audiotools/aiff.pyc
+${PYSITELIB}/audiotools/aiff.pyo
+${PYSITELIB}/audiotools/ape.py
+${PYSITELIB}/audiotools/ape.pyc
+${PYSITELIB}/audiotools/ape.pyo
+${PYSITELIB}/audiotools/au.py
+${PYSITELIB}/audiotools/au.pyc
+${PYSITELIB}/audiotools/au.pyo
 ${PYSITELIB}/audiotools/bitstream.so
 ${PYSITELIB}/audiotools/cdio.so
 ${PYSITELIB}/audiotools/cue.py
@@ -95,14 +45,46 @@ ${PYSITELIB}/audiotools/decoders.so
 ${PYSITELIB}/audiotools/delta.py
 ${PYSITELIB}/audiotools/delta.pyc
 ${PYSITELIB}/audiotools/delta.pyo
+${PYSITELIB}/audiotools/dvda.py
+${PYSITELIB}/audiotools/dvda.pyc
+${PYSITELIB}/audiotools/dvda.pyo
 ${PYSITELIB}/audiotools/encoders.so
+${PYSITELIB}/audiotools/flac.py
+${PYSITELIB}/audiotools/flac.pyc
+${PYSITELIB}/audiotools/flac.pyo
 ${PYSITELIB}/audiotools/freedb.py
 ${PYSITELIB}/audiotools/freedb.pyc
 ${PYSITELIB}/audiotools/freedb.pyo
+${PYSITELIB}/audiotools/id3.py
+${PYSITELIB}/audiotools/id3.pyc
+${PYSITELIB}/audiotools/id3.pyo
+${PYSITELIB}/audiotools/id3v1.py
+${PYSITELIB}/audiotools/id3v1.pyc
+${PYSITELIB}/audiotools/id3v1.pyo
+${PYSITELIB}/audiotools/image.py
+${PYSITELIB}/audiotools/image.pyc
+${PYSITELIB}/audiotools/image.pyo
+${PYSITELIB}/audiotools/m4a.py
+${PYSITELIB}/audiotools/m4a.pyc
+${PYSITELIB}/audiotools/m4a.pyo
+${PYSITELIB}/audiotools/m4a_atoms.py
+${PYSITELIB}/audiotools/m4a_atoms.pyc
+${PYSITELIB}/audiotools/m4a_atoms.pyo
+${PYSITELIB}/audiotools/mp3.py
+${PYSITELIB}/audiotools/mp3.pyc
+${PYSITELIB}/audiotools/mp3.pyo
 ${PYSITELIB}/audiotools/musicbrainz.py
 ${PYSITELIB}/audiotools/musicbrainz.pyc
 ${PYSITELIB}/audiotools/musicbrainz.pyo
+${PYSITELIB}/audiotools/ogg.py
+${PYSITELIB}/audiotools/ogg.pyc
+${PYSITELIB}/audiotools/ogg.pyo
+${PYSITELIB}/audiotools/opus.py
+${PYSITELIB}/audiotools/opus.pyc
+${PYSITELIB}/audiotools/opus.pyo
+${PYSITELIB}/audiotools/output.so
 ${PYSITELIB}/audiotools/pcm.so
+${PYSITELIB}/audiotools/pcmconverter.so
 ${PYSITELIB}/audiotools/player.py
 ${PYSITELIB}/audiotools/player.pyc
 ${PYSITELIB}/audiotools/player.pyo
@@ -118,6 +100,9 @@ ${PYSITELIB}/audiotools/py_decoders/flac.pyo
 ${PYSITELIB}/audiotools/py_decoders/shn.py
 ${PYSITELIB}/audiotools/py_decoders/shn.pyc
 ${PYSITELIB}/audiotools/py_decoders/shn.pyo
+${PYSITELIB}/audiotools/py_decoders/tta.py
+${PYSITELIB}/audiotools/py_decoders/tta.pyc
+${PYSITELIB}/audiotools/py_decoders/tta.pyo
 ${PYSITELIB}/audiotools/py_decoders/wavpack.py
 ${PYSITELIB}/audiotools/py_decoders/wavpack.pyc
 ${PYSITELIB}/audiotools/py_decoders/wavpack.pyo
@@ -133,18 +118,38 @@ ${PYSITELIB}/audiotools/py_encoders/flac.pyo
 ${PYSITELIB}/audiotools/py_encoders/shn.py
 ${PYSITELIB}/audiotools/py_encoders/shn.pyc
 ${PYSITELIB}/audiotools/py_encoders/shn.pyo
+${PYSITELIB}/audiotools/py_encoders/tta.py
+${PYSITELIB}/audiotools/py_encoders/tta.pyc
+${PYSITELIB}/audiotools/py_encoders/tta.pyo
 ${PYSITELIB}/audiotools/py_encoders/wavpack.py
 ${PYSITELIB}/audiotools/py_encoders/wavpack.pyc
 ${PYSITELIB}/audiotools/py_encoders/wavpack.pyo
 ${PYSITELIB}/audiotools/replaygain.so
-${PYSITELIB}/audiotools/replaygain_old.py
-${PYSITELIB}/audiotools/replaygain_old.pyc
-${PYSITELIB}/audiotools/replaygain_old.pyo
-${PYSITELIB}/audiotools/resample.so
+${PYSITELIB}/audiotools/shn.py
+${PYSITELIB}/audiotools/shn.pyc
+${PYSITELIB}/audiotools/shn.pyo
+${PYSITELIB}/audiotools/text.py
+${PYSITELIB}/audiotools/text.pyc
+${PYSITELIB}/audiotools/text.pyo
 ${PYSITELIB}/audiotools/toc.py
 ${PYSITELIB}/audiotools/toc.pyc
 ${PYSITELIB}/audiotools/toc.pyo
+${PYSITELIB}/audiotools/tta.py
+${PYSITELIB}/audiotools/tta.pyc
+${PYSITELIB}/audiotools/tta.pyo
 ${PYSITELIB}/audiotools/ui.py
 ${PYSITELIB}/audiotools/ui.pyc
 ${PYSITELIB}/audiotools/ui.pyo
 ${PYSITELIB}/audiotools/verify.so
+${PYSITELIB}/audiotools/vorbis.py
+${PYSITELIB}/audiotools/vorbis.pyc
+${PYSITELIB}/audiotools/vorbis.pyo
+${PYSITELIB}/audiotools/vorbiscomment.py
+${PYSITELIB}/audiotools/vorbiscomment.pyc
+${PYSITELIB}/audiotools/vorbiscomment.pyo
+${PYSITELIB}/audiotools/wav.py
+${PYSITELIB}/audiotools/wav.pyc
+${PYSITELIB}/audiotools/wav.pyo
+${PYSITELIB}/audiotools/wavpack.py
+${PYSITELIB}/audiotools/wavpack.pyc
+${PYSITELIB}/audiotools/wavpack.pyo
diff --git a/audio/py-audiotools/distinfo b/audio/py-audiotools/distinfo
index 16694160dfc..8a5143dfe65 100644
--- a/audio/py-audiotools/distinfo
+++ b/audio/py-audiotools/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2012/07/01 01:56:16 jakllsch Exp $
+$NetBSD: distinfo,v 1.2 2014/01/20 11:54:21 wiz Exp $
 
-SHA1 (audiotools-2.18.tar.gz) = d080dd2e470dc711a89777833a92d83fc2cb6614
-RMD160 (audiotools-2.18.tar.gz) = c503bf49dec30c7d0e1c535483aa5afe84140695
-Size (audiotools-2.18.tar.gz) = 6450713 bytes
+SHA1 (audiotools-2.20.tar.gz) = 0ed9c286f21101dc4ff9fa702b5d4d52f6826ea8
+RMD160 (audiotools-2.20.tar.gz) = d879fa9acc83e059b5aa124b36fda0d57479c4f6
+Size (audiotools-2.20.tar.gz) = 6471831 bytes
+SHA1 (patch-audiotools_player.py) = cf6a8884ca976c188ab13cf4acfb23c775c61c7f
diff --git a/audio/py-audiotools/patches/patch-audiotools_player.py b/audio/py-audiotools/patches/patch-audiotools_player.py
new file mode 100644
index 00000000000..c5363851977
--- /dev/null
+++ b/audio/py-audiotools/patches/patch-audiotools_player.py
@@ -0,0 +1,12 @@
+$NetBSD: patch-audiotools_player.py,v 1.1 2014/01/20 11:54:21 wiz Exp $
+
+Fix incorrect path so that pkgsrc logic can fix it.
+
+--- audiotools/player.py.orig	2014-01-20 11:41:18.000000000 +0000
++++ audiotools/player.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bin
++#!/usr/bin/python
+ 
+ #Audio Tools, a module and set of tools for manipulating audio data
+ #Copyright (C) 2007-2013  Brian Langenberger