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.

16 files changed, 36 insertions, 33 deletions

diff --git a/inputmethod/ibus-anthy/Makefile b/inputmethod/ibus-anthy/Makefile
index e97ec36c785..74e3d65db6f 100644
--- a/inputmethod/ibus-anthy/Makefile
+++ b/inputmethod/ibus-anthy/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/11/26 11:22:15 obache Exp $
-#
+# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:11 wiz Exp $
 
 DISTNAME=	ibus-anthy-1.5.4
 PKGREVISION=	1
@@ -15,6 +14,8 @@ DEPENDS+=	kasumi>=2.1:../../inputmethod/kasumi
 DEPENDS+=	ibus>=1.5.4:../../inputmethod/ibus
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # ibus
+
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/inputmethod/ibus-array/Makefile b/inputmethod/ibus-array/Makefile
index 3e16c4d0499..164915cab33 100644
--- a/inputmethod/ibus-array/Makefile
+++ b/inputmethod/ibus-array/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/10/23 12:11:14 obache Exp $
-#
+# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:11 wiz Exp $
 
 DISTNAME=	ibus-array-0.0.2
 PKGREVISION=	7
@@ -22,6 +21,8 @@ SUBST_STAGE.epython=	pre-configure
 SUBST_FILES.epython=	setup/ibus-setup-array.in
 SUBST_SED.epython=	-e 's;exec python;exec ${PYTHONBIN};g'
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2 via py-ibus-python
+
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ibus-python/Makefile b/inputmethod/ibus-python/Makefile
index b8ec5b1cbb8..7c5a6eae92d 100644
--- a/inputmethod/ibus-python/Makefile
+++ b/inputmethod/ibus-python/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/12/10 11:15:26 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:11 wiz Exp $
 
 .include "../../inputmethod/ibus/Makefile.common"
 
@@ -39,7 +38,7 @@ CONFIGURE_ARGS+=		--disable-dconf
 CONFIGURE_ARGS+=		--disable-gconf
 CONFIGURE_ARGS+=		--enable-python-library
 
-PYTHON_VERSIONS_INCOMPATIBLE=	26
+PYTHON_VERSIONS_INCOMPATIBLE=	26 33 # py-gtk2
 
 .include "../../devel/py-gobject3/buildlink3.mk"
 PY_PATCHPLIST=	yes
diff --git a/inputmethod/ibus-table/Makefile b/inputmethod/ibus-table/Makefile
index 2274ce0c3f9..1e1844c30ec 100644
--- a/inputmethod/ibus-table/Makefile
+++ b/inputmethod/ibus-table/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/12/28 09:02:31 obache Exp $
-#
+# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:11 wiz Exp $
 
 DISTNAME=	ibus-table-1.5.0
 PKGREVISION=	1
@@ -25,6 +24,7 @@ SUBST_FILES.prefix=	engine/tabcreatedb.py
 SUBST_SED.prefix=	-e 's|/usr/share|${PREFIX}/share|g'
 
 REPLACE_PYTHON+=	engine/tabcreatedb.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.5.0
 
 .include "../../lang/python/application.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
diff --git a/inputmethod/ibus-tegaki/Makefile b/inputmethod/ibus-tegaki/Makefile
index b6e7121c55c..9137552d43c 100644
--- a/inputmethod/ibus-tegaki/Makefile
+++ b/inputmethod/ibus-tegaki/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/10/23 12:45:35 obache Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:11 wiz Exp $
 
 DISTNAME=	ibus-tegaki-0.3.1
 PKGREVISION=	2
@@ -23,6 +22,7 @@ SUBST_FILES.epython=	ibus-engine-tegaki.in
 SUBST_SED.epython=	-e 's;exec python;exec ${PYTHONBIN};g'
 
 EGG_NAME=		${DISTNAME:S/-/_/}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2 via py-ibus-python
 
 .include "../../lang/python/distutils.mk"
 .include "../../lang/python/application.mk"
diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile
index e1f14cb7e25..063c53af88f 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2014/01/16 11:04:26 obache Exp $
-#
+# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:11 wiz Exp $
+
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.5.4
 
 .include "Makefile.common"
 
diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index d8210917afc..f3df1276426 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2014/01/20 10:39:29 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.6 2014/01/25 10:30:11 wiz Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -21,6 +21,8 @@ PATCHDIR=	${.CURDIR}/../../inputmethod/mozc-server/patches
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
 
+PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-gyp
+
 USE_LANGUAGES=	c c++
 # nullptr requires -std=c++11, and -std=c++11 requires gcc 4.7 or later
 GCC_REQD=	4.7
diff --git a/inputmethod/py-input-pad/Makefile b/inputmethod/py-input-pad/Makefile
index e20bf47f3a3..8431a22b876 100644
--- a/inputmethod/py-input-pad/Makefile
+++ b/inputmethod/py-input-pad/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/12/07 11:32:31 obache Exp $
-#
+# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:11 wiz Exp $
 
 .include "../../inputmethod/input-pad/Makefile.common"
 
@@ -27,6 +26,7 @@ post-configure:
 	${LN} -s ${BUILDLINK_DIR}/lib/libinput-pad.la ${WRKSRC}/input-pad
 
 PY_PATCHPLIST=		yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
 BUILDLINK_API_DEPENDS.input-pad+=	input-pad>=${PKGVERSION_NOREV}
 .include "../../inputmethod/input-pad/buildlink3.mk"
diff --git a/inputmethod/py-zinnia/Makefile b/inputmethod/py-zinnia/Makefile
index 0385b2555dd..1607fd54224 100644
--- a/inputmethod/py-zinnia/Makefile
+++ b/inputmethod/py-zinnia/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:15 asau Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:11 wiz Exp $
 
 .include "../../inputmethod/zinnia/Makefile.common"
 
@@ -12,6 +11,7 @@ USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
 PYSETUPSUBDIR=	python
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.06
 
 EGG_NAME=	zinnia_python-0.0.0
 
diff --git a/inputmethod/scim-python/Makefile b/inputmethod/scim-python/Makefile
index 4bfc29ea0a6..54065125099 100644
--- a/inputmethod/scim-python/Makefile
+++ b/inputmethod/scim-python/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/10/10 14:42:19 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:11 wiz Exp $
 
 DISTNAME=	scim-python-0.1.13rc1
 PKGREVISION=	21
@@ -30,7 +29,7 @@ post-extract:
 	${CP} ${WRKDIR}/py.db ${WRKSRC}/python/engine/PinYin/py.db
 
 PY_PATCHPLIST=		yes
-
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 REPLACE_PYTHON+=	python/engine/XingMa/XMCreateDB.py
 
 .include "../../inputmethod/scim/buildlink3.mk"
diff --git a/inputmethod/tegaki-pygtk/Makefile b/inputmethod/tegaki-pygtk/Makefile
index 7b40ea84c10..347ff48efd5 100644
--- a/inputmethod/tegaki-pygtk/Makefile
+++ b/inputmethod/tegaki-pygtk/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:19 asau Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:11 wiz Exp $
 
 DISTNAME=	tegaki-pygtk-0.3.1
 PKGREVISION=	2
@@ -17,6 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.10:../../x11/py-gtk2
 USE_LANGUAGES=	# none
 
 EGG_NAME=	${DISTNAME:S/-/_/}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/tegaki-python/Makefile b/inputmethod/tegaki-python/Makefile
index 931b3f72365..695317f8bd1 100644
--- a/inputmethod/tegaki-python/Makefile
+++ b/inputmethod/tegaki-python/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:19 asau Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:11 wiz Exp $
 
 DISTNAME=	tegaki-python-0.3.1
 PKGREVISION=	1
@@ -25,6 +24,7 @@ SUBST_FILES.prefix=	tegaki/engine.py
 SUBST_SED.prefix=	-e 's|/usr/local/share|${PREFIX}/share|g'
 
 EGG_NAME=	${DISTNAME:S/-/_/}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-zinnia
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/tegaki-recognize/Makefile b/inputmethod/tegaki-recognize/Makefile
index e15ec0dad59..abe0ec9b053 100644
--- a/inputmethod/tegaki-recognize/Makefile
+++ b/inputmethod/tegaki-recognize/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/06 14:25:19 asau Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:11 wiz Exp $
 
 DISTNAME=	tegaki-recognize-0.3.1.2
 PKGREVISION=	1
@@ -16,6 +15,7 @@ DEPENDS+=	tegaki-pygtk>=0.2:../../inputmethod/tegaki-pygtk
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON=	bin/tegaki-recognize
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.3.1.2
 
 EGG_NAME=	${DISTNAME:S/-/_/}
 
diff --git a/inputmethod/tegaki-tools/Makefile b/inputmethod/tegaki-tools/Makefile
index 65a88cedb35..305cef7151e 100644
--- a/inputmethod/tegaki-tools/Makefile
+++ b/inputmethod/tegaki-tools/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:19 asau Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:12 wiz Exp $
 
 DISTNAME=	tegaki-tools-0.3.1
 PKGREVISION=	1
@@ -16,6 +15,7 @@ DEPENDS+=	tegaki-pygtk>=0.3:../../inputmethod/tegaki-pygtk
 
 USE_LANGUAGES=	c c++
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.3.1
 EGG_NAME=	${DISTNAME:S/-/_/}
 
 .include "../../lang/python/application.mk"
diff --git a/inputmethod/tegaki-train/Makefile b/inputmethod/tegaki-train/Makefile
index 79f93b16ca7..58093f97974 100644
--- a/inputmethod/tegaki-train/Makefile
+++ b/inputmethod/tegaki-train/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 14:25:19 asau Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:12 wiz Exp $
 
 DISTNAME=	tegaki-train-0.3.1
 PKGREVISION=	1
@@ -15,6 +14,7 @@ DEPENDS+=	tegaki-pygtk>=0.2:../../inputmethod/tegaki-pygtk
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.3.1
 EGG_NAME=	${DISTNAME:S/-/_/}
 
 .include "../../lang/python/application.mk"
diff --git a/inputmethod/tegaki-wagomu/Makefile b/inputmethod/tegaki-wagomu/Makefile
index e43e522503d..c82f2a338d4 100644
--- a/inputmethod/tegaki-wagomu/Makefile
+++ b/inputmethod/tegaki-wagomu/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/01/25 12:50:02 obache Exp $
-#
+# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:12 wiz Exp $
 
 DISTNAME=	tegaki-wagomu-0.3.1
 PKGREVISION=	6
@@ -30,6 +29,7 @@ SUBST_FILES.fixver=	tegakiwagomu.py
 SUBST_SED.fixver=	-e 's|0\.3|${PKGVERSION_NOREV}|'
 
 EGG_NAME=	${DISTNAME:S/-/_/}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.3.1
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/python/distutils.mk"