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.

24 files changed, 68 insertions, 65 deletions

diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib
index 90070692b27..e3acaaade84 100644
--- a/graphics/Mesa/Makefile.lib
+++ b/graphics/Mesa/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.16 2013/12/29 16:28:15 bsiegert Exp $
+# $NetBSD: Makefile.lib,v 1.17 2014/01/25 10:30:09 wiz Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -21,6 +21,7 @@ USE_LANGUAGES=		c99 c++
 USE_TOOLS+=		automake bison flex gmake pkg-config makedepend
 
 PYTHON_FOR_BUILD_ONLY=  yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 7.11.2
 .include "../../lang/python/tool.mk"
 BUILDLINK_DEPMETHOD.libxml2?=   build
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index 9f0463551cf..e64402d5d82 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2013/10/10 14:42:12 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.49 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=		comix-4.0.4
 PKGREVISION=		25
@@ -12,7 +11,6 @@ COMMENT=		Image viewer specifically designed to handle comic books
 LICENSE=		gnu-gpl-v2
 
 DEPENDS+=		unrar-[0-9]*:../../archivers/unrar
-.include "../../lang/python/extension.mk"
 DEPENDS+=		${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 MANCOMPRESSED=		yes
@@ -25,7 +23,8 @@ SUBST_MESSAGE.install-path=	Fixing man page installation path.
 SUBST_FILES.install-path=	install.py
 SUBST_SED.install-path=		-e "s,share/man/man,${PKGMANDIR}/man,g"
 
-PYTHON_PATCH_SCRIPTS=		src/comix.py mime/comicthumb
+REPLACE_PYTHON=			src/comix.py mime/comicthumb
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-imaging, py-gtk2
 
 do-build:
 
@@ -37,6 +36,7 @@ do-install:
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.5
 .include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.12
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile
index f0f92147738..a46045e7002 100644
--- a/graphics/dia-python/Makefile
+++ b/graphics/dia-python/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2014/01/01 11:52:19 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.39 2014/01/25 10:30:09 wiz Exp $
 
 DIA_SUBPKG=		-python
 .include "../../graphics/dia/Makefile.common"
@@ -14,6 +13,7 @@ CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 PYTHON_PATCH_SCRIPTS=	po-checktrans.py
 PYTHON_PATCH_SCRIPTS+=	plug-ins/python/gtkcons.py
 PYTHON_PATCH_SCRIPTS+=	sheets/checktrans.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
 BUILD_DIRS+=		plug-ins/python
 INSTALL_DIRS+=		plug-ins/python
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 2bc2c47b516..e7a4aa62103 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2013/10/10 14:41:52 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.81 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=	eog-2.32.1
 PKGREVISION=	19
@@ -22,6 +21,7 @@ GCONF_SCHEMAS=	eog.schemas
 # XXX Python plugins do more harm than good for now
 #.include "../../lang/python/application.mk"
 #.include "../../x11/py-gtk2/buildlink3.mk"
+#PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 .include "../../devel/GConf/schemas.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.15.3
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/graphics/gimp-docs-en/Makefile.common b/graphics/gimp-docs-en/Makefile.common
index d8c7936541b..b5f275cbee8 100644
--- a/graphics/gimp-docs-en/Makefile.common
+++ b/graphics/gimp-docs-en/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2013/08/15 16:26:07 joerg Exp $
+# $NetBSD: Makefile.common,v 1.5 2014/01/25 10:30:09 wiz Exp $
 #
 # used by graphics/gimp-docs-de/Makefile
 # used by graphics/gimp-docs-en/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ENV=	ALL_LINGUAS=${HELPLANGUAGE}
 MAKE_FLAGS=	VERBOSE=2
 
 REPLACE_PYTHON=	tools/xml2po.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.8.0
 
 CONFLICTS=	gimp-docs<=2.4.0
 SUPERSEDES=	gimp-docs<=2.4.0
diff --git a/graphics/libscigraphica/Makefile b/graphics/libscigraphica/Makefile
index be6dcd30cfa..cd48fb2200e 100644
--- a/graphics/libscigraphica/Makefile
+++ b/graphics/libscigraphica/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/10/10 14:41:48 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=	libscigraphica-2.1.1
 PKGREVISION=	25
@@ -17,6 +16,7 @@ USE_TOOLS+=		pkg-config gmake intltool
 GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	libscigraphica-2.0.pc.in
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-numarray
 
 pre-configure:
 	ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index d219501bd3c..eaeb6ce755c 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/02/16 11:22:18 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=	mypaint-1.0.0
 PKGREVISION=	5
@@ -12,13 +11,15 @@ HOMEPAGE=	http://mypaint.intilinux.com/
 COMMENT=	Fast and easy open-source graphics application for digital painters
 LICENSE=	gnu-gpl-v2
 
+BUILD_DEPENDS+=	scons-[0-9]*:../../devel/scons
+DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
+
 USE_LANGUAGES=	c++
 
 USE_TOOLS+=	bash:run msgfmt pkg-config
 
-BUILD_DEPENDS+=	scons-[0-9]*:../../devel/scons
-DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
-DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+PYTHON_VERSIONED_DEPENDENCIES=	cairo
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
 FIND_PREFIX:=	SCONSDIR=scons
 .include "../../mk/find-prefix.mk"
@@ -53,6 +54,7 @@ do-install:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../devel/swig/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-OpenGL/Makefile b/graphics/py-OpenGL/Makefile
index d9846d24bb2..68c404517e6 100644
--- a/graphics/py-OpenGL/Makefile
+++ b/graphics/py-OpenGL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/01/11 14:42:03 adam Exp $
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=	PyOpenGL-3.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^Py//}
@@ -12,11 +12,9 @@ COMMENT=	Python bindings for OpenGL
 
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
-PYDISTUTILSPKG=	yes
-#PY_PATCHPLIST=	YES
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-Numeric
 
-#.include "../../lang/python/egg.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
index 20f1cb0105a..97927cecf0b 100644
--- a/graphics/py-Pillow/Makefile
+++ b/graphics/py-Pillow/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/01/23 08:54:59 obache Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=	Pillow-2.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +12,6 @@ COMMENT=	Python Imaging Library (Fork)
 
 CONFLICTS+=	${PYPKGPREFIX}-imaging-[0-9]*
 
-PYTHON_VERSIONS_INCLUDE_3X=	yes
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
diff --git a/graphics/py-aafigure/Makefile b/graphics/py-aafigure/Makefile
index 7ed23024c4d..f81812e2482 100644
--- a/graphics/py-aafigure/Makefile
+++ b/graphics/py-aafigure/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/12/06 12:11:15 obache Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=	aafigure-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,6 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
 USE_LANGUAGES=	# none
 
 PYTHON_SELF_CONFLICT=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-reportlab, py-imaging
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index 06e12889447..e35e68e1c59 100644
--- a/graphics/py-actdiag/Makefile
+++ b/graphics/py-actdiag/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/12/06 11:33:13 obache Exp $
-#
+# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=	actdiag-0.5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +13,6 @@ LICENSE=	apache-2.0
 DEPENDS+=	${PYPKGPREFIX}-blockdiag>=1.3.1:../../graphics/py-blockdiag
 
 PYTHON_SELF_CONFLICT=		yes
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 USE_LANGUAGES=	# none
 
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index 844c949f8e4..ea64c00142a 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/12/07 12:57:54 obache Exp $
-#
+# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=	blockdiag-1.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-funcparserlib>=0.3.6:../../devel/py-funcparserlib
 DEPENDS+=	${PYPKGPREFIX}-webcolors-[0-9]*:../../www/py-webcolors
 
 PYTHON_SELF_CONFLICT=		yes
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 USE_LANGUAGES=	# none
 
diff --git a/graphics/py-cairo3/Makefile b/graphics/py-cairo3/Makefile
index c98acdb9ca8..e0ca8c8800b 100644
--- a/graphics/py-cairo3/Makefile
+++ b/graphics/py-cairo3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/01/24 15:59:41 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:09 wiz Exp $
 
 DISTNAME=		pycairo-1.10.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -20,7 +20,6 @@ CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 PKGCONFIG_OVERRIDE+=	py3cairo.pc.in
 PYTHON_SELF_CONFLICT=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	26 27
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 PY_PATCHPLIST=		yes
 # waf is not smart enough for this as of 1.10.0
 PY_PEP3147=		no
diff --git a/graphics/py-gnuplot/Makefile b/graphics/py-gnuplot/Makefile
index 69cb33934fa..6520410f03e 100644
--- a/graphics/py-gnuplot/Makefile
+++ b/graphics/py-gnuplot/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/06 14:11:16 asau Exp $
-#
+# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=	gnuplot-py-1.8
 PKGNAME=	${PYPKGPREFIX}-gnuplot-1.8
@@ -17,5 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
 USE_LANGUAGES=	# empty
 EGG_NAME=	${DISTNAME:S/-/_/}
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.8
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index 66d6321f67c..aa47b08a1b0 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2013/10/10 14:42:15 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.34 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=	pygoocanvas-0.14.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -21,6 +20,8 @@ PKGCONFIG_OVERRIDE+=	pygoocanvas.pc.in
 CONFIGURE_ARGS+=	--disable-docs
 
 PY_PATCHPLIST=	yes
+PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
 .include "../../lang/python/pyversion.mk"
 
@@ -29,7 +30,6 @@ BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.10.0
 .include "../../devel/py-gobject/buildlink3.mk"
 BUILDLINK_API_DEPENDS.goocanvas+=	goocanvas>=0.14.0
 .include "../../graphics/goocanvas/buildlink3.mk"
-BUILDLINK_API_DEPENDS.pycairo+=	${PYPKGPREFIX}-cairo>=1.8.4
-.include "../../graphics/py-cairo/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-gtkglext/Makefile b/graphics/py-gtkglext/Makefile
index fbe6f3cad19..da0e98a0622 100644
--- a/graphics/py-gtkglext/Makefile
+++ b/graphics/py-gtkglext/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/10/10 14:42:15 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=	pygtkglext-1.1.0
 PKGNAME=	${PYPKGPREFIX}-pygtkglext-1.1.0
@@ -17,6 +16,7 @@ CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 PYDISTUTILSPKG=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
 PKGCONFIG_OVERRIDE+=	pygtkglext.pc.in
 
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index ec4aef84906..043629c43a4 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2013/06/04 22:16:25 tron Exp $
+# $NetBSD: Makefile,v 1.47 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=	Imaging-1.1.7
 PKGNAME=	${PYPKGPREFIX}-imaging-1.1.7
@@ -22,6 +22,8 @@ SUBST_SED.fix-path+=	-e 's,FREETYPE_ROOT = None,FREETYPE_ROOT = libinclude("${BU
 
 INSTALLATION_DIRS=	${PYINC}/PIL
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.1.7, use Pillow instead
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libImaging/ImPlatform.h ${DESTDIR}${PREFIX}/${PYINC}/PIL
 	${INSTALL_DATA} ${WRKSRC}/libImaging/Imaging.h ${DESTDIR}${PREFIX}/${PYINC}/PIL
diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index f6583b6cb27..ae5bb2c274a 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2014/01/21 21:16:02 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.46 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=		matplotlib-1.3.1
 PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-1.3.1
@@ -14,6 +13,7 @@ COMMENT=		GTK frontend for matplotlib
 USE_TOOLS+=		pkg-config
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 USE_LANGUAGES=		c c++
 
 post-patch:
diff --git a/graphics/py-piddle/Makefile b/graphics/py-piddle/Makefile
index c1ff2b43124..a83cb9c26dc 100644
--- a/graphics/py-piddle/Makefile
+++ b/graphics/py-piddle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/06 14:11:17 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=	piddle-1.0.15
 PKGREVISION=	3
@@ -12,5 +12,7 @@ COMMENT=	Python Plug In Drawing, Does Little Else
 
 USE_LANGUAGES=	# empty
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile
index f9cfb9bfaa9..dfd115ed88b 100644
--- a/graphics/py-pycha/Makefile
+++ b/graphics/py-pycha/Makefile
@@ -1,24 +1,27 @@
-# $NetBSD: Makefile,v 1.2 2013/08/15 20:57:14 richard Exp $
-DISTNAME=		pycha-0.6.0
+# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:10 wiz Exp $
+
+DISTNAME=	pycha-0.6.0
 PKGREVISION=	1
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=		graphics python
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	graphics python
 MASTER_SITES=	https://pypi.python.org/packages/source/p/pycha/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://bitbucket.org/lgs/pycha/
-COMMENT=		Library for making charts with Python
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://bitbucket.org/lgs/pycha/
+COMMENT=	Library for making charts with Python
 LICENSE=      	gnu-lgpl-v3
 
-DEPENDS+=		${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-DEPENDS+=		${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
+DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 
 USE_LANGUAGES=	#none
 
 PYTHON_SELF_CONFLICT=	yes
+PYTHON_VERSIONED_DEPENDENCIES=	cairo
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
 post-install:
 	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/*
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index ea0272eb0d9..8b3c92f7512 100644
--- a/graphics/py-seqdiag/Makefile
+++ b/graphics/py-seqdiag/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/12/06 11:30:53 obache Exp $
-#
+# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=	seqdiag-0.9.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +13,6 @@ LICENSE=	apache-2.0
 DEPENDS+=	${PYPKGPREFIX}-blockdiag>=1.3.0:../../graphics/py-blockdiag
 
 PYTHON_SELF_CONFLICT=		yes
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 USE_LANGUAGES=	# none
 
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 7e44f5ef533..f3bacb7ffbe 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2013/10/10 14:42:16 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.71 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=	scigraphica-2.1.0
 PKGREVISION=	24
@@ -23,6 +22,8 @@ CONFIGURE_ENV+=		PYTHONBIN=${PYTHONBIN:Q}
 USE_LIBTOOL=		YES
 PTHREAD_AUTO_VARS=	yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-numarray via libscigraphica
+
 pre-configure:
 	ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python
 
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 4e860b06741..069d227f29b 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/01/20 19:20:08 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=	skencil-0.6.17
 PKGREVISION=	12
@@ -14,6 +14,8 @@ DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 USE_TOOLS+=	pax
 
 PYTHON_PATCH_SCRIPTS= sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-imaging
+
 SK_CONF_ARGS=	--imaging-include=${BUILDLINK_PREFIX.pyimaging}/${PYINC}/PIL
 SK_TKFLAGS=	-L${BUILDLINK_PREFIX.tk}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tk}/lib -ltk -ltcl
 SK_TKFLAGS+=	${COMPILER_RPATH_FLAG}${X11BASE}/lib
diff --git a/graphics/xdot/Makefile b/graphics/xdot/Makefile
index a0102fbce76..5846ebfc85b 100644
--- a/graphics/xdot/Makefile
+++ b/graphics/xdot/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/01/05 22:12:33 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:10 wiz Exp $
 
 DISTNAME=	xdot
 PKGNAME=	xdot-20121124
@@ -18,6 +17,7 @@ WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none
 DIST_SUBDIR=	${PKGNAME_NOREV}
 REPLACE_PYTHON=	xdot.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 INSTALLATION_DIRS=	bin
 
 do-build: