devel/py-*: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.

36 files changed, 99 insertions, 99 deletions

diff --git a/devel/py-Optik/Makefile b/devel/py-Optik/Makefile
index af436494b33..d7dcb453b38 100644
--- a/devel/py-Optik/Makefile
+++ b/devel/py-Optik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/09/02 13:19:42 adam Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 10:18:26 rillig Exp $
 
 DISTNAME=	optik-1.5.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/optik/Optik/}
@@ -13,7 +13,7 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	#none
 
-PYTHON_VERSIONS_ACCEPTED=	 27
+PYTHON_VERSIONS_ACCEPTED=	27
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} test/test_optik.py
diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile
index 862a5e64837..11548684769 100644
--- a/devel/py-at-spi/Makefile
+++ b/devel/py-at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/09/02 13:19:40 adam Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/03 10:18:26 rillig Exp $
 
 DISTNAME=		at-spi-1.32.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,7 @@ USE_LANGUAGES=		#none
 NO_BUILD=	yes
 PY_PATCHPLIST=	yes
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-ORBit, py-gnome2
+PYTHON_VERSIONS_ACCEPTED=	27 # py-ORBit, py-gnome2
 
 PYATSPIDIR=		${PREFIX}/${PYSITELIB}/pyatspi
 INSTALLATION_DIRS=	${PYATSPIDIR}
diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index a27eec297e8..7568e8a41e7 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2018/06/03 07:49:27 leot Exp $
+# $NetBSD: Makefile,v 1.48 2019/11/03 10:18:26 rillig Exp $
 
 PKGNAME=	${PYPKGPREFIX}-curses-${PY_DISTVERSION}
 PKGREVISION=	5
@@ -9,15 +9,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Curses module for Python
 
 EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_cursesmodule.c
-PYDISTUTILSPKG=	yes
-PY_PATCHPLIST=	yes
+PYDISTUTILSPKG=		yes
+PY_PATCHPLIST=		yes
 
 # NetBSD-8 curses has enough support for py-curses
 USE_CURSES=	getsyx
 # But we build as ncurses still to get the full feature set easily
 FAKE_NCURSES=	yes
 
-PY_SETUP_SUBST=	NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
+PY_SETUP_SUBST=		NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)
diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile
index 2f44f3ce6d1..6fabbc7e0b3 100644
--- a/devel/py-cursespanel/Makefile
+++ b/devel/py-cursespanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/09/03 08:53:08 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 10:18:27 rillig Exp $
 
 PKGNAME=	${PYPKGPREFIX}-cursespanel-${PY_DISTVERSION}
 PKGREVISION=	4
@@ -14,10 +14,10 @@ USE_CURSES=	getsyx
 FAKE_NCURSES=	yes
 
 EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_curses_panel.c
-PYDISTUTILSPKG=	yes
-PY_PATCHPLIST=	yes
+PYDISTUTILSPKG=		yes
+PY_PATCHPLIST=		yes
 
-PY_SETUP_SUBST=	NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
+PY_SETUP_SUBST=		NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)
diff --git a/devel/py-dialog2/Makefile b/devel/py-dialog2/Makefile
index 80eada381a3..c4d2ec9364e 100644
--- a/devel/py-dialog2/Makefile
+++ b/devel/py-dialog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/09/02 13:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 10:18:27 rillig Exp $
 
 VERSION=	3.4.0
 DISTNAME=	python2-pythondialog-${VERSION}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://pythondialog.sourceforge.net/
 COMMENT=	Python wrapper for the dialog utility
 LICENSE=	gnu-lgpl-v2.1
 
-PYTHON_VERSIONS_ACCEPTED=	 27
+PYTHON_VERSIONS_ACCEPTED=	27
 
 .include "../../misc/dialog/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/devel/py-extras/Makefile b/devel/py-extras/Makefile
index 86f91884d1b..29bb8f53221 100644
--- a/devel/py-extras/Makefile
+++ b/devel/py-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/02/22 13:48:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 10:18:27 rillig Exp $
 
 DISTNAME=	extras-1.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	mit
 USE_LANGUAGES=	# none
 
 # TEST_DEPENDS
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+BUILD_DEPENDS+=		${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 # testtools depends on extras
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
diff --git a/devel/py-fixtures/Makefile b/devel/py-fixtures/Makefile
index a9b505605db..bedf5381159 100644
--- a/devel/py-fixtures/Makefile
+++ b/devel/py-fixtures/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/06/02 03:22:02 mef Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/03 10:18:27 rillig Exp $
 
 DISTNAME=	fixtures-3.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,8 +17,8 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.0.0:../../lang/py-six
 # TEST_DEPENDS
 # needs py-testtools for testing, but that depends on this
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
-BUILD_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-BUILD_DEPENDS+=	${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
+BUILD_DEPENDS+=		${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+BUILD_DEPENDS+=		${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-futures/Makefile b/devel/py-futures/Makefile
index 3e79e741051..1d8cc056ab8 100644
--- a/devel/py-futures/Makefile
+++ b/devel/py-futures/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/09/02 13:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 10:18:27 rillig Exp $
 
 DISTNAME=	futures-3.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/agronholm/pythonfutures
 COMMENT=	Library brings asynchronous computations from Python 3.x
 LICENSE=	python-software-foundation
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # included in 3+
+PYTHON_VERSIONS_ACCEPTED=	27 # included in 3+
 
 USE_LANGUAGES=	# none
 
diff --git a/devel/py-generate/Makefile b/devel/py-generate/Makefile
index 6967e1a37c9..fac3663d92e 100644
--- a/devel/py-generate/Makefile
+++ b/devel/py-generate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:03 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 10:18:27 rillig Exp $
 
 DISTNAME=	generate-2.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ MAKE_ENV+=		BINDIR=${DESTDIR}${PREFIX}/bin
 USE_TOOLS+=		gmake
 
 LIBS.SunOS+=	-lnsl -lsocket
-LIBS.QNX=		-lsocket
+LIBS.QNX=	-lsocket
 
 EGG_NAME=	${DISTNAME:S/${PKGVERSION_NOREV}/2.2/}
 
diff --git a/devel/py-gflags/Makefile b/devel/py-gflags/Makefile
index 7a671dca2c0..78dc25972b8 100644
--- a/devel/py-gflags/Makefile
+++ b/devel/py-gflags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/05/31 20:07:00 bsiegert Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 10:18:27 rillig Exp $
 
 DISTNAME=	python-gflags-3.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -12,7 +12,7 @@ COMMENT=	Python equivalent of gflags, a commandline flag implementation
 LICENSE=	modified-bsd
 
 REPLACE_PYTHON+=	*.py
-PYDISTUTILSPKG=	yes
+PYDISTUTILSPKG=		yes
 
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
diff --git a/devel/py-google-apputils/Makefile b/devel/py-google-apputils/Makefile
index 52aae51f9cc..d7285357051 100644
--- a/devel/py-google-apputils/Makefile
+++ b/devel/py-google-apputils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/09/02 13:19:37 adam Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/03 10:18:27 rillig Exp $
 
 DISTNAME=	google-apputils-0.4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/google/google-apputils
 COMMENT=	Google Application Utilities for Python
 LICENSE=	apache-2.0
 
-PYTHON_VERSIONS_ACCEPTED=	 27
+PYTHON_VERSIONS_ACCEPTED=	27
 
 # https://github.com/google/google-apputils/issues/4
 post-extract:
diff --git a/devel/py-hg-evolve/Makefile b/devel/py-hg-evolve/Makefile
index 2397c1260cd..6a84a6bafa7 100644
--- a/devel/py-hg-evolve/Makefile
+++ b/devel/py-hg-evolve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/09/02 13:19:38 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 10:18:27 rillig Exp $
 
 DISTNAME=	hg-evolve-8.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-mercurial>=4.3.1:../../devel/py-mercurial
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # See Mercurial itself.
+PYTHON_VERSIONS_ACCEPTED=	27 # See Mercurial itself.
 
 post-install:
 	rm -f ${DESTDIR}${PREFIX}/${PYSITELIB}/hgext3rd/__init__.py*
diff --git a/devel/py-hg-fastimport/Makefile b/devel/py-hg-fastimport/Makefile
index 4106c39e8e3..7b36396fa85 100644
--- a/devel/py-hg-fastimport/Makefile
+++ b/devel/py-hg-fastimport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/02 13:19:39 adam Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/03 10:18:28 rillig Exp $
 
 DISTNAME=	danielj7-hg-fastimport-d41a42894dfa
 PKGNAME=	${PYPKGPREFIX}-hg-fastimport-20170211
@@ -19,7 +19,7 @@ USE_LANGUAGES=	# none
 
 INSTALLATION_DIRS+=	${PYSITELIB}/hgfastimport share/doc/py-hg-fastimport
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-mercurial
+PYTHON_VERSIONS_ACCEPTED=	27 # py-mercurial
 PY_PATCHPLIST=			yes
 
 do-build:
diff --git a/devel/py-hg-git/Makefile b/devel/py-hg-git/Makefile
index eb9a09a6dd5..8841dd9c287 100644
--- a/devel/py-hg-git/Makefile
+++ b/devel/py-hg-git/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/09/02 13:19:37 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 10:18:28 rillig Exp $
 
 DISTNAME=	0.8.10
 PKGNAME=	${PYPKGPREFIX}-hg-git-${DISTNAME}
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/durin42-hg-git-6ef27582bfa5
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # as of 0.8.3
+PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.8.3
 EGG_NAME=	hg_git-${DISTNAME}
 
 .include "../../lang/python/egg.mk"
diff --git a/devel/py-hglist/Makefile b/devel/py-hglist/Makefile
index d0088dcaf58..8035f709350 100644
--- a/devel/py-hglist/Makefile
+++ b/devel/py-hglist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/09/02 13:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 10:18:28 rillig Exp $
 
 DISTNAME=	hglist-0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial
 
-PYTHON_VERSIONS_ACCEPTED=    27
+PYTHON_VERSIONS_ACCEPTED=	27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-hgnested/Makefile b/devel/py-hgnested/Makefile
index 4fd1bbfbd04..e2c782e048e 100644
--- a/devel/py-hgnested/Makefile
+++ b/devel/py-hgnested/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/09/02 13:19:35 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 10:18:28 rillig Exp $
 
 DISTNAME=	hgnested-0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-mercurial>=1.6:../../devel/py-mercurial
 
-PYTHON_VERSIONS_ACCEPTED=	 27	# XXX: devel/py-mercurial
+PYTHON_VERSIONS_ACCEPTED=	27	# XXX: devel/py-mercurial
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile
index fdd41324b42..5d848d8c2fd 100644
--- a/devel/py-idle/Makefile
+++ b/devel/py-idle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2017/09/03 08:53:08 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2019/11/03 10:18:28 rillig Exp $
 
 PKGNAME=	${PYPKGPREFIX}-idle-${PY_DISTVERSION}
 CATEGORIES=	devel python
@@ -32,8 +32,8 @@ IDLE_NAME=	idle
 .endif
 
 EXTRACT_ELEMENTS=	${PYSUBDIR}/Tools/scripts/${IDLE_NAME}
-REPLACE_PYTHON= Tools/scripts/${IDLE_NAME}
-NO_BUILD=	yes
+REPLACE_PYTHON=		Tools/scripts/${IDLE_NAME}
+NO_BUILD=		yes
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/devel/py-jersey/Makefile b/devel/py-jersey/Makefile
index 23237ba8a13..9395d6aed2e 100644
--- a/devel/py-jersey/Makefile
+++ b/devel/py-jersey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/09/02 13:19:40 adam Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 10:18:28 rillig Exp $
 
 DISTNAME=	jersey-0.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,10 +12,10 @@ COMMENT=	Framework for building Twisted Python command-line interfaces
 LICENSE=	modified-bsd
 
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
-DEPENDS+=	${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
-DEPENDS+=	${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
+DEPENDS+=		${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
+DEPENDS+=		${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # as of 0.1.5
+PYTHON_VERSIONS_ACCEPTED=	27 # as of 0.1.5
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile
index 3e7c35b7ea4..875bb2ecf6c 100644
--- a/devel/py-kqueue/Makefile
+++ b/devel/py-kqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/09/02 13:19:40 adam Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 10:18:28 rillig Exp $
 
 DISTNAME=	py-kqueue-2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py-//}
@@ -14,7 +14,7 @@ LICENSE=	modified-bsd
 .include "../../mk/bsd.prefs.mk"
 
 .if !defined(PKG_HAVE_KQUEUE)
-PKG_SKIP_REASON+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}; needs OS support for kqueue(2)"
+PKG_SKIP_REASON+=	"${PKGNAME} is not available for ${MACHINE_PLATFORM}; needs OS support for kqueue(2)"
 .endif
 
 EGG_NAME=	${DISTNAME:S/py-//}
diff --git a/devel/py-newt/Makefile b/devel/py-newt/Makefile
index 8126ae83d3f..3749ef0fb14 100644
--- a/devel/py-newt/Makefile
+++ b/devel/py-newt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/09/02 13:19:38 adam Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 10:18:28 rillig Exp $
 
 DISTNAME=	newt-0.52.16
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -19,7 +19,7 @@ USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libnewt.pc.in
 
 PY_PATCHPLIST=		yes
-PYTHON_VERSIONS_ACCEPTED=	 27
+PYTHON_VERSIONS_ACCEPTED= 27
 
 pre-configure:
 	cd ${WRKSRC}; \
diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile
index 76c012f36f6..3939a6e5da3 100644
--- a/devel/py-ode/Makefile
+++ b/devel/py-ode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/09/02 13:19:38 adam Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 10:18:28 rillig Exp $
 
 DISTNAME=	PyODE-1.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Py//:tl}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://pyode.sourceforge.net/
 COMMENT=	Python wrapper for the Open Dynamics Engine
 LICENSE=	modified-bsd OR gnu-lgpl-v2.1
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # as of 1.2.1
+PYTHON_VERSIONS_ACCEPTED=	27 # as of 1.2.1
 
 .include "../../devel/ode/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/devel/py-proteus/options.mk b/devel/py-proteus/options.mk
index f2c5fce530a..8980b3d33b2 100644
--- a/devel/py-proteus/options.mk
+++ b/devel/py-proteus/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.9 2019/09/02 13:19:42 adam Exp $
+# $NetBSD: options.mk,v 1.10 2019/11/03 10:18:29 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-proteus
 PKG_SUPPORTED_OPTIONS+=	cdecimal simplejson
 # track py-trytond for cdecimal suggested option selection
-PKG_SUGGESTED_OPTIONS+= ${PKG_DEFAULT_OPTIONS:Mcdecimal} ${PKG_OPTIONS.py-trytond:Mcdecimal}
+PKG_SUGGESTED_OPTIONS+=	${PKG_DEFAULT_OPTIONS:Mcdecimal} ${PKG_OPTIONS.py-trytond:Mcdecimal}
 PKG_SUGGESTED_OPTIONS+=	simplejson
 
 .include "../../mk/bsd.options.mk"
diff --git a/devel/py-pysvn/Makefile b/devel/py-pysvn/Makefile
index b11a5589d3c..fd656d327e6 100644
--- a/devel/py-pysvn/Makefile
+++ b/devel/py-pysvn/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.40 2019/04/03 00:32:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2019/11/03 10:18:29 rillig Exp $
 #
 
-VERS=			1.7.6
-DISTNAME=		pysvn-${VERS}
-PKGNAME=		${PYPKGPREFIX}-pysvn-${VERS}
-PKGREVISION=		20
-CATEGORIES=		devel
+VERS=		1.7.6
+DISTNAME=	pysvn-${VERS}
+PKGNAME=	${PYPKGPREFIX}-pysvn-${VERS}
+PKGREVISION=	20
+CATEGORIES=	devel
 MASTER_SITES=	http://pysvn.barrys-emacs.org/source_kits/
 
 MAINTAINER=		helgoman@users.sourceforge.net
diff --git a/devel/py-quixote/Makefile b/devel/py-quixote/Makefile
index 14e02cabce4..7d04d887654 100644
--- a/devel/py-quixote/Makefile
+++ b/devel/py-quixote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/09/02 13:19:36 adam Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 10:18:29 rillig Exp $
 
 DISTNAME=	Quixote-2.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,7 +10,7 @@ HOMEPAGE=	http://quixote.ca/
 COMMENT=	Framework for writing Python web application
 LICENSE=	mit
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # v3.0 is for Python 3.x only
+PYTHON_VERSIONS_ACCEPTED=	27 # v3.0 is for Python 3.x only
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile
index 637e313b0a4..6cb3e846b02 100644
--- a/devel/py-readline/Makefile
+++ b/devel/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/10/09 08:25:13 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/03 10:18:29 rillig Exp $
 
 PKGNAME=	${PYPKGPREFIX}-readline-${PY_DISTVERSION}
 CATEGORIES=	devel misc python
@@ -11,10 +11,10 @@ EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/readline.c
 
 USE_GCC_RUNTIME=	yes
 
-PYDISTUTILSPKG=	yes
-PY_PATCHPLIST=	yes
-PY_SETUP_SUBST+= RLPREFIX=${BUILDLINK_PREFIX.readline}
-PY_SETUP_SUBST+= RLRTPREFIX=${BUILDLINK_PREFIX.readline}
+PYDISTUTILSPKG=		yes
+PY_PATCHPLIST=		yes
+PY_SETUP_SUBST+=	RLPREFIX=${BUILDLINK_PREFIX.readline}
+PY_SETUP_SUBST+=	RLRTPREFIX=${BUILDLINK_PREFIX.readline}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)
diff --git a/devel/py-stem/Makefile b/devel/py-stem/Makefile
index 9a29e40a909..745d405c7c7 100644
--- a/devel/py-stem/Makefile
+++ b/devel/py-stem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/28 06:22:28 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/03 10:18:29 rillig Exp $
 
 DISTNAME=	stem-1.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -21,11 +21,11 @@ DEPENDS+=	${PYPKGPREFIX}-nacl-[0-9]*:../../security/py-nacl
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 
-REPLACE_PYTHON+=cache_fallback_directories.py
-REPLACE_PYTHON+=cache_manual.py
-REPLACE_PYTHON+=run_tests.py
-REPLACE_PYTHON+=setup.py
-REPLACE_PYTHON+=tor-prompt
+REPLACE_PYTHON+=	cache_fallback_directories.py
+REPLACE_PYTHON+=	cache_manual.py
+REPLACE_PYTHON+=	run_tests.py
+REPLACE_PYTHON+=	setup.py
+REPLACE_PYTHON+=	tor-prompt
 
 do-test:
 	cd ${WRKSRC} && ./run_tests.py --unit
diff --git a/devel/py-stompclient/Makefile b/devel/py-stompclient/Makefile
index cba4740f0b1..f30ef493301 100644
--- a/devel/py-stompclient/Makefile
+++ b/devel/py-stompclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/09/02 13:19:36 adam Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 10:18:29 rillig Exp $
 
 DISTNAME=	stompclient-0.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	Lightweight and extensible STOMP messaging client
 LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
-PYTHON_VERSIONS_ACCEPTED=	 27
+PYTHON_VERSIONS_ACCEPTED= 27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-testresources/Makefile b/devel/py-testresources/Makefile
index 416df73aec5..081b79e796e 100644
--- a/devel/py-testresources/Makefile
+++ b/devel/py-testresources/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/03/05 14:11:13 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 10:18:29 rillig Exp $
 
 DISTNAME=	testresources-2.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,11 +10,11 @@ HOMEPAGE=	https://pypi.python.org/pypi/testresources
 COMMENT=	Pyunit extension for managing expensive test resources
 LICENSE=	apache-2.0 OR modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
-DEPENDS+=	${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
-DEPENDS+=	${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
+DEPENDS+=		${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
+DEPENDS+=		${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
+DEPENDS+=		${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 # TEST_DEPENDS
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+BUILD_DEPENDS+=		${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 # circular dependency
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
 
diff --git a/devel/py-tortoisehg/Makefile b/devel/py-tortoisehg/Makefile
index 7349df40ae9..03d03a744f8 100644
--- a/devel/py-tortoisehg/Makefile
+++ b/devel/py-tortoisehg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2019/10/29 17:47:23 kamil Exp $
+# $NetBSD: Makefile,v 1.59 2019/11/03 10:18:29 rillig Exp $
 
 DISTNAME=		tortoisehg-5.0.2
 PKGREVISION=		1
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
 DEPENDS+=	${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-iniparse, py-mercurial
+PYTHON_VERSIONS_ACCEPTED=	27 # py-iniparse, py-mercurial
 
 thg_icon=		/share/pixmaps/tortoisehg/icons/thg_logo.ico
 SUBST_CLASSES+=		df
diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile
index 406a911a88a..5d9b59d4234 100644
--- a/devel/py-tryton/Makefile
+++ b/devel/py-tryton/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/09/02 13:19:38 adam Exp $
+# $NetBSD: Makefile,v 1.38 2019/11/03 10:18:29 rillig Exp $
 TRYTON_MODULE_NAME=	tryton
 PKGREVISION= 7
 .include "../../devel/py-trytond/Makefile.common"
@@ -11,7 +11,7 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=		# none
 
-PYTHON_VERSIONS_ACCEPTED=    27
+PYTHON_VERSIONS_ACCEPTED=	27
 
 .include "options.mk"
 
diff --git a/devel/py-trytond/Makefile.common b/devel/py-trytond/Makefile.common
index 30684b0f08d..7baf50a5e1b 100644
--- a/devel/py-trytond/Makefile.common
+++ b/devel/py-trytond/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2019/09/02 13:19:37 adam Exp $
+# $NetBSD: Makefile.common,v 1.17 2019/11/03 10:18:30 rillig Exp $
 
 # used by databases/py-ldap-authentication/Makefile
 # used by devel/py-proteus/Makefile
@@ -247,15 +247,15 @@ MODULE_REVISION.trytond_webdav=					0
 
 TRYTON_VERSION=	${TRYTON_BASEVER}.${MODULE_REVISION.${TRYTON_MODULE_NAME}}
 
-DISTNAME?=       ${TRYTON_MODULE_NAME}-${TRYTON_VERSION}
-PKGNAME?=        ${PYPKGPREFIX}-${DISTNAME:S/_/-/g}
+DISTNAME?=	${TRYTON_MODULE_NAME}-${TRYTON_VERSION}
+PKGNAME?=	${PYPKGPREFIX}-${DISTNAME:S/_/-/g}
 
-TRYTON_SITES=   http://downloads.tryton.org/${TRYTON_BASEVER}/
-MASTER_SITES=   ${TRYTON_SITES}
+TRYTON_SITES=	http://downloads.tryton.org/${TRYTON_BASEVER}/
+MASTER_SITES=	${TRYTON_SITES}
 
 DIST_SUBDIR=	tryton-${TRYTON_BASEVER}
 
-PYTHON_VERSIONS_ACCEPTED=    27 # py-gtk2 via py-pycha via py-relatorio
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 via py-pycha via py-relatorio
 # predefine these so modules don't have to.
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile
index bad5a96782a..72571ad52c6 100644
--- a/devel/py-unit/Makefile
+++ b/devel/py-unit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/09/02 13:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 10:18:30 rillig Exp $
 
 DISTNAME=	pyunit-1.4.1
 PKGNAME=	${PYPKGPREFIX}-unit-1.4.1
@@ -12,8 +12,8 @@ COMMENT=	Unit testing framework for python
 
 EGG_NAME=	PyUnit-${PKGVERSION_NOREV}
 
-PYTHON_SELF_CONFLICT=	yes
-PYTHON_VERSIONS_ACCEPTED=	 27
+PYTHON_SELF_CONFLICT=		yes
+PYTHON_VERSIONS_ACCEPTED=	27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-unitgui/Makefile b/devel/py-unitgui/Makefile
index f0789ee4f12..ba807e2ce30 100644
--- a/devel/py-unitgui/Makefile
+++ b/devel/py-unitgui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/09/02 13:19:41 adam Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 10:18:30 rillig Exp $
 
 DISTNAME=	pyunit-1.4.1
 PKGNAME=	${PYPKGPREFIX}-unitgui-1.4.1
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 EGG_NAME=	PyUnit-${PKGVERSION_NOREV}
 
-PYTHON_VERSIONS_ACCEPTED=	 27
+PYTHON_VERSIONS_ACCEPTED=	27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-visitor/Makefile b/devel/py-visitor/Makefile
index 32c59bdcf86..55e534f8f10 100644
--- a/devel/py-visitor/Makefile
+++ b/devel/py-visitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/10/23 15:20:45 adam Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 10:18:30 rillig Exp $
 
 DISTNAME=	visitor-0.1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/mbr/visitor
 COMMENT=	Tiny pythonic visitor implementation
 LICENSE=	mit
 
-#DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+#DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 #BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
 
 USE_LANGUAGES=	# none
diff --git a/devel/py-windbg/Makefile b/devel/py-windbg/Makefile
index 5eae1000191..613d30baaa2 100644
--- a/devel/py-windbg/Makefile
+++ b/devel/py-windbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/09/02 13:19:42 adam Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 10:18:30 rillig Exp $
 
 DISTNAME=	winpdb-1.4.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2 # or later
 
 DEPENDS+=	${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets
 
-PYTHON_VERSIONS_ACCEPTED=	 27 # py-wxWidgets
+PYTHON_VERSIONS_ACCEPTED=	27 # py-wxWidgets
 
 USE_LANGUAGES=	#none
 
diff --git a/devel/py-zanata-python-client/Makefile b/devel/py-zanata-python-client/Makefile
index 79aed0ea81e..dd70cc36d7d 100644
--- a/devel/py-zanata-python-client/Makefile
+++ b/devel/py-zanata-python-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/09/02 13:19:38 adam Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 10:18:30 rillig Exp $
 
 DISTNAME=	zanata-python-client-1.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-polib-[0-9]*:../../devel/py-polib
 DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 
 # Marked for 2.6 and 2.7 only
-PYTHON_VERSIONS_ACCEPTED=	 27
+PYTHON_VERSIONS_ACCEPTED= 27
 USE_LANGUAGES=	# none
 
 SUBST_CLASSES+=			version