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.

12 files changed, 30 insertions, 23 deletions

diff --git a/games/4stAttack/Makefile b/games/4stAttack/Makefile
index 14ca9a1c59a..5d3b1bcffaf 100644
--- a/games/4stAttack/Makefile
+++ b/games/4stAttack/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/10/24 12:32:38 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.24 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=		4stAttack-2.1.4
 PKGREVISION=		17
@@ -15,6 +14,7 @@ INSTALLATION_DIRS=	bin share/${PKGBASE}
 USE_TOOLS+=	pax
 
 PYTHON_PATCH_SCRIPTS=	4stattack.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.1.4
 
 FIND_EXCLUDE=	\( -name \*.orig -or -name \*.txt -or -name \*.pre -or -name GPL -or -name \*~ -or -name 4stattack \)
 
diff --git a/games/blindmine/Makefile b/games/blindmine/Makefile
index 732b16f8f92..38eb3c6b646 100644
--- a/games/blindmine/Makefile
+++ b/games/blindmine/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/10/24 12:32:38 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=	blindmine-0.3-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -23,6 +22,7 @@ SUBST_FILES.path=	blindmine.py sdl_ui.py
 SUBST_SED.path=		-e 's,/usr/bin/env python,${PYTHONBIN},g'
 
 PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.3
 
 INSTALLATION_DIRS=	bin share/doc/blindmine share/blindmine/data
 
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 7e9ba12969c..fbda937a970 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2012/07/31 15:49:37 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.40 2014/01/25 10:30:08 wiz Exp $
 
 # used by games/freeciv-share/Makefile
 # used by games/freeciv-client/Makefile
@@ -25,6 +25,7 @@ DISTINFO_FILE=		${.CURDIR}/../../games/freeciv-share/distinfo
 PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
 
 PYTHON_PATCH_SCRIPTS=	${WRKSRC}/common/generate_packets.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.3.2
 
 SUBST_CLASSES+=		data
 SUBST_STAGE.data=	post-patch
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 3aefc78ba15..56acbaf437c 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2014/01/01 11:52:15 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=	gcompris-12.11
 PKGREVISION=	12
@@ -11,6 +11,8 @@ HOMEPAGE=	http://gcompris.net/
 COMMENT=	Educational games for children
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	gnuchess-[0-9]*:../../games/gnuchess
+
 USE_TOOLS+=		gmake intltool gtar pkg-config msgfmt texi2html
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
@@ -19,10 +21,11 @@ USE_LIBTOOL=		YES
 CHECK_PORTABILITY_SKIP+= macosx/build-gtk.sh
 INFO_FILES=	yes
 
-DEPENDS+=	gnuchess-[0-9]*:../../games/gnuchess
-
 PTHREAD_AUTO_VARS=	yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-sqlite2, py-gtk2
+PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
+
 PKG_SUPPORTED_OPTIONS=	gnet
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcompris
 .include "../../mk/bsd.options.mk"
@@ -50,7 +53,7 @@ post-install:
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../graphics/py-cairo/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/application.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 4471e5546ef..8671b9ddc7b 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2014/01/04 13:46:55 obache Exp $
+# $NetBSD: Makefile,v 1.140 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=		gnome-games-2.32.1
 PKGREVISION=		24
@@ -11,6 +11,8 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 games collection
 #LICENSE=		gnu-gpl-v2 AND gnu-fdl-v1.1
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-ORBit via py-gnome2
+
 CONFLICTS=		xbill-[0-9]*
 SUPERSEDES=		glchess-[0-9]*
 
diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile
index 129c1556163..1c8788c30d6 100644
--- a/games/kajongg/Makefile
+++ b/games/kajongg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/01/01 11:52:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=	kajongg-${_KDE_VERSION}
 PKGREVISION=	1
@@ -9,6 +9,8 @@ COMMENT=	Maj Jong game
 
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-twisted
+
 REPLACE_PYTHON+=	setup.py
 REPLACE_PYTHON+=	src/deferredutil.py
 REPLACE_PYTHON+=	src/kajongg.py
diff --git a/games/kye/Makefile b/games/kye/Makefile
index b107ad86fa8..dfb021068c6 100644
--- a/games/kye/Makefile
+++ b/games/kye/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2013/10/10 14:42:11 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.47 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=		kye-1.0
 PKGREVISION=		18
@@ -16,6 +15,8 @@ SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	kye/common.py
 SUBST_SED.prefix=	's|@PREFIX@|${PREFIX}|g'
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/games/monsterz/Makefile b/games/monsterz/Makefile
index 7e4abb0c9bb..0f33edf307d 100644
--- a/games/monsterz/Makefile
+++ b/games/monsterz/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/06 11:54:47 asau Exp $
-#
+# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=		monsterz-0.7.1
 PKGREVISION=		4
@@ -14,6 +13,7 @@ DEPENDS+=		${PYPKGPREFIX}-game-[0-9]*:../../devel/py-game
 DEPENDS+=		${PYPKGPREFIX}-Numeric-[0-9]*:../../math/py-Numeric
 
 PYTHON_PATCH_SCRIPTS=	monsterz.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-Numeric
 
 MAKE_ENV+=		GAMEOWN=${GAMEOWN:Q}
 MAKE_ENV+=		GAMEGRP=${GAMEGRP:Q}
diff --git a/games/py-ranking/Makefile b/games/py-ranking/Makefile
index c8a66354058..06dcd680072 100644
--- a/games/py-ranking/Makefile
+++ b/games/py-ranking/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/07/06 17:36:39 kleink Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=	ranking-0.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,5 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# empty
 
-PYTHON_VERSIONS_INCLUDE_3X=	yes
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/py-trueskill/Makefile b/games/py-trueskill/Makefile
index 068e9573fe8..f4a623d7dc8 100644
--- a/games/py-trueskill/Makefile
+++ b/games/py-trueskill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/06/12 20:33:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=	trueskill-0.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=	Python module implementing the TrueSkill rating system
 LICENSE=	2-clause-bsd
 
 USE_LANGUAGES=			# none
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index 2cd18b7a36c..bfc5b854508 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/06/04 22:16:10 tron Exp $
+# $NetBSD: Makefile,v 1.18 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=	PySolFC-2.0
 PKGNAME=	${DISTNAME:tl}
@@ -13,6 +13,7 @@ COMMENT=	Over 1000 solitaire games
 LICENSE=	gnu-gpl-v3
 
 PYDISTUTILSPKG=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-imaging
 
 REPLACE_PYTHON+= \
 	data/themes/clearlooks/create_imgs.py \
diff --git a/games/pytraffic/Makefile b/games/pytraffic/Makefile
index 29a16de6a28..cba5f3a2514 100644
--- a/games/pytraffic/Makefile
+++ b/games/pytraffic/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2013/10/10 14:42:11 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.39 2014/01/25 10:30:08 wiz Exp $
 
 DISTNAME=		pytraffic-2.5.4
 PKGREVISION=		26
@@ -14,6 +13,7 @@ COMMENT=		Computer version of a popular board game
 DIST_SUBDIR=	pytraffic-2.5.4-070313
 
 PYDISTUTILSPKG=		yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"