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.

5 files changed, 11 insertions, 11 deletions

diff --git a/converters/py-chardet/Makefile b/converters/py-chardet/Makefile
index e4b9715cd96..306a387aea3 100644
--- a/converters/py-chardet/Makefile
+++ b/converters/py-chardet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/01/02 17:55:40 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	chardet-2.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=	Character encoding auto-detection in Python
 LICENSE=	gnu-lgpl-v2.1
 
 REPLACE_PYTHON=			chardet/chardetect.py
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/converters/py-jpCodecs/Makefile b/converters/py-jpCodecs/Makefile
index f396cd8a1e6..9048c62ef2b 100644
--- a/converters/py-jpCodecs/Makefile
+++ b/converters/py-jpCodecs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 00:20:16 asau Exp $
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	JapaneseCodecs-1.4.11
 PKGNAME=	${PYPKGPREFIX}-jpCodecs-1.4.11
@@ -11,5 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.asahi-net.or.jp/~rd6t-kjym/python/
 COMMENT=	Python Unicode codecs for Japanese charsets
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/py-simplejson/Makefile b/converters/py-simplejson/Makefile
index 0fbf9022b31..e36963894e9 100644
--- a/converters/py-simplejson/Makefile
+++ b/converters/py-simplejson/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/01/16 02:24:02 rodent Exp $
-#
+# $NetBSD: Makefile,v 1.20 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	simplejson-3.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,9 +13,6 @@ LICENSE=	mit
 
 USE_LANGUAGES=	c
 
-PYTHON_VERSIONS_ACCEPTED=	33 27 26
-PYTHON_VERSIONS_INCLUDE_3X=	yes
-
 do-test:
 	cd ${WRKSRC} && ${PYTHONBIN} setup.py test -q
 
diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index d53c61c9d96..749f49a8fe4 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/03 00:20:16 asau Exp $
-#
+# $NetBSD: Makefile,v 1.10 2014/01/25 10:29:59 wiz Exp $
 
 DISTNAME=	zfec-1.4.22
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -23,5 +22,7 @@ REPLACE.python.old=    /usr/bin/env python
 REPLACE.python.new=    ${PYTHONBIN}
 REPLACE_FILES.python=  zfec/cmdline_zfec.py zfec/cmdline_zunfec.py zfec/test/test_zfec.py
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-twisted via py-setuptools_trial
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/py-zhCodecs/Makefile b/converters/py-zhCodecs/Makefile
index 809b3cb0903..9c904517062 100644
--- a/converters/py-zhCodecs/Makefile
+++ b/converters/py-zhCodecs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 00:20:16 asau Exp $
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:59 wiz Exp $
 
 DISTNAME=	ChineseCodecs1.2.0
 PKGNAME=	${PYPKGPREFIX}-zhCodecs-1.2.0
@@ -14,6 +14,8 @@ COMMENT=	Python Unicode codecs for Chinese charsets
 WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 PYDISTUTILSPKG=	# defined
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33
+
 post-extract:
 	@${CHMOD} 711 ${WRKSRC}/chinesetw