Mark packages as not ready for python-3.x where applicable;

either because they themselves are not ready or because a
dependency isn't. This is annotated by
PYTHON_VERSIONS_INCOMPATIBLE=  33 # not yet ported as of x.y.z
or
PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-foo, py-bar
respectively, please use the same style for other packages,
and check during updates.

Use versioned_dependencies.mk where applicable.
Use REPLACE_PYTHON instead of handcoded alternatives, where applicable.
Reorder Makefile sections into standard order, where applicable.

Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default
with the next commit.

Whitespace cleanups and other nits corrected, where necessary.

audio/aubio/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/02/09 22:11:31 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	aubio-0.3.2
 PKGREVISION=	2
@@ -20,6 +19,7 @@ PKGCONFIG_OVERRIDE+=	aubio.pc.in
 # Python related variables:
 PY_PATCHPLIST=			yes
 PYTHON_PATCH_SCRIPTS=	python/aubiocut python/aubiopitch
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.3.2
 
 .include "options.mk"
 

audio/csound5/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/01/09 16:55:16 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.29 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=		Csound${CSOUND_VERSION}_src
 PKGNAME=		csound5-${CSOUND_VERSION}
@@ -26,6 +25,8 @@ SCONS_ARGS+=		useALSA=0 useJack=0 useOSC=0 usePortMIDI=0
 SCONS_ARGS+=		usePortAudio=0
 SCONS_ARGS+=		buildInterfaces=0
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 5.01
+
 INSTALLATION_DIRS=	bin
 
 .include "../../mk/bsd.prefs.mk"

audio/exaile/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2013/10/10 14:41:58 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.44 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	exaile_0.2.14
 PKGNAME=	${DISTNAME:S/_/-/1}
@@ -18,6 +17,8 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config gmake intltool msgfmt
 
 PYTHON_PATCH_SCRIPTS=	exaile.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-mutagen, py-sqlite2, py-gtk2, py-gstreamer0.10
+
 MAKE_ENV+=	PYTHONBIN=${PYTHONBIN}
 MAKE_FLAGS+=	PKGLOCALEDIR=${PKGLOCALEDIR}
 

audio/moss/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/02 23:47:58 asau Exp $
+# $NetBSD: Makefile,v 1.22 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	moss-0.1.13
 PKGREVISION=	6
