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.

11 files changed, 19 insertions, 21 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 09d5b49efdb..5df67e9ec14 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.172 2013/10/10 14:42:22 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.173 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=		gnumeric-1.8.4
 PKGREVISION=		36
@@ -26,6 +25,7 @@ REPLACE_PERL+=		plugins/perl-func/perl_func.pl
 
 CONFIGURE_ARGS+=	--with-python
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.8.4
 .include "../../lang/python/application.mk"
 .include "../../devel/py-gobject/buildlink3.mk"
 
diff --git a/math/gnumeric110/Makefile b/math/gnumeric110/Makefile
index bc4243384a8..8203d77813c 100644
--- a/math/gnumeric110/Makefile
+++ b/math/gnumeric110/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2013/10/10 14:42:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	gnumeric-1.10.17
 PKGREVISION=	19
@@ -29,6 +29,7 @@ PLIST_SUBST+=		GOFFICE_VERSION=${GOFFICE_VERSION}
 
 CONFIGURE_ARGS+=	--with-python
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.10.17
 .include "../../lang/python/application.mk"
 .include "../../devel/py-gobject/buildlink3.mk"
 
diff --git a/math/gnumeric112/Makefile b/math/gnumeric112/Makefile
index 08bdf98c089..bbf791720fa 100644
--- a/math/gnumeric112/Makefile
+++ b/math/gnumeric112/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/01/02 18:50:03 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	gnumeric-1.12.9
 CATEGORIES=	math gnome
@@ -26,6 +26,7 @@ PLIST_SUBST+=		GOFFICE_VERSION=${GOFFICE_VERSION}
 
 CONFIGURE_ARGS+=	--with-python
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.12.9
 .include "../../lang/python/application.mk"
 .include "../../devel/py-gobject3/buildlink3.mk"
 
diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index d06c2a1f2a8..584707aa7ab 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2012/09/11 23:04:30 asau Exp $
+# $NetBSD: Makefile,v 1.51 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	Numeric-24.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,6 +11,7 @@ HOMEPAGE=	http://numeric.scipy.org/
 COMMENT=	Adds multidimensional numeric arrays to Python
 
 PYSETUP=	setup.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 24.2
 
 PLIST_VARS+=	blas
 .if exists(/System/Library/Frameworks/vecLib.framework)
diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index ff427cad030..c9861032efa 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/09/01 12:14:07 obache Exp $
+# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	ScientificPython-2.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Python//}
@@ -13,6 +13,7 @@ COMMENT=	Python modules for scientific computing
 CONFLICTS+=	py-Scientific-[0-9]*
 
 PYDISTUTILSPKG=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.8
 
 MAKE_ENV+=	NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf}
 
diff --git a/math/py-gmpy/Makefile b/math/py-gmpy/Makefile
index cd55c294820..e47e07b786f 100644
--- a/math/py-gmpy/Makefile
+++ b/math/py-gmpy/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/01/24 09:16:18 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	gmpy-1.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +11,6 @@ HOMEPAGE=	http://code.google.com/p/gmpy
 COMMENT=	Python library for arbitrary precision arithmetic
 LICENSE=	gnu-lgpl-v2.1
 
-PYTHON_VERSIONS_INCLUDE_3X=	yes
-
 USE_LANGUAGES=	c
 BUILD_TARGET= gmpy.so
 
diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile
index f0ed87e8309..61c4346a9b8 100644
--- a/math/py-mpmath/Makefile
+++ b/math/py-mpmath/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/09/11 23:04:31 asau Exp $
-#
+# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	mpmath-0.17
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,6 +13,8 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 PYDISTUTILSPKG=	yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33
+
 TEST_ENV+=	PYTHONPATH=${WRKSRC}/build/lib
 do-test:
 	${RUN} cd ${WRKSRC}/build/lib/mpmath/tests; \
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index a62ca618725..b6f055c5978 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/04 00:21:59 cheusov Exp $
-#
+# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	networkx-1.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,6 +13,7 @@ COMMENT=	Python package for creating and manipulating graphs and networks
 LICENSE=	modified-bsd
 
 PYTHON_SELF_CONFLICT=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 9ebced3559e..a1292aeccb2 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2013/05/20 05:59:58 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	numpy-1.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=	Array processing for numbers, strings, records, and objects
 LICENSE=	modified-bsd
 
 USE_LANGUAGES=		c fortran
-PYTHON_VERSIONS_INCLUDE_3X= yes
 PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 MAKE_ENV+=		ATLAS=None
 
diff --git a/math/py-roman/Makefile b/math/py-roman/Makefile
index 9b712c0ffd3..a21163a35ba 100644
--- a/math/py-roman/Makefile
+++ b/math/py-roman/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/09/11 23:04:32 asau Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	roman-1.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +13,6 @@ LICENSE=	python-software-foundation
 CONFLICTS+=	${PYPKGPREFIX}-docutils<=0.7
 
 USE_LANGUAGES=	# none
-PYTHON_VERSIONS_INCLUDE_3X= yes
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile
index 036e7beac15..1460c71f657 100644
--- a/math/py-scipy/Makefile
+++ b/math/py-scipy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/10/16 19:35:40 markd Exp $
+# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:13 wiz Exp $
 
 DISTNAME=	scipy-0.12.1
 PKGNAME=	${PYPKGPREFIX}-scipy-0.12.1
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 PYDISTUTILSPKG=	yes
 PLIST_SUBST+=   PYPKGPREFIX=${PYPKGPREFIX}
 USE_LANGUAGES+=	c c++ fortran
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 MAKE_ENV+=	ATLAS=None
 
 # XXX Avoid picking up other compilers when installed