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.

4 files changed, 10 insertions, 8 deletions

diff --git a/filesystems/fuse-gmailfs/Makefile b/filesystems/fuse-gmailfs/Makefile
index 5bbb387804f..d650b5153de 100644
--- a/filesystems/fuse-gmailfs/Makefile
+++ b/filesystems/fuse-gmailfs/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/03 16:08:31 asau Exp $
-#
+# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:07 wiz Exp $
 
 DISTNAME=	gmailfs-0.7.2
 PKGREVISION=	3
@@ -13,6 +12,7 @@ COMMENT=	FUSE filesystem which uses Google mail for free space
 
 NO_BUILD=			yes
 PYTHON_PATCH_SCRIPTS=		gmailfs.py mount.gmailfs
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-fuse-bindings
 
 CONF_FILES=		${PREFIX}/share/examples/gmailfs/gmailfs.conf \
 			${PKG_SYSCONFDIR}/gmailfs.conf
diff --git a/filesystems/py-filesystem/Makefile b/filesystems/py-filesystem/Makefile
index cfe9683e5b3..6fddc7ed28b 100644
--- a/filesystems/py-filesystem/Makefile
+++ b/filesystems/py-filesystem/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/04 00:22:00 cheusov Exp $
-#
+# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:07 wiz Exp $
 
 VERSION=	0.4.0
 DISTNAME=	fs-${VERSION}
@@ -16,6 +15,7 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 
 PYTHON_SELF_CONFLICT=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.4.0
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/py-fuse-bindings/Makefile b/filesystems/py-fuse-bindings/Makefile
index 97c87c8c836..d737f15659e 100644
--- a/filesystems/py-fuse-bindings/Makefile
+++ b/filesystems/py-fuse-bindings/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/03 16:08:33 asau Exp $
-#
+# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:07 wiz Exp $
 
 VERSION=		0.2.1
 DISTNAME=		fuse-python-${VERSION}
@@ -17,6 +16,8 @@ PYDISTUTILSPKG=		yes
 PY_PATCHLIST=		yes
 USE_TOOLS+=		pkg-config
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.2.1
+
 INSTALLATION_DIRS=	share/examples/fuse-python
 
 post-install:
diff --git a/filesystems/tahoe-lafs/Makefile b/filesystems/tahoe-lafs/Makefile
index 303dfdf02bb..c8fe3850a50 100644
--- a/filesystems/tahoe-lafs/Makefile
+++ b/filesystems/tahoe-lafs/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/10/31 16:04:05 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:07 wiz Exp $
 
 VERSION=	1.10.0
 PKGREVISION=	2
@@ -46,6 +45,8 @@ DEPENDS+=	${PYPKGPREFIX}-cryptopp-[0-9]*:../../security/py-cryptopp
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-nevow-[0-9]*:../../www/py-nevow
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-twisted, py-xml via py-nevow, py-zbase32, py-cryptopp
+
 # Note that there is an upstream (inherited from setuptools) bug
 #   https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that
 # will cause a build to fail if there is a package with bad modes