@@ -12,6 +12,8 @@ COMMENT=	MP3/OGG Streaming Server
 DEPENDS+=	${PYPKGPREFIX}-ogg>=1.3:../../audio/py-ogg
 DEPENDS+=	${PYPKGPREFIX}-vorbis>=1.3:../../audio/py-vorbis
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-ogg, py-vorbis
+
 PYTHON_PATCH_SCRIPTS=	${WRKSRC}/*.py
 
 RCD_SCRIPTS=	moss

audio/mutagen-tools/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/12/04 16:48:21 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.3 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	mutagen-1.22
 PKGNAME=	mutagen-tools-1.22
@@ -11,10 +10,11 @@ HOMEPAGE=	http://code.google.com/p/mutagen/
 COMMENT=	Audio metadata handling for Python
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
+
 USE_LANGUAGES=	# none
 PY_NO_EGG=	yes
-
-DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.22
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

audio/picard/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/08/21 15:39:43 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.19 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	picard-1.2
 CATEGORIES=	audio
@@ -16,6 +15,8 @@ DEPENDS+=	${PYPKGPREFIX}-mutagen>=1.20:../../audio/py-mutagen
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	msgfmt pkg-config
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-mutagen
+
 HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${PYTHONBIN}
 CONFIGURE_SCRIPT=	setup.py

audio/py-acoustid/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/02 10:44:41 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	v1.0.0
 PKGNAME=	${PYPKGPREFIX}-acoustid-1.0.0
@@ -12,12 +11,13 @@ HOMEPAGE=	https://github.com/sampsyo/pyacoustid
 COMMENT=	Audio fingerprinting
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-audioread-[0-9]*:../../audio/py-audioread
+DEPENDS+=	chromaprint-[0-9]*:../../audio/chromaprint
+
 WRKSRC=		${WRKDIR}/pyacoustid-1.0.0
 USE_LANGUAGES=	# none
 EGG_NAME=	pyacoustid-1.0.0
-
-DEPENDS+=	${PYPKGPREFIX}-audioread-[0-9]*:../../audio/py-audioread
-DEPENDS+=	chromaprint-[0-9]*:../../audio/chromaprint
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.0.0
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

audio/py-beets/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/01/15 16:17:23 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.9 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	v1.3.2
 PKGNAME=	beets-${DISTNAME:S/v//}
@@ -20,6 +19,8 @@ DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 DEPENDS+=	${PYPKGPREFIX}-Unidecode-[0-9]*:../../textproc/py-Unidecode
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-mutagen
+
 .include "../../lang/python/pyversion.mk"
 .if empty(PYPKGPREFIX:Mpy27)
 DEPENDS+=	${PYPKGPREFIX}-ordereddict-[0-9]*:../../devel/py-ordereddict

audio/py-cddb/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/02 23:48:05 asau Exp $
-#
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	CDDB-1.4
 PKGNAME=	${PYPKGPREFIX}-cddb-1.4
@@ -12,5 +11,7 @@ HOMEPAGE=	http://cddb-py.sourceforge.net/
 COMMENT=	Python module to access the CDDB online database
 LICENSE=	gnu-gpl-v2
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.4
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

audio/py-discogs_client/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/08/21 15:26:56 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	v1.1.1
 PKGNAME=	${PYPKGPREFIX}-discogs_client-1.1.1
@@ -11,11 +11,13 @@ HOMEPAGE=	https://github.com/discogs/discogs_client/
 COMMENT=	Python Client for the Discogs API
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+
 WRKSRC=		${WRKDIR}/discogs_client-1.1.1
 USE_LANGUAGES=	# none
 EGG_NAME=	discogs_client-1.1.1
 
-DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+PYTHON_VERSIONS_INCOMPATIBLE=	33
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

audio/py-id3/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/02 23:48:05 asau Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	id3-py_1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py_//}
@@ -16,5 +16,7 @@ USE_LANGUAGES=	# empty
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 EGG_NAME=	${DISTNAME:S/py_//:tu}
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

audio/py-id3lib/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/02 23:48:05 asau Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/01/25 10:29:56 wiz Exp $
 
 DISTNAME=	pyid3lib-0.5.1
 PKGNAME=	${PYPKGPREFIX}-id3lib-0.5.1
@@ -15,6 +14,8 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_LANGUAGES=	c c++
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.5.1
+
 .include "../../lang/python/distutils.mk"
 .include "../../audio/id3lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

audio/py-karaoke/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/10/24 12:32:38 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.27 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=	pykaraoke-0.7.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -19,6 +18,8 @@ DEPENDS+=	${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets
 DEPENDS+=	${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
 DEPENDS+=	${PYPKGPREFIX}-Numeric-[0-9]*:../../math/py-Numeric
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-Numeric, py-wxWidgets, py-mutagen
+
 REPLACE_PYTHON+=	performer_prompt.py
 REPLACE_PYTHON+=	pycdg.py
 REPLACE_PYTHON+=	pykar.py

audio/py-last/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/03 22:14:00 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=	pylast-0.5.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,7 +11,6 @@ COMMENT=	Python interface to Last.fm
 LICENSE=	apache-2.0
 
 USE_LANGUAGES=			# none
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

audio/py-mad/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/02 23:48:06 asau Exp $
-#
+# $NetBSD: Makefile,v 1.15 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=		pymad-0.6
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -17,6 +16,8 @@ CONFIG_SHELL=		${PYTHONBIN}
 CONFIGURE_SCRIPT=	config_unix.py
 CONFIGURE_ARGS+=	--prefix ${PREFIX}
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.6
+
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

audio/py-musicbrainz-ngs/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/06/12 20:25:18 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=	v0.4
 PKGNAME=	${PYPKGPREFIX}-musicbrainz-ngs-0.4
@@ -15,7 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 WRKSRC=		${WRKDIR}/python-musicbrainz-ngs-0.4
 DIST_SUBDIR=	py-musicbrainz-ngs
 
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 EGG_NAME=			musicbrainzngs-0.4
 
 do-test:

audio/py-musicbrainz/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/04 00:22:00 cheusov Exp $
+# $NetBSD: Makefile,v 1.12 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=	python-musicbrainz2-0.4.1
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -11,12 +11,11 @@ HOMEPAGE=	http://musicbrainz.org/doc/PythonMusicBrainz2
 COMMENT=	Python interface to the MusicBrainz XML web service
 LICENSE=	modified-bsd
 
-PYTHON_SELF_CONFLICT=	yes
-
-.include "../../lang/python/pyversion.mk"
-
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
+PYTHON_SELF_CONFLICT=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33
+
 EGG_NAME=	${DISTNAME:S/-/_/}
 
 .include "../../audio/libdiscid/buildlink3.mk"

audio/py-musique/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2013/10/10 14:42:00 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.44 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=	pymusique-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -24,6 +23,7 @@ DEPENDS+=	${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-twisted, py-mcrypt, py-gtk2
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"

audio/py-mutagen/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/12/04 16:47:32 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.13 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=	mutagen-1.22
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,6 +11,7 @@ COMMENT=	Audio metadata handling for Python
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.22
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

audio/py-ogg/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/02 23:48:06 asau Exp $
-#
+# $NetBSD: Makefile,v 1.13 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=		pyogg-1.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -17,6 +16,8 @@ CONFIG_SHELL=		${PYTHONBIN}
 CONFIGURE_SCRIPT=	config_unix.py
 CONFIGURE_ARGS+=	--prefix ${PREFIX}
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.3
+
 .include "../../lang/python/distutils.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 

audio/py-vorbis/Makefile

@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/10/02 23:48:06 asau Exp $
-#
+# $NetBSD: Makefile,v 1.13 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=		pyvorbis-1.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	2
+PKGREVISION=		2
 CATEGORIES=		audio python
 MASTER_SITES=		http://vorbis.com/files/1.0.1/unix/py/
 
@@ -13,6 +12,7 @@ COMMENT=		Python bindings for Vorbis library
 
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-ogg, and itself not ported as of 1.3
 
 HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${PYTHONBIN}

audio/quodlibet2/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/23 13:58:13 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=	quodlibet-2.6.3
 CATEGORIES=	audio
@@ -20,6 +19,7 @@ USE_PKGLOCALEDIR=	yes
 #BUILD_TARGET=		_trayicon.so _mmkeys.so
 
 PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-mutagen, py-gtk2, py-gstreamer0.10
 PYTHON_PATCH_SCRIPTS=	exfalso.py quodlibet.py operon.py
 
 .include "../../devel/py-gobject/buildlink3.mk"

audio/rhythmbox-gtk3/Makefile

@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/01/01 11:52:09 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=	rhythmbox-2.99.1
 PKGREVISION=	9
@@ -22,6 +21,8 @@ CONFIGURE_ARGS+=	--disable-browser-plugin
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--disable-fm-radio
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gstreamer0.10
+
 # option?
 .include "../../net/grilo/buildlink3.mk"