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.
NetBSD · Aug 28, 2016 · 4f4721f · 4f4721f
1 parent 28e1362
commit 4f4721f
Show file tree

Hide file tree

Showing 112 changed files with 166 additions and 287 deletions.
diff --git a/archivers/py-yuicompressor/Makefile b/archivers/py-yuicompressor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:20 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:28 wiz Exp $
 
 DISTNAME=	yuicompressor-2.4.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 
 PY_PATCHPLIST=	yes
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 USE_JAVA=	run
 
 post-install:

diff --git a/audio/playitslowly/Makefile b/audio/playitslowly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/05/29 21:12:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:28 wiz Exp $
 
 DISTNAME=	playitslowly-1.5.1
 CATEGORIES=	audio
@@ -22,7 +22,6 @@ SUBST_STAGE.exec=	post-build
 SUBST_MESSAGE.exec=	Fixing path to python interpreter.
 
 USE_LANGUAGES=	# none
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

diff --git a/biology/py-mol/Makefile b/biology/py-mol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/07/09 13:03:32 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/28 15:48:28 wiz Exp $
 
 DISTNAME=	pymol-v1.5.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pymol-v/mol-/}
@@ -33,8 +33,6 @@ CHECK_PORTABILITY_SKIP+=	setup/*
 
 INSTALLATION_DIRS=	bin
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 # Gross hack
 PYSETUPBUILDTARGET=	install ${_PYSETUPINSTALLARGS}
 

diff --git a/converters/py-cairosvg/Makefile b/converters/py-cairosvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:21 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/28 15:48:28 wiz Exp $
 
 DISTNAME=	CairoSVG-1.0.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,7 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-cairocffi-[0-9]*:../../graphics/py-cairocffi
 USE_LANGUAGES=	# none
 
 PY_PATCHPLIST=	yes
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/cairosvg \

diff --git a/converters/py-chardet/Makefile b/converters/py-chardet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	chardet-2.3.0
 PKGREVISION=	1
@@ -12,8 +12,6 @@ COMMENT=	Character encoding auto-detection in Python
 LICENSE=	gnu-lgpl-v2.1
 
 REPLACE_PYTHON=		chardet/chardetect.py
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/chardetect ${DESTDIR}${PREFIX}/bin/chardetect-${PYVERSSUFFIX}

diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/07/09 13:03:35 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.6 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	CouchDB-0.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -27,7 +26,6 @@ REPLACE_PYTHON+=	couchdb/tools/replication_helper.py
 REPLACE_PYTHON+=	couchdb/tools/replication_helper_test.py
 REPLACE_PYTHON+=	couchdb/view.py
 PY_PATCHPLIST=		yes
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.rst \

diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 13:03:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:29 wiz Exp $
 
 DISTNAME=	skytools-3.2
 PKGREVISION=	1
@@ -21,7 +21,6 @@ USE_TOOLS+=	awk gmake grep sed
 PY_PATCHPLIST=	yes
 PY_NO_EGG=	no
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 3.2
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 REPLACE_PYTHON+=	scripts/*.py
 REPLACE_PYTHON+=	python/*.py

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: