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.

13 files changed, 33 insertions, 21 deletions

diff --git a/chat/gajim/Makefile b/chat/gajim/Makefile
index a3e6c13c3ec..71574cee484 100644
--- a/chat/gajim/Makefile
+++ b/chat/gajim/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/10/10 14:42:02 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.24 2014/01/25 10:29:57 wiz Exp $
 
 DISTNAME=	gajim-0.15
 PKGREVISION=	11
@@ -16,6 +15,8 @@ DEPENDS=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS=	${PYPKGPREFIX}-dbus>=0.81:../../sysutils/py-dbus
 DEPENDS=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
+
 .include "options.mk"
 
 USE_TOOLS+=	gmake intltool pkg-config msgfmt
diff --git a/chat/gajim/options.mk b/chat/gajim/options.mk
index e849e3851fa..8c7381280ba 100644
--- a/chat/gajim/options.mk
+++ b/chat/gajim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/04/17 20:57:09 gls Exp $
+# $NetBSD: options.mk,v 1.4 2014/01/25 10:29:57 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gajim
 PKG_SUPPORTED_OPTIONS=	avahi gnome gnome-keyring ssl
@@ -20,6 +20,7 @@ DEPENDS+=	avahi-[0-9]*:../../net/avahi
 # gnome
 .if !empty(PKG_OPTIONS:Mgnome)
 DEPENDS+=	${PYPKGPREFIX}-gnome2-[0-9]*:../../x11/py-gnome2
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-ORBit via py-gnome2
 .endif
 
 # gnome-keyring
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 1a8b242accc..cbe6cf4ef20 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2012/08/01 15:23:46 drochner Exp $
+# $NetBSD: options.mk,v 1.22 2014/01/25 10:29:58 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=		avahi dbus debug farsight gnome gnutls
@@ -62,6 +62,7 @@ REPLACE_SH+=		libpurple/purple-send
 REPLACE_SH+=		libpurple/purple-send-async
 REPLACE_PYTHON+=	libpurple/purple-remote
 REPLACE_PYTHON+=	libpurple/purple-url-handler
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.10.7
 .  include "../../sysutils/py-dbus/buildlink3.mk"
 .  include "../../sysutils/dbus/buildlink3.mk"
 .  include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/chat/libtelepathy/Makefile b/chat/libtelepathy/Makefile
index 70feeffb2b0..428162c7aa1 100644
--- a/chat/libtelepathy/Makefile
+++ b/chat/libtelepathy/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/01/01 11:52:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.16 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	libtelepathy-0.3.3
 PKGREVISION=	9
@@ -19,6 +18,8 @@ USE_TOOLS+=	gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=	libtelepathy.pc.in
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.3.3
+
 .include "../../lang/python/pyversion.mk"
 CONFIGURE_ENV+=		ac_cv_prog_PYTHON=${PYTHONBIN}
 
diff --git a/chat/py-xmpppy/Makefile b/chat/py-xmpppy/Makefile
index 052b12de57b..7a78fe2e561 100644
--- a/chat/py-xmpppy/Makefile
+++ b/chat/py-xmpppy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/01/17 23:11:27 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	xmpppy-0.5.0rc1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,6 +17,7 @@ USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=		yes
 PYTHON_VERSIONED_DEPENDENCIES=	dns
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.5.0rc1
 
 DOCDIR=		${PREFIX}/share/doc/py-xmpppy
 EXDIR=		${PREFIX}/share/examples/py-xmpppy
diff --git a/chat/spectrum/Makefile b/chat/spectrum/Makefile
index 0c74d10697a..4788de25d72 100644
--- a/chat/spectrum/Makefile
+++ b/chat/spectrum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2013/10/19 09:07:00 adam Exp $
+# $NetBSD: Makefile,v 1.38 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=		spectrum-1.4.8
 PKGREVISION=		23
@@ -20,6 +20,7 @@ USE_LANGUAGES=		c++ c
 
 REPLACE_PYTHON+=	spectrumctl/spectrumctl.py
 PY_PATCHPLIST=		yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-xmpppy
 
 BUILD_DEFS+=		JABBER_USER JABBER_GROUP
 BUILD_DEFS+=		SPECTRUM_RUN SPECTRUM_DB SPECTRUM_LOG
diff --git a/chat/telepathy-farsight/Makefile b/chat/telepathy-farsight/Makefile
index 9738129db70..5d81dd6856f 100644
--- a/chat/telepathy-farsight/Makefile
+++ b/chat/telepathy-farsight/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/10/10 14:42:02 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.37 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	telepathy-farsight-0.0.16
 PKGREVISION=	20
@@ -20,6 +19,8 @@ CFLAGS.SunOS+=	-std=c99 -D_XOPEN_SOURCE=600
 PKGCONFIG_OVERRIDE+=	telepathy-farsight/telepathy-farsight.pc.in
 
 PY_PATCHPLIST=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2, py-gstreamer0.10
+
 .include "../../lang/python/extension.mk"
 
 .include "../../chat/telepathy-glib/buildlink3.mk"
diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile
index fcfdddb1520..014c05dc074 100644
--- a/chat/telepathy-gabble/Makefile
+++ b/chat/telepathy-gabble/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2014/01/01 11:52:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.36 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	telepathy-gabble-0.11.10
 PKGREVISION=	17
@@ -18,6 +17,8 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 CONFIGURE_ENV+=	UUID_CFLAGS=" " UUID_LIBS=" "
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.11.10
+
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CFLAGS+=	-Wno-error=deprecated-declarations \
diff --git a/chat/telepathy-glib/Makefile b/chat/telepathy-glib/Makefile
index fff9dd216aa..8c2842c24d7 100644
--- a/chat/telepathy-glib/Makefile
+++ b/chat/telepathy-glib/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2014/01/01 11:52:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.36 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	telepathy-glib-0.20.2
 PKGREVISION=	1
@@ -23,6 +22,7 @@ PKGCONFIG_OVERRIDE+=	telepathy-glib/telepathy-glib.pc.in
 PYTHON_FOR_BUILD_ONLY=	yes
 CONFIGURE_ENV+=		ac_cv_prog_PYTHON=${PYTHONBIN}
 REPLACE_PYTHON+=	tests/all-errors-documented.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.20.2
 TEST_TARGET=		check
 
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.32.0
diff --git a/chat/telepathy-idle/Makefile b/chat/telepathy-idle/Makefile
index 29d1a1dced0..28bab1bfd64 100644
--- a/chat/telepathy-idle/Makefile
+++ b/chat/telepathy-idle/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2014/01/01 11:52:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.27 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	telepathy-idle-0.1.8
 PKGREVISION=	8
@@ -13,6 +12,8 @@ LICENSE=	gnu-lgpl-v2.1
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.1.8
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
diff --git a/chat/telepathy-logger/Makefile b/chat/telepathy-logger/Makefile
index fb525e5b93d..3f6141a1ee4 100644
--- a/chat/telepathy-logger/Makefile
+++ b/chat/telepathy-logger/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/10/19 09:06:56 adam Exp $
-#
+# $NetBSD: Makefile,v 1.24 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	telepathy-logger-0.2.7
 PKGREVISION=	12
@@ -24,6 +23,7 @@ PKGCONFIG_OVERRIDE+=	telepathy-logger/telepathy-logger-0.1.pc.in
 BUILD_DEPENDS=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.2.7
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
diff --git a/chat/telepathy-mission-control5/Makefile b/chat/telepathy-mission-control5/Makefile
index cb0c3a1e200..f5e5297715f 100644
--- a/chat/telepathy-mission-control5/Makefile
+++ b/chat/telepathy-mission-control5/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/01/01 11:52:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.14 2014/01/25 10:29:58 wiz Exp $
 
 DISTNAME=	telepathy-mission-control-5.7.9
 PKGNAME=	telepathy-mission-control5-5.7.9
@@ -20,6 +19,8 @@ PKGCONFIG_OVERRIDE+=	mission-control-plugins.pc.in
 #PKGCONFIG_OVERRIDE+=	libmcclient.pc.in
 #PKGCONFIG_OVERRIDE+=	mission-control.pc.in
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 5.7.9
+
 #.include "../../lang/python/pyversion.mk"
 CONFIGURE_ENV+=		ac_cv_prog_PYTHON=${PYTHONBIN}
 
diff --git a/chat/xchat-python/Makefile b/chat/xchat-python/Makefile
index 2ae41813fb5..10951a5c456 100644
--- a/chat/xchat-python/Makefile
+++ b/chat/xchat-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/05/31 12:39:42 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2014/01/25 10:29:58 wiz Exp $
 
 .include "../../chat/xchat/Makefile.common"
 
@@ -28,6 +28,8 @@ SUBST_FILES.libutil=	configure
 SUBST_SED.libutil=	-e 's/ -lutil//g'
 .endif
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.8.8
+
 .include "../../lang/python/application.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"