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.

6 files changed, 17 insertions, 16 deletions

diff --git a/editors/gedit-python/Makefile b/editors/gedit-python/Makefile
index 277ae6dbed9..675bf78284d 100644
--- a/editors/gedit-python/Makefile
+++ b/editors/gedit-python/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/10/10 14:42:06 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:06 wiz Exp $
 
 DISTNAME=		gedit-2.30.4
 PKGNAME=		gedit-python-2.30.4
@@ -26,6 +25,8 @@ BUILD_DIRS=	plugin-loaders/python
 BUILD_DIRS+=	plugins/pythonconsole plugins/quickopen plugins/snippets
 INSTALL_DIRS=	${BUILD_DIRS}
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
+
 .include "../../lang/python/application.mk"
 .include "../../devel/py-gobject/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile
index 7d36bfc8ce4..e45294613fe 100644
--- a/editors/kdissert/Makefile
+++ b/editors/kdissert/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2014/01/01 11:52:14 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.50 2014/01/25 10:30:06 wiz Exp $
 
 DISTNAME=	kdissert-1.0.7
 PKGREVISION=	26
@@ -17,6 +16,7 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		msgfmt
 PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.0.7
 
 do-configure:
 	${RUN} ${_ULIMIT_CMD} \
diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile
index 2be4844d89a..6fc122b61d7 100644
--- a/editors/lyx/Makefile
+++ b/editors/lyx/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2014/01/19 14:04:39 rumko Exp $
-#
+# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:06 wiz Exp $
 
 DISTNAME=		lyx-2.0.6
 CATEGORIES=		editors
@@ -65,6 +64,7 @@ GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake perl:run pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.6.10
 
 CXXFLAGS.Linux+=	-fpermissive
 
diff --git a/editors/medit/Makefile b/editors/medit/Makefile
index 3c36998135d..9bbac89c6c2 100644
--- a/editors/medit/Makefile
+++ b/editors/medit/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/10/10 14:42:07 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:07 wiz Exp $
 
 DISTNAME=	medit-1.1.1
 PKGREVISION=	10
@@ -20,6 +19,7 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config msgfmt intltool
 
 PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.1.1
 CONFIGURE_ARGS+=	--with-python=no
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/editors/nts/Makefile b/editors/nts/Makefile
index 455bfd79262..a19abb8d043 100644
--- a/editors/nts/Makefile
+++ b/editors/nts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/01/16 10:41:53 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:07 wiz Exp $
 
 DISTNAME=	nts-78
 PKGREVISION=	1
@@ -13,6 +13,7 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	${PYPKGPREFIX}-wxWidgets>=2.8.7:../../x11/py-wxWidgets
 
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-wxWidgets
 
 USE_LANGUAGES=	# none
 
diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index ef4a424957b..6a857341a7e 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/10/10 14:42:08 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:07 wiz Exp $
 
 DISTNAME=	zim-0.59
 PKGREVISION=	7
@@ -12,16 +11,16 @@ HOMEPAGE=	http://zim-wiki.org/
 COMMENT=	Zim brings the concept of a wiki to your desktop
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=	# none
-
-REPLACE_PYTHON=	${WRKSRC}/zim.py
-PYDISTUTILSPKG=	YES
-
 DEPENDS+=	${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
 DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
 
+USE_LANGUAGES=	# none
+
+REPLACE_PYTHON=	${WRKSRC}/zim.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
+
 SUBST_CLASSES+=		data-path
 SUBST_STAGE.data-path=	pre-configure
 SUBST_FILES.data-path=	zim/config.py