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.

15 files changed, 15 insertions, 39 deletions

diff --git a/textproc/csvtomd/Makefile b/textproc/csvtomd/Makefile
index 4f629afc7f7..abd17926397 100644
--- a/textproc/csvtomd/Makefile
+++ b/textproc/csvtomd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/07/28 09:54:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:34 wiz Exp $
 
 DISTNAME=	csvtomd-0.1.1
 CATEGORIES=	textproc
@@ -13,7 +13,6 @@ LICENSE=	mit
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	csvtomd
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile
index 4fe9a73ea5e..43efda7af31 100644
--- a/textproc/py-HappyDoc/Makefile
+++ b/textproc/py-HappyDoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/07/09 13:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	HappyDoc_r2_1
 PKGNAME=	${PYPKGPREFIX}-HappyDoc-2.1
@@ -13,7 +13,6 @@ COMMENT=	Python tool to generate Python API documents
 USE_LANGUAGES=	#none
 
 WRKSRC=		${WRKDIR}/HappyDoc-r2_1
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 EGG_NAME=	${DISTNAME:S/_r/-/:S/_/./g}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 2.1
diff --git a/textproc/py-cElementTree/Makefile b/textproc/py-cElementTree/Makefile
index 74e0dc5047f..3ee0479cf75 100644
--- a/textproc/py-cElementTree/Makefile
+++ b/textproc/py-cElementTree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/03/15 19:42:33 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:35 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION}
 CATEGORIES=	textproc python
@@ -17,7 +17,6 @@ PY_PATCHPLIST=	yes
 PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR}
 PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat}
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 0cf8111aa3a..c7d2533e800 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2015/02/24 11:03:05 markd Exp $
+# $NetBSD: Makefile,v 1.44 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	docutils-0.12
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,8 +14,6 @@ DEPENDS+=	${PYPKGPREFIX}-roman>=1.4:../../math/py-roman
 DEPENDS+=	${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 
 USE_LANGUAGES=	#none
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 REPLACE_PYTHON+=	docutils/utils/code_analyzer.py
 REPLACE_PYTHON+=	docutils/utils/error_reporting.py
diff --git a/textproc/py-empy/Makefile b/textproc/py-empy/Makefile
index 3fe347d1d33..cc9a7c2ee70 100644
--- a/textproc/py-empy/Makefile
+++ b/textproc/py-empy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/07/09 13:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	empy-3.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@ REPLACE_PYTHON+=        em.py
 
 USE_TOOLS+=		pax
 PYDISTUTILSPKG=		# yes
-PLIST_SUBST+=		PYVERSSUFFIX="${PYVERSSUFFIX}"
 
 PYTHON_SELF_CONFLICT=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35
diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile
index f6142843e37..1f6e78f9d44 100644
--- a/textproc/py-expat/Makefile
+++ b/textproc/py-expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2016/08/28 15:48:35 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-expat-${PY_DISTVERSION}
 CATEGORIES=	textproc python
@@ -16,7 +16,6 @@ PY_PATCHPLIST=	yes
 PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR}
 PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat}
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)
diff --git a/textproc/py-ftfy/Makefile b/textproc/py-ftfy/Makefile
index eb96be724e8..ed09c7a40a2 100644
--- a/textproc/py-ftfy/Makefile
+++ b/textproc/py-ftfy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	ftfy-3.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-PLIST_SUBST=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/ftfy \
 		${DESTDIR}${PREFIX}/bin/ftfy${PYVERSSUFFIX}
diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile
index e9083c60477..9f2dd76f5f7 100644
--- a/textproc/py-html2text/Makefile
+++ b/textproc/py-html2text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2016/07/03 11:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=		html2text-2016.5.29
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -11,8 +11,6 @@ COMMENT=		Convert HTML into easy-to-read plain ASCII text
 LICENSE=		gnu-gpl-v2
 
 REPLACE_PYTHON=	html2text/__init__.py
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/html2text ${DESTDIR}${PREFIX}/bin/html2text-${PYVERSSUFFIX}
diff --git a/textproc/py-jsonschema/Makefile b/textproc/py-jsonschema/Makefile
index fab8bde3537..f38525b1baf 100644
--- a/textproc/py-jsonschema/Makefile
+++ b/textproc/py-jsonschema/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:42 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	jsonschema-2.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,6 @@ HOMEPAGE=	https://github.com/Julian/jsonschema
 COMMENT=	Implementation of JSON Schema for Python
 LICENSE=	modified-bsd
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
 .include "../../lang/python/egg.mk"
 
 post-install:
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index fe14ca696b9..d2e8d1d851f 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/11/13 14:47:09 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	Markdown-2.6.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,8 +15,6 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
 USE_LANGUAGES=	# none
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 post-extract:
 	${MV} ${WRKSRC}/bin/markdown_py ${WRKSRC}/bin/markdown_py${PYVERSSUFFIX}
 
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index 1b01c637713..7903abfdff3 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2016/06/08 17:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	Pygments-2.0.2
 PKGREVISION=	1
@@ -17,8 +17,6 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
 USE_LANGUAGES=		# none
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/pygmentize ${DESTDIR}${PREFIX}/bin/pygmentize${PYVERSSUFFIX}
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index afb9576c9b7..42972615e9c 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/09 06:23:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	rdflib-4.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -23,8 +23,6 @@ REPLACE_PYTHON+=	rdflib/plugins/parsers/pyRdfa/extras/httpheader.py
 REPLACE_PYTHON+=	rdflib/plugins/parsers/structureddata.py
 REPLACE_PYTHON+=	rdflib/tools/rdfpipe.py
 
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/csv2rdf \
 		${DESTDIR}${PREFIX}/bin/csv2rdf${PYVERSSUFFIX}
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index 8aaa4423da3..9374fedd4c6 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2016/06/08 17:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	Sphinx-1.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -24,8 +24,6 @@ DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 BUILD_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 
 USE_LANGUAGES=	#none
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 REPLACE_PYTHON+=	sphinx/pycode/pgen2/token.py
 
diff --git a/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile
index 807664888c4..b5a08bf67a2 100644
--- a/textproc/py-vobject/Makefile
+++ b/textproc/py-vobject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/08/27 15:45:19 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2016/08/28 15:48:35 wiz Exp $
 
 DISTNAME=	vobject-0.9.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +13,6 @@ LICENSE=	apache-2.0
 DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 		${MV} change_tz change_tz-${PYVERSSUFFIX} && \
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index 793208ae5ee..1534fcc7f53 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/07/09 13:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/28 15:48:36 wiz Exp $
 
 DISTNAME=	PyXML-0.8.4
 PKGNAME=	${PYPKGPREFIX}-xml-0.8.4
@@ -32,7 +32,6 @@ post-extract:
 .endfor
 
 REPLACE_PYTHON=	${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g}
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../lang/python/distutils.mk"