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.

3 files changed, 12 insertions, 10 deletions

diff --git a/wm/bmpanel2/Makefile b/wm/bmpanel2/Makefile
index c4842dae5e8..c47f47faa6a 100644
--- a/wm/bmpanel2/Makefile
+++ b/wm/bmpanel2/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/10/10 14:42:34 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:26 wiz Exp $
 
 DISTNAME=	bmpanel2-2.1pre1
 PKGREVISION=	15
@@ -11,12 +10,15 @@ HOMEPAGE=	http://code.google.com/p/bmpanel2/
 COMMENT=	NETWM-compatible panel for X11
 LICENSE=	mit
 
+BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
+
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config gzip
 
 PY_PATCHPLIST=	yes
 REPLACE_PYTHON=	extra/py/bmpanel2.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.1pre1
 
 SUBST_CLASSES+=		prefix
 SUBST_SED.prefix=	-e "s,/usr/local,${PREFIX},g"
@@ -24,8 +26,6 @@ SUBST_FILES.prefix=	xdg.c
 SUBST_STAGE.prefix=	post-extract
 SUBST_MESSAGE.prefix=	Fixing path to themes.
 
-BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/wm/ccsm/Makefile b/wm/ccsm/Makefile
index e0287e6658f..4c3fd3355e1 100644
--- a/wm/ccsm/Makefile
+++ b/wm/ccsm/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 12:42:18 asau Exp $
-#
+# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:26 wiz Exp $
 
 PKGVER=			0.8.4
 DISTNAME=		ccsm-${PKGVER}
@@ -12,17 +11,18 @@ HOMEPAGE=		http://compiz.org/
 COMMENT=		CompizConfig Settings Manager
 LICENSE=		gnu-gpl-v2
 
+DEPENDS+=		compizconfig-backend-gconf>=0.6.0:../../devel/compizconfig-backend-gconf
+DEPENDS+=		${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
+
 USE_TOOLS+=		pkg-config gmake msgfmt intltool
 
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 REPLACE_PYTHON=		${WRKSRC}/setup.py ${WRKSRC}/ccm/*.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
 
 MAKE_ENV+=	PYTHONBIN=${PYTHONBIN:Q}
 
-DEPENDS+=	compizconfig-backend-gconf>=0.6.0:../../devel/compizconfig-backend-gconf
-DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
-
 .include "../../devel/py-compizconfig/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/wm/icecc/Makefile b/wm/icecc/Makefile
index f193df4a30a..433c1ed1c79 100644
--- a/wm/icecc/Makefile
+++ b/wm/icecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/10/09 17:39:18 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:26 wiz Exp $
 
 # Package version reflects icecc version, with PKGREVISION incremented
 # for any tool updates, according to the authors scheme.
@@ -39,6 +39,8 @@ PYTHON_PATCH_SCRIPTS=	icecursorscfg-0.6/icecurcfg.py iceiconcvt-1.0/iceiconcvt.p
 PYTHON_PATCH_SCRIPTS+=	icemergeprefs-0.5/icemergeprefs.py icerrun-0.5/icerrrun.py
 PYTHON_PATCH_SCRIPTS+=	icerrun-0.5/icerrun.py
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-qt3-base
+
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	icebgset-1.3/icebgset.pro icecc-2.9/icecc.pro iceked-1.5/iceked.pro