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.

11 files changed, 13 insertions, 33 deletions

diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 55810720bae..0930e72c612 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2016/03/05 11:29:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2016/08/28 15:48:36 wiz Exp $
 
 DISTNAME=	pycurl-7.19.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,12 +11,9 @@ HOMEPAGE=	http://pycurl.sourceforge.net/
 COMMENT=	Python module interface to the cURL library
 LICENSE=	gnu-lgpl-v2.1 OR mit
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
-BUILDLINK_API_DEPENDS.curl+=	curl>=7.19.0
-
 PYSETUPARGS=	--with-ssl
 
+BUILDLINK_API_DEPENDS.curl+=	curl>=7.19.0
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index f49436e4847..75d6d843b43 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2016/08/04 08:23:11 adam Exp $
+# $NetBSD: Makefile,v 1.76 2016/08/28 15:48:36 wiz Exp $
 
 DISTNAME=	Django-1.9.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,8 +10,6 @@ HOMEPAGE=	http://www.djangoproject.com/
 COMMENT=	Django, a high-level Python Web framework
 LICENSE=	modified-bsd
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
 USE_LANGUAGES=		# empty
 REPLACE_PYTHON=		${WRKSRC}/django/bin/django-admin.py
 REPLACE_PYTHON+=	${WRKSRC}/django/conf/project_template/manage.py-tpl
diff --git a/www/py-django14/Makefile b/www/py-django14/Makefile
index 1687eeae61a..3a8030318ba 100644
--- a/www/py-django14/Makefile
+++ b/www/py-django14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 13:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/28 15:48:36 wiz Exp $
 
 DISTNAME=	Django-1.4.22
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,8 +10,6 @@ HOMEPAGE=	http://www.djangoproject.com/
 COMMENT=	Django, a high-level Python Web framework (LTS version)
 LICENSE=	modified-bsd
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
 USE_LANGUAGES=		# empty
 REPLACE_PYTHON=		${WRKSRC}/django/bin/*.py
 REPLACE_PYTHON+=	${WRKSRC}/django/bin/profiling/*.py
diff --git a/www/py-feedgen/Makefile b/www/py-feedgen/Makefile
index e1e06a1ead2..b24018cf5d3 100644
--- a/www/py-feedgen/Makefile
+++ b/www/py-feedgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/17 01:01:22 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:36 wiz Exp $
 
 DISTNAME=	v0.3.2
 PKGNAME=	${PYPKGPREFIX}-${GITHUB_PROJECT:S/python-//}-${DISTNAME:S/v//}
@@ -16,7 +16,5 @@ LICENSE=	2-clause-bsd
 DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index d84decc32bf..95d1b47f44a 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/01 21:05:46 kleink Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/28 15:48:36 wiz Exp $
 
 DISTNAME=	Flask-0.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# empty
 
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
 DEPENDS+=	${PYPKGPREFIX}-click>=2.0:../../devel/py-click
 DEPENDS+=	${PYPKGPREFIX}-itsdangerous-[0-9]*:../../security/py-itsdangerous
 DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
diff --git a/www/py-mod_wsgi/Makefile b/www/py-mod_wsgi/Makefile
index 4a727b91c73..4ca010d2ab0 100644
--- a/www/py-mod_wsgi/Makefile
+++ b/www/py-mod_wsgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/28 15:48:36 wiz Exp $
 
 DISTNAME=	mod_wsgi-4.4.12
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,8 +18,6 @@ APACHE_MODULE=		yes
 MESSAGE_SUBST+=		PYSITELIB=${PYSITELIB}
 MESSAGE_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 PLIST_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 # __init__.py is the same as in mod_wsgi-metrics; remove it to avoid conflict
 post-extract:
diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile
index 861028f08f8..c3f8eb5f8cf 100644
--- a/www/py-pelican/Makefile
+++ b/www/py-pelican/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/27 22:14:57 nils Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:36 wiz Exp $
 
 DISTNAME=		pelican-3.6.3
 GITHUB_PROJECT=		pelican
@@ -25,7 +25,6 @@ DEPENDS+=		${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 BUILD_DEPENDS+=		${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
 USE_TOOLS+=		bash:run make:build
 
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 REPLACE_PYTHON+=	pelican/tools/pelican_import.py
 REPLACE_PYTHON+=	pelican/tools/pelican_quickstart.py
 REPLACE_PYTHON+=	pelican/tools/pelican_themes.py
diff --git a/www/py-static/Makefile b/www/py-static/Makefile
index 2103bd42db8..79f28276119 100644
--- a/www/py-static/Makefile
+++ b/www/py-static/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:36 wiz Exp $
 
 DISTNAME=	static-1.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=	Serve static or templated content via WSGI or stand-alone
 LICENSE=	mit
 
 USE_LANGUAGES=	# none
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/static ${DESTDIR}${PREFIX}/bin/static-${PYVERSSUFFIX}
diff --git a/www/py-twill/Makefile b/www/py-twill/Makefile
index 05f818f9ea7..553ebdd62ab 100644
--- a/www/py-twill/Makefile
+++ b/www/py-twill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 13:04:15 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:37 wiz Exp $
 
 DISTNAME=	twill-1.8.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-PY_PATCHPLIST=	yes
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # setup fails for 1.8.0
 
 post-install:
diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile
index 8450969a669..f7ab2a10ecd 100644
--- a/www/py-uwsgi/Makefile
+++ b/www/py-uwsgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/03/05 11:29:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.33 2016/08/28 15:48:37 wiz Exp $
 
 DISTNAME=	uwsgi-2.0.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2 # with linking exception
 USE_LANGUAGES=	c
 USE_TOOLS+=	pkg-config
 
-PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX} PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
 EGG_NAME=	${DISTNAME:S/uwsgi/uWSGI/}
 
 .include "options.mk"
diff --git a/www/py-uwsgitop/Makefile b/www/py-uwsgitop/Makefile
index 96f65453eb8..f5c6efaa810 100644
--- a/www/py-uwsgitop/Makefile
+++ b/www/py-uwsgitop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:47 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:37 wiz Exp $
 
 DISTNAME=	uwsgitop-0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,9 +17,6 @@ DEPENDS+=	${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
 
 USE_LANGUAGES=	# none
 
-PY_PATCHPLIST=	yes
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/uwsgitop \
 		${DESTDIR}${PREFIX}/bin/uwsgitop${PYVERSSUFFIX}