Remove unnecessary PLIST_SUBST and FILES_SUBST that are now provided

by the infrastructure.

Mark a couple more packages as not ready for python-3.x.

32 files changed, 33 insertions, 84 deletions

diff --git a/devel/bugs-everywhere/Makefile b/devel/bugs-everywhere/Makefile
index 53a1f105994..8d6dedd416e 100644
--- a/devel/bugs-everywhere/Makefile
+++ b/devel/bugs-everywhere/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/07/09 13:03:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	be-1.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/be/bugs-everywhere/}
@@ -22,10 +22,8 @@ DEPENDS+=	${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
 USE_LANGUAGES=	# none
 
 EGG_NAME=			bugs_everywhere-${PKGVERSION_NOREV}
-PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not ported yet as of 1.1.1
 REPLACE_PYTHON+=		libbe/version.py
-FILES_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && mv be be${PYVERSSUFFIX}
diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index b8de0cdff9e..5009bb2f188 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/06/08 17:43:24 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	Babel-1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,9 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 
 USE_LANGUAGES=	# none
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/pybabel \
 		${DESTDIR}${PREFIX}/bin/pybabel-${PYVERSSUFFIX}
diff --git a/devel/py-binaryornot/Makefile b/devel/py-binaryornot/Makefile
index 2567a56163a..da850baad22 100644
--- a/devel/py-binaryornot/Makefile
+++ b/devel/py-binaryornot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/09 06:23:39 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=			binaryornot-0.4.0
 GITHUB_PROJECT=			binaryornot
@@ -13,7 +13,6 @@ COMMENT=			Guess whether a file is binary or text
 LICENSE=			modified-bsd
 
 USE_LANGUAGES=			#none
-PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 
 DEPENDS+=			${PYPKGPREFIX}-chardet>=2.0.0:../../converters/py-chardet
 
diff --git a/devel/py-checker/Makefile b/devel/py-checker/Makefile
index 97657b8a59b..c635147321a 100644
--- a/devel/py-checker/Makefile
+++ b/devel/py-checker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/07/09 13:03:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	pychecker-0.8.19
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,7 +11,6 @@ COMMENT=	Python code checker
 LICENSE=	modified-bsd
 
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX:Q}
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 0.8.19
 
diff --git a/devel/py-cookiecutter/Makefile b/devel/py-cookiecutter/Makefile
index 0b8acea562b..0bde981e310 100644
--- a/devel/py-cookiecutter/Makefile
+++ b/devel/py-cookiecutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/09 06:23:39 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=			cookiecutter-1.3.0
 GITHUB_PROJECT=			cookiecutter
@@ -34,7 +34,6 @@ DEPENDS+=			${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe
 DEPENDS+=			${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 .endif
 
-PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 REPLACE_PYTHON+=		setup.py
 REPLACE_PYTHON+=		cookiecutter/*.py
 
diff --git a/devel/py-coverage/Makefile b/devel/py-coverage/Makefile
index 1817196fc2a..2c1f036f085 100644
--- a/devel/py-coverage/Makefile
+++ b/devel/py-coverage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:24 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	coverage-4.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 BUILD_DEPENDS+=	${PYPKGPREFIX}-greenlet-[0-9]*:../../devel/py-greenlet
 
 USE_LANGUAGES=	c
-PLIST_SUBST=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-extract:
 	${CHMOD} +r ${WRKSRC}/coverage.egg-info/*
diff --git a/devel/py-cython/Makefile b/devel/py-cython/Makefile
index 3517ffc7502..d2cc036e8f5 100644
--- a/devel/py-cython/Makefile
+++ b/devel/py-cython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2016/08/15 00:07:28 leot Exp $
+# $NetBSD: Makefile,v 1.34 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	Cython-0.24
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Cy/cy/}
@@ -12,7 +12,6 @@ LICENSE=	apache-1.1
 
 USE_LANGUAGES=	c
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 PLIST_VARS=	cygdb
 
 REPLACE_PYTHON+=	Cython/Build/Cythonize.py
diff --git a/devel/py-distribute/Makefile b/devel/py-distribute/Makefile
index 1fcad4a40dc..6074d25c0b1 100644
--- a/devel/py-distribute/Makefile
+++ b/devel/py-distribute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:25 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	distribute-0.6.49
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=	Replacement for setuptools
 LICENSE=	python-software-foundation # or ZPL
 
 CONFLICTS+=	${PYPKGPREFIX}-setuptools-[0-9]*
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 REPLACE_PYTHON=		setuptools/command/easy_install.py
 REPLACE_PYTHON+=	setuptools/tests/test_resources.py
diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index 046528b4399..ee9c75b8250 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:23 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	flake8-2.2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,8 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-mccabe-[0-9]*:../../devel/py-mccabe
 DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 DEPENDS+=	${PYPKGPREFIX}-pep8-[0-9]*:../../devel/py-pep8
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/flake8 ${DESTDIR}${PREFIX}/bin/flake8-${PYVERSSUFFIX}
 
diff --git a/devel/py-flakes/Makefile b/devel/py-flakes/Makefile
index c23c3cfb5bc..7d3128ae6af 100644
--- a/devel/py-flakes/Makefile
+++ b/devel/py-flakes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	pyflakes-0.9.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -13,7 +13,6 @@ LICENSE=	mit
 USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG= yes
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/pyflakes ${DESTDIR}${PREFIX}/bin/pyflakes${PYVERSSUFFIX}
diff --git a/devel/py-gobject/Makefile.common b/devel/py-gobject/Makefile.common
index 76ce748dd81..3812259a141 100644
--- a/devel/py-gobject/Makefile.common
+++ b/devel/py-gobject/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2011/09/12 22:01:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.20 2016/08/28 15:48:30 wiz Exp $
 #
 # used by devel/py-gobject/Makefile
 # used by devel/py-gobject-shared/Makefile
@@ -24,5 +24,4 @@ DISTINFO_FILE=		${.CURDIR}/../../devel/py-gobject/distinfo
 
 PKGCONFIG_OVERRIDE+=	pygobject-2.0.pc.in
 PY_PATCHPLIST=		yes
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 CONFLICTS+=		${PYPKGPREFIX}-gtk2<2.8.4
diff --git a/devel/py-gobject3/Makefile.common b/devel/py-gobject3/Makefile.common
index cc216cd0868..3470a6bd541 100644
--- a/devel/py-gobject3/Makefile.common
+++ b/devel/py-gobject3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2016/04/08 07:41:26 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.8 2016/08/28 15:48:30 wiz Exp $
 # used by devel/py-gobject3/Makefile
 # used by devel/py-gobject3-common/Makefile
 
@@ -25,7 +25,6 @@ PATCHDIR=		${.CURDIR}/../../devel/py-gobject3/patches
 
 PKGCONFIG_OVERRIDE+=	pygobject-3.0.pc.in
 PY_PATCHPLIST=		yes
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 CONFLICTS+=		${PYPKGPREFIX}-gtk2<2.8.4
 CONFLICTS+=		${PYPKGPREFIX}-gobject<2.28.6nb4
 
diff --git a/devel/py-hgview/Makefile b/devel/py-hgview/Makefile
index bca43aefb04..4db610494cc 100644
--- a/devel/py-hgview/Makefile
+++ b/devel/py-hgview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/07/09 13:03:41 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	hgview-1.8.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,6 @@ BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
 REPLACE_PYTHON= *.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 1.8.0
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 USE_TOOLS+=	gmake
 
diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile
index 73d6af25b60..b7b92640f82 100644
--- a/devel/py-idle/Makefile
+++ b/devel/py-idle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/02/17 08:08:31 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2016/08/28 15:48:30 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-idle-${PY_DISTVERSION}
 CATEGORIES=	devel python
@@ -10,7 +10,6 @@ COMMENT=	IDLE - The Integrated DeveLopment Environment for Python
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 PY_PATCHPLIST=	yes
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)
 do-patch:
diff --git a/devel/py-ipython/Makefile b/devel/py-ipython/Makefile
index f753e4dac47..a3e9ccf146f 100644
--- a/devel/py-ipython/Makefile
+++ b/devel/py-ipython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/07/21 12:13:12 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	ipython-3.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -23,9 +23,6 @@ DEPENDS+=	${PYPKGPREFIX}-zmq>=14.0.1:../../net/py-zmq
 
 USE_LANGUAGES=	# none
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 REPLACE_PYTHON=	*/*/*.py */*/*/*.py
 
 post-install:
diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index 3c54513533b..1e5817daa6b 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/07/09 13:03:42 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	logilab-common-0.63.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,6 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.4.0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-colorama-[0-9]*:../../comms/py-colorama
 .endif
 
-PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-mxDateTime
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
diff --git a/devel/py-macholib/Makefile b/devel/py-macholib/Makefile
index 3fe4f377d9a..a23e609748a 100644
--- a/devel/py-macholib/Makefile
+++ b/devel/py-macholib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:27 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	macholib-1.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@ USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	macholib/macho_dump.py macholib/macho_find.py
 REPLACE_PYTHON+=	macholib/macho_standalone.py
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/macho_dump \
diff --git a/devel/py-modulegraph/Makefile b/devel/py-modulegraph/Makefile
index aeee2b4b2f6..2953532a8fb 100644
--- a/devel/py-modulegraph/Makefile
+++ b/devel/py-modulegraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:27 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	modulegraph-0.12.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,8 +14,6 @@ DEPENDS+=	${PYPKGPREFIX}-altgraph>=0.11:../../graphics/py-altgraph
 
 USE_LANGUAGES=	# none
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/modulegraph \
 		${DESTDIR}${PREFIX}/bin/modulegraph${PYVERSSUFFIX}
diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile
index a16559379d7..33fd2116de8 100644
--- a/devel/py-nose/Makefile
+++ b/devel/py-nose/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/07/24 11:56:15 kamil Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	nose-1.3.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ LICENSE=	gnu-lgpl-v2.1
 #DEPENDS+=	${PYPKGPREFIX}-coverage>=3.0:../../devel/py-coverage
 
 USE_LANGUAGES=	# none
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 SUBST_CLASSES+=		manpath
 SUBST_STAGE.manpath=	pre-build
diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile
index 9f5aecdf5c4..5d383fca039 100644
--- a/devel/py-pbr/Makefile
+++ b/devel/py-pbr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/06/08 17:49:20 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	pbr-1.10.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 REPLACE_PYTHON+=	pbr/tests/testpackage/setup.py
 
 post-install:
diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 7182150b57c..195801b6793 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/08/27 11:41:23 richard Exp $
+# $NetBSD: Makefile,v 1.16 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	pip-8.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,9 +10,6 @@ HOMEPAGE=	http://www.pip-installer.org/
 COMMENT=	Installs Python packages as an easy_install replacement
 LICENSE=	mit
 
-PLIST_SUBST+=	PYVERSSUFFIX="${PYVERSSUFFIX}"
-FILES_SUBST+=	PYVERSSUFFIX="${PYVERSSUFFIX}"
-
 REPLACE_PYTHON+=	pip/__init__.py pip/_vendor/requests/certs.py
 REPLACE_PYTHON+=	pip/_vendor/requests/packages/chardet/chardetect.py
 
diff --git a/devel/py-pylint/Makefile b/devel/py-pylint/Makefile
index 978c40ac965..2df72dd5992 100644
--- a/devel/py-pylint/Makefile
+++ b/devel/py-pylint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/07/12 09:32:14 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/28 15:48:30 wiz Exp $
 
 DISTNAME=	pylint-1.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,6 @@ USE_LANGUAGES=	# none
 
 DOCDIR=			${PREFIX}/share/doc/pylint
 INSTALLATION_DIRS=	${DOCDIR} ${PKGMANDIR}/man1
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 REPLACE_PYTHON+=	pylint/__main__.py pylint/test/data/ascript pylint/test/input/noext
 
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index f3c97205bd0..cdaa48e47d5 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2016/08/22 14:12:15 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2016/08/28 15:48:31 wiz Exp $
 
 DISTNAME=		setuptools-26.0.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,6 @@ DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 # not sure if this would introduce a dependency cycle
 #BUILD_DEPENDS+=		${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 PLIST_SUBST+=		EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 
 REPLACE_PYTHON+=	setuptools/command/easy_install.py
diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile
index 116c51ff62a..d44beaf2c04 100644
--- a/devel/py-setuptools_scm/Makefile
+++ b/devel/py-setuptools_scm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/06 05:30:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:31 wiz Exp $
 
 DISTNAME=		setuptools_scm-1.10.1
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +13,5 @@ LICENSE=		mit
 
 #DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-#PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
-#PLIST_SUBST+=		EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-tabular/Makefile b/devel/py-tabular/Makefile
index 72e60142a34..5076179fb34 100644
--- a/devel/py-tabular/Makefile
+++ b/devel/py-tabular/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 13:03:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:31 wiz Exp $
 
 DISTNAME=	tabular-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,13 +10,10 @@ HOMEPAGE=	http://pypi.python.org/pypi/tabular
 COMMENT=	Tabular data tools for Python
 LICENSE=	mit
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 0.1
 
 .include "../../graphics/py-matplotlib/buildlink3.mk"
-.include "../../math/py-numpy/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pynumpy+=	${PYPKGPREFIX}-numpy>=1.6
-
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-test/Makefile b/devel/py-test/Makefile
index 2628ac62841..4a3230484c0 100644
--- a/devel/py-test/Makefile
+++ b/devel/py-test/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/08/24 21:35:12 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2016/08/28 15:48:31 wiz Exp $
 
 DISTNAME=	pytest-3.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -20,9 +20,6 @@ USE_TOOLS+=	bash:build
 
 USE_LANGUAGES=	# none
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 REPLACE_PYTHON+=	_pytest/standalonetemplate.py
 
 post-install:
diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile
index a9dd2233895..cf6a6ecdee9 100644
--- a/devel/py-tryton/Makefile
+++ b/devel/py-tryton/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/08/03 10:22:39 adam Exp $
+# $NetBSD: Makefile,v 1.21 2016/08/28 15:48:31 wiz Exp $
 TRYTON_MODULE_NAME=	tryton
 PKGREVISION= 1
 .include "../../devel/py-trytond/Makefile.common"
@@ -13,7 +13,6 @@ USE_LANGUAGES=		# none
 
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 PY_PATCHPLIST=			yes
-PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "options.mk"
 
diff --git a/devel/py-trytond/Makefile b/devel/py-trytond/Makefile
index 28545c876bd..4c1d9abdafd 100644
--- a/devel/py-trytond/Makefile
+++ b/devel/py-trytond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/02/25 12:12:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/28 15:48:31 wiz Exp $
 TRYTON_MODULE_NAME=	trytond
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	devel python
@@ -33,7 +33,6 @@ REPLACE_PYTHON+=	trytond/tests/test_tryton.py
 
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 PY_PATCHPLIST=			yes
-PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "options.mk"
 
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index cb5e94ed253..f6f72b85d0d 100644
--- a/devel/py-unittest2/Makefile
+++ b/devel/py-unittest2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:27 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/28 15:48:31 wiz Exp $
 
 DISTNAME=		unittest2-1.1.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,6 @@ DEPENDS+=		${PYPKGPREFIX}-linecache2-[0-9]*:../../devel/py-linecache2
 DOCDIR=			share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	${DOCDIR}
 PLIST_SUBST+=		DOCDIR=${DOCDIR}
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 SUBST_CLASSES+=		multi
 SUBST_STAGE.multi=	pre-configure
diff --git a/devel/py-unittest2py3k/Makefile b/devel/py-unittest2py3k/Makefile
index 390345d9a34..583f072d045 100644
--- a/devel/py-unittest2py3k/Makefile
+++ b/devel/py-unittest2py3k/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:23 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:31 wiz Exp $
 
 DISTNAME=		unittest2py3k-0.5.1
 # to match python-2.x name
@@ -17,7 +17,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 DOCDIR=			share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	${DOCDIR}
 PLIST_SUBST+=		DOCDIR=${DOCDIR}
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/${DOCDIR}
diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index c6cc449930e..c5e6b3b5b1a 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2016/08/19 15:35:22 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2016/08/28 15:48:31 wiz Exp $
 
 DISTNAME=	virtualenv-15.0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,6 @@ HOMEPAGE=	http://pypi.python.org/pypi/virtualenv
 COMMENT=	Virtual Python Environment builder
 LICENSE=	mit
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 REPLACE_PYTHON=	virtualenv.py
 
 post-install:
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index a3094518605..d2cdbac4f9b 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/05/16 07:53:02 nils Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:31 wiz Exp $
 
 DISTNAME=	wheel-0.26.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,9 +12,6 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/wheel \
 	      ${DESTDIR}${PREFIX}/bin/wheel-${PYVERSSUFFIX}