pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/p*: fix pkglint indentation warnings



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat Jan 27 23:17:02 2018 +0000
Changeset:	36efccc8ac43265dd6624c791e4dd556d16fc4b2

Modified Files:
	p4/Makefile.common
	p5-Asterisk-vicidial/Makefile
	p5-CGI-Application-Dispatch/Makefile
	p5-CGI-Application-Plugin-ConfigAuto/Makefile
	p5-CGI-Application-Plugin-ErrorPage/Makefile
	p5-CGI-Application-Plugin-Forward/Makefile
	p5-CGI-Application-Server/Makefile
	p5-CGI-Expand/Makefile
	p5-Catalyst-Component-InstancePerContext/Makefile
	p5-Catalyst-Controller-DBIC-API/Makefile
	p5-Catalyst-Engine-Apache/Makefile
	p5-Catalyst-Helper-Model-Email/Makefile
	p5-Catalyst-Plugin-Cache-FileCache/Makefile
	p5-Catalyst-Plugin-Compress-Zlib/Makefile
	p5-Catalyst-Plugin-Email/Makefile
	p5-Catalyst-Plugin-FillInForm/Makefile
	p5-Catalyst-Plugin-FormValidator/Makefile
	p5-Catalyst-Plugin-Prototype/Makefile
	p5-Catalyst-Plugin-Static/Makefile
	p5-Catalyst-Plugin-SubRequest/Makefile
	p5-Catalyst-Plugin-Unicode-Encoding/Makefile
	p5-Catalyst-View-XML-Feed/Makefile
	p5-Class-DBI-SQLite/Makefile
	p5-Class-DBI-Sweet/Makefile
	p5-Data-DPath-Validator/Makefile
	p5-Data-DPath/Makefile
	p5-Egg-Plugin-Crypt-CBC/Makefile
	p5-Email-AddressParser/Makefile
	p5-FCGI-Daemon/Makefile
	p5-GPS-Garmin/Makefile
	p5-Image-EXIF/Makefile
	p5-Iterator-Util/Makefile
	p5-Iterator/Makefile
	p5-Lingua-StopWords/Makefile
	p5-Math-FixedPrecision/Makefile
	p5-Module-Pluggable-Ordered/Makefile
	p5-MongoDB/Makefile
	p5-MooseX-Iterator/Makefile
	p5-MooseX-Role-BuildInstanceOf/Makefile
	p5-Net-Delicious/Makefile
	p5-Net-SMS-Clickatell/Makefile
	p5-Net-Syslog/Makefile
	p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
	p5-Plucene/Makefile
	p5-PluceneSimple/Makefile
	p5-Shell-Command/Makefile
	p5-Sub-Prototype/Makefile
	p5-Sys-MemInfo/Makefile
	p5-Test-Most/Makefile
	p5-Test-Stub/Makefile
	p5-Text-CHM/Makefile
	p5-URI-Find-Rule/Makefile
	p5-Unicode-CheckUTF8/Makefile
	p5-WWW-YouTube-VideoURI/Makefile
	p5-WebService-CIA/Makefile
	p5-mha4mysql-manager/Makefile
	p5-mha4mysql-node/Makefile
	p5-spf-policyd/Makefile
	p5-transdecoder/PLIST
	p5-xmlsig-svn/Makefile
	p6-Grammar-Profiler-Simple/Makefile
	p6-Perl6-MIME-Base64/Makefile
	p6-Pod-To-HTML/Makefile
	p6-Template-Mustache/Makefile
	p6-Terminal-ANSIColor/Makefile
	p6-grammar-debugger/Makefile
	p6-json/Makefile
	p6-json_fast/Makefile
	p6-oo-monitors/Makefile
	p6-perl6-digest-md5/Makefile
	p6-perl6-encode/Makefile
	p6-perl6-http-status/Makefile
	p6-svg-plot/Makefile
	p6-svg/Makefile
	p6-test-mock/Makefile
	p6-uri/Makefile
	p6-xml-writer/Makefile
	palp/Makefile
	pam-pkcs11/Makefile
	pam-pkcs11/PLIST.common
	pan2-git/Makefile
	parallel/PLIST
	paraview/Makefile
	parcellite/Makefile
	pbbam/PLIST
	pbcopper/PLIST
	pbcopper/buildlink3.mk
	pbseqan/PLIST
	pdftk/Makefile
	pdftk/PLIST
	pear-Base/Makefile
	pear-CakePHP_CodeSniffer/Makefile
	pear-ConsoleTools/Makefile
	pear-FPDF/Makefile
	pear-File_Iterator/Makefile
	pear-Finder/Makefile
	pear-FinderFacade/Makefile
	pear-Horde_Db/Makefile
	pear-PHPUnit_MockObject/Makefile
	pear-PHP_CodeCoverage/Makefile
	pear-PHP_CodeSniffer/Makefile
	pear-PHP_Depend/Makefile
	pear-PHP_Invoker/Makefile
	pear-PHP_PMD/Makefile
	pear-PHP_Timer/Makefile
	pear-PHP_TokenStream/Makefile
	pear-Swift/Makefile
	pear-Text_Template/Makefile
	pear-Version/Makefile
	pear-Yaml/Makefile
	pear-fDOMDocument/Makefile
	pear-phpcpd/Makefile
	pear-phpdcd/Makefile
	pear-phploc/Makefile
	peercoin/Makefile
	pessulus/Makefile
	pgplot/Makefile
	pgplot/PLIST
	pgstudio/Makefile
	phantomjs/Makefile
	phantomjs2/Makefile
	php-composer/Makefile
	php-doc-br/Makefile
	php-doc-de/Makefile
	php-doc-en/Makefile
	php-doc-es/Makefile
	php-doc-fr/Makefile
	php-doc-ja/Makefile
	php-doc-pl/Makefile
	php-doc-ro/Makefile
	php-doc-ru/Makefile
	php-doc-tr/Makefile
	php-doc-zh/Makefile
	php-doc/Makefile.template
	php-libawl-git/Makefile
	php-tclink/Makefile
	picolisp64/Makefile
	picosat/Makefile
	pidgin-festival/Makefile
	pilemc-svn/Makefile
	pinball/Makefile
	piwik/Makefile
	pjproject/buildlink3.mk
	pkg_fake/PLIST
	plasma-workspace/buildlink3.mk
	plasma-workspace/hacks.mk
	plink/Makefile
	poedit/Makefile
	polarssl11/Makefile
	polarssl11/buildlink3.mk
	polkit-git/Makefile
	polymul/Makefile
	pop3.proxy/Makefile
	postfix-logwatch/Makefile.common
	postoffice/Makefile
	postr/Makefile
	ppr/Makefile
	praat/Makefile
	primecoin/Makefile
	probcons/Makefile
	prosody/Makefile
	prover9/Makefile
	proxychains-ng/PLIST
	proxyknife/Makefile
	prpltwtr/Makefile
	psh/Makefile
	psybnc/Makefile
	ptlib/buildlink3.mk
	pulseaudio-git/Makefile
	pulseaudio-git/PLIST
	pure/Makefile
	purple-facebook/Makefile
	pwnat/Makefile
	pxlib/PLIST
	py-Brenda/Makefile
	py-DirectoryStorage/Makefile
	py-EMpy/Makefile
	py-EditObj2/Makefile
	py-Kallithea/Makefile
	py-PyPE/Makefile
	py-PythonDirector/Makefile
	py-PythonMagick/Makefile
	py-RXP/Makefile
	py-achemkit/Makefile
	py-acq4/Makefile
	py-aesthete/Makefile
	py-agaro/Makefile
	py-ahoy/Makefile
	py-aigo/Makefile
	py-aikif/Makefile
	py-albatross/Makefile
	py-algebraic/Makefile
	py-algebraixlib/Makefile
	py-applpy/Makefile
	py-asciimathml/Makefile
	py-aspects/Makefile
	py-atmark/Makefile
	py-atom/Makefile
	py-bandit/Makefile
	py-bannock/Makefile
	py-bigfloat/Makefile
	py-bip/Makefile
	py-biskit/Makefile
	py-bitsets/Makefile
	py-blaze/Makefile
	py-blist/Makefile
	py-booktype/Makefile
	py-brian/Makefile
	py-bruce/Makefile
	py-calphad/Makefile
	py-calverter/Makefile
	py-canonicaljson/Makefile
	py-causalinfo/Makefile
	py-cbc/Makefile
	py-cexprtk/Makefile
	py-cf-python/Makefile
	py-chaintipy/Makefile
	py-chebpy/Makefile
	py-chinup/Makefile
	py-chompack/Makefile
	py-christofides/Makefile
	py-cli/Makefile
	py-clickatell/Makefile
	py-clics/Makefile
	py-clid/Makefile
	py-cligj/Makefile
	py-cloudlib/Makefile
	py-cma/Makefile
	py-cmtoolkit/Makefile
	py-cnfgen/Makefile
	py-coala/Makefile
	py-cobra/Makefile
	py-cogapp/Makefile
	py-cogent/Makefile
	py-complexsystems/Makefile
	py-concepts/Makefile
	py-conda/Makefile
	py-corpus/Makefile
	py-corrfitter/Makefile
	py-cryptoidlib/Makefile
	py-csp/Makefile
	py-cutadapt/buildlink3.mk
	py-cva/Makefile
	py-cythongsl/Makefile
	py-dana/Makefile
	py-dbglog/Makefile
	py-dbglog/buildlink3.mk
	py-deltasigma/Makefile
	py-dependency_management/Makefile
	py-dependenpy/Makefile
	py-dexy/Makefile
	py-dexy_viewer/Makefile
	py-dicom/Makefile
	py-diffpy-structure/Makefile
	py-dill/Makefile
	py-divmod-epsilon/Makefile
	py-django-markwhat/Makefile
	py-django-registration/Makefile
	py-dns-clientsubnetoption/Makefile
	py-downhill/Makefile
	py-duali/Makefile
	py-dubins/Makefile
	py-easymodeler/Makefile
	py-ecos/Makefile
	py-eemeter/Makefile
	py-eigency/Makefile
	py-engfmt/Makefile
	py-enumit/Makefile
	py-epigrass/Makefile
	py-errorhandler/Makefile
	py-escher/Makefile
	py-eventlet/Makefile
	py-fancyimpute/Makefile
	py-fanova/Makefile
	py-fatiando/Makefile
	py-fcn/Makefile
	py-fdasrsf/Makefile
	py-fedmsg/Makefile
	py-fiona/Makefile
	py-fix-yahoo-finance/Makefile
	py-fjd/Makefile
	py-fluiddyn/Makefile
	py-forthon/Makefile
	py-fortpy/Makefile
	py-frozendict/Makefile
	py-fwm-ensayo/Makefile
	py-gato/Makefile
	py-gbpy/Makefile
	py-gcalendarsync/Makefile
	py-gem/Makefile
	py-gmpy2/Makefile
	py-gnm/Makefile
	py-golangenv/Makefile
	py-gosam/Makefile
	py-graphs/Makefile
	py-grpy/Makefile
	py-guppy/Makefile
	py-gvar/Makefile
	py-gwpy/Makefile
	py-gwsurrogate/Makefile
	py-hamilton/Makefile
	py-hamnonlineng/Makefile
	py-harvestingkit/Makefile
	py-hcluster/Makefile
	py-hddm/Makefile
	py-healpy/Makefile
	py-helio/Makefile
	py-hessianfree/Makefile
	py-hmf/Makefile
	py-htmlparser/Makefile
	py-icane/Makefile
	py-igraph/Makefile
	py-iisignature/Makefile
	py-inspyred/Makefile
	py-ioflo/Makefile
	py-iprogress/Makefile
	py-irco/Makefile
	py-jabber-aimt/Makefile
	py-jabber-icqt/Makefile
	py-jabber-idavoll/Makefile
	py-jabber-punjab/Makefile
	py-jbessel/Makefile
	py-jitcode/Makefile
	py-jsonpath/Makefile
	py-kabuki/Makefile
	py-keras/Makefile
	py-kivy/Makefile
	py-knnimpute/Makefile
	py-knockknock/Makefile
	py-krylov/Makefile
	py-krypy/Makefile
	py-lapack/Makefile
	py-larry/Makefile
	py-lds/Makefile
	py-lea/Makefile
	py-lenstools/Makefile
	py-lhafile/Makefile
	py-lib/Makefile
	py-libmpdclient2/Makefile
	py-libnacl/Makefile
	py-libtunepimp/Makefile
	py-linearalgebra/Makefile
	py-lmfit/Makefile
	py-logilab-pigg/Makefile
	py-louvain/Makefile
	py-lrparsing/Makefile
	py-lsqfit/Makefile
	py-m2ext/Makefile
	py-macaroons/Makefile
	py-mark/Makefile
	py-math-snappy/Makefile
	py-matrix-angular-sdk/Makefile
	py-mave/Makefile
	py-mdanalysis/Makefile
	py-mdtraj/Makefile
	py-mendeleev/Makefile
	py-minidb/Makefile
	py-monad/Makefile
	py-mox/Makefile
	py-msumastro/Makefile
	py-multiprocess/Makefile
	py-multitasking/Makefile
	py-mystic/Makefile
	py-naima/Makefile
	py-neovim/Makefile
	py-netcdf/Makefile
	py-netflowvizu/Makefile
	py-nilearn/Makefile
	py-nipy-data/Makefile
	py-nipy/Makefile
	py-notify-dev/buildlink3.mk
	py-ntch/Makefile
	py-oct2py/Makefile
	py-odeint/Makefile
	py-odesys/Makefile
	py-okasha/Makefile
	py-okpy/Makefile
	py-openxmllib/Makefile
	py-ordereddict/Makefile
	py-othman/Makefile
	py-owslib/Makefile
	py-paegan/Makefile
	py-paida/Makefile
	py-papyon/Makefile
	py-pcapy/Makefile
	py-peng/Makefile
	py-percol/Makefile
	py-peru/Makefile
	py-piquant/Makefile
	py-plac/Makefile
	py-plink/Makefile
	py-plucker/Makefile
	py-postmarkup/Makefile
	py-prayertime/Makefile
	py-prel/Makefile
	py-propyte/Makefile
	py-pyaiml/Makefile
	py-pyamg/Makefile
	py-pycifrw/Makefile
	py-pycryptodomex/Makefile
	py-pydenticon/Makefile
	py-pydy/Makefile
	py-pyecm/Makefile
	py-pyentropy/Makefile
	py-pyfaces/Makefile
	py-pygr/Makefile
	py-pylons/Makefile
	py-pymbolic/Makefile
	py-pymigemo/Makefile
	py-pynn/Makefile
	py-pypi-browser/Makefile
	py-pyqu/Makefile
	py-pyquante/Makefile
	py-pysaml2/Makefile
	py-pyside-shiboken/Makefile
	py-pyside-tools/Makefile
	py-pyside/Makefile
	py-pyside/buildlink3.mk
	py-pytools/Makefile
	py-pyvib2/Makefile
	py-qequ/Makefile
	py-qmath/Makefile
	py-qnet/Makefile
	py-quaternions/Makefile
	py-qutrub/Makefile
	py-raphrase/Makefile
	py-reducer/Makefile
	py-remctl/Makefile
	py-repoze.who/Makefile
	py-restkit/Makefile
	py-rlcompleter2/Makefile
	py-ruffus/Makefile
	py-sage/Makefile
	py-sas7bdat/Makefile
	py-sasa/Makefile
	py-scikit-aero/Makefile
	py-scikits_bvp1lg/Makefile
	py-scikits_timeseries/Makefile
	py-scikits_vectorplot/Makefile
	py-sfepy/Makefile
	py-signedjson/Makefile
	py-simpleparse-mxtexttools/Makefile
	py-smcp/Makefile
	py-sode/Makefile
	py-spams/Makefile
	py-sparce/Makefile
	py-spark/Makefile
	py-spatialdata/Makefile
	py-speview/Makefile
	py-sphinxreport/Makefile
	py-spotpy/Makefile
	py-sqlalchemy-searchable/Makefile
	py-ssh2/Makefile
	py-sunpy/Makefile
	py-sydent/Makefile
	py-symcxx/Makefile
	py-tablib-garetjax/Makefile
	py-tashaphyne/Makefile
	py-teafiles/Makefile
	py-technicolor/Makefile
	py-telepathy/Makefile
	py-teng/Makefile
	py-teradata/Makefile
	py-theano/Makefile
	py-toscawidgets/Makefile
	py-traitsgui/Makefile
	py-translationstring/Makefile
	py-trottersuzuki/Makefile
	py-twilio/Makefile
	py-twisted-kqueue/Makefile
	py-twistml/Makefile
	py-txdbus/Makefile
	py-unpaddedbase64/Makefile
	py-vdirsyncer-git/Makefile
	py-vegas/Makefile
	py-version-control-tools-hg/Makefile
	py-vespa/Makefile
	py-viper/buildlink3.mk
	py-visionegg/Makefile
	py-visionegg/buildlink3.mk
	py-vispy/Makefile
	py-wahcade/Makefile
	py-wasanbon/Makefile
	py-websocket/Makefile
	py-wordpress-xmlrpc/Makefile
	py-wxWidgets-unicode/Makefile
	py-xlutils/Makefile
	py-yapf/Makefile
	py-yapgvb/Makefile
	py-yapps2/Makefile
	py-yaprt/Makefile
	py-yellowhiggs/Makefile
	py-z2pack/Makefile
	py-zipline/Makefile
	py-zope.deprecation/Makefile
	pydb/Makefile
	pythia6/Makefile

Log Message:
wip/p*: fix pkglint indentation warnings

pkglint -Wall -F -o aligned p*/

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=36efccc8ac43265dd6624c791e4dd556d16fc4b2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 p4/Makefile.common                                 |  14 +--
 p5-Asterisk-vicidial/Makefile                      |   4 +-
 p5-CGI-Application-Dispatch/Makefile               |   8 +-
 p5-CGI-Application-Plugin-ConfigAuto/Makefile      |   2 +-
 p5-CGI-Application-Plugin-ErrorPage/Makefile       |   6 +-
 p5-CGI-Application-Plugin-Forward/Makefile         |   6 +-
 p5-CGI-Application-Server/Makefile                 |   6 +-
 p5-CGI-Expand/Makefile                             |   2 +-
 p5-Catalyst-Component-InstancePerContext/Makefile  |   2 +-
 p5-Catalyst-Controller-DBIC-API/Makefile           |   2 +-
 p5-Catalyst-Engine-Apache/Makefile                 |   2 +-
 p5-Catalyst-Helper-Model-Email/Makefile            |   2 +-
 p5-Catalyst-Plugin-Cache-FileCache/Makefile        |   2 +-
 p5-Catalyst-Plugin-Compress-Zlib/Makefile          |   2 +-
 p5-Catalyst-Plugin-Email/Makefile                  |   2 +-
 p5-Catalyst-Plugin-FillInForm/Makefile             |   2 +-
 p5-Catalyst-Plugin-FormValidator/Makefile          |   2 +-
 p5-Catalyst-Plugin-Prototype/Makefile              |   2 +-
 p5-Catalyst-Plugin-Static/Makefile                 |   2 +-
 p5-Catalyst-Plugin-SubRequest/Makefile             |   2 +-
 p5-Catalyst-Plugin-Unicode-Encoding/Makefile       |   2 +-
 p5-Catalyst-View-XML-Feed/Makefile                 |   2 +-
 p5-Class-DBI-SQLite/Makefile                       |   2 +-
 p5-Class-DBI-Sweet/Makefile                        |   2 +-
 p5-Data-DPath-Validator/Makefile                   |   2 +-
 p5-Data-DPath/Makefile                             |   2 +-
 p5-Egg-Plugin-Crypt-CBC/Makefile                   |   2 +-
 p5-Email-AddressParser/Makefile                    |   2 +-
 p5-FCGI-Daemon/Makefile                            |  42 +++----
 p5-GPS-Garmin/Makefile                             |   2 +-
 p5-Image-EXIF/Makefile                             |   2 +-
 p5-Iterator-Util/Makefile                          |   2 +-
 p5-Iterator/Makefile                               |   2 +-
 p5-Lingua-StopWords/Makefile                       |   2 +-
 p5-Math-FixedPrecision/Makefile                    |   2 +-
 p5-Module-Pluggable-Ordered/Makefile               |   2 +-
 p5-MongoDB/Makefile                                |   2 +-
 p5-MooseX-Iterator/Makefile                        |   2 +-
 p5-MooseX-Role-BuildInstanceOf/Makefile            |   2 +-
 p5-Net-Delicious/Makefile                          |   4 +-
 p5-Net-SMS-Clickatell/Makefile                     |   4 +-
 p5-Net-Syslog/Makefile                             |   2 +-
 .../Makefile                                       |   2 +-
 p5-Plucene/Makefile                                |   2 +-
 p5-PluceneSimple/Makefile                          |   2 +-
 p5-Shell-Command/Makefile                          |   6 +-
 p5-Sub-Prototype/Makefile                          |   6 +-
 p5-Sys-MemInfo/Makefile                            |   2 +-
 p5-Test-Most/Makefile                              |   6 +-
 p5-Test-Stub/Makefile                              |   2 +-
 p5-Text-CHM/Makefile                               |   2 +-
 p5-URI-Find-Rule/Makefile                          |   4 +-
 p5-Unicode-CheckUTF8/Makefile                      |  16 +--
 p5-WWW-YouTube-VideoURI/Makefile                   |   2 +-
 p5-WebService-CIA/Makefile                         |   8 +-
 p5-mha4mysql-manager/Makefile                      |   4 +-
 p5-mha4mysql-node/Makefile                         |   4 +-
 p5-spf-policyd/Makefile                            |  14 +--
 p5-transdecoder/PLIST                              |  14 +--
 p5-xmlsig-svn/Makefile                             |   4 +-
 p6-Grammar-Profiler-Simple/Makefile                |   4 +-
 p6-Perl6-MIME-Base64/Makefile                      |   4 +-
 p6-Pod-To-HTML/Makefile                            |   6 +-
 p6-Template-Mustache/Makefile                      |   4 +-
 p6-Terminal-ANSIColor/Makefile                     |   4 +-
 p6-grammar-debugger/Makefile                       |   4 +-
 p6-json/Makefile                                   |   4 +-
 p6-json_fast/Makefile                              |   4 +-
 p6-oo-monitors/Makefile                            |   4 +-
 p6-perl6-digest-md5/Makefile                       |   4 +-
 p6-perl6-encode/Makefile                           |   4 +-
 p6-perl6-http-status/Makefile                      |   4 +-
 p6-svg-plot/Makefile                               |   4 +-
 p6-svg/Makefile                                    |   4 +-
 p6-test-mock/Makefile                              |   4 +-
 p6-uri/Makefile                                    |   4 +-
 p6-xml-writer/Makefile                             |   6 +-
 palp/Makefile                                      |   4 +-
 pam-pkcs11/Makefile                                |   2 +-
 pam-pkcs11/PLIST.common                            |   2 +-
 pan2-git/Makefile                                  |   2 +-
 parallel/PLIST                                     |   8 +-
 paraview/Makefile                                  |  10 +-
 parcellite/Makefile                                |   4 +-
 pbbam/PLIST                                        |  76 ++++++-------
 pbcopper/PLIST                                     |  42 +++----
 pbcopper/buildlink3.mk                             |   2 +-
 pbseqan/PLIST                                      | 122 ++++++++++-----------
 pdftk/Makefile                                     |  26 ++---
 pdftk/PLIST                                        |   2 +-
 pear-Base/Makefile                                 |   2 +-
 pear-CakePHP_CodeSniffer/Makefile                  |   2 +-
 pear-ConsoleTools/Makefile                         |   2 +-
 pear-FPDF/Makefile                                 |   2 +-
 pear-File_Iterator/Makefile                        |   2 +-
 pear-Finder/Makefile                               |   2 +-
 pear-FinderFacade/Makefile                         |   2 +-
 pear-Horde_Db/Makefile                             |   2 +-
 pear-PHPUnit_MockObject/Makefile                   |   2 +-
 pear-PHP_CodeCoverage/Makefile                     |   2 +-
 pear-PHP_CodeSniffer/Makefile                      |   2 +-
 pear-PHP_Depend/Makefile                           |   2 +-
 pear-PHP_Invoker/Makefile                          |   2 +-
 pear-PHP_PMD/Makefile                              |   2 +-
 pear-PHP_Timer/Makefile                            |   2 +-
 pear-PHP_TokenStream/Makefile                      |   2 +-
 pear-Swift/Makefile                                |   2 +-
 pear-Text_Template/Makefile                        |   2 +-
 pear-Version/Makefile                              |   2 +-
 pear-Yaml/Makefile                                 |   2 +-
 pear-fDOMDocument/Makefile                         |   2 +-
 pear-phpcpd/Makefile                               |   2 +-
 pear-phpdcd/Makefile                               |   2 +-
 pear-phploc/Makefile                               |   2 +-
 peercoin/Makefile                                  |  18 +--
 pessulus/Makefile                                  |   8 +-
 pgplot/Makefile                                    |   8 +-
 pgplot/PLIST                                       |   2 +-
 pgstudio/Makefile                                  |   2 +-
 phantomjs/Makefile                                 |   4 +-
 phantomjs2/Makefile                                |   4 +-
 php-composer/Makefile                              |  10 +-
 php-doc-br/Makefile                                |   2 +-
 php-doc-de/Makefile                                |   2 +-
 php-doc-en/Makefile                                |   2 +-
 php-doc-es/Makefile                                |   2 +-
 php-doc-fr/Makefile                                |   2 +-
 php-doc-ja/Makefile                                |   2 +-
 php-doc-pl/Makefile                                |   2 +-
 php-doc-ro/Makefile                                |   2 +-
 php-doc-ru/Makefile                                |   2 +-
 php-doc-tr/Makefile                                |   2 +-
 php-doc-zh/Makefile                                |   2 +-
 php-doc/Makefile.template                          |  10 +-
 php-libawl-git/Makefile                            |   6 +-
 php-tclink/Makefile                                |   2 +-
 picolisp64/Makefile                                |   2 +-
 picosat/Makefile                                   |   2 +-
 pidgin-festival/Makefile                           |   2 +-
 pilemc-svn/Makefile                                |  16 +--
 pinball/Makefile                                   |  12 +-
 piwik/Makefile                                     |   2 +-
 pjproject/buildlink3.mk                            |   4 +-
 pkg_fake/PLIST                                     |   2 +-
 plasma-workspace/buildlink3.mk                     |   2 +-
 plasma-workspace/hacks.mk                          |   2 +-
 plink/Makefile                                     |   2 +-
 poedit/Makefile                                    |  12 +-
 polarssl11/Makefile                                |   4 +-
 polarssl11/buildlink3.mk                           |   2 +-
 polkit-git/Makefile                                |  12 +-
 polymul/Makefile                                   |   6 +-
 pop3.proxy/Makefile                                |   2 +-
 postfix-logwatch/Makefile.common                   |   2 +-
 postoffice/Makefile                                |  14 +--
 postr/Makefile                                     |   2 +-
 ppr/Makefile                                       |   2 +-
 praat/Makefile                                     |   4 +-
 primecoin/Makefile                                 |   8 +-
 probcons/Makefile                                  |   2 +-
 prosody/Makefile                                   |   8 +-
 prover9/Makefile                                   |   4 +-
 proxychains-ng/PLIST                               |   2 +-
 proxyknife/Makefile                                |   8 +-
 prpltwtr/Makefile                                  |   2 +-
 psh/Makefile                                       |   2 +-
 psybnc/Makefile                                    |  20 ++--
 ptlib/buildlink3.mk                                |   4 +-
 pulseaudio-git/Makefile                            |  22 ++--
 pulseaudio-git/PLIST                               |   2 +-
 pure/Makefile                                      |   8 +-
 purple-facebook/Makefile                           |   4 +-
 pwnat/Makefile                                     |   4 +-
 pxlib/PLIST                                        |   2 +-
 py-Brenda/Makefile                                 |   4 +-
 py-DirectoryStorage/Makefile                       |   4 +-
 py-EMpy/Makefile                                   |   6 +-
 py-EditObj2/Makefile                               |   2 +-
 py-Kallithea/Makefile                              |   4 +-
 py-PyPE/Makefile                                   |   4 +-
 py-PythonDirector/Makefile                         |   4 +-
 py-PythonMagick/Makefile                           |   8 +-
 py-RXP/Makefile                                    |   2 +-
 py-achemkit/Makefile                               |   2 +-
 py-acq4/Makefile                                   |   2 +-
 py-aesthete/Makefile                               |   4 +-
 py-agaro/Makefile                                  |   2 +-
 py-ahoy/Makefile                                   |   2 +-
 py-aigo/Makefile                                   |   2 +-
 py-aikif/Makefile                                  |   2 +-
 py-albatross/Makefile                              |  10 +-
 py-algebraic/Makefile                              |   2 +-
 py-algebraixlib/Makefile                           |   2 +-
 py-applpy/Makefile                                 |   2 +-
 py-asciimathml/Makefile                            |   2 +-
 py-aspects/Makefile                                |   2 +-
 py-atmark/Makefile                                 |   2 +-
 py-atom/Makefile                                   |   4 +-
 py-bandit/Makefile                                 |  10 +-
 py-bannock/Makefile                                |   2 +-
 py-bigfloat/Makefile                               |   2 +-
 py-bip/Makefile                                    |   2 +-
 py-biskit/Makefile                                 |   2 +-
 py-bitsets/Makefile                                |   2 +-
 py-blaze/Makefile                                  |   2 +-
 py-blist/Makefile                                  |   4 +-
 py-booktype/Makefile                               |   2 +-
 py-brian/Makefile                                  |   2 +-
 py-bruce/Makefile                                  |   2 +-
 py-calphad/Makefile                                |   8 +-
 py-calverter/Makefile                              |   2 +-
 py-canonicaljson/Makefile                          |  14 +--
 py-causalinfo/Makefile                             |   2 +-
 py-cbc/Makefile                                    |   2 +-
 py-cexprtk/Makefile                                |   4 +-
 py-cf-python/Makefile                              |   2 +-
 py-chaintipy/Makefile                              |   2 +-
 py-chebpy/Makefile                                 |   4 +-
 py-chinup/Makefile                                 |   2 +-
 py-chompack/Makefile                               |   2 +-
 py-christofides/Makefile                           |   2 +-
 py-cli/Makefile                                    |   2 +-
 py-clickatell/Makefile                             |  18 +--
 py-clics/Makefile                                  |   6 +-
 py-clid/Makefile                                   |   2 +-
 py-cligj/Makefile                                  |   2 +-
 py-cloudlib/Makefile                               |   2 +-
 py-cma/Makefile                                    |  14 +--
 py-cmtoolkit/Makefile                              |   2 +-
 py-cnfgen/Makefile                                 |   2 +-
 py-coala/Makefile                                  |   2 +-
 py-cobra/Makefile                                  |   2 +-
 py-cogapp/Makefile                                 |   2 +-
 py-cogent/Makefile                                 |   6 +-
 py-complexsystems/Makefile                         |   8 +-
 py-concepts/Makefile                               |   2 +-
 py-conda/Makefile                                  |   6 +-
 py-corpus/Makefile                                 |   4 +-
 py-corrfitter/Makefile                             |   4 +-
 py-cryptoidlib/Makefile                            |   2 +-
 py-csp/Makefile                                    |  10 +-
 py-cutadapt/buildlink3.mk                          |   2 +-
 py-cva/Makefile                                    |   2 +-
 py-cythongsl/Makefile                              |   2 +-
 py-dana/Makefile                                   |   2 +-
 py-dbglog/Makefile                                 |   8 +-
 py-dbglog/buildlink3.mk                            |   2 +-
 py-deltasigma/Makefile                             |   2 +-
 py-dependency_management/Makefile                  |   4 +-
 py-dependenpy/Makefile                             |   2 +-
 py-dexy/Makefile                                   |   8 +-
 py-dexy_viewer/Makefile                            |   6 +-
 py-dicom/Makefile                                  |   4 +-
 py-diffpy-structure/Makefile                       |   2 +-
 py-dill/Makefile                                   |   2 +-
 py-divmod-epsilon/Makefile                         |   8 +-
 py-django-markwhat/Makefile                        |   6 +-
 py-django-registration/Makefile                    |   2 +-
 py-dns-clientsubnetoption/Makefile                 |   4 +-
 py-downhill/Makefile                               |   2 +-
 py-duali/Makefile                                  |   2 +-
 py-dubins/Makefile                                 |   2 +-
 py-easymodeler/Makefile                            |   4 +-
 py-ecos/Makefile                                   |   2 +-
 py-eemeter/Makefile                                |   2 +-
 py-eigency/Makefile                                |   6 +-
 py-engfmt/Makefile                                 |   2 +-
 py-enumit/Makefile                                 |   2 +-
 py-epigrass/Makefile                               |   4 +-
 py-errorhandler/Makefile                           |  10 +-
 py-escher/Makefile                                 |   6 +-
 py-eventlet/Makefile                               |   2 +-
 py-fancyimpute/Makefile                            |   6 +-
 py-fanova/Makefile                                 |   2 +-
 py-fatiando/Makefile                               |   2 +-
 py-fcn/Makefile                                    |   2 +-
 py-fdasrsf/Makefile                                |   2 +-
 py-fedmsg/Makefile                                 |   6 +-
 py-fiona/Makefile                                  |   2 +-
 py-fix-yahoo-finance/Makefile                      |   2 +-
 py-fjd/Makefile                                    |   2 +-
 py-fluiddyn/Makefile                               |   4 +-
 py-forthon/Makefile                                |   2 +-
 py-fortpy/Makefile                                 |   2 +-
 py-frozendict/Makefile                             |   6 +-
 py-fwm-ensayo/Makefile                             |   2 +-
 py-gato/Makefile                                   |   2 +-
 py-gbpy/Makefile                                   |   2 +-
 py-gcalendarsync/Makefile                          |   2 +-
 py-gem/Makefile                                    |   2 +-
 py-gmpy2/Makefile                                  |   2 +-
 py-gnm/Makefile                                    |   2 +-
 py-golangenv/Makefile                              |   2 +-
 py-gosam/Makefile                                  |   2 +-
 py-graphs/Makefile                                 |   2 +-
 py-grpy/Makefile                                   |   8 +-
 py-guppy/Makefile                                  |   2 +-
 py-gvar/Makefile                                   |   2 +-
 py-gwpy/Makefile                                   |   6 +-
 py-gwsurrogate/Makefile                            |   2 +-
 py-hamilton/Makefile                               |   2 +-
 py-hamnonlineng/Makefile                           |   2 +-
 py-harvestingkit/Makefile                          |   2 +-
 py-hcluster/Makefile                               |   2 +-
 py-hddm/Makefile                                   |   4 +-
 py-healpy/Makefile                                 |   2 +-
 py-helio/Makefile                                  |   2 +-
 py-hessianfree/Makefile                            |   2 +-
 py-hmf/Makefile                                    |   4 +-
 py-htmlparser/Makefile                             |   2 +-
 py-icane/Makefile                                  |   2 +-
 py-igraph/Makefile                                 |  10 +-
 py-iisignature/Makefile                            |   4 +-
 py-inspyred/Makefile                               |   2 +-
 py-ioflo/Makefile                                  |   4 +-
 py-iprogress/Makefile                              |   6 +-
 py-irco/Makefile                                   |   2 +-
 py-jabber-aimt/Makefile                            |  10 +-
 py-jabber-icqt/Makefile                            |   8 +-
 py-jabber-idavoll/Makefile                         |   4 +-
 py-jabber-punjab/Makefile                          |   4 +-
 py-jbessel/Makefile                                |   2 +-
 py-jitcode/Makefile                                |   2 +-
 py-jsonpath/Makefile                               |   2 +-
 py-kabuki/Makefile                                 |   2 +-
 py-keras/Makefile                                  |   2 +-
 py-kivy/Makefile                                   |   4 +-
 py-knnimpute/Makefile                              |   2 +-
 py-knockknock/Makefile                             |   2 +-
 py-krylov/Makefile                                 |  12 +-
 py-krypy/Makefile                                  |   2 +-
 py-lapack/Makefile                                 |   2 +-
 py-larry/Makefile                                  |   2 +-
 py-lds/Makefile                                    |   2 +-
 py-lea/Makefile                                    |  12 +-
 py-lenstools/Makefile                              |   2 +-
 py-lhafile/Makefile                                |  24 ++--
 py-lib/Makefile                                    |  42 +++----
 py-libmpdclient2/Makefile                          |   2 +-
 py-libnacl/Makefile                                |   4 +-
 py-libtunepimp/Makefile                            |   4 +-
 py-linearalgebra/Makefile                          |   2 +-
 py-lmfit/Makefile                                  |   2 +-
 py-logilab-pigg/Makefile                           |   2 +-
 py-louvain/Makefile                                |   4 +-
 py-lrparsing/Makefile                              |   2 +-
 py-lsqfit/Makefile                                 |   4 +-
 py-m2ext/Makefile                                  |   6 +-
 py-macaroons/Makefile                              |  12 +-
 py-mark/Makefile                                   |   2 +-
 py-math-snappy/Makefile                            |   4 +-
 py-matrix-angular-sdk/Makefile                     |  14 +--
 py-mave/Makefile                                   |   2 +-
 py-mdanalysis/Makefile                             |   2 +-
 py-mdtraj/Makefile                                 |   2 +-
 py-mendeleev/Makefile                              |   2 +-
 py-minidb/Makefile                                 |   2 +-
 py-monad/Makefile                                  |   2 +-
 py-mox/Makefile                                    |   2 +-
 py-msumastro/Makefile                              |   2 +-
 py-multiprocess/Makefile                           |   2 +-
 py-multitasking/Makefile                           |   2 +-
 py-mystic/Makefile                                 |   4 +-
 py-naima/Makefile                                  |   6 +-
 py-neovim/Makefile                                 |   6 +-
 py-netcdf/Makefile                                 |   2 +-
 py-netflowvizu/Makefile                            |   2 +-
 py-nilearn/Makefile                                |   6 +-
 py-nipy-data/Makefile                              |   2 +-
 py-nipy/Makefile                                   |   2 +-
 py-notify-dev/buildlink3.mk                        |   2 +-
 py-ntch/Makefile                                   |   2 +-
 py-oct2py/Makefile                                 |   2 +-
 py-odeint/Makefile                                 |   2 +-
 py-odesys/Makefile                                 |   8 +-
 py-okasha/Makefile                                 |   2 +-
 py-okpy/Makefile                                   |   2 +-
 py-openxmllib/Makefile                             |   2 +-
 py-ordereddict/Makefile                            |   2 +-
 py-othman/Makefile                                 |   8 +-
 py-owslib/Makefile                                 |   2 +-
 py-paegan/Makefile                                 |   2 +-
 py-paida/Makefile                                  |   2 +-
 py-papyon/Makefile                                 |   2 +-
 py-pcapy/Makefile                                  |   6 +-
 py-peng/Makefile                                   |   8 +-
 py-percol/Makefile                                 |   2 +-
 py-peru/Makefile                                   |   4 +-
 py-piquant/Makefile                                |  10 +-
 py-plac/Makefile                                   |   2 +-
 py-plink/Makefile                                  |   2 +-
 py-plucker/Makefile                                |   2 +-
 py-postmarkup/Makefile                             |   2 +-
 py-prayertime/Makefile                             |   4 +-
 py-prel/Makefile                                   |   2 +-
 py-propyte/Makefile                                |   2 +-
 py-pyaiml/Makefile                                 |   2 +-
 py-pyamg/Makefile                                  |   2 +-
 py-pycifrw/Makefile                                |   4 +-
 py-pycryptodomex/Makefile                          |  12 +-
 py-pydenticon/Makefile                             |   8 +-
 py-pydy/Makefile                                   |   2 +-
 py-pyecm/Makefile                                  |   4 +-
 py-pyentropy/Makefile                              |   2 +-
 py-pyfaces/Makefile                                |   2 +-
 py-pygr/Makefile                                   |   4 +-
 py-pylons/Makefile                                 |   6 +-
 py-pymbolic/Makefile                               |   4 +-
 py-pymigemo/Makefile                               |   6 +-
 py-pynn/Makefile                                   |   2 +-
 py-pypi-browser/Makefile                           |   2 +-
 py-pyqu/Makefile                                   |   4 +-
 py-pyquante/Makefile                               |   4 +-
 py-pysaml2/Makefile                                |  22 ++--
 py-pyside-shiboken/Makefile                        |   8 +-
 py-pyside-tools/Makefile                           |   8 +-
 py-pyside/Makefile                                 |   8 +-
 py-pyside/buildlink3.mk                            |   2 +-
 py-pytools/Makefile                                |   6 +-
 py-pyvib2/Makefile                                 |   2 +-
 py-qequ/Makefile                                   |   2 +-
 py-qmath/Makefile                                  |   2 +-
 py-qnet/Makefile                                   |   2 +-
 py-quaternions/Makefile                            |   2 +-
 py-qutrub/Makefile                                 |   2 +-
 py-raphrase/Makefile                               |   2 +-
 py-reducer/Makefile                                |  10 +-
 py-remctl/Makefile                                 |   6 +-
 py-repoze.who/Makefile                             |   2 +-
 py-restkit/Makefile                                |  10 +-
 py-rlcompleter2/Makefile                           |   2 +-
 py-ruffus/Makefile                                 |   2 +-
 py-sage/Makefile                                   |   2 +-
 py-sas7bdat/Makefile                               |   4 +-
 py-sasa/Makefile                                   |   4 +-
 py-scikit-aero/Makefile                            |   2 +-
 py-scikits_bvp1lg/Makefile                         |   2 +-
 py-scikits_timeseries/Makefile                     |   2 +-
 py-scikits_vectorplot/Makefile                     |   2 +-
 py-sfepy/Makefile                                  |   2 +-
 py-signedjson/Makefile                             |   6 +-
 py-simpleparse-mxtexttools/Makefile                |   2 +-
 py-smcp/Makefile                                   |   2 +-
 py-sode/Makefile                                   |   2 +-
 py-spams/Makefile                                  |   2 +-
 py-sparce/Makefile                                 |   2 +-
 py-spark/Makefile                                  |   4 +-
 py-spatialdata/Makefile                            |   6 +-
 py-speview/Makefile                                |   8 +-
 py-sphinxreport/Makefile                           |   4 +-
 py-spotpy/Makefile                                 |   2 +-
 py-sqlalchemy-searchable/Makefile                  |  16 +--
 py-ssh2/Makefile                                   |  12 +-
 py-sunpy/Makefile                                  |   2 +-
 py-sydent/Makefile                                 |  38 +++----
 py-symcxx/Makefile                                 |   2 +-
 py-tablib-garetjax/Makefile                        |   4 +-
 py-tashaphyne/Makefile                             |   2 +-
 py-teafiles/Makefile                               |   2 +-
 py-technicolor/Makefile                            |   2 +-
 py-telepathy/Makefile                              |  22 ++--
 py-teng/Makefile                                   |   6 +-
 py-teradata/Makefile                               |   2 +-
 py-theano/Makefile                                 |   6 +-
 py-toscawidgets/Makefile                           |   2 +-
 py-traitsgui/Makefile                              |   2 +-
 py-translationstring/Makefile                      |   2 +-
 py-trottersuzuki/Makefile                          |   2 +-
 py-twilio/Makefile                                 |   4 +-
 py-twisted-kqueue/Makefile                         |   4 +-
 py-twistml/Makefile                                |   2 +-
 py-txdbus/Makefile                                 |   2 +-
 py-unpaddedbase64/Makefile                         |  14 +--
 py-vdirsyncer-git/Makefile                         |   4 +-
 py-vegas/Makefile                                  |   2 +-
 py-version-control-tools-hg/Makefile               |   4 +-
 py-vespa/Makefile                                  |   2 +-
 py-viper/buildlink3.mk                             |   2 +-
 py-visionegg/Makefile                              |   8 +-
 py-visionegg/buildlink3.mk                         |   2 +-
 py-vispy/Makefile                                  |   2 +-
 py-wahcade/Makefile                                |  10 +-
 py-wasanbon/Makefile                               |   2 +-
 py-websocket/Makefile                              |   2 +-
 py-wordpress-xmlrpc/Makefile                       |   2 +-
 py-wxWidgets-unicode/Makefile                      |   4 +-
 py-xlutils/Makefile                                |   4 +-
 py-yapf/Makefile                                   |   2 +-
 py-yapgvb/Makefile                                 |  18 +--
 py-yapps2/Makefile                                 |   4 +-
 py-yaprt/Makefile                                  |   2 +-
 py-yellowhiggs/Makefile                            |   2 +-
 py-z2pack/Makefile                                 |   4 +-
 py-zipline/Makefile                                |   2 +-
 py-zope.deprecation/Makefile                       |   2 +-
 pydb/Makefile                                      |   8 +-
 pythia6/Makefile                                   |   2 +-
 497 files changed, 1157 insertions(+), 1157 deletions(-)

diffs:
diff --git a/p4/Makefile.common b/p4/Makefile.common
index 56468d6136..addc85ecd0 100644
--- a/p4/Makefile.common
+++ b/p4/Makefile.common
@@ -38,19 +38,19 @@ EMUL_REQD=		netbsd>=3.0
 .  include "../../mk/bsd.prefs.mk"
 
 .  if ${EMUL_PLATFORM:Mdarwin-*}
-P4ARCH?=	darwin90u
+P4ARCH?=		darwin90u
 .  elif ${EMUL_PLATFORM} == "freebsd-i386"
-P4ARCH?=	freebsd60x86
+P4ARCH?=		freebsd60x86
 .  elif ${EMUL_PLATFORM} == "freebsd-x86_64"
-P4ARCH?=	freebsd60x86_64
+P4ARCH?=		freebsd60x86_64
 .  elif ${EMUL_PLATFORM} == "linux-i386"
-P4ARCH?=	linux26x86
+P4ARCH?=		linux26x86
 .  elif ${EMUL_PLATFORM} == "linux-x86_64"
-P4ARCH?=	linux26x86_64
+P4ARCH?=		linux26x86_64
 .  elif ${EMUL_PLATFORM} == "netbsd-i386" || ${EMUL_PLATFORM} == "netbsd-x86_64"
-P4ARCH?=	netbsd31x86
+P4ARCH?=		netbsd31x86
 .  else
-P4ARCH?=	none
+P4ARCH?=		none
 PKG_FAIL_REASON=	"no p4 binary available for ${EMUL_PLATFORM}"
 .  endif
 
diff --git a/p5-Asterisk-vicidial/Makefile b/p5-Asterisk-vicidial/Makefile
index 1e34bcdb79..b9d768e390 100644
--- a/p5-Asterisk-vicidial/Makefile
+++ b/p5-Asterisk-vicidial/Makefile
@@ -16,8 +16,8 @@ MAKE_PARAMS+=	PREFIX=${PREFIX}/vicidial/asterisk-perl
 # The following  statements were taken from comms/p5-Asterisk Makefile;
 EXAMPLES_DIR=		${PREFIX}/share/examples/p5-Asterisk
 EXAMPLE_FILES=		agi-enum.agi agi-sayani.agi agi-test.agi
-EXAMPLE_FILES+= 	calleridnamelookup.agi manager-test.pl
-EXAMPLE_FILES+= 	tts-bofh.agi tts-line.agi tts-ping.agi
+EXAMPLE_FILES+=		calleridnamelookup.agi manager-test.pl
+EXAMPLE_FILES+=		tts-bofh.agi tts-line.agi tts-ping.agi
 
 .for file in ${EXAMPLE_FILES}
 REPLACE_PERL+=		${WRKSRC}/examples/${file}
diff --git a/p5-CGI-Application-Dispatch/Makefile b/p5-CGI-Application-Dispatch/Makefile
index 1d7075fe22..08384cd62e 100644
--- a/p5-CGI-Application-Dispatch/Makefile
+++ b/p5-CGI-Application-Dispatch/Makefile
@@ -11,10 +11,10 @@ HOMEPAGE=	http://search.cpan.org/dist/CGI-Application-Dispatch/
 COMMENT=	Dispatch requests to CGI::Application based objects
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=       p5-CGI-Application>=4.01:../../www/p5-CGI-Application
-DEPENDS+=       p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
-DEPENDS+=       p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
-DEPENDS+=       p5-HTTP-Exception-[0-9]*:../../wip/p5-HTTP-Exception
+DEPENDS+=	p5-CGI-Application>=4.01:../../www/p5-CGI-Application
+DEPENDS+=	p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
+DEPENDS+=	p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
+DEPENDS+=	p5-HTTP-Exception-[0-9]*:../../wip/p5-HTTP-Exception
 
 BUILD_DEPENDS+=	p5-CGI-PSGI-[0-9]*:../../www/p5-CGI-PSGI
 BUILD_DEPENDS+=	p5-Test-LongString-[0-9]*:../../devel/p5-Test-LongString
diff --git a/p5-CGI-Application-Plugin-ConfigAuto/Makefile b/p5-CGI-Application-Plugin-ConfigAuto/Makefile
index 9df62e4f01..c2ef9aa8df 100644
--- a/p5-CGI-Application-Plugin-ConfigAuto/Makefile
+++ b/p5-CGI-Application-Plugin-ConfigAuto/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Easy config file management for CGI::Application
 DEPENDS+=	p5-CGI-Application>=4.11:../../www/p5-CGI-Application
 DEPENDS+=	p5-Config-Auto>=0:../../devel/p5-Config-Auto
 
-PERL5_PACKLIST=         auto/CGI/Application/Plugin/ConfigAuto/.packlist
+PERL5_PACKLIST=		auto/CGI/Application/Plugin/ConfigAuto/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-CGI-Application-Plugin-ErrorPage/Makefile b/p5-CGI-Application-Plugin-ErrorPage/Makefile
index 78d198d5bf..1cba66e2c7 100644
--- a/p5-CGI-Application-Plugin-ErrorPage/Makefile
+++ b/p5-CGI-Application-Plugin-ErrorPage/Makefile
@@ -9,9 +9,9 @@ MAINTAINER=	ficovh%yahoo.com@localhost
 HOMEPAGE=	http://search.cpan.org/CPAN/authors/id/M/MA/MARKSTOS/
 COMMENT=	Simple error page plugin for CGI::Application
 
-DEPENDS+=       p5-CGI-Application>=4.01:../../www/p5-CGI-Application
-DEPENDS+=       p5-Params-Validate>0:../../devel/p5-Params-Validate
-DEPENDS+=       p5-Module-Build>0:../../devel/p5-Module-Build
+DEPENDS+=	p5-CGI-Application>=4.01:../../www/p5-CGI-Application
+DEPENDS+=	p5-Params-Validate>0:../../devel/p5-Params-Validate
+DEPENDS+=	p5-Module-Build>0:../../devel/p5-Module-Build
 
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/CGI/Application/Plugin/ErrorPage/.packlist
diff --git a/p5-CGI-Application-Plugin-Forward/Makefile b/p5-CGI-Application-Plugin-Forward/Makefile
index 296be40bcd..10652a9701 100644
--- a/p5-CGI-Application-Plugin-Forward/Makefile
+++ b/p5-CGI-Application-Plugin-Forward/Makefile
@@ -10,9 +10,9 @@ MAINTAINER=	ficovh%yahoo.com@localhost
 HOMEPAGE=	http://search.cpan.org/CPAN/authors/id/M/MG/MGRAHAM/
 COMMENT=	Pass control from one run mode to another
 
-DEPENDS+=       p5-CGI-Application>=4.01:../../www/p5-CGI-Application
-DEPENDS+=       p5-CGI-Application-Plugin-AutoRunmode>=0:../../wip/p5-CGI-Application-Plugin-AutoRunmode
-DEPENDS+=       p5-Test-Simple>=0:../../devel/p5-Test-Simple
+DEPENDS+=	p5-CGI-Application>=4.01:../../www/p5-CGI-Application
+DEPENDS+=	p5-CGI-Application-Plugin-AutoRunmode>=0:../../wip/p5-CGI-Application-Plugin-AutoRunmode
+DEPENDS+=	p5-Test-Simple>=0:../../devel/p5-Test-Simple
 
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/CGI/Application/Plugin/Forward/.packlist
diff --git a/p5-CGI-Application-Server/Makefile b/p5-CGI-Application-Server/Makefile
index 0a7de87ae0..20b492199c 100644
--- a/p5-CGI-Application-Server/Makefile
+++ b/p5-CGI-Application-Server/Makefile
@@ -14,9 +14,9 @@ DEPENDS+=	p5-Test-Exception>=0:../../devel/p5-Test-Exception
 DEPENDS+=	p5-Test-HTTP-Server-Simple>=0:../../www/p5-Test-HTTP-Server-Simple
 DEPENDS+=	p5-CGI-Application-Plugin-Redirect>=0:../../wip/p5-CGI-Application-Plugin-Redirect
 DEPENDS+=	p5-libwww>=0:../../www/p5-libwww
-DEPENDS+=       p5-HTTP-Server-Simple>=0:../../www/p5-HTTP-Server-Simple
-DEPENDS+=       p5-Test-WWW-Mechanize>=0:../../www/p5-Test-WWW-Mechanize
-DEPENDS+=       p5-HTTP-Server-Simple-Static>=0:../../www/p5-HTTP-Server-Simple-Static
+DEPENDS+=	p5-HTTP-Server-Simple>=0:../../www/p5-HTTP-Server-Simple
+DEPENDS+=	p5-Test-WWW-Mechanize>=0:../../www/p5-Test-WWW-Mechanize
+DEPENDS+=	p5-HTTP-Server-Simple-Static>=0:../../www/p5-HTTP-Server-Simple-Static
 
 PERL5_PACKLIST=		auto/CGI/Application/Server/.packlist
 USE_LANGUAGES=		# none
diff --git a/p5-CGI-Expand/Makefile b/p5-CGI-Expand/Makefile
index 56578559c7..9d3c9a8b62 100644
--- a/p5-CGI-Expand/Makefile
+++ b/p5-CGI-Expand/Makefile
@@ -13,7 +13,7 @@ DEPENDS+=	p5-Test-Simple>0:../../devel/p5-Test-Simple
 DEPENDS+=	p5-Test-Exception>0:../../devel/p5-Test-Exception
 
 USE_LANGUAGES+=	# empty
-PERL5_PACKLIST= auto/CGI/Expand/.packlist
+PERL5_PACKLIST=	auto/CGI/Expand/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Component-InstancePerContext/Makefile b/p5-Catalyst-Component-InstancePerContext/Makefile
index 748dfce960..42d6f90fcc 100755
--- a/p5-Catalyst-Component-InstancePerContext/Makefile
+++ b/p5-Catalyst-Component-InstancePerContext/Makefile
@@ -15,7 +15,7 @@ DEPENDS+=	p5-Test-Simple>=0:../../devel/p5-Test-Simple
 DEPENDS+=	p5-Scalar-List-Utils-[0-9]*:../../devel/p5-Scalar-List-Utils
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/Catalyst/Component/InstancePerContext/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Component/InstancePerContext/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Controller-DBIC-API/Makefile b/p5-Catalyst-Controller-DBIC-API/Makefile
index 8be52da46e..d218a57ea4 100644
--- a/p5-Catalyst-Controller-DBIC-API/Makefile
+++ b/p5-Catalyst-Controller-DBIC-API/Makefile
@@ -20,7 +20,7 @@ DEPENDS+=	p5-JSON>0:../../converters/p5-JSON
 DEPENDS+=	p5-Data-DPath-Validator>0:../../wip/p5-Data-DPath-Validator
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/Catalyst/Controller/DBIC/API/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Controller/DBIC/API/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Engine-Apache/Makefile b/p5-Catalyst-Engine-Apache/Makefile
index 027840a6d7..d46735d69b 100644
--- a/p5-Catalyst-Engine-Apache/Makefile
+++ b/p5-Catalyst-Engine-Apache/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Catalyst Apache Engines
 BUILD_DEPENDS+=	p5-Catalyst-Runtime>=5.50:../../www/p5-Catalyst-Runtime
 BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
-PERL5_PACKLIST= auto/Catalyst/Engine/Apache/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Engine/Apache/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Helper-Model-Email/Makefile b/p5-Catalyst-Helper-Model-Email/Makefile
index 58125f34cb..e2e6fb254f 100755
--- a/p5-Catalyst-Helper-Model-Email/Makefile
+++ b/p5-Catalyst-Helper-Model-Email/Makefile
@@ -14,7 +14,7 @@ EPENDS+=	p5-Test-Simple-[0-9]*:../../devel/p5-Test-Simple
 DEPENDS+=	p5-ExtUtils-MakeMaker-[0-9]*:../../devel/p5-ExtUtils-MakeMaker
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/Catalyst/Helper/Model/Email/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Helper/Model/Email/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Plugin-Cache-FileCache/Makefile b/p5-Catalyst-Plugin-Cache-FileCache/Makefile
index 7622c91ec2..9d6a37b3b4 100644
--- a/p5-Catalyst-Plugin-Cache-FileCache/Makefile
+++ b/p5-Catalyst-Plugin-Cache-FileCache/Makefile
@@ -13,7 +13,7 @@ DEPENDS+=	p5-Cache-Cache>=0:../../devel/p5-Cache-Cache
 
 
 PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST= auto/Catalyst/Plugin/Cache/FileCache/.packlist
+PERL5_PACKLIST=		auto/Catalyst/Plugin/Cache/FileCache/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Plugin-Compress-Zlib/Makefile b/p5-Catalyst-Plugin-Compress-Zlib/Makefile
index 7fa0af9a01..a0b7b35152 100644
--- a/p5-Catalyst-Plugin-Compress-Zlib/Makefile
+++ b/p5-Catalyst-Plugin-Compress-Zlib/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-ExtUtils-MakeMaker>=0:../../devel/p5-ExtUtils-MakeMaker
 DEPENDS+=	p5-Catalyst-Runtime>=2.99:../../www/p5-Catalyst-Runtime
 
 
-PERL5_PACKLIST= auto/Catalyst/Plugin/Compress/Zlib/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Plugin/Compress/Zlib/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Plugin-Email/Makefile b/p5-Catalyst-Plugin-Email/Makefile
index 6973ce2aff..e8d54d53a5 100644
--- a/p5-Catalyst-Plugin-Email/Makefile
+++ b/p5-Catalyst-Plugin-Email/Makefile
@@ -13,7 +13,7 @@ DEPENDS+=	p5-Email-MIME>=0:../../mail/p5-Email-MIME
 DEPENDS+=	p5-Email-Send>=0:../../mail/p5-Email-Send
 DEPENDS+=	p5-Catalyst-Runtime>=2.99:../../www/p5-Catalyst-Runtime
 
-PERL5_PACKLIST= auto/Catalyst/Plugin/Email/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Plugin/Email/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Plugin-FillInForm/Makefile b/p5-Catalyst-Plugin-FillInForm/Makefile
index 2c54b8106c..2e8d5ca433 100644
--- a/p5-Catalyst-Plugin-FillInForm/Makefile
+++ b/p5-Catalyst-Plugin-FillInForm/Makefile
@@ -18,7 +18,7 @@ DEPENDS+=	p5-NEXT>=0:../../devel/p5-NEXT
 BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
-PERL5_PACKLIST= auto/Catalyst/Plugin/FillInForm/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Plugin/FillInForm/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Plugin-FormValidator/Makefile b/p5-Catalyst-Plugin-FormValidator/Makefile
index d6271acf10..6b1ab1478d 100644
--- a/p5-Catalyst-Plugin-FormValidator/Makefile
+++ b/p5-Catalyst-Plugin-FormValidator/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Data-FormValidator>=0:../../textproc/p5-Data-FormValidator
 BUILD_DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
-PERL5_PACKLIST= auto/Catalyst/Plugin/FormValidator/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Plugin/FormValidator/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Plugin-Prototype/Makefile b/p5-Catalyst-Plugin-Prototype/Makefile
index f4c011d987..84226dfddb 100644
--- a/p5-Catalyst-Plugin-Prototype/Makefile
+++ b/p5-Catalyst-Plugin-Prototype/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Class-Data-Inheritable>=0:../../devel/p5-Class-Data-Inheritable
 DEPENDS+=	p5-HTML-Prototype>=1.30:../../www/p5-HTML-Prototype
 
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
-PERL5_PACKLIST= auto/Catalyst/Plugin/Prototype/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Plugin/Prototype/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Plugin-Static/Makefile b/p5-Catalyst-Plugin-Static/Makefile
index a40857cdf5..5e76d7c0cb 100644
--- a/p5-Catalyst-Plugin-Static/Makefile
+++ b/p5-Catalyst-Plugin-Static/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-File-MimeInfo>=0.11:../../devel/p5-File-MimeInfo
 DEPENDS+=	p5-File-Slurp>=0:../../devel/p5-File-Slurp
 DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
-PERL5_PACKLIST= auto/Catalyst/Plugin/Static/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Plugin/Static/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Plugin-SubRequest/Makefile b/p5-Catalyst-Plugin-SubRequest/Makefile
index 55088c898c..951e5d1e1f 100644
--- a/p5-Catalyst-Plugin-SubRequest/Makefile
+++ b/p5-Catalyst-Plugin-SubRequest/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-File-Slurp>=0:../../devel/p5-File-Slurp
 DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
 
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
-PERL5_PACKLIST= auto/Catalyst/Plugin/SubRequest/.packlist
+PERL5_PACKLIST=	auto/Catalyst/Plugin/SubRequest/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-Plugin-Unicode-Encoding/Makefile b/p5-Catalyst-Plugin-Unicode-Encoding/Makefile
index d817787d0c..8cf83a2c6d 100644
--- a/p5-Catalyst-Plugin-Unicode-Encoding/Makefile
+++ b/p5-Catalyst-Plugin-Unicode-Encoding/Makefile
@@ -16,7 +16,7 @@ DEPENDS+=	p5-Catalyst-Runtime>=5.2:../../www/p5-Catalyst-Runtime
 
 
 PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST=	auto/Catalyst/Plugin/Unicode/Encoding/.packlist
+PERL5_PACKLIST=		auto/Catalyst/Plugin/Unicode/Encoding/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Catalyst-View-XML-Feed/Makefile b/p5-Catalyst-View-XML-Feed/Makefile
index c22723124a..3a0a46061d 100755
--- a/p5-Catalyst-View-XML-Feed/Makefile
+++ b/p5-Catalyst-View-XML-Feed/Makefile
@@ -18,7 +18,7 @@ DEPENDS+=	p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-Deprecatio
 
 USE_LANGUAGES=	# empty
 MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
-PERL5_PACKLIST= auto/Catalyst/View/XML/Feed/.packlist
+PERL5_PACKLIST=	auto/Catalyst/View/XML/Feed/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Class-DBI-SQLite/Makefile b/p5-Class-DBI-SQLite/Makefile
index 14f6782d90..2b6b7676c7 100644
--- a/p5-Class-DBI-SQLite/Makefile
+++ b/p5-Class-DBI-SQLite/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Ima-DBI>=0.27:../../databases/p5-Ima-DBI
 DEPENDS+=	p5-DBD-SQLite>=0.07:../../databases/p5-DBD-SQLite
 DEPENDS+=	p5-Test-Simple>=0.32:../../devel/p5-Test-Simple
 
-PERL5_PACKLIST= auto/Class/DBI/SQLite/.packlist
+PERL5_PACKLIST=	auto/Class/DBI/SQLite/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Class-DBI-Sweet/Makefile b/p5-Class-DBI-Sweet/Makefile
index da7c479eaa..a758dade97 100644
--- a/p5-Class-DBI-Sweet/Makefile
+++ b/p5-Class-DBI-Sweet/Makefile
@@ -20,7 +20,7 @@ DEPENDS+=	p5-DBD-SQLite>=1.08:../../databases/p5-DBD-SQLite
 CHECK_PORTABILITY_SKIP+=	script/import-cdbi-tests.sh
 
 PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST= auto/Class/DBI/Sweet/.packlist
+PERL5_PACKLIST=		auto/Class/DBI/Sweet/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Data-DPath-Validator/Makefile b/p5-Data-DPath-Validator/Makefile
index 4dbc5622e4..d0e4c41ae3 100644
--- a/p5-Data-DPath-Validator/Makefile
+++ b/p5-Data-DPath-Validator/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Data-DPath>0:../../wip/p5-Data-DPath
 DEPENDS+=	p5-Data-Visitor>0:../../devel/p5-Data-Visitor
 
 USE_LANGUAGES+=	# empty
-PERL5_PACKLIST= auto/Data/DPath/Validator/.packlist
+PERL5_PACKLIST=	auto/Data/DPath/Validator/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Data-DPath/Makefile b/p5-Data-DPath/Makefile
index 4cbfa362a6..2ba974003d 100644
--- a/p5-Data-DPath/Makefile
+++ b/p5-Data-DPath/Makefile
@@ -22,7 +22,7 @@ DEPENDS+=	p5-Iterator-Util>0:../../wip/p5-Iterator-Util
 DEPENDS+=	p5-Data-Dumper>0:../../devel/p5-Data-Dumper
 
 USE_LANGUAGES+=	# empty
-PERL5_PACKLIST= auto/Data/DPath/.packlist
+PERL5_PACKLIST=	auto/Data/DPath/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Egg-Plugin-Crypt-CBC/Makefile b/p5-Egg-Plugin-Crypt-CBC/Makefile
index 9e70764e7c..a65a39fa01 100644
--- a/p5-Egg-Plugin-Crypt-CBC/Makefile
+++ b/p5-Egg-Plugin-Crypt-CBC/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Crypt::CBC for Egg Plugin.
 DEPENDS+=	p5-Crypt-CBC>=0:../../security/p5-Crypt-CBC
 
 
-PERL5_PACKLIST= auto/Egg/Plugin/Crypt/CBC/.packlist
+PERL5_PACKLIST=	auto/Egg/Plugin/Crypt/CBC/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Email-AddressParser/Makefile b/p5-Email-AddressParser/Makefile
index 2d1a02cbf3..3b3dd1c64f 100644
--- a/p5-Email-AddressParser/Makefile
+++ b/p5-Email-AddressParser/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://search.cpan.org/dist/Email-AddressParser/
 COMMENT=	RFC 2822 Address Parsing and Creation
 
 
-PERL5_PACKLIST= auto/Email/AddressParser/.packlist
+PERL5_PACKLIST=	auto/Email/AddressParser/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-FCGI-Daemon/Makefile b/p5-FCGI-Daemon/Makefile
index 41e4871c0d..a6a4015f2d 100644
--- a/p5-FCGI-Daemon/Makefile
+++ b/p5-FCGI-Daemon/Makefile
@@ -1,33 +1,33 @@
 # $NetBSD$
 
-PKGBASE=        FCGI-Daemon
-DISTNAME=       ${PKGBASE}-0.20151226
-PKGNAME=        p5-${DISTNAME}
-PKGREVISION=    1
-CATEGORIES=     www perl5
-MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=FCGI/}
+PKGBASE=	FCGI-Daemon
+DISTNAME=	${PKGBASE}-0.20151226
+PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
+CATEGORIES=	www perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=FCGI/}
 
-MAINTAINER=     ast%NetBSD.org@localhost
-HOMEPAGE=       http://search.cpan.org/dist/FCGI-Daemon/
-COMMENT=        Perl-aware Fast CGI daemon for use with nginx web server
-LICENSE=        gnu-agpl-v3
+MAINTAINER=	ast%NetBSD.org@localhost
+HOMEPAGE=	http://search.cpan.org/dist/FCGI-Daemon/
+COMMENT=	Perl-aware Fast CGI daemon for use with nginx web server
+LICENSE=	gnu-agpl-v3
 
-USE_TOOLS+=     perl:run
+USE_TOOLS+=	perl:run
 
-DEPENDS+=       p5-FCGI>=0.71:../../www/p5-FCGI
-DEPENDS+=       p5-BSD-Resource>=1.29:../../devel/p5-BSD-Resource
-DEPENDS+=       p5-FCGI-ProcManager>=0.18:../../www/p5-FCGI-ProcManager
+DEPENDS+=	p5-FCGI>=0.71:../../www/p5-FCGI
+DEPENDS+=	p5-BSD-Resource>=1.29:../../devel/p5-BSD-Resource
+DEPENDS+=	p5-FCGI-ProcManager>=0.18:../../www/p5-FCGI-ProcManager
 
-FCGID_EG_DIR=   share/examples/fcgi-daemon
-FCGID_NGINX=    nginx/common.conf nginx/ikiwiki.conf nginx/sample.conf
+FCGID_EG_DIR=	share/examples/fcgi-daemon
+FCGID_NGINX=	nginx/common.conf nginx/ikiwiki.conf nginx/sample.conf
 
-INSTALLATION_DIRS+= ${FCGID_EG_DIR} ${FCGID_EG_DIR}/nginx
-INSTALLATION_DIRS+= ${PERL5_SUB_INSTALLVENDORMAN3DIR}
-INSTALLATION_DIRS+= ${PERL5_SUB_INSTALLVENDORLIB}/FCGI
+INSTALLATION_DIRS+=	${FCGID_EG_DIR} ${FCGID_EG_DIR}/nginx
+INSTALLATION_DIRS+=	${PERL5_SUB_INSTALLVENDORMAN3DIR}
+INSTALLATION_DIRS+=	${PERL5_SUB_INSTALLVENDORLIB}/FCGI
 
-REPLACE_PERL=   lib/FCGI/Daemon.pm
+REPLACE_PERL=	lib/FCGI/Daemon.pm
 
-RCD_SCRIPTS=    fcgi_daemon
+RCD_SCRIPTS=	fcgi_daemon
 
 do-install:
 	${INSTALL_SCRIPT} \
diff --git a/p5-GPS-Garmin/Makefile b/p5-GPS-Garmin/Makefile
index f7230eed8c..547a411ce4 100644
--- a/p5-GPS-Garmin/Makefile
+++ b/p5-GPS-Garmin/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	uli%habel.name@localhost
 HOMEPAGE=	http://search.cpan.org/dist/perl-GPS/
 COMMENT=	GPS::Garmin access module for Perl
 
-DEPENDS+= p5-Device-SerialPort>=0.12:../../comms/p5-Device-SerialPort
+DEPENDS+=	p5-Device-SerialPort>=0.12:../../comms/p5-Device-SerialPort
 
 PERL5_PACKLIST=		auto/GPS/Garmin/.packlist
 
diff --git a/p5-Image-EXIF/Makefile b/p5-Image-EXIF/Makefile
index d1d4ce8689..a9ee7d3712 100644
--- a/p5-Image-EXIF/Makefile
+++ b/p5-Image-EXIF/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	kuli0020%umn.edu@localhost
 HOMEPAGE=	http://cpan.uwinnipeg.ca/dist/Image-EXIF
 COMMENT=	Perl extension for exif library
 
-PERL5_PACKLIST= auto/Image/EXIF/.packlist
+PERL5_PACKLIST=	auto/Image/EXIF/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Iterator-Util/Makefile b/p5-Iterator-Util/Makefile
index 385ab56b3b..953136e331 100644
--- a/p5-Iterator-Util/Makefile
+++ b/p5-Iterator-Util/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Essential utilities for the Iterator class
 DEPENDS+=	p5-Iterator>0:../../wip/p5-Iterator
 
 USE_LANGUAGES+=	# empty
-PERL5_PACKLIST= auto/Iterator/Util/.packlist
+PERL5_PACKLIST=	auto/Iterator/Util/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Iterator/Makefile b/p5-Iterator/Makefile
index ae532acdeb..e6624b32dd 100644
--- a/p5-Iterator/Makefile
+++ b/p5-Iterator/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A general-purpose iterator class
 DEPENDS+=	p5-Exception-Class>0:../../devel/p5-Exception-Class
 
 USE_LANGUAGES+=	# empty
-PERL5_PACKLIST= auto/Iterator/.packlist
+PERL5_PACKLIST=	auto/Iterator/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Lingua-StopWords/Makefile b/p5-Lingua-StopWords/Makefile
index 07989bbd1a..642d0fd13a 100644
--- a/p5-Lingua-StopWords/Makefile
+++ b/p5-Lingua-StopWords/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://search.cpan.org/dist/Lingua-StopWords/
 COMMENT=	Lingua::StopWords - Stop words for several languages
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST= auto/Lingua/StopWords/.packlist
+PERL5_PACKLIST=	auto/Lingua/StopWords/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Math-FixedPrecision/Makefile b/p5-Math-FixedPrecision/Makefile
index a6d86de4f3..ffa602a79d 100644
--- a/p5-Math-FixedPrecision/Makefile
+++ b/p5-Math-FixedPrecision/Makefile
@@ -14,7 +14,7 @@ REPLACE_PERL+=	t/test.t
 
 DEPENDS+=	p5-Math-BigInteger-*:../../math/p5-Math-BigInteger
 
-PERL5_PACKLIST= auto/Math/FixedPrecision/.packlist
+PERL5_PACKLIST=	auto/Math/FixedPrecision/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Module-Pluggable-Ordered/Makefile b/p5-Module-Pluggable-Ordered/Makefile
index a2eee368f4..0f330d4bf3 100644
--- a/p5-Module-Pluggable-Ordered/Makefile
+++ b/p5-Module-Pluggable-Ordered/Makefile
@@ -13,7 +13,7 @@ LICENSE=	${PERL5_LICENSE}
 DEPENDS+=	p5-Module-Pluggable>=1.9:../../devel/p5-Module-Pluggable
 DEPENDS+=	p5-UNIVERSAL-require-[0-9]*:../../devel/p5-UNIVERSAL-require
 
-PERL5_PACKLIST= auto/Module/Pluggable/Ordered/.packlist
+PERL5_PACKLIST=	auto/Module/Pluggable/Ordered/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-MongoDB/Makefile b/p5-MongoDB/Makefile
index c3b9d1d711..0bb2269e50 100644
--- a/p5-MongoDB/Makefile
+++ b/p5-MongoDB/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MO/MONGODB/}
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://search.cpan.org/dist/MongoDB/
 COMMENT=	Mongo Driver for Perl
-LICENSE=        apache-2.0
+LICENSE=	apache-2.0
 
 DEPENDS+=	p5-Any-Moose>=0.18:../../devel/p5-Any-Moose
 DEPENDS+=	p5-Class-Method-Modifiers>=1.07:../../devel/p5-Class-Method-Modifiers
diff --git a/p5-MooseX-Iterator/Makefile b/p5-MooseX-Iterator/Makefile
index e57720027a..25e14a3cd9 100644
--- a/p5-MooseX-Iterator/Makefile
+++ b/p5-MooseX-Iterator/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-ExtUtils-MakeMaker>0:../../devel/p5-ExtUtils-MakeMaker
 DEPENDS+=	p5-Moose>0:../../devel/p5-Moose
 
 USE_LANGUAGES+=	# empty
-PERL5_PACKLIST= auto/MooseX/Iterator/.packlist
+PERL5_PACKLIST=	auto/MooseX/Iterator/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-MooseX-Role-BuildInstanceOf/Makefile b/p5-MooseX-Role-BuildInstanceOf/Makefile
index a6133183ce..39241c5787 100644
--- a/p5-MooseX-Role-BuildInstanceOf/Makefile
+++ b/p5-MooseX-Role-BuildInstanceOf/Makefile
@@ -19,7 +19,7 @@ DEPENDS+=	p5-MooseX-Role-Parameterized>0:../../devel/p5-MooseX-Role-Parameterize
 DEPENDS+=	p5-List-MoreUtils>0:../../devel/p5-List-MoreUtils
 
 USE_LANGUAGES=	# empty
-PERL5_PACKLIST= auto/MooseX/Role/BuildInstanceOf/.packlist
+PERL5_PACKLIST=	auto/MooseX/Role/BuildInstanceOf/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Net-Delicious/Makefile b/p5-Net-Delicious/Makefile
index 69a68d20ef..48a727213e 100644
--- a/p5-Net-Delicious/Makefile
+++ b/p5-Net-Delicious/Makefile
@@ -21,9 +21,9 @@ DEPENDS+=	p5-IO-stringy>=2.10:../../devel/p5-IO-stringy
 DEPENDS+=	p5-YAML>=0.39:../../textproc/p5-YAML
 DEPENDS+=	p5-Config-Simple>=2:../../sysutils/p5-Config-Simple
 
-PERL5_PACKLIST= auto/Net/Delicious/.packlist
+PERL5_PACKLIST=	auto/Net/Delicious/.packlist
 
-PERL5_MODULE_TYPE= Module::Build
+PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Net-SMS-Clickatell/Makefile b/p5-Net-SMS-Clickatell/Makefile
index 5bbb7a9123..c3370ff043 100644
--- a/p5-Net-SMS-Clickatell/Makefile
+++ b/p5-Net-SMS-Clickatell/Makefile
@@ -9,8 +9,8 @@ HOMEPAGE=	http://search.cpan.org/~ralamosm/Net-SMS-Clickatell/
 COMMENT=	Access to Clickatell SMS messaging service
 LICENSE=	${PERL5_LICENSE}
 
-USE_LANGUAGES=  # empty
-PERL5_PACKLIST= auto/Net/SMS/Clickatell/.packlist
+USE_LANGUAGES=	# empty
+PERL5_PACKLIST=	auto/Net/SMS/Clickatell/.packlist
 
 #DEPENDS+=       p5-OptArgs>=0.1.18:../../wip/p5-OptArgs
 
diff --git a/p5-Net-Syslog/Makefile b/p5-Net-Syslog/Makefile
index 0010a567db..9e86956f83 100644
--- a/p5-Net-Syslog/Makefile
+++ b/p5-Net-Syslog/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/L/LH/LHOWARD/}
 MAINTAINER=	evaldo%gardenali.biz@localhost
 HOMEPAGE=	http://search.cpan.org/CPAN/authors/id/L/LH/LHOWARD/
 COMMENT=	Extension for sending syslog messages directly to a remote syslogd
-LICENSE=        ${PERL5_LICENSE}
+LICENSE=	${PERL5_LICENSE}
 
 PERL5_PACKLIST=	auto/Net/Syslog/.packlist
 USE_LANGUAGES=	# none
diff --git a/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile b/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
index f39daae178..e95a70387e 100644
--- a/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
+++ b/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Lingua-Stem-Snowball>=0:../../textproc/p5-Lingua-Stem-Snowball
 DEPENDS+=	p5-Plucene>=0:../../wip/p5-Plucene
 
 
-PERL5_PACKLIST= auto/Plucene/Plugin/Analyzer/SnowballAnalyzer/.packlist
+PERL5_PACKLIST=	auto/Plucene/Plugin/Analyzer/SnowballAnalyzer/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Plucene/Makefile b/p5-Plucene/Makefile
index 9d568b537f..fb7f261215 100644
--- a/p5-Plucene/Makefile
+++ b/p5-Plucene/Makefile
@@ -24,7 +24,7 @@ DEPENDS+=	p5-Encode-compat>=0:../../wip/p5-Encode-compat
 BUILD_DEPENDS+=	p5-File-Slurp>=2002.1031:../../devel/p5-File-Slurp
 
 PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST= auto/Plucene/.packlist
+PERL5_PACKLIST=		auto/Plucene/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-PluceneSimple/Makefile b/p5-PluceneSimple/Makefile
index 8991e9b951..fbd9171d31 100644
--- a/p5-PluceneSimple/Makefile
+++ b/p5-PluceneSimple/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=	p5-Test-Class>=0.03:../../devel/p5-Test-Class
 
 
 PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST= auto/PluceneSimple/.packlist
+PERL5_PACKLIST=		auto/PluceneSimple/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Shell-Command/Makefile b/p5-Shell-Command/Makefile
index 9668ad9dd6..8283cd83fa 100644
--- a/p5-Shell-Command/Makefile
+++ b/p5-Shell-Command/Makefile
@@ -1,14 +1,14 @@
 # $NetBSD$
 
 DISTNAME=	Shell-Command-0.06
-PKGNAME=        p5-${DISTNAME}
+PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel perl5
-MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=Shell/}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Shell/}
 
 MAINTAINER=	sasha-pkgsrc%arcocene.org@localhost
 HOMEPAGE=	http://search.cpan.org/dist/Shell-Command/
 COMMENT=	Cross-platform functions emulating common shell commands
-LICENSE=        ${PERL5_LICENSE}
+LICENSE=	${PERL5_LICENSE}
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Sub-Prototype/Makefile b/p5-Sub-Prototype/Makefile
index 899c85ffdc..06ffc905d1 100644
--- a/p5-Sub-Prototype/Makefile
+++ b/p5-Sub-Prototype/Makefile
@@ -12,9 +12,9 @@ LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Sub-Exporter-[0-9]*:../../devel/p5-Sub-Exporter
 
-MAKE_ENV+=	PERL_USE_UNSAFE_INC=1
-PERL5_PACKLIST=	auto/Sub/Prototype/.packlist
-USE_LANGUAGES=	c
+MAKE_ENV+=		PERL_USE_UNSAFE_INC=1
+PERL5_PACKLIST=		auto/Sub/Prototype/.packlist
+USE_LANGUAGES=		c
 PERL5_MODULE_TYPE=	Module::Install
 
 .include "../../lang/perl5/module.mk"
diff --git a/p5-Sys-MemInfo/Makefile b/p5-Sys-MemInfo/Makefile
index cd4962ab8b..437cc27f7a 100644
--- a/p5-Sys-MemInfo/Makefile
+++ b/p5-Sys-MemInfo/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://search.cpan.org/~scresto/Sys-MemInfo/
 COMMENT=	Perl 5 module for getting memory information
 LICENSE=	${PERL5_LICENSE}
 
-PERL5_PACKLIST= auto/Sys/MemInfo/.packlist
+PERL5_PACKLIST=	auto/Sys/MemInfo/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Test-Most/Makefile b/p5-Test-Most/Makefile
index da12bb9e65..8d47fab05a 100644
--- a/p5-Test-Most/Makefile
+++ b/p5-Test-Most/Makefile
@@ -1,14 +1,14 @@
 # $NetBSD$
 
 DISTNAME=	Test-Most-0.35
-PKGNAME=        p5-${DISTNAME}
+PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel perl5
-MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=Test/}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
 
 MAINTAINER=	sasha-pkgsrc%arcocene.org@localhost
 HOMEPAGE=	http://search.cpan.org/dist/Shell-Command/
 COMMENT=	Most commonly needed test functions and features
-LICENSE=        ${PERL5_LICENSE}
+LICENSE=	${PERL5_LICENSE}
 
 DEPENDS+=	p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
 DEPENDS+=	p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
diff --git a/p5-Test-Stub/Makefile b/p5-Test-Stub/Makefile
index fc7cfec57e..9a2f08dfbf 100644
--- a/p5-Test-Stub/Makefile
+++ b/p5-Test-Stub/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=	p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
 USE_LANGUAGES=	# empty
 
 PERL5_MODULE_TYPE=	Module::Build
-PERL5_PACKLIST=	auto/Test/Stub/.packlist
+PERL5_PACKLIST=		auto/Test/Stub/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Text-CHM/Makefile b/p5-Text-CHM/Makefile
index 711f970d87..7f893eb05e 100644
--- a/p5-Text-CHM/Makefile
+++ b/p5-Text-CHM/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
 MAINTAINER=	lkundrak%skosi.org@localhost
-HOMEPAGE=       http://search.cpan.org/dist/Text-CHM/
+HOMEPAGE=	http://search.cpan.org/dist/Text-CHM/
 COMMENT=	Module that implements a support for handling CHM files
 LICENSE=	${PERL5_LICENSE}
 
diff --git a/p5-URI-Find-Rule/Makefile b/p5-URI-Find-Rule/Makefile
index 4c510a4733..f21ea4c8b3 100644
--- a/p5-URI-Find-Rule/Makefile
+++ b/p5-URI-Find-Rule/Makefile
@@ -13,9 +13,9 @@ DEPENDS+=	p5-URI-Find>=0:../../www/p5-URI-Find
 DEPENDS+=	p5-Text-Glob>=0:../../textproc/p5-Text-Glob
 
 
-PERL5_PACKLIST= auto/URI/Find/Rule/.packlist
+PERL5_PACKLIST=	auto/URI/Find/Rule/.packlist
 
-PERL5_MODULE_TYPE= Module::Build
+PERL5_MODULE_TYPE=	Module::Build
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-Unicode-CheckUTF8/Makefile b/p5-Unicode-CheckUTF8/Makefile
index e9369f1a80..0b682dee3f 100644
--- a/p5-Unicode-CheckUTF8/Makefile
+++ b/p5-Unicode-CheckUTF8/Makefile
@@ -1,18 +1,18 @@
 # $NetBSD: Makefile,v 1.5 2014/10/09 14:06:30 thomasklausner Exp $
 #
 
-DISTNAME=       Unicode-CheckUTF8-1.03
-PKGNAME=        p5-${DISTNAME}
-CATEGORIES=     converters perl5
-MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=Unicode/}
+DISTNAME=	Unicode-CheckUTF8-1.03
+PKGNAME=	p5-${DISTNAME}
+CATEGORIES=	converters perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Unicode/}
 
-MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=       http://search.cpan.org/dist/Unicode-CheckUTF8/
-COMMENT=        Perl5 module to check if scalar is valid UTF-8
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://search.cpan.org/dist/Unicode-CheckUTF8/
+COMMENT=	Perl5 module to check if scalar is valid UTF-8
 LICENSE=	generic-nonlicense
 
 USE_LANGUAGES=	c
-PERL5_PACKLIST=         auto/Unicode/CheckUTF8/.packlist
+PERL5_PACKLIST=	auto/Unicode/CheckUTF8/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-WWW-YouTube-VideoURI/Makefile b/p5-WWW-YouTube-VideoURI/Makefile
index 58baecbad7..35b0f370f5 100644
--- a/p5-WWW-YouTube-VideoURI/Makefile
+++ b/p5-WWW-YouTube-VideoURI/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	WWW-YouTube-VideoURI-0.1
 PKGNAME=	p5-${DISTNAME}
-CATEGORIES= www perl5
+CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=WWW/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
diff --git a/p5-WebService-CIA/Makefile b/p5-WebService-CIA/Makefile
index 3bed517ae5..f6b89f0b13 100644
--- a/p5-WebService-CIA/Makefile
+++ b/p5-WebService-CIA/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.4 2013/11/24 10:00:21 thomasklausner Exp $
 
-DISTNAME=		WebService-CIA-1.4
-PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		1
-CATEGORIES=		www perl5
+DISTNAME=	WebService-CIA-1.4
+PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
+CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/I/IM/IMALPASS/}
 
 MAINTAINER=		jfranz%bsdprojects.net@localhost
diff --git a/p5-mha4mysql-manager/Makefile b/p5-mha4mysql-manager/Makefile
index 5e667b7de4..f79de12d02 100644
--- a/p5-mha4mysql-manager/Makefile
+++ b/p5-mha4mysql-manager/Makefile
@@ -2,7 +2,7 @@
 #
 
 PKGNAME=	p5-mha4mysql-manager-0.57
-GIT_COMMIT= 	fea77e93168c8212550c21f542fec48f5d978535
+GIT_COMMIT=	fea77e93168c8212550c21f542fec48f5d978535
 DISTNAME=	${PKGNAME}-${GIT_COMMIT}
 CATEGORIES=	databases perl5
 MASTER_SITES=	-https://github.com/yoshinorim/mha4mysql-manager/archive/${GIT_COMMIT}.tar.gz
@@ -23,7 +23,7 @@ DEPENDS+=	p5-Parallel-ForkManager>=0.7:../../devel/p5-Parallel-ForkManager
 DEPENDS+=	p5-Time-HiRes>=1:../../time/p5-Time-HiRes
 DEPENDS+=	p5-mha4mysql-node>=0.56:../../wip/p5-mha4mysql-node
 
-PERL5_PACKLIST= 	auto/mha4mysql/manager/.packlist
+PERL5_PACKLIST=		auto/mha4mysql/manager/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-mha4mysql-node/Makefile b/p5-mha4mysql-node/Makefile
index e3d28efe20..ca9415f616 100644
--- a/p5-mha4mysql-node/Makefile
+++ b/p5-mha4mysql-node/Makefile
@@ -2,7 +2,7 @@
 #
 
 PKGNAME=	p5-mha4mysql-node-0.56
-GIT_COMMIT= 	ef26bdeeeb16c4c1c5e37bdaa276d118ffdd85e7
+GIT_COMMIT=	ef26bdeeeb16c4c1c5e37bdaa276d118ffdd85e7
 DISTNAME=	${PKGNAME}-${GIT_COMMIT}
 CATEGORIES=	databases perl5
 MASTER_SITES=	-https://github.com/yoshinorim/mha4mysql-node/archive/${GIT_COMMIT}.tar.gz
@@ -19,7 +19,7 @@ DEPENDS+=	p5-DBD-mysql>=1:../../databases/p5-DBD-mysql
 DEPENDS+=	p5-DBI>=1.13:../../databases/p5-DBI
 DEPENDS+=	p5-Module-Install>=0:../../devel/p5-Module-Install
 
-PERL5_PACKLIST= 	auto/mha4mysql/node/.packlist
+PERL5_PACKLIST=		auto/mha4mysql/node/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p5-spf-policyd/Makefile b/p5-spf-policyd/Makefile
index 85d014ce2a..9f097c6688 100644
--- a/p5-spf-policyd/Makefile
+++ b/p5-spf-policyd/Makefile
@@ -1,19 +1,19 @@
 # $NetBSD: Makefile,v 1.4 2014/08/13 20:02:17 shindenmorr Exp $
 #
 
-DISTNAME=      postfix-policyd-spf-perl-2.010
-PKGNAME=       p5-policyd-spf-2.010
-CATEGORIES=    mail
-MASTER_SITES=  http://launchpad.net/postfix-policyd-spf-perl/trunk/release2.010/+download/
+DISTNAME=	postfix-policyd-spf-perl-2.010
+PKGNAME=	p5-policyd-spf-2.010
+CATEGORIES=	mail
+MASTER_SITES=	http://launchpad.net/postfix-policyd-spf-perl/trunk/release2.010/+download/
 
 MAINTAINER=	morr%NetBSD.org@localhost
 HOMEPAGE=	http://launchpad.net/postfix-policyd-spf-perl/
 COMMENT=	Basic Postfix policy engine for SPF checking
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	p5-Mail-SPF-[0-9]*:../../mail/p5-Mail-SPF
-DEPENDS+=	p5-NetAddr-IP-[0-9]*:../../net/p5-NetAddr-IP
-REPLACE_PERL=	postfix-policyd-spf-perl
+DEPENDS+=		p5-Mail-SPF-[0-9]*:../../mail/p5-Mail-SPF
+DEPENDS+=		p5-NetAddr-IP-[0-9]*:../../net/p5-NetAddr-IP
+REPLACE_PERL=		postfix-policyd-spf-perl
 INSTALLATION_DIRS=	libexec
 
 USE_LANGUAGES=	# none
diff --git a/p5-transdecoder/PLIST b/p5-transdecoder/PLIST
index a652fb4cd3..42a42353cc 100644
--- a/p5-transdecoder/PLIST
+++ b/p5-transdecoder/PLIST
@@ -1,6 +1,13 @@
 @comment $NetBSD$
 bin/TransDecoder.LongOrfs
 bin/TransDecoder.Predict
+lib/TransDecoder/PerlLib/Fasta_reader.pm
+lib/TransDecoder/PerlLib/GFF3_utils.pm
+lib/TransDecoder/PerlLib/Gene_obj.pm
+lib/TransDecoder/PerlLib/Gene_obj_indexer.pm
+lib/TransDecoder/PerlLib/Longest_orf.pm
+lib/TransDecoder/PerlLib/Nuc_translator.pm
+lib/TransDecoder/PerlLib/TiedHash.pm
 libexec/TransDecoder/util/cdna_alignment_orf_to_genome_orf.pl
 libexec/TransDecoder/util/compute_base_probs.pl
 libexec/TransDecoder/util/cufflinks_gtf_genome_to_cdna_fasta.pl
@@ -17,10 +24,3 @@ libexec/TransDecoder/util/pfam_runner.pl
 libexec/TransDecoder/util/remove_eclipsed_ORFs.pl
 libexec/TransDecoder/util/score_CDS_liklihood_all_6_frames.pl
 libexec/TransDecoder/util/seq_n_baseprobs_to_logliklihood_vals.pl
-lib/TransDecoder/PerlLib/Fasta_reader.pm
-lib/TransDecoder/PerlLib/Gene_obj_indexer.pm
-lib/TransDecoder/PerlLib/Gene_obj.pm
-lib/TransDecoder/PerlLib/GFF3_utils.pm
-lib/TransDecoder/PerlLib/Longest_orf.pm
-lib/TransDecoder/PerlLib/Nuc_translator.pm
-lib/TransDecoder/PerlLib/TiedHash.pm
diff --git a/p5-xmlsig-svn/Makefile b/p5-xmlsig-svn/Makefile
index bdf46348b7..6ba96a2047 100644
--- a/p5-xmlsig-svn/Makefile
+++ b/p5-xmlsig-svn/Makefile
@@ -17,11 +17,11 @@ SVN_REPO.xmlsig=	http://svn.code.sf.net/p/xmlsig/code/trunk
 
 WRKSRC=		${WRKDIR}/${SVN_MODULE.xmlsig}
 
-CONFIGURE_DIRS= perl
+CONFIGURE_DIRS=	perl
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake perl
 
-PERL5_PACKLIST= auto/xmlsig/.packlist
+PERL5_PACKLIST=	auto/xmlsig/.packlist
 
 # swig does its thing here
 pre-configure:
diff --git a/p6-Grammar-Profiler-Simple/Makefile b/p6-Grammar-Profiler-Simple/Makefile
index 6727d39ad1..fa00bc3f0c 100644
--- a/p6-Grammar-Profiler-Simple/Makefile
+++ b/p6-Grammar-Profiler-Simple/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	Grammar-Profiler-Simple
 GITHUB_TAG=	c0aca5fab323b2974821dabd6b89330c609e0b7d
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=perlpilot/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/perlpilot/Grammar-Profiler-Simple
 COMMENT=	A simple profiler that counts calls and records timing for grammar rules
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-Perl6-MIME-Base64/Makefile b/p6-Perl6-MIME-Base64/Makefile
index 9300a3f3c0..29e96bf879 100644
--- a/p6-Perl6-MIME-Base64/Makefile
+++ b/p6-Perl6-MIME-Base64/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	Perl6-MIME-Base64
 GITHUB_TAG=	26302c6ac2dd8c234faa88729bed0a26cfbbd11f
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=perl6/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/perl6/${GITHUB_PROJECT}
 COMMENT=	A Perl 6 module for Base64
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-Pod-To-HTML/Makefile b/p6-Pod-To-HTML/Makefile
index 999860c622..af1271ecc6 100644
--- a/p6-Pod-To-HTML/Makefile
+++ b/p6-Pod-To-HTML/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	Pod-To-HTML
 GITHUB_TAG=	c5847eab0a1b7c39133c1ef7c93fc80b8a0cd792
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=perl6/}
@@ -12,12 +12,12 @@ HOMEPAGE=	https://github.com/jnthn/${GITHUB_PROJECT}
 COMMENT=	convert POD6 to HTML
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
 
-DEPENDS+= p6-uri-[a-z0-9]*:../p6-uri
+DEPENDS+=	p6-uri-[a-z0-9]*:../p6-uri
 
 GENERATE_PLIST=	cd ${DESTDIR}${PREFIX} && ${FIND} * -type f -print |${SORT} -u;
 
diff --git a/p6-Template-Mustache/Makefile b/p6-Template-Mustache/Makefile
index 0bb9c5285f..1a3773445d 100644
--- a/p6-Template-Mustache/Makefile
+++ b/p6-Template-Mustache/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	p6-Template-Mustache
 GITHUB_TAG=	2ffcb06e5417aadcfd3e3f663fdb2e738a165dfb
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=softmoth/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/softmoth/${GITHUB_PROJECT}
 COMMENT=	Perl6 library for the Mustache template format
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-Terminal-ANSIColor/Makefile b/p6-Terminal-ANSIColor/Makefile
index deb891cc82..103307ec56 100644
--- a/p6-Terminal-ANSIColor/Makefile
+++ b/p6-Terminal-ANSIColor/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	Terminal-ANSIColor
 GITHUB_TAG=	bb68d51182235b390277e47da1dbedf745abd163
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tadzik/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/tadzik/Terminal-ANSIColor
 COMMENT=	A Perl 6 module for terminal ansicolors
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-grammar-debugger/Makefile b/p6-grammar-debugger/Makefile
index cddc03a404..edf7434874 100644
--- a/p6-grammar-debugger/Makefile
+++ b/p6-grammar-debugger/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	grammar-debugger
 GITHUB_TAG=	443d53950288798610cf8878454cb8441c6ea84d
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jnthn/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/jnthn/${GITHUB_PROJECT}
 COMMENT=	A Perl 6 module for debugging grammars
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-json/Makefile b/p6-json/Makefile
index 7c96e6aa94..df1045b2b0 100644
--- a/p6-json/Makefile
+++ b/p6-json/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	json
 GITHUB_TAG=	f6fe07850504e06a9422adb246e4326251004ad8
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=moritz/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/moritz/${GITHUB_PROJECT}
 COMMENT=	A tiny JSON parser and emitter for Perl 6 on Rakudo
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-json_fast/Makefile b/p6-json_fast/Makefile
index d899af8c45..2fe0a2b476 100644
--- a/p6-json_fast/Makefile
+++ b/p6-json_fast/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	json_fast
 GITHUB_TAG=	36e7b1f4d24f519b994be4e0a18a216387d5315d
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=timo/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/timo/${GITHUB_PROJECT}
 COMMENT=	A Perl 6 module for JSON
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-oo-monitors/Makefile b/p6-oo-monitors/Makefile
index a56a7c01ba..ac6e88c044 100644
--- a/p6-oo-monitors/Makefile
+++ b/p6-oo-monitors/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	oo-monitors
 GITHUB_TAG=	b9de07c277f0a9fa805bb18113788228f6acfd3b
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jnthn/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/jnthn/oo-monitors/
 COMMENT=	A monitor provides per-instance mutual exclusion for objects
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-perl6-digest-md5/Makefile b/p6-perl6-digest-md5/Makefile
index 5f9b29c2e8..9995cb5b59 100644
--- a/p6-perl6-digest-md5/Makefile
+++ b/p6-perl6-digest-md5/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	perl6-digest-md5
 GITHUB_TAG=	2194250ff2d50a37f92d4f82fac216729f4eba87
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=cosimo/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/cosimo/${GITHUB_PROJECT}
 COMMENT=	A Perl 6 module for MD5
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-perl6-encode/Makefile b/p6-perl6-encode/Makefile
index 58f204b556..cd67ed5515 100644
--- a/p6-perl6-encode/Makefile
+++ b/p6-perl6-encode/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	perl6-encode
 GITHUB_TAG=	702214dcedd05ea62d815ffb4c287e1596cee4c9
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sergot/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/sergot/${GITHUB_PROJECT}
 COMMENT=	A Perl 6 module for some text encoding
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-perl6-http-status/Makefile b/p6-perl6-http-status/Makefile
index b37b982b1a..26226b215c 100644
--- a/p6-perl6-http-status/Makefile
+++ b/p6-perl6-http-status/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	perl6-http-status
 GITHUB_TAG=	20486489dfb9b3a81300e0ad068edf96855ba22b
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=supernovus/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/supernovus/${GITHUB_PROJECT}
 COMMENT=	A Perl 6 module for HTTP status code text
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-svg-plot/Makefile b/p6-svg-plot/Makefile
index d8d972c173..e1c1cca4b2 100644
--- a/p6-svg-plot/Makefile
+++ b/p6-svg-plot/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	svg-plot
 GITHUB_TAG=	f867cbfe31fd3aadb5830f2acd433c2d8a1de6df
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=moritz/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/moritz/svg-plot
 COMMENT=	A simple 2D chart plotter for Perl 6
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-svg/Makefile b/p6-svg/Makefile
index e22b30fe7e..c601906a19 100644
--- a/p6-svg/Makefile
+++ b/p6-svg/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	svg
 GITHUB_TAG=	f7117f484c713ec5d84f5662ac87909bca5dfe5d
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=moritz/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/moritz/svg
 COMMENT=	A Perl 6 module for SVG graphics
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-test-mock/Makefile b/p6-test-mock/Makefile
index ea7e5881d6..593401eb8e 100644
--- a/p6-test-mock/Makefile
+++ b/p6-test-mock/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	test-mock
 GITHUB_TAG=	b28dd4f3410ff1298649ea3ccb4efac0f77ab71b
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jnthn/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/jnthn
 COMMENT=	A Perl 6 module for testing
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-uri/Makefile b/p6-uri/Makefile
index e0fc5e33f1..84af369ac6 100644
--- a/p6-uri/Makefile
+++ b/p6-uri/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	uri
 GITHUB_TAG=	bac75821337a2142c0f364a5deefc5ecbddd8ee4
-PKGREVISION= 1
+PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=perl6-community-modules/}
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/perl6-community-modules/${GITHUB_PROJECT}
 COMMENT=	Perl6 realization of URI — Uniform Resource Identifiers handler
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
diff --git a/p6-xml-writer/Makefile b/p6-xml-writer/Makefile
index fff5612b94..3268968cb3 100644
--- a/p6-xml-writer/Makefile
+++ b/p6-xml-writer/Makefile
@@ -2,7 +2,7 @@
 
 GITHUB_PROJECT=	xml-writer
 GITHUB_TAG=	4d30a9d8e06033ca97387971b653817becd5a759
-PKGREVISION= 2
+PKGREVISION=	2
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=masak/}
@@ -12,11 +12,11 @@ HOMEPAGE=	https://github.com/masak/xml-writer
 COMMENT=	A Perl 6 module to generate XML
 LICENSE=	artistic
 
-WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}*
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gtar
 EXTRACT_USING=	gtar
-NO_INTALL= yes
+NO_INTALL=	yes
 
 GENERATE_PLIST=	cd ${DESTDIR}${PREFIX} && ${FIND} * -type f -print |${SORT} -u;
 
diff --git a/palp/Makefile b/palp/Makefile
index 6b1bdbae21..ec4d08b169 100644
--- a/palp/Makefile
+++ b/palp/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE=	http://hep.itp.tuwien.ac.at/%7Ekreuzer/CY/palp/
 COMMENT=	Analyzing lattice polytopes
 #LICENSE=	# TODO: (see mk/license.mk)
 
-WRKSRC=	${WRKDIR}/palp
-MAKE_FILE=      GNUmakefile
+WRKSRC=		${WRKDIR}/palp
+MAKE_FILE=	GNUmakefile
 
 INSTALLATION_DIRS+=	bin share/doc/palp
 
diff --git a/pam-pkcs11/Makefile b/pam-pkcs11/Makefile
index 39db3caf2f..58317f64a4 100644
--- a/pam-pkcs11/Makefile
+++ b/pam-pkcs11/Makefile
@@ -21,7 +21,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 
-EGDIR=        		${PREFIX}/share/examples/pam-pkcs11
+EGDIR=			${PREFIX}/share/examples/pam-pkcs11
 PKG_SYSCONFSUBDIR=	pam-pkcs11
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--docdir=${EGDIR}
diff --git a/pam-pkcs11/PLIST.common b/pam-pkcs11/PLIST.common
index ebdc675af5..e81f1aa7c9 100644
--- a/pam-pkcs11/PLIST.common
+++ b/pam-pkcs11/PLIST.common
@@ -2,10 +2,10 @@
 bin/card_eventmgr
 bin/pkcs11_eventmgr
 bin/pkcs11_inspect
+bin/pkcs11_inspect
 bin/pkcs11_listcerts
 bin/pkcs11_make_hash_link
 bin/pkcs11_setup
-bin/pkcs11_inspect
 bin/pklogin_finder
 lib/pam_pkcs11/opensc_mapper.la
 lib/pam_pkcs11/openssh_mapper.la
diff --git a/pan2-git/Makefile b/pan2-git/Makefile
index 63820c244b..062139ac6f 100644
--- a/pan2-git/Makefile
+++ b/pan2-git/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS+=		gnome-common>=3.6.0nb1:../../devel/gnome-common
 BUILD_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
 
 GIT_REPOSITORIES=	gnome
-GIT_REPO.gnome= 	git://git.gnome.org/pan2
+GIT_REPO.gnome=		git://git.gnome.org/pan2
 GIT_MODULE.gnome=	pan2
 WRKSRC=			${WRKDIR}/pan2
 
diff --git a/parallel/PLIST b/parallel/PLIST
index de90b94c32..2fa56fe427 100755
--- a/parallel/PLIST
+++ b/parallel/PLIST
@@ -11,19 +11,19 @@ man/man7/parallel_design.7
 man/man7/parallel_tutorial.7
 share/doc/parallel/COPYING
 share/doc/parallel/NEWS
+share/doc/parallel/README
 share/doc/parallel/niceload.html
 share/doc/parallel/niceload.pdf
 share/doc/parallel/niceload.texi
-share/doc/parallel/parallel_design.html
-share/doc/parallel/parallel_design.pdf
-share/doc/parallel/parallel_design.texi
 share/doc/parallel/parallel.html
 share/doc/parallel/parallel.pdf
 share/doc/parallel/parallel.texi
+share/doc/parallel/parallel_design.html
+share/doc/parallel/parallel_design.pdf
+share/doc/parallel/parallel_design.texi
 share/doc/parallel/parallel_tutorial.html
 share/doc/parallel/parallel_tutorial.pdf
 share/doc/parallel/parallel_tutorial.texi
-share/doc/parallel/README
 share/doc/parallel/sem.html
 share/doc/parallel/sem.pdf
 share/doc/parallel/sem.texi
diff --git a/paraview/Makefile b/paraview/Makefile
index 89d5eff145..ea0cbbc1fc 100644
--- a/paraview/Makefile
+++ b/paraview/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.11 2014/08/11 23:10:13 thomasklausner Exp $
 
-VER=4.0.1
+VER=		4.0.1
 PKGNAME=	paraview-${VER}
 DISTNAME=	ParaView-v${VER}-source
 PKGREVISION=	1
@@ -17,8 +17,8 @@ USE_LANGUAGES=		c c++ fortran
 USE_TOOLS+=		gmake
 DEPENDS+=		qt4-sqlite3>=4.0:../../x11/qt4-sqlite3
 
-USE_CMAKE=				yes
-CHECK_PORTABILITY_SKIP=		Utilities/protobuf/configure
+USE_CMAKE=		yes
+CHECK_PORTABILITY_SKIP=	Utilities/protobuf/configure
 
 CMAKE_ARGS+=			-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=			-DBUILD_SHARED_LIBS=ON
@@ -44,8 +44,8 @@ CMAKE_ARGS+=			-DVTK_USE_SYSTEM_PNG=ON \
 						-DVTK_USE_SYSTEM_LIBXML2=ON \
 						-DVTK_USE_X=ON
 
-CMAKE_ARG_PATH= 		..
-CONFIGURE_DIRS= 		_ParaView_build
+CMAKE_ARG_PATH=			..
+CONFIGURE_DIRS=			_ParaView_build
 
 PY_PATCHPLIST=			yes
 
diff --git a/parcellite/Makefile b/parcellite/Makefile
index 1607de0dfe..65c390bb75 100644
--- a/parcellite/Makefile
+++ b/parcellite/Makefile
@@ -13,9 +13,9 @@ LICENSE=	gnu-gpl-v3
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake intltool msgfmt msgmerge perl pkg-config xgettext
 
-EGDIR=		share/examples/xdg/autostart
+EGDIR=			share/examples/xdg/autostart
 INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/xdg/autostart ${EGDIR}
-CONF_FILES=	${EGDIR}/parcellite-startup.desktop ${PKG_SYSCONFDIR}/xdg/autostart/parcellite-startup.desktop
+CONF_FILES=		${EGDIR}/parcellite-startup.desktop ${PKG_SYSCONFDIR}/xdg/autostart/parcellite-startup.desktop
 
 .include "options.mk"
 
diff --git a/pbbam/PLIST b/pbbam/PLIST
index 795cead71a..15d64068af 100644
--- a/pbbam/PLIST
+++ b/pbbam/PLIST
@@ -9,8 +9,8 @@ include/pbbam/BaiIndexedBamReader.h
 include/pbbam/BamFile.h
 include/pbbam/BamHeader.h
 include/pbbam/BamReader.h
-include/pbbam/BamRecordBuilder.h
 include/pbbam/BamRecord.h
+include/pbbam/BamRecordBuilder.h
 include/pbbam/BamRecordImpl.h
 include/pbbam/BamTagCodec.h
 include/pbbam/BamWriter.h
@@ -24,26 +24,59 @@ include/pbbam/DataSet.h
 include/pbbam/DataSetTypes.h
 include/pbbam/DataSetXsd.h
 include/pbbam/EntireFileQuery.h
-include/pbbam/exception/InvalidSequencingChemistryException.h
-include/pbbam/exception/ValidationException.h
 include/pbbam/Frames.h
 include/pbbam/GenomicInterval.h
 include/pbbam/GenomicIntervalQuery.h
 include/pbbam/IndexedFastaReader.h
+include/pbbam/Interval.h
+include/pbbam/LocalContextFlags.h
+include/pbbam/MD5.h
+include/pbbam/Orientation.h
+include/pbbam/PbiBasicTypes.h
+include/pbbam/PbiBuilder.h
+include/pbbam/PbiFile.h
+include/pbbam/PbiFilter.h
+include/pbbam/PbiFilterQuery.h
+include/pbbam/PbiFilterTypes.h
+include/pbbam/PbiIndex.h
+include/pbbam/PbiIndexedBamReader.h
+include/pbbam/PbiLookupData.h
+include/pbbam/PbiRawData.h
+include/pbbam/Position.h
+include/pbbam/ProgramInfo.h
+include/pbbam/QNameQuery.h
+include/pbbam/QualityValue.h
+include/pbbam/QualityValues.h
+include/pbbam/ReadAccuracyQuery.h
+include/pbbam/ReadGroupInfo.h
+include/pbbam/SamTagCodec.h
+include/pbbam/SequenceInfo.h
+include/pbbam/Strand.h
+include/pbbam/SubreadLengthQuery.h
+include/pbbam/Tag.h
+include/pbbam/TagCollection.h
+include/pbbam/UnmappedReadsQuery.h
+include/pbbam/Validator.h
+include/pbbam/ZmwGroupQuery.h
+include/pbbam/ZmwQuery.h
+include/pbbam/ZmwType.h
+include/pbbam/ZmwTypeMap.h
+include/pbbam/exception/InvalidSequencingChemistryException.h
+include/pbbam/exception/ValidationException.h
 include/pbbam/internal/Accuracy.inl
 include/pbbam/internal/BamHeader.inl
+include/pbbam/internal/BamRecord.inl
 include/pbbam/internal/BamRecordBuilder.inl
 include/pbbam/internal/BamRecordImpl.inl
-include/pbbam/internal/BamRecord.inl
 include/pbbam/internal/Cigar.inl
 include/pbbam/internal/CigarOperation.inl
 include/pbbam/internal/Compare.inl
 include/pbbam/internal/CompositeBamReader.inl
+include/pbbam/internal/DataSet.inl
 include/pbbam/internal/DataSetBaseTypes.h
 include/pbbam/internal/DataSetBaseTypes.inl
 include/pbbam/internal/DataSetElement.h
 include/pbbam/internal/DataSetElement.inl
-include/pbbam/internal/DataSet.inl
 include/pbbam/internal/DataSetListElement.h
 include/pbbam/internal/DataSetListElement.inl
 include/pbbam/internal/DataSetTypes.inl
@@ -65,35 +98,6 @@ include/pbbam/internal/ReadGroupInfo.inl
 include/pbbam/internal/SequenceInfo.inl
 include/pbbam/internal/Tag.inl
 include/pbbam/internal/Validator.inl
-include/pbbam/Interval.h
-include/pbbam/LocalContextFlags.h
-include/pbbam/MD5.h
-include/pbbam/Orientation.h
-include/pbbam/PbiBasicTypes.h
-include/pbbam/PbiBuilder.h
-include/pbbam/PbiFile.h
-include/pbbam/PbiFilter.h
-include/pbbam/PbiFilterQuery.h
-include/pbbam/PbiFilterTypes.h
-include/pbbam/PbiIndexedBamReader.h
-include/pbbam/PbiIndex.h
-include/pbbam/PbiLookupData.h
-include/pbbam/PbiRawData.h
-include/pbbam/Position.h
-include/pbbam/ProgramInfo.h
-include/pbbam/QNameQuery.h
-include/pbbam/QualityValue.h
-include/pbbam/QualityValues.h
-include/pbbam/ReadAccuracyQuery.h
-include/pbbam/ReadGroupInfo.h
-include/pbbam/SamTagCodec.h
-include/pbbam/SequenceInfo.h
-include/pbbam/Strand.h
-include/pbbam/SubreadLengthQuery.h
-include/pbbam/TagCollection.h
-include/pbbam/Tag.h
-include/pbbam/UnmappedReadsQuery.h
-include/pbbam/Validator.h
 include/pbbam/virtual/VirtualPolymeraseBamRecord.h
 include/pbbam/virtual/VirtualPolymeraseCompositeReader.h
 include/pbbam/virtual/VirtualPolymeraseReader.h
@@ -104,8 +108,4 @@ include/pbbam/virtual/VirtualZmwBamRecord.h
 include/pbbam/virtual/WhitelistedZmwReadStitcher.h
 include/pbbam/virtual/ZmwReadStitcher.h
 include/pbbam/virtual/ZmwWhitelistVirtualReader.h
-include/pbbam/ZmwGroupQuery.h
-include/pbbam/ZmwQuery.h
-include/pbbam/ZmwType.h
-include/pbbam/ZmwTypeMap.h
 lib/libpbbam.a
diff --git a/pbcopper/PLIST b/pbcopper/PLIST
index 8b9f0829be..40da3be0fa 100644
--- a/pbcopper/PLIST
+++ b/pbcopper/PLIST
@@ -1,57 +1,57 @@
 @comment $NetBSD$
+include/pbcopper/Config.h
 include/pbcopper/cli/BuiltInOption.h
 include/pbcopper/cli/CLI.h
 include/pbcopper/cli/HelpPrinter.h
 include/pbcopper/cli/Interface.h
-include/pbcopper/cli/internal/Option-inl.h
-include/pbcopper/cli/internal/Results-inl.h
 include/pbcopper/cli/Option.h
 include/pbcopper/cli/Parser.h
 include/pbcopper/cli/PositionalArg.h
 include/pbcopper/cli/Results.h
 include/pbcopper/cli/SingleDashMode.h
+include/pbcopper/cli/VersionPrinter.h
+include/pbcopper/cli/internal/Option-inl.h
+include/pbcopper/cli/internal/Results-inl.h
 include/pbcopper/cli/toolcontract/Config.h
 include/pbcopper/cli/toolcontract/Driver.h
 include/pbcopper/cli/toolcontract/InputFileType.h
-include/pbcopper/cli/toolcontract/internal/Config-inl.h
-include/pbcopper/cli/toolcontract/internal/Driver-inl.h
-include/pbcopper/cli/toolcontract/internal/InputFileType-inl.h
-include/pbcopper/cli/toolcontract/internal/OutputFileType-inl.h
-include/pbcopper/cli/toolcontract/internal/Task-inl.h
 include/pbcopper/cli/toolcontract/JsonPrinter.h
 include/pbcopper/cli/toolcontract/OutputFileType.h
 include/pbcopper/cli/toolcontract/ResolvedToolContract.h
 include/pbcopper/cli/toolcontract/ResourceType.h
 include/pbcopper/cli/toolcontract/Task.h
 include/pbcopper/cli/toolcontract/TaskType.h
-include/pbcopper/cli/VersionPrinter.h
-include/pbcopper/Config.h
+include/pbcopper/cli/toolcontract/internal/Config-inl.h
+include/pbcopper/cli/toolcontract/internal/Driver-inl.h
+include/pbcopper/cli/toolcontract/internal/InputFileType-inl.h
+include/pbcopper/cli/toolcontract/internal/OutputFileType-inl.h
+include/pbcopper/cli/toolcontract/internal/Task-inl.h
 include/pbcopper/data/CCSTag.h
-include/pbcopper/data/internal/Interval-inl.h
-include/pbcopper/data/internal/MovieName-inl.h
-include/pbcopper/data/internal/ReadNameBase.h
-include/pbcopper/data/internal/ReadNameBase-inl.h
-include/pbcopper/data/internal/RSMovieName-inl.h
 include/pbcopper/data/Interval.h
 include/pbcopper/data/MovieName.h
 include/pbcopper/data/Position.h
-include/pbcopper/data/ReadName.h
 include/pbcopper/data/RSMovieName.h
 include/pbcopper/data/RSReadName.h
+include/pbcopper/data/ReadName.h
 include/pbcopper/data/Zmw.h
-include/pbcopper/json/internal/json.hpp
+include/pbcopper/data/internal/Interval-inl.h
+include/pbcopper/data/internal/MovieName-inl.h
+include/pbcopper/data/internal/RSMovieName-inl.h
+include/pbcopper/data/internal/ReadNameBase-inl.h
+include/pbcopper/data/internal/ReadNameBase.h
 include/pbcopper/json/JSON.h
-include/pbcopper/logging/internal/Logging-inl.h
+include/pbcopper/json/internal/json.hpp
 include/pbcopper/logging/Logging.h
+include/pbcopper/logging/internal/Logging-inl.h
 include/pbcopper/stream/Stream.h
 include/pbcopper/utility/CallbackTimer.h
 include/pbcopper/utility/EnumClassHash.h
-include/pbcopper/utility/internal/CallbackTimer-inl.h
-include/pbcopper/utility/internal/Stopwatch-inl.h
-include/pbcopper/utility/internal/StringUtils-inl.h
-include/pbcopper/utility/internal/SystemInfo-inl.h
 include/pbcopper/utility/Stopwatch.h
 include/pbcopper/utility/StringUtils.h
 include/pbcopper/utility/SystemInfo.h
 include/pbcopper/utility/Version.h.in
+include/pbcopper/utility/internal/CallbackTimer-inl.h
+include/pbcopper/utility/internal/Stopwatch-inl.h
+include/pbcopper/utility/internal/StringUtils-inl.h
+include/pbcopper/utility/internal/SystemInfo-inl.h
 lib/libpbcopper.a
diff --git a/pbcopper/buildlink3.mk b/pbcopper/buildlink3.mk
index a9c0ab9501..99fc0ce144 100644
--- a/pbcopper/buildlink3.mk
+++ b/pbcopper/buildlink3.mk
@@ -8,7 +8,7 @@ PBCOPPER_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.pbcopper?=	build
 
 BUILDLINK_API_DEPENDS.pbcopper+=	pbcopper>=2016.09.13
-BUILDLINK_PKGSRCDIR.pbcopper?=	../../wip/pbcopper
+BUILDLINK_PKGSRCDIR.pbcopper?=		../../wip/pbcopper
 
 # XXX
 # XXX Uncomment and keep only the buildlink3 lines below which are directly
diff --git a/pbseqan/PLIST b/pbseqan/PLIST
index 500f924d94..da5d2b95ec 100644
--- a/pbseqan/PLIST
+++ b/pbseqan/PLIST
@@ -1,22 +1,24 @@
 @comment $NetBSD$
+include/PacBio/seqan/LICENSE
+include/PacBio/seqan/align.h
 include/PacBio/seqan/align/align_base.h
 include/PacBio/seqan/align/align_cols.h
 include/PacBio/seqan/align/align_config.h
 include/PacBio/seqan/align/align_iterator_base.h
-include/PacBio/seqan/align/alignment_algorithm_tags.h
-include/PacBio/seqan/align/alignment_operations.h
 include/PacBio/seqan/align/align_metafunctions.h
 include/PacBio/seqan/align/align_traceback.h
+include/PacBio/seqan/align/alignment_algorithm_tags.h
+include/PacBio/seqan/align/alignment_operations.h
 include/PacBio/seqan/align/dp_algorithm_impl.h
 include/PacBio/seqan/align/dp_band.h
+include/PacBio/seqan/align/dp_cell.h
 include/PacBio/seqan/align/dp_cell_affine.h
 include/PacBio/seqan/align/dp_cell_dynamic.h
-include/PacBio/seqan/align/dp_cell.h
 include/PacBio/seqan/align/dp_cell_linear.h
 include/PacBio/seqan/align/dp_context.h
+include/PacBio/seqan/align/dp_formula.h
 include/PacBio/seqan/align/dp_formula_affine.h
 include/PacBio/seqan/align/dp_formula_dynamic.h
-include/PacBio/seqan/align/dp_formula.h
 include/PacBio/seqan/align/dp_formula_linear.h
 include/PacBio/seqan/align/dp_matrix.h
 include/PacBio/seqan/align/dp_matrix_navigator.h
@@ -28,14 +30,10 @@ include/PacBio/seqan/align/dp_meta_info.h
 include/PacBio/seqan/align/dp_profile.h
 include/PacBio/seqan/align/dp_scout.h
 include/PacBio/seqan/align/dp_setup.h
+include/PacBio/seqan/align/dp_trace_segment.h
 include/PacBio/seqan/align/dp_traceback_adaptor.h
 include/PacBio/seqan/align/dp_traceback_impl.h
-include/PacBio/seqan/align/dp_trace_segment.h
 include/PacBio/seqan/align/evaluate_alignment.h
-include/PacBio/seqan/align_extend/align_extend_base.h
-include/PacBio/seqan/align_extend/align_extend.h
-include/PacBio/seqan/align_extend/dp_scout_xdrop.h
-include/PacBio/seqan/align_extend.h
 include/PacBio/seqan/align/fragment.h
 include/PacBio/seqan/align/gap_anchor.h
 include/PacBio/seqan/align/gapped_value_type.h
@@ -51,29 +49,33 @@ include/PacBio/seqan/align/global_alignment_myers_hirschberg_impl.h
 include/PacBio/seqan/align/global_alignment_myers_impl.h
 include/PacBio/seqan/align/global_alignment_specialized.h
 include/PacBio/seqan/align/global_alignment_unbanded.h
-include/PacBio/seqan/align.h
 include/PacBio/seqan/align/local_alignment_banded.h
 include/PacBio/seqan/align/local_alignment_banded_waterman_eggert_impl.h
-include/PacBio/seqan/align/local_alignment_enumeration_banded.h
 include/PacBio/seqan/align/local_alignment_enumeration.h
+include/PacBio/seqan/align/local_alignment_enumeration_banded.h
 include/PacBio/seqan/align/local_alignment_enumeration_unbanded.h
 include/PacBio/seqan/align/local_alignment_unbanded.h
 include/PacBio/seqan/align/local_alignment_waterman_eggert_impl.h
 include/PacBio/seqan/align/matrix_base.h
+include/PacBio/seqan/align_extend.h
+include/PacBio/seqan/align_extend/align_extend.h
+include/PacBio/seqan/align_extend/align_extend_base.h
+include/PacBio/seqan/align_extend/dp_scout_xdrop.h
+include/PacBio/seqan/align_profile.h
+include/PacBio/seqan/align_profile/add_to_profile.h
+include/PacBio/seqan/align_profile/score_profile_seq.h
+include/PacBio/seqan/align_split.h
+include/PacBio/seqan/align_split/align_split_interface.h
+include/PacBio/seqan/align_split/dp_scout_split.h
+include/PacBio/seqan/alignment_free.h
 include/PacBio/seqan/alignment_free/af_d2.h
 include/PacBio/seqan/alignment_free/af_d2star.h
 include/PacBio/seqan/alignment_free/af_d2z.h
 include/PacBio/seqan/alignment_free/af_n2.h
 include/PacBio/seqan/alignment_free/alignment_free_base.h
 include/PacBio/seqan/alignment_free/alignment_free_comparison.h
-include/PacBio/seqan/alignment_free.h
 include/PacBio/seqan/alignment_free/kmer_functions.h
-include/PacBio/seqan/align_profile/add_to_profile.h
-include/PacBio/seqan/align_profile.h
-include/PacBio/seqan/align_profile/score_profile_seq.h
-include/PacBio/seqan/align_split/align_split_interface.h
-include/PacBio/seqan/align_split/dp_scout_split.h
-include/PacBio/seqan/align_split.h
+include/PacBio/seqan/arg_parse.h
 include/PacBio/seqan/arg_parse/arg_parse_argument.h
 include/PacBio/seqan/arg_parse/arg_parse_ctd_support.h
 include/PacBio/seqan/arg_parse/arg_parse_doc.h
@@ -82,9 +84,9 @@ include/PacBio/seqan/arg_parse/arg_parse_option.h
 include/PacBio/seqan/arg_parse/arg_parse_parse.h
 include/PacBio/seqan/arg_parse/arg_parse_type_support.h
 include/PacBio/seqan/arg_parse/argument_parser.h
-include/PacBio/seqan/arg_parse.h
 include/PacBio/seqan/arg_parse/tool_doc.h
 include/PacBio/seqan/arg_parse/xml_support.h
+include/PacBio/seqan/bam_io.h
 include/PacBio/seqan/bam_io/bam_alignment_record.h
 include/PacBio/seqan/bam_io/bam_alignment_record_util.h
 include/PacBio/seqan/bam_io/bam_file.h
@@ -95,11 +97,11 @@ include/PacBio/seqan/bam_io/bam_sam_conversion.h
 include/PacBio/seqan/bam_io/bam_scanner_cache.h
 include/PacBio/seqan/bam_io/bam_tags_dict.h
 include/PacBio/seqan/bam_io/cigar.h
-include/PacBio/seqan/bam_io.h
 include/PacBio/seqan/bam_io/read_bam.h
 include/PacBio/seqan/bam_io/read_sam.h
 include/PacBio/seqan/bam_io/write_bam.h
 include/PacBio/seqan/bam_io/write_sam.h
+include/PacBio/seqan/basic.h
 include/PacBio/seqan/basic/aggregate_concept.h
 include/PacBio/seqan/basic/allocator_chunkpool.h
 include/PacBio/seqan/basic/allocator_interface.h
@@ -113,8 +115,8 @@ include/PacBio/seqan/basic/alphabet_concept.h
 include/PacBio/seqan/basic/alphabet_math.h
 include/PacBio/seqan/basic/alphabet_profile.h
 include/PacBio/seqan/basic/alphabet_qualities.h
-include/PacBio/seqan/basic/alphabet_residue_funcs.h
 include/PacBio/seqan/basic/alphabet_residue.h
+include/PacBio/seqan/basic/alphabet_residue_funcs.h
 include/PacBio/seqan/basic/alphabet_residue_tabs.h
 include/PacBio/seqan/basic/alphabet_simple_type.h
 include/PacBio/seqan/basic/alphabet_storage.h
@@ -153,14 +155,13 @@ include/PacBio/seqan/basic/fundamental_conversion.h
 include/PacBio/seqan/basic/fundamental_metafunctions.h
 include/PacBio/seqan/basic/fundamental_tags.h
 include/PacBio/seqan/basic/fundamental_transport.h
-include/PacBio/seqan/basic.h
 include/PacBio/seqan/basic/holder_base.h
 include/PacBio/seqan/basic/holder_simple.h
 include/PacBio/seqan/basic/holder_tristate.h
 include/PacBio/seqan/basic/hosted_type_interface.h
-include/PacBio/seqan/basic/iterator_adaptor.h
 include/PacBio/seqan/basic/iterator_adapt_pointer.h
 include/PacBio/seqan/basic/iterator_adapt_std.h
+include/PacBio/seqan/basic/iterator_adaptor.h
 include/PacBio/seqan/basic/iterator_base.h
 include/PacBio/seqan/basic/iterator_concept.h
 include/PacBio/seqan/basic/iterator_counting.h
@@ -174,8 +175,8 @@ include/PacBio/seqan/basic/metaprogramming_control.h
 include/PacBio/seqan/basic/metaprogramming_enable_if.h
 include/PacBio/seqan/basic/metaprogramming_logic.h
 include/PacBio/seqan/basic/metaprogramming_math.h
-include/PacBio/seqan/basic/metaprogramming_type_algebra.h
 include/PacBio/seqan/basic/metaprogramming_type.h
+include/PacBio/seqan/basic/metaprogramming_type_algebra.h
 include/PacBio/seqan/basic/pair_base.h
 include/PacBio/seqan/basic/pair_bit_compressed.h
 include/PacBio/seqan/basic/pair_packed.h
@@ -189,11 +190,12 @@ include/PacBio/seqan/basic/triple_packed.h
 include/PacBio/seqan/basic/tuple_base.h
 include/PacBio/seqan/basic/tuple_bit_compressed.h
 include/PacBio/seqan/basic/volatile_ptr.h
+include/PacBio/seqan/bed_io.h
 include/PacBio/seqan/bed_io/bed_file.h
 include/PacBio/seqan/bed_io/bed_record.h
-include/PacBio/seqan/bed_io.h
 include/PacBio/seqan/bed_io/read_bed.h
 include/PacBio/seqan/bed_io/write_bed.h
+include/PacBio/seqan/consensus.h
 include/PacBio/seqan/consensus/consensus_aligner.h
 include/PacBio/seqan/consensus/consensus_aligner_interface.h
 include/PacBio/seqan/consensus/consensus_alignment_options.h
@@ -202,18 +204,18 @@ include/PacBio/seqan/consensus/consensus_builder.h
 include/PacBio/seqan/consensus/consensus_library.h
 include/PacBio/seqan/consensus/consensus_realign.h
 include/PacBio/seqan/consensus/consensus_score.h
-include/PacBio/seqan/consensus.h
 include/PacBio/seqan/consensus/overlap_info_computation.h
 include/PacBio/seqan/consensus/overlapper.h
+include/PacBio/seqan/file.h
 include/PacBio/seqan/file/file_base.h
 include/PacBio/seqan/file/file_cstyle.h
 include/PacBio/seqan/file/file_forwards.h
 include/PacBio/seqan/file/file_interface.h
 include/PacBio/seqan/file/file_mapping.h
 include/PacBio/seqan/file/file_page.h
-include/PacBio/seqan/file.h
 include/PacBio/seqan/file/string_external.h
 include/PacBio/seqan/file/string_mmap.h
+include/PacBio/seqan/find.h
 include/PacBio/seqan/find/find_abndm.h
 include/PacBio/seqan/find/find_ahocorasick.h
 include/PacBio/seqan/find/find_base.h
@@ -236,10 +238,10 @@ include/PacBio/seqan/find/find_shiftor.h
 include/PacBio/seqan/find/find_simple.h
 include/PacBio/seqan/find/find_wild_shiftand.h
 include/PacBio/seqan/find/find_wumanber.h
-include/PacBio/seqan/find.h
+include/PacBio/seqan/gff_io.h
 include/PacBio/seqan/gff_io/gff_file.h
 include/PacBio/seqan/gff_io/gff_io_base.h
-include/PacBio/seqan/gff_io.h
+include/PacBio/seqan/graph_algorithms.h
 include/PacBio/seqan/graph_algorithms/all_pairs_shortest_path.h
 include/PacBio/seqan/graph_algorithms/bellman_ford.h
 include/PacBio/seqan/graph_algorithms/bipartite_matching.h
@@ -252,7 +254,6 @@ include/PacBio/seqan/graph_algorithms/ford_fulkerson.h
 include/PacBio/seqan/graph_algorithms/graph_algorithm_heap_tree.h
 include/PacBio/seqan/graph_algorithms/graph_algorithm_hmm.h
 include/PacBio/seqan/graph_algorithms/graph_algorithm_lis_his.h
-include/PacBio/seqan/graph_algorithms.h
 include/PacBio/seqan/graph_algorithms/kruskal.h
 include/PacBio/seqan/graph_algorithms/path_growing.h
 include/PacBio/seqan/graph_algorithms/prim.h
@@ -262,17 +263,18 @@ include/PacBio/seqan/graph_algorithms/topological_sort.h
 include/PacBio/seqan/graph_algorithms/transitive_closure.h
 include/PacBio/seqan/graph_algorithms/weakly_connected_components.h
 include/PacBio/seqan/graph_algorithms/weighted_bipartite_matching.h
-include/PacBio/seqan/graph_align/graph_algorithm_refine_aligngraph.h
+include/PacBio/seqan/graph_align.h
 include/PacBio/seqan/graph_align/graph_algorithm_refine_align.h
+include/PacBio/seqan/graph_align/graph_algorithm_refine_aligngraph.h
 include/PacBio/seqan/graph_align/graph_algorithm_refine_annotation.h
 include/PacBio/seqan/graph_align/graph_algorithm_refine_exact.h
 include/PacBio/seqan/graph_align/graph_algorithm_refine_exact_iterative.h
 include/PacBio/seqan/graph_align/graph_algorithm_refine_fragment.h
 include/PacBio/seqan/graph_align/graph_algorithm_refine_inexact.h
 include/PacBio/seqan/graph_align/graph_algorithm_refine_scoring.h
-include/PacBio/seqan/graph_align/graph_impl_align_adapt.h
 include/PacBio/seqan/graph_align/graph_impl_align.h
-include/PacBio/seqan/graph_align.h
+include/PacBio/seqan/graph_align/graph_impl_align_adapt.h
+include/PacBio/seqan/graph_msa.h
 include/PacBio/seqan/graph_msa/graph_align_tcoffee_base.h
 include/PacBio/seqan/graph_msa/graph_align_tcoffee_distance.h
 include/PacBio/seqan/graph_msa/graph_align_tcoffee_guidetree.h
@@ -282,7 +284,7 @@ include/PacBio/seqan/graph_msa/graph_align_tcoffee_library.h
 include/PacBio/seqan/graph_msa/graph_align_tcoffee_msa.h
 include/PacBio/seqan/graph_msa/graph_align_tcoffee_progressive.h
 include/PacBio/seqan/graph_msa/graph_align_tcoffee_refinement.h
-include/PacBio/seqan/graph_msa.h
+include/PacBio/seqan/graph_types.h
 include/PacBio/seqan/graph_types/graph_base.h
 include/PacBio/seqan/graph_types/graph_drawing.h
 include/PacBio/seqan/graph_types/graph_edgestump.h
@@ -296,18 +298,18 @@ include/PacBio/seqan/graph_types/graph_impl_trie.h
 include/PacBio/seqan/graph_types/graph_impl_undirected.h
 include/PacBio/seqan/graph_types/graph_impl_wordgraph.h
 include/PacBio/seqan/graph_types/graph_interface.h
+include/PacBio/seqan/graph_types/graph_iterator.h
 include/PacBio/seqan/graph_types/graph_iterator_adjacency.h
 include/PacBio/seqan/graph_types/graph_iterator_bfs.h
 include/PacBio/seqan/graph_types/graph_iterator_dfs.h
 include/PacBio/seqan/graph_types/graph_iterator_edge.h
-include/PacBio/seqan/graph_types/graph_iterator.h
 include/PacBio/seqan/graph_types/graph_iterator_outedge.h
 include/PacBio/seqan/graph_types/graph_iterator_vertex.h
 include/PacBio/seqan/graph_types/graph_utility_parsing.h
-include/PacBio/seqan/graph_types.h
 include/PacBio/seqan/graph_types/property_map_generic.h
 include/PacBio/seqan/graph_types/property_map_internal.h
 include/PacBio/seqan/graph_types/property_map_internal_pointer.h
+include/PacBio/seqan/index.h
 include/PacBio/seqan/index/find2_backtracking.h
 include/PacBio/seqan/index/find2_base.h
 include/PacBio/seqan/index/find2_functors.h
@@ -315,15 +317,14 @@ include/PacBio/seqan/index/find2_index.h
 include/PacBio/seqan/index/find2_index_multi.h
 include/PacBio/seqan/index/find2_vstree_factory.h
 include/PacBio/seqan/index/find_backtracking.h
+include/PacBio/seqan/index/find_index.h
 include/PacBio/seqan/index/find_index_approx.h
 include/PacBio/seqan/index/find_index_esa.h
-include/PacBio/seqan/index/find_index.h
 include/PacBio/seqan/index/find_index_lambda.h
 include/PacBio/seqan/index/find_index_qgram.h
 include/PacBio/seqan/index/find_pigeonhole.h
 include/PacBio/seqan/index/find_quasar.h
 include/PacBio/seqan/index/find_swift.h
-include/PacBio/seqan/index.h
 include/PacBio/seqan/index/index_base.h
 include/PacBio/seqan/index/index_bwt.h
 include/PacBio/seqan/index/index_childtab.h
@@ -334,11 +335,11 @@ include/PacBio/seqan/index/index_esa_algs_multi.h
 include/PacBio/seqan/index/index_esa_base.h
 include/PacBio/seqan/index/index_esa_drawing.h
 include/PacBio/seqan/index/index_esa_stree.h
+include/PacBio/seqan/index/index_fm.h
 include/PacBio/seqan/index/index_fm_compressed_sa.h
 include/PacBio/seqan/index/index_fm_compressed_sa_iterator.h
 include/PacBio/seqan/index/index_fm_device.h
 include/PacBio/seqan/index/index_fm_dox.h
-include/PacBio/seqan/index/index_fm.h
 include/PacBio/seqan/index/index_fm_lf_table.h
 include/PacBio/seqan/index/index_fm_rank_dictionary_base.h
 include/PacBio/seqan/index/index_fm_rank_dictionary_levels.h
@@ -351,11 +352,11 @@ include/PacBio/seqan/index/index_fm_stree.h
 include/PacBio/seqan/index/index_forwards.h
 include/PacBio/seqan/index/index_lcp.h
 include/PacBio/seqan/index/index_lcp_tree.h
-include/PacBio/seqan/index/index_pizzachili_find.h
 include/PacBio/seqan/index/index_pizzachili.h
+include/PacBio/seqan/index/index_pizzachili_find.h
 include/PacBio/seqan/index/index_pizzachili_string.h
-include/PacBio/seqan/index/index_qgram_bucketrefinement.h
 include/PacBio/seqan/index/index_qgram.h
+include/PacBio/seqan/index/index_qgram_bucketrefinement.h
 include/PacBio/seqan/index/index_qgram_openaddressing.h
 include/PacBio/seqan/index/index_qgram_stree.h
 include/PacBio/seqan/index/index_sa_btree.h
@@ -391,13 +392,12 @@ include/PacBio/seqan/journaled_set/journal_alignment_interface.h
 include/PacBio/seqan/journaled_set/journal_alignment_traceback_adaptor.h
 include/PacBio/seqan/journaled_set/journaled_set_base.h
 include/PacBio/seqan/journaled_set/journaled_set_impl.h
+include/PacBio/seqan/journaled_set/journaled_set_join.h
 include/PacBio/seqan/journaled_set/journaled_set_join_config.h
 include/PacBio/seqan/journaled_set/journaled_set_join_global_align_compact.h
 include/PacBio/seqan/journaled_set/journaled_set_join_global_align_manhatten.h
-include/PacBio/seqan/journaled_set/journaled_set_join.h
 include/PacBio/seqan/journaled_set/journaled_set_journal_trace_descriptor.h
 include/PacBio/seqan/journaled_set/score_biaffine.h
-include/PacBio/seqan/LICENSE
 include/PacBio/seqan/map.h
 include/PacBio/seqan/map/map_adapter_stl.h
 include/PacBio/seqan/map/map_base.h
@@ -413,8 +413,8 @@ include/PacBio/seqan/math/math_operators.h
 include/PacBio/seqan/math/math_rational.h
 include/PacBio/seqan/misc/accumulators.h
 include/PacBio/seqan/misc/base.h
-include/PacBio/seqan/misc/bit_twiddling_functors.h
 include/PacBio/seqan/misc/bit_twiddling.h
+include/PacBio/seqan/misc/bit_twiddling_functors.h
 include/PacBio/seqan/misc/cuda.h
 include/PacBio/seqan/misc/dequeue.h
 include/PacBio/seqan/misc/edit_environment.h
@@ -429,10 +429,10 @@ include/PacBio/seqan/misc/sse2.h
 include/PacBio/seqan/misc/svg.h
 include/PacBio/seqan/misc/terminal.h
 include/PacBio/seqan/misc/union_find.h
-include/PacBio/seqan/modifier/cyclic_shape.h
 include/PacBio/seqan/modifier.h
-include/PacBio/seqan/modifier/modifier_alphabet_expansion.h
+include/PacBio/seqan/modifier/cyclic_shape.h
 include/PacBio/seqan/modifier/modifier_alphabet.h
+include/PacBio/seqan/modifier/modifier_alphabet_expansion.h
 include/PacBio/seqan/modifier/modifier_cyclic_shape.h
 include/PacBio/seqan/modifier/modifier_functors.h
 include/PacBio/seqan/modifier/modifier_iterator.h
@@ -484,8 +484,8 @@ include/PacBio/seqan/platform/platform_pgi.h
 include/PacBio/seqan/platform/platform_solaris.h
 include/PacBio/seqan/platform/platform_windows.h
 include/PacBio/seqan/platform/windows_stdint.h
-include/PacBio/seqan/random/ext_MersenneTwister.h
 include/PacBio/seqan/random.h
+include/PacBio/seqan/random/ext_MersenneTwister.h
 include/PacBio/seqan/random/random_base.h
 include/PacBio/seqan/random/random_beta.h
 include/PacBio/seqan/random/random_beta_kfunc.h
@@ -517,23 +517,23 @@ include/PacBio/seqan/roi_io/write_roi.h
 include/PacBio/seqan/score.h
 include/PacBio/seqan/score/score_base.h
 include/PacBio/seqan/score/score_edit.h
-include/PacBio/seqan/score/score_matrix_data.h
 include/PacBio/seqan/score/score_matrix.h
+include/PacBio/seqan/score/score_matrix_data.h
 include/PacBio/seqan/score/score_matrix_io.h
 include/PacBio/seqan/score/score_simple.h
+include/PacBio/seqan/seeds.h
 include/PacBio/seqan/seeds/banded_chain_alignment.h
 include/PacBio/seqan/seeds/banded_chain_alignment_impl.h
 include/PacBio/seqan/seeds/banded_chain_alignment_profile.h
 include/PacBio/seqan/seeds/banded_chain_alignment_scout.h
 include/PacBio/seqan/seeds/banded_chain_alignment_traceback.h
 include/PacBio/seqan/seeds/basic_iter_indirect.h
-include/PacBio/seqan/seeds.h
 include/PacBio/seqan/seeds/seeds_base.h
 include/PacBio/seqan/seeds/seeds_combination.h
 include/PacBio/seqan/seeds/seeds_extension.h
+include/PacBio/seqan/seeds/seeds_global_chaining.h
 include/PacBio/seqan/seeds/seeds_global_chaining_base.h
 include/PacBio/seqan/seeds/seeds_global_chaining_gusfield.h
-include/PacBio/seqan/seeds/seeds_global_chaining.h
 include/PacBio/seqan/seeds/seeds_seed_base.h
 include/PacBio/seqan/seeds/seeds_seed_chained.h
 include/PacBio/seqan/seeds/seeds_seed_diagonal.h
@@ -542,27 +542,21 @@ include/PacBio/seqan/seeds/seeds_seed_set_non_scored.h
 include/PacBio/seqan/seeds/seeds_seed_set_scored.h
 include/PacBio/seqan/seeds/seeds_seed_set_unordered.h
 include/PacBio/seqan/seeds/seeds_seed_simple.h
+include/PacBio/seqan/seq_io.h
 include/PacBio/seqan/seq_io/fai_index.h
 include/PacBio/seqan/seq_io/fasta_fastq.h
 include/PacBio/seqan/seq_io/genomic_region.h
-include/PacBio/seqan/seq_io.h
 include/PacBio/seqan/seq_io/read_embl.h
 include/PacBio/seqan/seq_io/read_genbank.h
 include/PacBio/seqan/seq_io/sequence_file.h
+include/PacBio/seqan/sequence.h
 include/PacBio/seqan/sequence/adapt_array_pointer.h
 include/PacBio/seqan/sequence/adapt_std_list.h
 include/PacBio/seqan/sequence/adapt_std_string.h
 include/PacBio/seqan/sequence/adapt_std_vector.h
 include/PacBio/seqan/sequence/adapt_thrust_vector.h
 include/PacBio/seqan/sequence/container_view.h
-include/PacBio/seqan/sequence.h
 include/PacBio/seqan/sequence/iter_concat_virtual.h
-include/PacBio/seqan/sequence_journaled.h
-include/PacBio/seqan/sequence_journaled/journal_entries_sorted_array.h
-include/PacBio/seqan/sequence_journaled/journal_entry.h
-include/PacBio/seqan/sequence_journaled/sequence_journaled.h
-include/PacBio/seqan/sequence_journaled/sequence_journaled_iterator_fast.h
-include/PacBio/seqan/sequence_journaled/sequence_journaled_iterator.h
 include/PacBio/seqan/sequence/segment_base.h
 include/PacBio/seqan/sequence/segment_infix.h
 include/PacBio/seqan/sequence/segment_prefix.h
@@ -588,6 +582,12 @@ include/PacBio/seqan/sequence/string_set_device.h
 include/PacBio/seqan/sequence/string_set_owner.h
 include/PacBio/seqan/sequence/string_set_segment.h
 include/PacBio/seqan/sequence/string_set_view.h
+include/PacBio/seqan/sequence_journaled.h
+include/PacBio/seqan/sequence_journaled/journal_entries_sorted_array.h
+include/PacBio/seqan/sequence_journaled/journal_entry.h
+include/PacBio/seqan/sequence_journaled/sequence_journaled.h
+include/PacBio/seqan/sequence_journaled/sequence_journaled_iterator.h
+include/PacBio/seqan/sequence_journaled/sequence_journaled_iterator_fast.h
 include/PacBio/seqan/simple_intervals_io.h
 include/PacBio/seqan/simple_intervals_io/simple_intervals_file.h
 include/PacBio/seqan/simple_intervals_io/simple_intervals_io.h
@@ -602,19 +602,19 @@ include/PacBio/seqan/store/store_annotation.h
 include/PacBio/seqan/store/store_base.h
 include/PacBio/seqan/store/store_contig.h
 include/PacBio/seqan/store/store_intervaltree.h
-include/PacBio/seqan/store/store_io_gff.h
 include/PacBio/seqan/store/store_io.h
+include/PacBio/seqan/store/store_io_gff.h
 include/PacBio/seqan/store/store_io_sam.h
 include/PacBio/seqan/store/store_io_ucsc.h
 include/PacBio/seqan/store/store_library.h
 include/PacBio/seqan/store/store_matepair.h
 include/PacBio/seqan/store/store_read.h
+include/PacBio/seqan/stream.h
 include/PacBio/seqan/stream/adapt_ios.h
 include/PacBio/seqan/stream/buffered_stream.h
 include/PacBio/seqan/stream/file_stream.h
 include/PacBio/seqan/stream/formatted_file.h
 include/PacBio/seqan/stream/guess_format.h
-include/PacBio/seqan/stream.h
 include/PacBio/seqan/stream/iostream_bgzf.h
 include/PacBio/seqan/stream/iostream_bgzf_impl.h
 include/PacBio/seqan/stream/iostream_bzip2.h
@@ -628,11 +628,11 @@ include/PacBio/seqan/stream/stream_base.h
 include/PacBio/seqan/stream/stream_compressor.h
 include/PacBio/seqan/stream/tokenization.h
 include/PacBio/seqan/stream/virtual_stream.h
+include/PacBio/seqan/system.h
 include/PacBio/seqan/system/file_async.h
 include/PacBio/seqan/system/file_directory.h
 include/PacBio/seqan/system/file_forwards.h
 include/PacBio/seqan/system/file_sync.h
-include/PacBio/seqan/system.h
 include/PacBio/seqan/system/system_base.h
 include/PacBio/seqan/system/system_condition.h
 include/PacBio/seqan/system/system_critical_section.h
diff --git a/pdftk/Makefile b/pdftk/Makefile
index 52e4215e3a..0c9f1fba13 100644
--- a/pdftk/Makefile
+++ b/pdftk/Makefile
@@ -1,15 +1,15 @@
 # $NetBSD: Makefile,v 1.2 2012/10/05 08:46:09 asau Exp $
 #
 
-DISTNAME=		pdftk-2.02-src
+DISTNAME=	pdftk-2.02-src
 PKGNAME=	${DISTNAME:S/-src//}
-CATEGORIES=		print
-MASTER_SITES=		https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
-EXTRACT_SUFX=		.zip
+CATEGORIES=	print
+MASTER_SITES=	https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
+EXTRACT_SUFX=	.zip
 
-MAINTAINER=		mwicks%kettering.edu@localhost
-HOMEPAGE=		https://www.pdflabs.com/tools/pdftk-server/
-COMMENT=		Swiss army knife for PDF files
+MAINTAINER=	mwicks%kettering.edu@localhost
+HOMEPAGE=	https://www.pdflabs.com/tools/pdftk-server/
+COMMENT=	Swiss army knife for PDF files
 LICENSE=	gnu-gpl-v2
 
 BUILD_DIRS=		pdftk
@@ -19,13 +19,13 @@ WRKSRC=			${WRKDIR}/${DISTNAME:S/-src/-dist/}
 USE_TOOLS+=		gmake
 USE_LANGUAGES+=		c++
 
-SUBST_CLASSES+=		   fix-paths
-SUBST_STAGE.fix-paths=	   post-patch
-SUBST_MESSAGE.fix-paths=   Fixing absolute paths in make file
-SUBST_FILES.fix-paths=	   pdftk/Makefile.Base
-SUBST_SED.fix-paths=	   -e 's,/usr/local,${PREFIX},g'
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		post-patch
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths in make file
+SUBST_FILES.fix-paths=		pdftk/Makefile.Base
+SUBST_SED.fix-paths=		-e 's,/usr/local,${PREFIX},g'
 
-INSTALLATION_DIRS= 	 ${PKGMANDIR}/man1 share/doc/pdftk
+INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/doc/pdftk
 
 post-install:
 	${INSTALL_MAN}  ${WRKSRC}/debian/pdftk.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/pdftk/PLIST b/pdftk/PLIST
index 902eafaba5..a62d9da9bd 100644
--- a/pdftk/PLIST
+++ b/pdftk/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:05 thomasklausner Exp $
 bin/pdftk
 man/man1/pdftk.1
+share/doc/html/pdftk/pdftk.html
 share/doc/pdftk/COPYING
 share/doc/pdftk/License-Adobe.txt
-share/doc/html/pdftk/pdftk.html
diff --git a/pear-Base/Makefile b/pear-Base/Makefile
index 0ad08a5ca3..a102ca7892 100644
--- a/pear-Base/Makefile
+++ b/pear-Base/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://components.ez.no/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://www.ezcomponents.org/docs/tutorials/Base
+HOMEPAGE=	http://www.ezcomponents.org/docs/tutorials/Base
 COMMENT=	Basic functionality that all eZ Components need
 LICENSE=	modified-bsd
 
diff --git a/pear-CakePHP_CodeSniffer/Makefile b/pear-CakePHP_CodeSniffer/Makefile
index 5e19f64f7f..a2aaefdae0 100755
--- a/pear-CakePHP_CodeSniffer/Makefile
+++ b/pear-CakePHP_CodeSniffer/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www
 MASTER_SITES+=	http://pear.cakephp.org/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.cakephp.org/
+HOMEPAGE=	http://pear.cakephp.org/
 COMMENT=	CodeSniffer rules for checking code against the CakePHP coding standards
 LICENSE=	mit
 
diff --git a/pear-ConsoleTools/Makefile b/pear-ConsoleTools/Makefile
index 9d97ee8bad..bd467b4751 100644
--- a/pear-ConsoleTools/Makefile
+++ b/pear-ConsoleTools/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://components.ez.no/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://www.ezcomponents.org/docs/tutorials/ConsoleTools
+HOMEPAGE=	http://www.ezcomponents.org/docs/tutorials/ConsoleTools
 COMMENT=	Tools to build applications that run on a computer console
 LICENSE=	modified-bsd
 
diff --git a/pear-FPDF/Makefile b/pear-FPDF/Makefile
index 289df1145d..0f1f2a991d 100644
--- a/pear-FPDF/Makefile
+++ b/pear-FPDF/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	print
 MASTER_SITES+=	http://pearhub.org/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://www.pearhub.org/projects/FPDF
+HOMEPAGE=	http://www.pearhub.org/projects/FPDF
 COMMENT=	Unofficial PEAR FPDF-library
 LICENSE=	gnu-lgpl-v3
 
diff --git a/pear-File_Iterator/Makefile b/pear-File_Iterator/Makefile
index 0158879425..ba9bfda01b 100644
--- a/pear-File_Iterator/Makefile
+++ b/pear-File_Iterator/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Filters files based on a list of suffixes
 LICENSE=	modified-bsd
 
diff --git a/pear-Finder/Makefile b/pear-Finder/Makefile
index cd2bfa9462..45a619b34e 100644
--- a/pear-Finder/Makefile
+++ b/pear-Finder/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www
 MASTER_SITES+=	http://pear.symfony.com/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://symfony.com/
+HOMEPAGE=	http://symfony.com/
 COMMENT=	Symfony2 Finder Component
 LICENSE=	mit
 
diff --git a/pear-FinderFacade/Makefile b/pear-FinderFacade/Makefile
index 3ab66ec599..e588495c67 100755
--- a/pear-FinderFacade/Makefile
+++ b/pear-FinderFacade/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Convenience wrapper for Symfony\'s Finder component
 
 BUILD_DEPENDS+=	${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
diff --git a/pear-Horde_Db/Makefile b/pear-Horde_Db/Makefile
index d99018cc57..ed398f3fc4 100644
--- a/pear-Horde_Db/Makefile
+++ b/pear-Horde_Db/Makefile
@@ -4,7 +4,7 @@
 DISTNAME=	Horde_Db-1.2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://pear.horde.org/get/
-EXTRACT_USING=  bsdtar
+EXTRACT_USING=	bsdtar
 
 MAINTAINER=	frederic%fauberteau.org@localhost
 HOMEPAGE=	http://pear.horde.org/
diff --git a/pear-PHPUnit_MockObject/Makefile b/pear-PHPUnit_MockObject/Makefile
index 27ccdd6d95..1ea9cfb7db 100644
--- a/pear-PHPUnit_MockObject/Makefile
+++ b/pear-PHPUnit_MockObject/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Mock Object library for PHPUnit
 LICENSE=	modified-bsd
 
diff --git a/pear-PHP_CodeCoverage/Makefile b/pear-PHP_CodeCoverage/Makefile
index 34cd21cf08..f9523c448b 100644
--- a/pear-PHP_CodeCoverage/Makefile
+++ b/pear-PHP_CodeCoverage/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Collection, processing, and rendering for PHP code coverage
 LICENSE=	modified-bsd
 
diff --git a/pear-PHP_CodeSniffer/Makefile b/pear-PHP_CodeSniffer/Makefile
index b31b5f159c..0eca615975 100755
--- a/pear-PHP_CodeSniffer/Makefile
+++ b/pear-PHP_CodeSniffer/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	PHP_CodeSniffer-1.4.7
 CATEGORIES=	devel
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://www.squizlabs.com/php-codesniffer
+HOMEPAGE=	http://www.squizlabs.com/php-codesniffer
 COMMENT=	Detects PHP, JavaScript and CSS violations of coding standards
 LICENSE=	modified-bsd
 
diff --git a/pear-PHP_Depend/Makefile b/pear-PHP_Depend/Makefile
index 260ebdd61e..cb02e94a6a 100644
--- a/pear-PHP_Depend/Makefile
+++ b/pear-PHP_Depend/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.pdepend.org/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pdepend.org/
+HOMEPAGE=	http://pdepend.org/
 COMMENT=	PHP_Depend design quality metrics for PHP packages	
 LICENSE=	original-bsd
 
diff --git a/pear-PHP_Invoker/Makefile b/pear-PHP_Invoker/Makefile
index 926873ad2e..1107cc512c 100644
--- a/pear-PHP_Invoker/Makefile
+++ b/pear-PHP_Invoker/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Utility class for invoking callables with a timeout
 LICENSE=	modified-bsd
 
diff --git a/pear-PHP_PMD/Makefile b/pear-PHP_PMD/Makefile
index 87b0fd9334..3439765146 100644
--- a/pear-PHP_PMD/Makefile
+++ b/pear-PHP_PMD/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpmd.org/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://phpmd.org/
+HOMEPAGE=	http://phpmd.org/
 COMMENT=	PHP Mess Detector
 LICENSE=	original-bsd
 
diff --git a/pear-PHP_Timer/Makefile b/pear-PHP_Timer/Makefile
index 1215a2a8b6..58312fa278 100644
--- a/pear-PHP_Timer/Makefile
+++ b/pear-PHP_Timer/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Utility class for timing	
 LICENSE=	modified-bsd
 
diff --git a/pear-PHP_TokenStream/Makefile b/pear-PHP_TokenStream/Makefile
index 259daf3ec5..512113666f 100644
--- a/pear-PHP_TokenStream/Makefile
+++ b/pear-PHP_TokenStream/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Wrapper around PHP\'s tokenizer extension
 LICENSE=	modified-bsd
 
diff --git a/pear-Swift/Makefile b/pear-Swift/Makefile
index 66b8ebabe8..a4d654d20e 100644
--- a/pear-Swift/Makefile
+++ b/pear-Swift/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	mail
 MASTER_SITES+=	http://pear.swiftmailer.org/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://swiftmailer.org/
+HOMEPAGE=	http://swiftmailer.org/
 COMMENT=	Free Feature-rich PHP Mailer
 LICENSE=	gnu-lgpl-v3
 
diff --git a/pear-Text_Template/Makefile b/pear-Text_Template/Makefile
index 1a843a1eae..823f04accc 100755
--- a/pear-Text_Template/Makefile
+++ b/pear-Text_Template/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Simple template engine
 LICENSE=	modified-bsd
 
diff --git a/pear-Version/Makefile b/pear-Version/Makefile
index 2450e7220e..dc735080ca 100644
--- a/pear-Version/Makefile
+++ b/pear-Version/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Library that helps with managing the version number of Git-hosted PHP projects	
 LICENSE=	modified-bsd
 
diff --git a/pear-Yaml/Makefile b/pear-Yaml/Makefile
index ae63e0fe99..eec9d44a9c 100755
--- a/pear-Yaml/Makefile
+++ b/pear-Yaml/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www
 MASTER_SITES+=	http://pear.symfony.com/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://symfony.com/components
+HOMEPAGE=	http://symfony.com/components
 COMMENT=	Symfony2 Yaml Component
 LICENSE=	mit
 
diff --git a/pear-fDOMDocument/Makefile b/pear-fDOMDocument/Makefile
index 5fd41d963c..e52e8af8cd 100755
--- a/pear-fDOMDocument/Makefile
+++ b/pear-fDOMDocument/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.netpirates.net/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.netpirates.net/
+HOMEPAGE=	http://pear.netpirates.net/
 COMMENT=	Extension to PHP\'s standard DOM to add methods and exceptions
 LICENSE=	modified-bsd	# XXX unsure which bsd license
 
diff --git a/pear-phpcpd/Makefile b/pear-phpcpd/Makefile
index 72bd09f454..646a576645 100755
--- a/pear-phpcpd/Makefile
+++ b/pear-phpcpd/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Copy/Paste Detector (CPD) for PHP code
 LICENSE=	modified-bsd
 
diff --git a/pear-phpdcd/Makefile b/pear-phpdcd/Makefile
index b265004e4c..248e815575 100755
--- a/pear-phpdcd/Makefile
+++ b/pear-phpdcd/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de/
+HOMEPAGE=	http://pear.phpunit.de/
 COMMENT=	Dead Code Detector (DCD) for PHP code
 LICENSE=	modified-bsd
 
diff --git a/pear-phploc/Makefile b/pear-phploc/Makefile
index 5f13649ef3..26c8a4d889 100755
--- a/pear-phploc/Makefile
+++ b/pear-phploc/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES+=	http://pear.phpunit.de/get/
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
-HOMEPAGE= 	http://pear.phpunit.de
+HOMEPAGE=	http://pear.phpunit.de
 COMMENT=	A tool for quickly measuring the size of a project
 
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-ConsoleTools>=1.5.1:../../wip/pear-ConsoleTools
diff --git a/peercoin/Makefile b/peercoin/Makefile
index 22c557a4cb..5b85d3b2b4 100644
--- a/peercoin/Makefile
+++ b/peercoin/Makefile
@@ -2,7 +2,7 @@
 
 #DISTNAME=	v0.4.0ppc
 #DISTNAME=	v0.6.2.2
-DISTNAME=       master
+DISTNAME=	master
 PKGNAME=	peercoin-${DISTNAME:C/v([0-9]\.[0-9]\.[0-9]).*/\1/1}
 CATEGORIES=	finance
 #MASTER_SITES=	https://github.com/ppcoin/ppcoin/archive/
@@ -22,10 +22,10 @@ WRKSRC=		${WRKDIR}/ppcoin-${DISTNAME:S/v//1}
 AUTO_MKDIRS=	yes
 
 #CXXFLAGS+=	-std=c++0x
-CXXFLAGS+=      -I${BUILDLINK_PREFIX.boost-libs}/include/boost
-CXXFLAGS+=      -I/usr/include
+CXXFLAGS+=	-I${BUILDLINK_PREFIX.boost-libs}/include/boost
+CXXFLAGS+=	-I/usr/include
 
-BUILDLINK_TRANSFORM+=   l:db_cxx:db4_cxx
+BUILDLINK_TRANSFORM+=	l:db_cxx:db4_cxx
 
 
 QMAKE_OPTIONS+=	BOOST_INCLUDE_PATH=${PREFIX}/include/boost
@@ -37,10 +37,10 @@ QMAKE_OPTIONS+=	BDB_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	OPENSSL_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	LIB_RPATH=${PREFIX}/lib
 
-RCD_SCRIPTS=	peercoind
-OWN_DIRS=	${VARBASE}/peercoin
-EGDIR=		${PREFIX}/share/examples/peercoin
-CONF_FILES=	${EGDIR}/peercoin.conf ${PKG_SYSCONFDIR}/peercoin.conf
+RCD_SCRIPTS=		peercoind
+OWN_DIRS=		${VARBASE}/peercoin
+EGDIR=			${PREFIX}/share/examples/peercoin
+CONF_FILES=		${EGDIR}/peercoin.conf ${PKG_SYSCONFDIR}/peercoin.conf
 CONF_FILES_PERMS=	${EGDIR}/peercoin.conf ${PKG_SYSCONFDIR}/peercoin.conf ${ROOT_USER} ${ROOT_GROUP} 0600
 
 
@@ -65,7 +65,7 @@ do-install:
 LIBS+=  -lexecinfo
 .endif
 
-DL_AUTO_VARS=           yes
+DL_AUTO_VARS=		yes
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/pessulus/Makefile b/pessulus/Makefile
index a1c1bcb3bc..8d7ccd1f5c 100644
--- a/pessulus/Makefile
+++ b/pessulus/Makefile
@@ -11,10 +11,10 @@ HOMEPAGE=	http://live.gnome.org/Pessulus
 COMMENT=	Pessulus is a lockdown editor for GNOME
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+=	pkg-config gmake intltool msgfmt
-USE_LANGUAGES=	c
+GNU_CONFIGURE=		yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		pkg-config gmake intltool msgfmt
+USE_LANGUAGES=		c
 
 PY_PATCHPLIST=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit via py-gnome2, py-gtk2, py-gobject
diff --git a/pgplot/Makefile b/pgplot/Makefile
index 09811ed7cb..8b77827121 100644
--- a/pgplot/Makefile
+++ b/pgplot/Makefile
@@ -13,7 +13,7 @@ LICENSE=	pgplot-license
 # http://www.astro.caltech.edu/~tjp/npgplot/license.html
 
 # to build demos (see patches/patch-makemake)
-USE_LIBTOOL=yes
+USE_LIBTOOL=	yes
 
 WRKSRC=		${WRKDIR}/pgplot
 USE_LANGUAGES=	c fortran
@@ -23,10 +23,10 @@ do-configure:
 	cd ${WRKSRC} && \
 	${SETENV}  ${CONFIGURE_ENV} ./makemake . linux g77_gcc
 
-MAKE_FILE=makefile
-BUILD_MAKE_FLAGS=FCOMPL=${PKG_FC} CCOMPL=${PKG_CC} FFLAGC='-O2 -g -fPIC'
+MAKE_FILE=		makefile
+BUILD_MAKE_FLAGS=	FCOMPL=${PKG_FC} CCOMPL=${PKG_CC} FFLAGC='-O2 -g -fPIC'
 # build cpgdemo to test the library
-BUILD_TARGET=all cpg cpgdemo
+BUILD_TARGET=		all cpg cpgdemo
 
 INSTALLATION_DIRS=	bin lib include
 do-install:
diff --git a/pgplot/PLIST b/pgplot/PLIST
index 59f82589ea..582dc6d32a 100644
--- a/pgplot/PLIST
+++ b/pgplot/PLIST
@@ -3,6 +3,6 @@ bin/pgdisp
 bin/pgxwin_server
 include/cpgplot.h
 lib/grfont.dat
-lib/rgb.txt
 lib/libcpgplot.a
 lib/libpgplot.a
+lib/rgb.txt
diff --git a/pgstudio/Makefile b/pgstudio/Makefile
index fa52e8062d..cc0f792c0f 100644
--- a/pgstudio/Makefile
+++ b/pgstudio/Makefile
@@ -15,7 +15,7 @@ DEPENDS+=	apache-tomcat-[0-9]*:../../www/apache-tomcat8
 DEPENDS+=	p5-CGI-[0-9]*:../../www/p5-CGI
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
 
-INSTALLATION_DIRS+= share/tomcat/webapps
+INSTALLATION_DIRS+=	share/tomcat/webapps
 
 USE_LANGUAGES=	# none
 
diff --git a/phantomjs/Makefile b/phantomjs/Makefile
index f74b59682c..b8daca15df 100644
--- a/phantomjs/Makefile
+++ b/phantomjs/Makefile
@@ -16,8 +16,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-source//}
 USE_LANGUAGES=	c c++ c99
 USE_TOOLS+=	bash gmake
 
-CHECK_PORTABILITY_SKIP=	src/qt/config.tests/mac/dwarf2.test src/qt/configure
-CHECK_PORTABILITY_SKIP+=src/breakpad/src/third_party/protobuf/protobuf/post_process_dist.sh
+CHECK_PORTABILITY_SKIP=		src/qt/config.tests/mac/dwarf2.test src/qt/configure
+CHECK_PORTABILITY_SKIP+=	src/breakpad/src/third_party/protobuf/protobuf/post_process_dist.sh
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/phantomjs2/Makefile b/phantomjs2/Makefile
index afc445a885..7537591de8 100644
--- a/phantomjs2/Makefile
+++ b/phantomjs2/Makefile
@@ -24,8 +24,8 @@ USE_LANGUAGES=	c c++ c99
 USE_TOOLS+=	bash bison flex gmake perl pkg-config sed
 REPLACE_PERL+=	src/qt/qtwebkit/Source/WebKit2/Scripts/generate-forwarding-headers.pl
 
-CHECK_PORTABILITY_SKIP=	src/qt/config.tests/mac/dwarf2.test src/qt/configure
-CHECK_PORTABILITY_SKIP+=src/breakpad/src/third_party/protobuf/protobuf/post_process_dist.sh
+CHECK_PORTABILITY_SKIP=		src/qt/config.tests/mac/dwarf2.test src/qt/configure
+CHECK_PORTABILITY_SKIP+=	src/breakpad/src/third_party/protobuf/protobuf/post_process_dist.sh
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/php-composer/Makefile b/php-composer/Makefile
index bea45434fe..c467c031e1 100644
--- a/php-composer/Makefile
+++ b/php-composer/Makefile
@@ -28,10 +28,10 @@ do-install:
 	${INSTALL} -m 0644 ${DISTDIR}/${DIST_SUBDIR}/composer.phar \
 		${DESTDIR}${PREFIX}/share/php/composer.phar
 
-SUBST_CLASSES+=		fix-paths
-SUBST_STAGE.fix-paths=	post-extract
-SUBST_MESSAGE.fix-paths=Fixing absolute paths.
-SUBST_FILES.fix-paths=	composer
-SUBST_SED.fix-paths=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		post-extract
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
+SUBST_FILES.fix-paths=		composer
+SUBST_SED.fix-paths=		-e 's,@PREFIX@,${PREFIX},g'
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/php-doc-br/Makefile b/php-doc-br/Makefile
index c91e57121d..786c5f9a56 100644
--- a/php-doc-br/Makefile
+++ b/php-doc-br/Makefile
@@ -2,7 +2,7 @@
 # $NetBSD: Makefile,v 1.3 2012/05/19 16:21:15 noud4 Exp $
 # $Id: Makefile,v 1.3 2012/05/19 16:21:15 noud4 Exp $
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120224
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120224
 
 PHP_DOC_LANG=		pt_BR
 PHP_DOC_LANG_DESC=	Brazilian Portuguese
diff --git a/php-doc-de/Makefile b/php-doc-de/Makefile
index f4f20be8c9..9345c032e4 100644
--- a/php-doc-de/Makefile
+++ b/php-doc-de/Makefile
@@ -2,7 +2,7 @@
 # $NetBSD: Makefile,v 1.2 2012/05/19 16:21:16 noud4 Exp $
 # $Id: Makefile,v 1.2 2012/05/19 16:21:16 noud4 Exp $
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120518
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120518
 
 PHP_DOC_LANG=		de
 PHP_DOC_LANG_DESC=	German
diff --git a/php-doc-en/Makefile b/php-doc-en/Makefile
index 7690f31ff3..7340076792 100644
--- a/php-doc-en/Makefile
+++ b/php-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $NetBSD: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 # $Id: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120518
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120518
 
 PHP_DOC_LANG=		en
 PHP_DOC_LANG_DESC=	English
diff --git a/php-doc-es/Makefile b/php-doc-es/Makefile
index 9e7409a5d1..ee1f3ba58c 100644
--- a/php-doc-es/Makefile
+++ b/php-doc-es/Makefile
@@ -2,7 +2,7 @@
 # $NetBSD: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 # $Id: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120518
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120518
 
 PHP_DOC_LANG=		es
 PHP_DOC_LANG_DESC=	Spanish
diff --git a/php-doc-fr/Makefile b/php-doc-fr/Makefile
index 6ce14d4ea7..5a2d0beb0d 100644
--- a/php-doc-fr/Makefile
+++ b/php-doc-fr/Makefile
@@ -2,7 +2,7 @@
 # $NetBSD: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 # $Id: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120504
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120504
 
 PHP_DOC_LANG=		fr
 PHP_DOC_LANG_DESC=	French
diff --git a/php-doc-ja/Makefile b/php-doc-ja/Makefile
index a45aed342c..50b158bf3b 100644
--- a/php-doc-ja/Makefile
+++ b/php-doc-ja/Makefile
@@ -2,7 +2,7 @@
 # $NetBSD: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 # $Id: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120518
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120518
 
 PHP_DOC_LANG=		ja
 PHP_DOC_LANG_DESC=	Japanese
diff --git a/php-doc-pl/Makefile b/php-doc-pl/Makefile
index 16165d851b..1a60132ee6 100755
--- a/php-doc-pl/Makefile
+++ b/php-doc-pl/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1.1.1 2012/05/19 16:16:38 noud4 Exp $
 #
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120323
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120323
 
 PHP_DOC_LANG=		pl
 PHP_DOC_LANG_DESC=	Polish
diff --git a/php-doc-ro/Makefile b/php-doc-ro/Makefile
index bb20325202..c3b6653544 100644
--- a/php-doc-ro/Makefile
+++ b/php-doc-ro/Makefile
@@ -2,7 +2,7 @@
 # $NetBSD: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 # $Id: Makefile,v 1.2 2012/05/19 16:21:17 noud4 Exp $
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120518
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120518
 
 PHP_DOC_LANG=		ro
 PHP_DOC_LANG_DESC=	Romanian
diff --git a/php-doc-ru/Makefile b/php-doc-ru/Makefile
index a8d3b3672d..999482f9b0 100644
--- a/php-doc-ru/Makefile
+++ b/php-doc-ru/Makefile
@@ -2,7 +2,7 @@
 # $NetBSD: Makefile,v 1.2 2012/05/19 16:21:18 noud4 Exp $
 # $Id: Makefile,v 1.2 2012/05/19 16:21:18 noud4 Exp $
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120518
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120518
 
 PHP_DOC_LANG=		ru
 PHP_DOC_LANG_DESC=	Russian
diff --git a/php-doc-tr/Makefile b/php-doc-tr/Makefile
index a739d724fd..2bd437dcc6 100755
--- a/php-doc-tr/Makefile
+++ b/php-doc-tr/Makefile
@@ -2,7 +2,7 @@
 # $NetBSD: Makefile,v 1.1.1.1 2012/05/19 16:17:45 noud4 Exp $
 #
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120323
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120323
 
 PHP_DOC_LANG=		tr
 PHP_DOC_LANG_DESC=	Turkish
diff --git a/php-doc-zh/Makefile b/php-doc-zh/Makefile
index 6e7cd8c492..825548a24d 100755
--- a/php-doc-zh/Makefile
+++ b/php-doc-zh/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1.1.1 2012/05/19 16:18:30 noud4 Exp $
 #
 
-PKGNAME=       		php-doc-${PHP_DOC_LANG}-20120518
+PKGNAME=		php-doc-${PHP_DOC_LANG}-20120518
 
 PHP_DOC_LANG=		zh
 PHP_DOC_LANG_DESC=	Chinese (Simplified)
diff --git a/php-doc/Makefile.template b/php-doc/Makefile.template
index 35339f308b..bf739f1f5b 100644
--- a/php-doc/Makefile.template
+++ b/php-doc/Makefile.template
@@ -7,13 +7,13 @@
 #####################################################################
 
 DISTNAME=		php_manual_${PHP_DOC_LANG}
-WRKSRC=	       		${WRKDIR}
-CATEGORIES=    		misc
-MASTER_SITES=  		${PHP_DOC_MASTER_SITES}
+WRKSRC=			${WRKDIR}
+CATEGORIES=		misc
+MASTER_SITES=		${PHP_DOC_MASTER_SITES}
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      		http://www.php.net/
-COMMENT=       		${PHP_DOC_LANG_DESC} documentation for PHP
+HOMEPAGE=		http://www.php.net/
+COMMENT=		${PHP_DOC_LANG_DESC} documentation for PHP
 
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
diff --git a/php-libawl-git/Makefile b/php-libawl-git/Makefile
index 8e0a8deff2..d816b2b553 100644
--- a/php-libawl-git/Makefile
+++ b/php-libawl-git/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	awl-${LIBAWL_VERSION}
 PKGNAME=	${PHP_PKG_PREFIX}-libawl-${LIBAWL_VERSION}
-PKGREVISION=    ${_GIT_PKGVERSION:S/.//g}
+PKGREVISION=	${_GIT_PKGVERSION:S/.//g}
 LIBAWL_VERSION=	0.53
 CATEGORIES=	devel
 MASTER_SITES=	http://debian.mcmillan.net.nz/packages/awl/
@@ -13,8 +13,8 @@ HOMEPAGE=	http://andrew.mcmillan.net.nz/projects/awl/
 COMMENT=	PHP Andrew's Web Libraries
 LICENSE=	gnu-gpl-v2
 
-GIT_REPOSITORIES=       awl
-GIT_REPO.awl=	        git://repo.or.cz/awl.git
+GIT_REPOSITORIES=	awl
+GIT_REPO.awl=		git://repo.or.cz/awl.git
 GIT_MODULE.awl=		awl
 
 WRKSRC=		${WRKDIR}/awl
diff --git a/php-tclink/Makefile b/php-tclink/Makefile
index 074198f66b..3cd4f3ed41 100644
--- a/php-tclink/Makefile
+++ b/php-tclink/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=		mbowie%buzmo.com@localhost
 HOMEPAGE=		http://www.trustcommerce.com/
 COMMENT=		PHP extension for TrustCommerce credit card processing
 
-CONFIGURE_ARGS=         --enable-${MODNAME}
+CONFIGURE_ARGS=		--enable-${MODNAME}
 
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/picolisp64/Makefile b/picolisp64/Makefile
index 48764aad8c..fba2bb8794 100644
--- a/picolisp64/Makefile
+++ b/picolisp64/Makefile
@@ -4,6 +4,6 @@ PKGNAME=	picolisp64-${PIL_VERSION}
 
 .include "../../wip/picolisp/Makefile.common"
 
-BUILD_DIRS+= src64
+BUILD_DIRS+=	src64
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/picosat/Makefile b/picosat/Makefile
index 6d8a0a876a..5328b5fa93 100644
--- a/picosat/Makefile
+++ b/picosat/Makefile
@@ -10,7 +10,7 @@ COMMENT=	SAT solver with proof and core support
 LICENSE=	mit
 
 HAS_CONFIGURE=	yes
-MAKE_FILE=		makefile
+MAKE_FILE=	makefile
 
 INCLUDIR=	${PREFIX}/include/picosat
 
diff --git a/pidgin-festival/Makefile b/pidgin-festival/Makefile
index ce95f8774c..22747fd19e 100644
--- a/pidgin-festival/Makefile
+++ b/pidgin-festival/Makefile
@@ -21,7 +21,7 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		aclocal autoconf autoheader automake gm4 msgfmt
 USE_TOOLS+=		pkg-config xgettext
 
-CFLAGS+=                -DFESTIVAL_VOICES_PATH='"${PREFIX}/share/festival/lib/voices"'
+CFLAGS+=		-DFESTIVAL_VOICES_PATH='"${PREFIX}/share/festival/lib/voices"'
 
 INSTALLATION_DIRS=	lib/purple-2 share/locale/es/LC_MESSAGES share/locale/pt_BR/LC_MESSAGES share/locale/ru/LC_MESSAGES
 
diff --git a/pilemc-svn/Makefile b/pilemc-svn/Makefile
index 455738b76f..b3a3730bb0 100644
--- a/pilemc-svn/Makefile
+++ b/pilemc-svn/Makefile
@@ -1,22 +1,22 @@
 # $NetBSD: Makefile,v 1.2 2012/10/05 11:31:52 asau Exp $
 
-DISTNAME=		pilemc
+DISTNAME=	pilemc
 PKGNAME=	${DISTNAME}-svn-${VERSION}
-CATEGORIES=		math
+CATEGORIES=	math
 
-MAINTAINER=		jihbed.research%gmail.com@localhost
-HOMEPAGE=		http://pilemc.hepforge.org/
+MAINTAINER=	jihbed.research%gmail.com@localhost
+HOMEPAGE=	http://pilemc.hepforge.org/
 COMMENT=	Tool for the simulation of pile-up events at HepMC level
 
 SVN_REPOSITORIES=	pilemc
-SVN_REPO.pilemc=		http://pilemc.hepforge.org/svn/trunk/
+SVN_REPO.pilemc=	http://pilemc.hepforge.org/svn/trunk/
 
 WRKSRC=			${WRKDIR}/$(SVN_MODULE.pilemc)
 
 VERSION=	1.2alpha0
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		aclocal autoconf automake # gmake gm4
-USE_LANGUAGES=		c c++
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	aclocal autoconf automake # gmake gm4
+USE_LANGUAGES=	c c++
 
 pre-configure:
 	cd ${WRKSRC} &&  ./reconf && ./configure
diff --git a/pinball/Makefile b/pinball/Makefile
index ac722af74b..d124a0e0c8 100644
--- a/pinball/Makefile
+++ b/pinball/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Pinball using the Allegro game library
 LICENSE=	gnu-gpl-v1
 
 
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake aclocal automake
-USE_GAMESGROUP=	YES
-GNU_CONFIGURE=	YES
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake aclocal automake
+USE_GAMESGROUP=		YES
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-USE_LIBTOOL=	YES
-WRKSRC=		${WRKDIR}/${DISTNAME}
+USE_LIBTOOL=		YES
+WRKSRC=			${WRKDIR}/${DISTNAME}
 
 
 MAKE_JOBS_SAFE=	no
diff --git a/piwik/Makefile b/piwik/Makefile
index 858e8bb040..6f159a9fe3 100644
--- a/piwik/Makefile
+++ b/piwik/Makefile
@@ -41,7 +41,7 @@ DEPENDS+=	bash-[0-9]*:../../shells/bash
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 DEPENDS+=	mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
 
-PHP_VERSIONS_ACCEPTED= 54 55 56
+PHP_VERSIONS_ACCEPTED=	54 55 56
 #PHP_VERSION_REQD= 56
 
 # Add line to ${PREFIX}/etc/php.ini for above
diff --git a/pjproject/buildlink3.mk b/pjproject/buildlink3.mk
index b7e19eca5f..024513cb94 100644
--- a/pjproject/buildlink3.mk
+++ b/pjproject/buildlink3.mk
@@ -6,9 +6,9 @@ BUILDLINK_TREE+=	pjproject
 PJPROJECT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pjproject+=	pjproject>=2.1
-BUILDLINK_PKGSRCDIR.pjproject?=	../../wip/pjproject
+BUILDLINK_PKGSRCDIR.pjproject?=		../../wip/pjproject
 
-BUILDLINK_DEPMETHOD.pjproject?= build
+BUILDLINK_DEPMETHOD.pjproject?=	build
 
 #.include "../../devel/libuuid/buildlink3.mk"
 .endif	# PJPROJECT_BUILDLINK3_MK
diff --git a/pkg_fake/PLIST b/pkg_fake/PLIST
index 65d74c65b0..184cce30dc 100644
--- a/pkg_fake/PLIST
+++ b/pkg_fake/PLIST
@@ -1,3 +1,3 @@
 @comment $NetBSD: PLIST,v 1.2 2005/09/17 02:08:10 poppnk Exp $
-sbin/pkg_fake
 man/man1/pkg_fake.1
+sbin/pkg_fake
diff --git a/plasma-workspace/buildlink3.mk b/plasma-workspace/buildlink3.mk
index 7961f449f8..058954fb82 100644
--- a/plasma-workspace/buildlink3.mk
+++ b/plasma-workspace/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	plasma-workspace
 PLASMA_WORKSPACE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.plasma-workspace+=	plasma-workspace>=5.6.3
-BUILDLINK_PKGSRCDIR.plasma-workspace?=	../../wip/plasma-workspace
+BUILDLINK_PKGSRCDIR.plasma-workspace?=		../../wip/plasma-workspace
 
 .include "../../net/knewstuff/buildlink3.mk"
 .include "../../x11/kxmlgui/buildlink3.mk"
diff --git a/plasma-workspace/hacks.mk b/plasma-workspace/hacks.mk
index 6a89854605..9c686b8489 100644
--- a/plasma-workspace/hacks.mk
+++ b/plasma-workspace/hacks.mk
@@ -4,4 +4,4 @@
 # ld: BFD (NetBSD Binutils nb1) 2.27 assertion fail
 # /usr/src/external/gpl3/binutils/lib/libbfd/../../dist/bfd/elflink.c:2694
 # unless -lexecinfo preceeds -lQt5Widgets
-BUILDLINK_TRANSFORM.NetBSD+=l:Qt5Widgets:execinfo:Qt5Widgets
+BUILDLINK_TRANSFORM.NetBSD+=	l:Qt5Widgets:execinfo:Qt5Widgets
diff --git a/plink/Makefile b/plink/Makefile
index 15fb30207a..f57d5f02b4 100644
--- a/plink/Makefile
+++ b/plink/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	bacon%NetBSD.org@localhost
 COMMENT=	Whole genome association analysis toolset
 LICENSE=	gnu-gpl-v2
 
-BUILDLINK_API_DEPENDS.zlib+=    zlib>=1.2.4
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.4
 
 # We need Fortran LDFLAGS to link with Lapack.
 USE_LANGUAGES=	c c++ fortran
diff --git a/poedit/Makefile b/poedit/Makefile
index 15c1cff1b5..7dcd129697 100644
--- a/poedit/Makefile
+++ b/poedit/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.54 2015/04/25 14:20:43 tnn Exp $
 
-DISTNAME=       poedit-1.8.6
-CATEGORIES=     editors
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=vslavik/}
-GITHUB_RELEASE= v1.8.6-oss
+DISTNAME=	poedit-1.8.6
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_GITHUB:=vslavik/}
+GITHUB_RELEASE=	v1.8.6-oss
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.poedit.net/
@@ -17,9 +17,9 @@ USE_TOOLS+=		aclocal autoconf automake gmake pkg-config zip:run
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		BDB_TYPE="${BDB_TYPE}"
 CONFIGURE_ENV+=		WX_CONFIG_NAME=${BUILDLINK_PREFIX.wxGTK30}/bin/wx-config
-CONFIGURE_ARGS+= --disable-legacytm
+CONFIGURE_ARGS+=	--disable-legacytm
 
-MAKE_ENV+=            wxWidgets_CONFIG_EXECUTABLE=${BUILDLINK_PREFIX.wxGTK30}/bin/wx-config
+MAKE_ENV+=	wxWidgets_CONFIG_EXECUTABLE=${BUILDLINK_PREFIX.wxGTK30}/bin/wx-config
 
 
 .include "../../mk/bdb.buildlink3.mk"
diff --git a/polarssl11/Makefile b/polarssl11/Makefile
index a7796ec84f..d8ba94cb6f 100644
--- a/polarssl11/Makefile
+++ b/polarssl11/Makefile
@@ -11,9 +11,9 @@ HOMEPAGE=	https://polarssl.org/download/
 COMMENT=	Open Source embedded SSL/TLS cryptographic library
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS=              gmake tar
+USE_TOOLS=		gmake tar
 
-LDFLAGS.SunOS+= -lsocket -lnsl
+LDFLAGS.SunOS+=	-lsocket -lnsl
 
 BINFILES=	ssl/ssl_client1 ssl/ssl_client2 ssl/ssl_server aes/aescrypt2 \
 		pkey/dh_client pkey/dh_genprime pkey/dh_server pkey/mpi_demo \
diff --git a/polarssl11/buildlink3.mk b/polarssl11/buildlink3.mk
index 86faed9735..15beb2f3f7 100644
--- a/polarssl11/buildlink3.mk
+++ b/polarssl11/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	polarssl
 POLARSSL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.polarssl+=	polarssl>=1.1.4
-BUILDLINK_PKGSRCDIR.polarssl?=	../../wip/polarssl11
+BUILDLINK_PKGSRCDIR.polarssl?=		../../wip/polarssl11
 
 .endif	# POLARSSL_BUILDLINK3_MK
 
diff --git a/polkit-git/Makefile b/polkit-git/Makefile
index c4487a98c1..30246372f6 100644
--- a/polkit-git/Makefile
+++ b/polkit-git/Makefile
@@ -41,14 +41,14 @@ CONFIGURE_ARGS+=	--with-os-type=netbsd
 CONFIGURE_ARGS+=	--with-os-type=solaris
 .endif
 
-POLKITD_USER?=		polkitd
-POLKITD_GROUP?=		polkitd
-PKG_GROUPS+=		${POLKITD_GROUP}
-PKG_USERS+=		${POLKITD_USER}:${POLKITD_GROUP}
+POLKITD_USER?=			polkitd
+POLKITD_GROUP?=			polkitd
+PKG_GROUPS+=			${POLKITD_GROUP}
+PKG_USERS+=			${POLKITD_USER}:${POLKITD_GROUP}
 PKG_GECOS.${POLKITD_USER}=	Polkit Daemon User
 PKG_HOME.${POLKITD_USER}=	${VARBASE}
-PKG_GROUPS_VARS+=	POLKITD_GROUP
-PKG_USERS_VARS+=	POLKITD_USER
+PKG_GROUPS_VARS+=		POLKITD_GROUP
+PKG_USERS_VARS+=		POLKITD_USER
 
 REPLACE_PERL+=		src/polkitbackend/toarray.pl
 
diff --git a/polymul/Makefile b/polymul/Makefile
index 5b2099eb13..55037004cc 100644
--- a/polymul/Makefile
+++ b/polymul/Makefile
@@ -11,13 +11,13 @@ HOMEPAGE=	http://code.google.com/p/polymul/
 COMMENT=	Fast multivariate polynomial multiplication in C++
 LICENSE=	mit
 
-NO_BUILD= yes
+NO_BUILD=	yes
 USE_LANGUAGES=	c++
 
 REPLACE_PYTHON+=	gentab.py
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
-INSTALLATION_DIRS= bin include share/doc/polymul
+INSTALLATION_DIRS=	bin include share/doc/polymul
 
 post-extract:
 	${MV} ${WRKSRC}/gentab.py ${WRKSRC}/gentab${PYVERSSUFFIX}
diff --git a/pop3.proxy/Makefile b/pop3.proxy/Makefile
index a083f1166c..6a647a9458 100644
--- a/pop3.proxy/Makefile
+++ b/pop3.proxy/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://quietsche-entchen.de/cgi-bin/wiki.cgi/proxies/00-WikiIndex
 COMMENT=	The pop3.proxy is an application level proxy for POP3
 LICENSE=	gnu-gpl-v2
 
-MAKE_FILE=	makefile
+MAKE_FILE=		makefile
 INSTALLATION_DIRS=	sbin man/man1
 
 .include "../../security/clamav/buildlink3.mk"
diff --git a/postfix-logwatch/Makefile.common b/postfix-logwatch/Makefile.common
index ef478d4474..f2038d822a 100644
--- a/postfix-logwatch/Makefile.common
+++ b/postfix-logwatch/Makefile.common
@@ -8,7 +8,7 @@ REPLACE_PERL+=	${FILTER_NAME}
 NO_BUILD=	yes
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path= 	post-patch
+SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	Makefile ${FILTER_NAME}
 SUBST_SED.path+=	-e "s|/etc/logwatch|${PKG_SYSCONFDIR}|g"
 SUBST_SED.path+=	-e "s|/usr/local|${PREFIX}|g"
diff --git a/postoffice/Makefile b/postoffice/Makefile
index d11a804729..ca6680be71 100644
--- a/postoffice/Makefile
+++ b/postoffice/Makefile
@@ -30,16 +30,16 @@ BUILD_DEFS+=		POSTOFFICE_GREYLIST
 	CONFIGURE_ARGS+=	--with-greylist
 .endif
 
-PKG_GROUPS=             mail
-PKG_GID.mail=           6
-PKG_USERS=              mail:mail
-PKG_UID.mail=           8
+PKG_GROUPS=		mail
+PKG_GID.mail=		6
+PKG_USERS=		mail:mail
+PKG_UID.mail=		8
 
 RCD_SCRIPTS=		postoffice
 
 INSTALLATION_DIRS=	${DESTDIR}${PREFIX}/share/examples/postoffice
-EGDIR=                  ${DESTDIR}${PREFIX}/share/examples/postoffice
-CONF_FILES=             ${EGDIR}/postoffice.cf ${PKG_SYSCONFDIR}/postoffice.cf
+EGDIR=			${DESTDIR}${PREFIX}/share/examples/postoffice
+CONF_FILES=		${EGDIR}/postoffice.cf ${PKG_SYSCONFDIR}/postoffice.cf
 
 OWN_DIRS=		${DESTDIR}${PREFIX}/sbin
 OWN_DIRS+=		${DESTDIR}${PKG_SYSCONFDIR}/virtual
@@ -48,7 +48,7 @@ OWN_DIRS+=		${VARBASE}/spool/virtual
 
 OWN_DIRS_PERMS=		${DESTDIR}${PKG_SYSCONFDIR}/virtual mail mail 0700
 OWN_DIRS_PERMS+=	${VARBASE}/spool/mqueue mail mail 0700
-OWN_DIRS_PERMS+=        ${VARBASE}/spool/virtual mail mail 0700
+OWN_DIRS_PERMS+=	${VARBASE}/spool/virtual mail mail 0700
 
 post-install:
 	sed -e 's:@PREFIX@:${PREFIX}:' \
diff --git a/postr/Makefile b/postr/Makefile
index ee0c0f230c..404f4cab18 100644
--- a/postr/Makefile
+++ b/postr/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GNOME flickr uploader
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG=		yes
+PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit via py-gnome2, py-gobject, py-elementtree
 
 .include "../../databases/py-bsddb3/buildlink3.mk"
diff --git a/ppr/Makefile b/ppr/Makefile
index 3afd935a8a..75fe8e8ba8 100644
--- a/ppr/Makefile
+++ b/ppr/Makefile
@@ -69,7 +69,7 @@ CONF_FILES+=		${EGDIR}/acl/pprprox.allow ${PKG_SYSCONFDIR}/acl/pprprox.allow
 CONF_FILES+=		${EGDIR}/acl/ppuser.allow ${PKG_SYSCONFDIR}/acl/ppuser.allow
 SUPPORT_FILES=		${EGDIR}/media.db ${PKG_SYSCONFDIR}/media.db
 
-RCD_SCRIPTS=		pprd ppr-papd papsrv lprsrv
+RCD_SCRIPTS=			pprd ppr-papd papsrv lprsrv
 RCD_SCRIPT_SRC.pprd=		# empty
 RCD_SCRIPT_SRC.ppr-papd=	# empty
 RCD_SCRIPT_SRC.papsrv=		# empty
diff --git a/praat/Makefile b/praat/Makefile
index abe1bbeea0..5bead972e3 100644
--- a/praat/Makefile
+++ b/praat/Makefile
@@ -13,10 +13,10 @@ LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=	c c++
 USE_TOOLS=	gmake pkg-config
 
-NO_CONFIGURE=   yes
+NO_CONFIGURE=	yes
 MAKE_FILE=	makefile
 
-INSTALLATION_DIRS=      bin # ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin # ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/praat ${DESTDIR}${PREFIX}/bin/praat
diff --git a/primecoin/Makefile b/primecoin/Makefile
index a85ec0e13c..dfda347709 100644
--- a/primecoin/Makefile
+++ b/primecoin/Makefile
@@ -27,10 +27,10 @@ QMAKE_OPTIONS+=	BDB_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	OPENSSL_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	LIB_RPATH=${PREFIX}/lib
 
-RCD_SCRIPTS=	primecoind
-OWN_DIRS=	${VARBASE}/primecoin
-EGDIR=		${PREFIX}/share/examples/primecoin
-CONF_FILES=	${EGDIR}/primecoin.conf ${PKG_SYSCONFDIR}/primecoin.conf
+RCD_SCRIPTS=		primecoind
+OWN_DIRS=		${VARBASE}/primecoin
+EGDIR=			${PREFIX}/share/examples/primecoin
+CONF_FILES=		${EGDIR}/primecoin.conf ${PKG_SYSCONFDIR}/primecoin.conf
 CONF_FILES_PERMS=	${EGDIR}/primecoin.conf ${PKG_SYSCONFDIR}/primecoin.conf ${ROOT_USER} ${ROOT_GROUP} 0600
 INSTALLATION_DIRS+=	share/examples/primecoin
 
diff --git a/probcons/Makefile b/probcons/Makefile
index e70ade64b8..db0473d3d3 100644
--- a/probcons/Makefile
+++ b/probcons/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://probcons.stanford.edu/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://probcons.stanford.edu/
-COMMENT= Probabilistic Consistency-based Multiple Alignment of Amino Acid Sequences
+COMMENT=	Probabilistic Consistency-based Multiple Alignment of Amino Acid Sequences
 
 WRKSRC=		${WRKDIR}/probcons
 
diff --git a/prosody/Makefile b/prosody/Makefile
index 47625daec5..399035f6d5 100644
--- a/prosody/Makefile
+++ b/prosody/Makefile
@@ -34,10 +34,10 @@ OWN_DIRS_PERMS+=	${PROSODY_LOG} ${PROSODY_USER} ${PROSODY_GROUP} 0770
 OWN_DIRS_PERMS+=	${PROSODY_RUN} ${PROSODY_USER} ${PROSODY_GROUP} 0770
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/certs
 
-PKG_USERS_VARS=		PROSODY_USER
-PKG_GROUPS_VARS=	PROSODY_GROUP
-PKG_GROUPS=		${PROSODY_GROUP}
-PKG_USERS=		${PROSODY_USER}:${PROSODY_GROUP}
+PKG_USERS_VARS=			PROSODY_USER
+PKG_GROUPS_VARS=		PROSODY_GROUP
+PKG_GROUPS=			${PROSODY_GROUP}
+PKG_USERS=			${PROSODY_USER}:${PROSODY_GROUP}
 PKG_GECOS.${PROSODY_USER}=	Prosody daemon user
 PKG_HOME.${PROSODY_USER}=	${PROSODY_DATA}
 PKG_SHELL.${PROSODY_USER}=	${NOLOGIN}
diff --git a/prover9/Makefile b/prover9/Makefile
index e81cd5cf76..935a36ecc1 100644
--- a/prover9/Makefile
+++ b/prover9/Makefile
@@ -11,13 +11,13 @@ HOMEPAGE=	http://www.cs.unm.edu/~mccune/prover9/
 COMMENT=	Prover9 is an automated theorem prover
 LICENSE=	gnu-gpl-v2
 
-MAKE_JOBS_SAFE= 	no
+MAKE_JOBS_SAFE=		no
 
 REPLACE_PYTHON=		utilities/attack utilities/gvizify utilities/looper utilities/prover9-mace4
 
 TEST_TARGET=	test1 test2 test3
 
-INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1 share/examples/prover9/prover9 share/examples/prover9/mace4
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/prover9/prover9 share/examples/prover9/mace4
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/bin
diff --git a/proxychains-ng/PLIST b/proxychains-ng/PLIST
index 36d9382b99..548bbef98e 100644
--- a/proxychains-ng/PLIST
+++ b/proxychains-ng/PLIST
@@ -1,4 +1,4 @@
 @comment $NetBSD$
-lib/libproxychains4.so
 bin/proxychains4
+lib/libproxychains4.so
 share/examples/proxychains/proxychains.conf
diff --git a/proxyknife/Makefile b/proxyknife/Makefile
index 027e8637f1..38365049b3 100644
--- a/proxyknife/Makefile
+++ b/proxyknife/Makefile
@@ -9,11 +9,11 @@ HOMEPAGE=	http://www.gnu.org/software/proxyknife/proxyknife.html
 COMMENT=	Proxyknife is a tool to validate free proxies
 LICENSE=	gnu-gpl-v3
 
-GNU_CONFIGURE=	YES
-INFO_FILES=	YES
+GNU_CONFIGURE=		YES
+INFO_FILES=		YES
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=	perl gmake
-USE_FEATURES+=	snprintf
+USE_TOOLS+=		perl gmake
+USE_FEATURES+=		snprintf
 
 CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/proxyknife
 CPPFLAGS.SunOS+=	-DHAVE_LOCALE_H # apparently not automatically detected
diff --git a/prpltwtr/Makefile b/prpltwtr/Makefile
index f2c895079d..42241938da 100644
--- a/prpltwtr/Makefile
+++ b/prpltwtr/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=		http://code.google.com/p/prpltwtr/
 COMMENT=		Treat microblogging (Twitter, etc) as IM protocols
 LICENSE=		gnu-gpl-v2
 
-GIT_REPOSITORIES=       prpltwtr
+GIT_REPOSITORIES=	prpltwtr
 GIT_REPO.prpltwtr=	git://github.com/mikeage/prpltwtr.git
 
 WRKSRC=			${WRKDIR}/prpltwtr
diff --git a/psh/Makefile b/psh/Makefile
index 62035013ce..d8d167117d 100644
--- a/psh/Makefile
+++ b/psh/Makefile
@@ -15,7 +15,7 @@ DEPENDS+=	p5-BSD-Resource>=1.24:../../devel/p5-BSD-Resource
 DEPENDS+=	p5-Term-ReadLine>=1.16:../../devel/p5-Term-ReadLine
 
 PERL5_MODULE_TYPE=	MakeMaker
-PERL5_PACKLIST=	auto/psh/.packlist
+PERL5_PACKLIST=		auto/psh/.packlist
 
 USE_LANGUAGES=	# none
 
diff --git a/psybnc/Makefile b/psybnc/Makefile
index fb032ccacd..29311988ff 100644
--- a/psybnc/Makefile
+++ b/psybnc/Makefile
@@ -12,21 +12,21 @@ LICENSE=	gnu-gpl-v2
 
 WRKSRC=	${WRKDIR}/psybnc
 
-BUILD_DEPENDS+=         glib-[0-9]*:../../devel/glib
+BUILD_DEPENDS+=		glib-[0-9]*:../../devel/glib
 
 USE_TOOLS+=	gmake
 
-CONF_FILES=             share/examples/psybnc/psybnc.conf \
+CONF_FILES=		share/examples/psybnc/psybnc.conf \
                         ${PKG_SYSCONFDIR}/psybnc.conf
 
-SUBST_CLASSES+=         prefix
-SUBST_FILES.prefix=     tools/autoconf.c
-SUBST_SED.prefix=       -e "s|@PREFIX@|${PREFIX}|g"
-SUBST_STAGE.prefix=     post-patch
-SUBST_CLASSES+=         openssl
-SUBST_FILES.openssl=     makefile.out
-SUBST_SED.openssl=       -e "s|/usr/bin/openssl|@echo openssl|g"
-SUBST_STAGE.openssl=     pre-build
+SUBST_CLASSES+=		prefix
+SUBST_FILES.prefix=	tools/autoconf.c
+SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_STAGE.prefix=	post-patch
+SUBST_CLASSES+=		openssl
+SUBST_FILES.openssl=	makefile.out
+SUBST_SED.openssl=	-e "s|/usr/bin/openssl|@echo openssl|g"
+SUBST_STAGE.openssl=	pre-build
 
 INSTALLATION_DIRS=	bin share/examples/psybnc
 INSTALLATION_DIRS+=	share/doc/psybnc
diff --git a/ptlib/buildlink3.mk b/ptlib/buildlink3.mk
index dd5ec789c1..3a01f82ba7 100644
--- a/ptlib/buildlink3.mk
+++ b/ptlib/buildlink3.mk
@@ -9,8 +9,8 @@ BUILDLINK_API_DEPENDS.ptlib+=	ptlib>=2.6.1
 BUILDLINK_ABI_DEPENDS.ptlib+=	ptlib>=2.10.7nb10
 BUILDLINK_PKGSRCDIR.ptlib?=	../../wip/ptlib
 
-PTLIB_CONFIG?=     ${BUILDLINK_PREFIX.ptlib}/bin/ptlib-config
-CONFIGURE_ENV+=    PTLIB_CONFIG=${PTLIB_CONFIG:Q}
+PTLIB_CONFIG?=	${BUILDLINK_PREFIX.ptlib}/bin/ptlib-config
+CONFIGURE_ENV+=	PTLIB_CONFIG=${PTLIB_CONFIG:Q}
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
diff --git a/pulseaudio-git/Makefile b/pulseaudio-git/Makefile
index 8aa823164e..b11bf8f304 100644
--- a/pulseaudio-git/Makefile
+++ b/pulseaudio-git/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.100 2015/11/02 13:40:41 ryoon Exp $
 
-DISTNAME=	pulseaudio-9.0
-CATEGORIES=	audio
+DISTNAME=		pulseaudio-9.0
+CATEGORIES=		audio
 GIT_REPOSITORIES=	pulse
 GIT_REPO.pulse=		git://github.com/pulseaudio/pulseaudio.git
 
@@ -36,7 +36,7 @@ USE_PKGLOCALEDIR=	yes
 
 # Wrong sys/capability.h assumptions, incompatible implementation:
 .if ${OPSYS} == "FreeBSD"
-CONFIGURE_ARGS+=       --without-caps
+CONFIGURE_ARGS+=	--without-caps
 .endif
 
 CONFIGURE_ENV+=		EGDIR=${EGDIR}
@@ -78,13 +78,13 @@ PULSE_GROUP_ACCESS?=	pulseacc
 BUILD_DEFS+=		VARBASE PKG_SYSCONFBASE
 
 PKG_SYSCONFSUBDIR=	pulse
-EGDIR=		${PREFIX}/share/examples/pulseaudio
-CONF_FILES=	${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf
-CONF_FILES+=	${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf
-CONF_FILES+=	${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa
-CONF_FILES+=	${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
-CONF_FILES+=	${EGDIR}/pulseaudio-system.conf \
-		${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf
+EGDIR=			${PREFIX}/share/examples/pulseaudio
+CONF_FILES=		${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf
+CONF_FILES+=		${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf
+CONF_FILES+=		${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa
+CONF_FILES+=		${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
+CONF_FILES+=		${EGDIR}/pulseaudio-system.conf \
+			${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf
 
 PLIST_VARS+=		bonjour coreaudio evdev oss sun
 
@@ -94,7 +94,7 @@ PLIST.sun=		yes
 PLIST.oss=		yes
 .  endif
 .elif ${OPSYS} == "Darwin"
-PLIST.bonjour=	yes
+PLIST.bonjour=		yes
 PLIST.coreaudio=	yes
 .else
 PLIST.oss=		yes
diff --git a/pulseaudio-git/PLIST b/pulseaudio-git/PLIST
index 8b86219447..150617e912 100644
--- a/pulseaudio-git/PLIST
+++ b/pulseaudio-git/PLIST
@@ -220,8 +220,8 @@ ${PLIST.avahi}lib/pulse-6.0/modules/module-zeroconf-discover.a
 ${PLIST.avahi}lib/pulse-6.0/modules/module-zeroconf-discover.so
 ${PLIST.avahi}lib/pulse-6.0/modules/module-zeroconf-publish.a
 ${PLIST.avahi}lib/pulse-6.0/modules/module-zeroconf-publish.so
-lib/pulseaudio/libpulsecore-6.0.la
 lib/pulseaudio/libpulsecommon-6.0.la
+lib/pulseaudio/libpulsecore-6.0.la
 ${PLIST.oss}lib/pulseaudio/libpulsedsp.la
 man/man1/esdcompat.1
 man/man1/pacat.1
diff --git a/pure/Makefile b/pure/Makefile
index 8f1f51ae2b..e701f2f8d5 100644
--- a/pure/Makefile
+++ b/pure/Makefile
@@ -10,10 +10,10 @@ HOMEPAGE=	http://purelang.bitbucket.org/
 COMMENT=	Modern-style functional programming language based on term rewriting
 LICENSE=	gnu-lgpl-v3
 
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake flex bison
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake flex bison
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-release --without-elisp
 PKGCONFIG_OVERRIDE=	pure.pc.in
 
diff --git a/purple-facebook/Makefile b/purple-facebook/Makefile
index 725dcfe640..02c35b52b0 100644
--- a/purple-facebook/Makefile
+++ b/purple-facebook/Makefile
@@ -3,8 +3,8 @@
 PKGNAME=	purple-facebook-0.9.5
 CATEGORIES=	chat
 DISTNAME=	purple-facebook-0.9.5-9ff9acf9fa14
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=jgeboski/}
-GITHUB_PROJECT= purple-facebook
+MASTER_SITES=	${MASTER_SITE_GITHUB:=jgeboski/}
+GITHUB_PROJECT=	purple-facebook
 GITHUB_RELEASE=	v0.9.5-9ff9acf9fa14
 
 MAINTAINER=	izaac%setec.org@localhost
diff --git a/pwnat/Makefile b/pwnat/Makefile
index 07e4efb0ea..4450406e84 100644
--- a/pwnat/Makefile
+++ b/pwnat/Makefile
@@ -11,9 +11,9 @@ LICENSE=	gnu-gpl-v3
 BUILD_DEPENDS+=	${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
 
 GIT_REPOSITORIES=	samyk
-GIT_REPO.samyk=	git://github.com/samyk/${PKGBASE}.git
+GIT_REPO.samyk=		git://github.com/samyk/${PKGBASE}.git
 GIT_MODULE.samyk=	${PKGBASE}
-WRKSRC=		${WRKDIR}/${PKGBASE}
+WRKSRC=			${WRKDIR}/${PKGBASE}
 
 USE_TOOLS=		gmake
 NO_CONFIGURE=		YES
diff --git a/pxlib/PLIST b/pxlib/PLIST
index 5bc6f738fc..7d4055d45c 100644
--- a/pxlib/PLIST
+++ b/pxlib/PLIST
@@ -1,7 +1,7 @@
 @comment $NetBSD: PLIST,v 1.4 2013/03/03 17:27:54 othyro Exp $
-include/paradox.h
 include/paradox-gsf.h
 include/paradox-mp.h
+include/paradox.h
 include/pxversion.h
 lib/libpx.la
 lib/pkgconfig/pxlib.pc
diff --git a/py-Brenda/Makefile b/py-Brenda/Makefile
index 97280d3482..9b55612083 100644
--- a/py-Brenda/Makefile
+++ b/py-Brenda/Makefile
@@ -2,8 +2,8 @@
 #
 
 DISTNAME=	PyBrenda041-tar
-PKGNAME=		${PYPKGPREFIX}-Brenda-0.4.1
-CATEGORIES=		devel
+PKGNAME=	${PYPKGPREFIX}-Brenda-0.4.1
+CATEGORIES=	devel
 MASTER_SITES=	http://xml.coverpages.org/
 EXTRACT_SUFX=	.gz
 
diff --git a/py-DirectoryStorage/Makefile b/py-DirectoryStorage/Makefile
index d3c3c3defb..b6f1d63d8b 100644
--- a/py-DirectoryStorage/Makefile
+++ b/py-DirectoryStorage/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://dirstorage.sourceforge.net/
 COMMENT=		Storage for ZODB, that uses files and directories
 
-NO_CONFIGURE=		yes
+NO_CONFIGURE=	yes
 REPLACE_PYTHON=	${TOOLS}
-PY_PATCHPLIST=		yes
+PY_PATCHPLIST=	yes
 
 AUTO_MKDIRS=		yes
 
diff --git a/py-EMpy/Makefile b/py-EMpy/Makefile
index a2ce570230..1c2ae226fa 100644
--- a/py-EMpy/Makefile
+++ b/py-EMpy/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Suite of numerical algorithms widely used in electromagnetism
 
 WRKSRC=		${WRKDIR}/usr
 
-VERSION= 0.1.2
+VERSION=	0.1.2
 USE_TOOLS+=	pax
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
-PLIST_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX:Q}
-PY_PATCHPLIST=		yes
+PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX:Q}
+PY_PATCHPLIST=	yes
 
 INSTALLATION_DIRS=	${PYSITELIB}
 
diff --git a/py-EditObj2/Makefile b/py-EditObj2/Makefile
index 70a449beca..633d56619f 100644
--- a/py-EditObj2/Makefile
+++ b/py-EditObj2/Makefile
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG=         yes
+PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2, py-gobject
 
 do-test:
diff --git a/py-Kallithea/Makefile b/py-Kallithea/Makefile
index 8e495f7f24..047535b2d4 100644
--- a/py-Kallithea/Makefile
+++ b/py-Kallithea/Makefile
@@ -54,8 +54,8 @@ DEPENDS+=	${PYPKGPREFIX}-bcrypt>=0.3.0:../../security/py-bcrypt
 REPLACE_PYTHON+=	kallithea/lib/dbmigrate/migrate/versioning/templates/*.py_tmpl
 REPLACE_PYTHON+=	kallithea/lib/dbmigrate/migrate/versioning/templates/*/*.py_tmpl
 
-USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		# none
+USE_PKGLOCALEDIR=		yes
+USE_LANGUAGES=			# none
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.2.2
 
 .include "../../lang/python/application.mk"
diff --git a/py-PyPE/Makefile b/py-PyPE/Makefile
index 83a02e63b4..7e9ec41b06 100644
--- a/py-PyPE/Makefile
+++ b/py-PyPE/Makefile
@@ -15,8 +15,8 @@ COMMENT=		Lightweight, but powerful editor for Python
 DEPENDS=	${PYPKGPREFIX}-wxWidgets>=2.4.2.4:../../x11/py-wxWidgets
 
 REPLACE_PYTHON=	pype.py
-NO_BUILD=		yes
-PY_PATCHPLIST=		yes
+NO_BUILD=	yes
+PY_PATCHPLIST=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-wxWidgets
 
 do-install:
diff --git a/py-PythonDirector/Makefile b/py-PythonDirector/Makefile
index a4fdfdd98d..6cf3c70d96 100644
--- a/py-PythonDirector/Makefile
+++ b/py-PythonDirector/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Pure-python TCP load balancer
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-m2crypto>=0.13:../../security/py-m2crypto
 
-PY_PATCHPLIST=		yes
-PYDISTUTILSPKG=		yes
+PY_PATCHPLIST=	yes
+PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-m2crypto
 USE_LANGUAGES=	# none
 
diff --git a/py-PythonMagick/Makefile b/py-PythonMagick/Makefile
index 15b795c7e5..baa261c94e 100644
--- a/py-PythonMagick/Makefile
+++ b/py-PythonMagick/Makefile
@@ -1,19 +1,19 @@
 # $NetBSD: Makefile,v 1.6 2015/07/13 15:11:25 thomasklausner Exp $
 
 DISTNAME=	PythonMagick-0.9.12
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python graphics
 MASTER_SITES=	http://www.imagemagick.org/download/python/
 EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER= 	pkgsrc%blackmouse.biz@localhost
+MAINTAINER=	pkgsrc%blackmouse.biz@localhost
 HOMEPAGE=	http://www.imagemagick.org/script/api.php
 COMMENT=	Python binding for ImageMagick
 
 USE_LANGUAGES=	c c++
-USE_TOOLS+=     pkg-config
+USE_TOOLS+=	pkg-config
 
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 PY_PATCHPLIST=	yes
 
 .include "../../graphics/ImageMagick/buildlink3.mk"
diff --git a/py-RXP/Makefile b/py-RXP/Makefile
index 0a4b60f29d..4a5d20ff84 100644
--- a/py-RXP/Makefile
+++ b/py-RXP/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Validating XML parser for Python)
 
 WRKSRC=	${WRKDIR}/pyRXP-2.1.0
 
-MAKE_ENV+=   LIBERROR=0
+MAKE_ENV+=	LIBERROR=0
 PYDISTUTILSPKG=	YES
 
 DOCDIR=	${PREFIX}/share/doc/${PKGNAME}
diff --git a/py-achemkit/Makefile b/py-achemkit/Makefile
index d41cb575d8..664c6d29e7 100644
--- a/py-achemkit/Makefile
+++ b/py-achemkit/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_PYPI:=A/AChemKit/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://github.com/afaulconbridge/PyAChemKit
+HOMEPAGE=	https://github.com/afaulconbridge/PyAChemKit
 COMMENT=	Artificial Chemistry Tookit
 LICENSE=	modified-bsd
 
diff --git a/py-acq4/Makefile b/py-acq4/Makefile
index fd612b02bc..6346029273 100644
--- a/py-acq4/Makefile
+++ b/py-acq4/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=a/acq4/}
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://files.pythonhosted.org/packages/source/a/acq4/
 COMMENT=	Neurophysiology acquisition and analysis platform
-LICENSE = mit
+LICENSE =	mit
 
 #DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.2.1:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
diff --git a/py-aesthete/Makefile b/py-aesthete/Makefile
index e6a3fb2491..5a04f096f6 100644
--- a/py-aesthete/Makefile
+++ b/py-aesthete/Makefile
@@ -6,8 +6,8 @@ PKGNAME=	${PYPKGPREFIX}-aesthete-0.4.1-7
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=A/Aesthete/}
 
-MAINTAINER= 	jihbed.research%gmail.com@localhost
-HOMEPAGE=       http://www.philtweir.co.uk/aesthete/wiki/pmwiki.php
+MAINTAINER=	jihbed.research%gmail.com@localhost
+HOMEPAGE=	http://www.philtweir.co.uk/aesthete/wiki/pmwiki.php
 COMMENT=	Integrated mathematics environment
 LICENSE=	gnu-gpl-v3
 
diff --git a/py-agaro/Makefile b/py-agaro/Makefile
index b87c119828..2878974a08 100644
--- a/py-agaro/Makefile
+++ b/py-agaro/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/agaro/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
-HOMEPAGE=	 https://github.com/eddiejessup/agaro
+HOMEPAGE=	https://github.com/eddiejessup/agaro
 COMMENT=	Framework to run models
 LICENSE=	modified-bsd
 
diff --git a/py-ahoy/Makefile b/py-ahoy/Makefile
index f06ef9b5df..abff58846f 100644
--- a/py-ahoy/Makefile
+++ b/py-ahoy/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=a/ahoy/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://github.com/eddiejessup/ahoy
-COMMENT=		Agent-based simulations of active particles
+COMMENT=	Agent-based simulations of active particles
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-ciabatta>=0.4.0:../../wip/py-ciabatta
diff --git a/py-aigo/Makefile b/py-aigo/Makefile
index c8e9a77bd9..0527b52659 100644
--- a/py-aigo/Makefile
+++ b/py-aigo/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	http://code.google.com/p/aigo/
 COMMENT=	Analysis and Inter-comparison of Gene Ontology functional annotations
 LICENSE=	gnu-gpl-v3
 
-CONFLICTS=	 ${PYPKGPREFIX}-creole-[0-9]*
+CONFLICTS=	${PYPKGPREFIX}-creole-[0-9]*
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-wxWidgets
 
diff --git a/py-aikif/Makefile b/py-aikif/Makefile
index a1d2e5def6..16b7c93c14 100644
--- a/py-aikif/Makefile
+++ b/py-aikif/Makefile
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v3
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE= 27
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-albatross/Makefile b/py-albatross/Makefile
index 5cdb572837..ab05af74f1 100644
--- a/py-albatross/Makefile
+++ b/py-albatross/Makefile
@@ -23,8 +23,8 @@ EXAMPLEDIR=	${DESTDIR}${PREFIX}/share/examples/albatross
 LOGFILE?=	${LOGDIR}/al-session-daemon.log
 PIDFILE?=	${RUNTIME_DIR}/session-daemon.pid
 
-ALBATROSS_USER=	albatross
-ALBATROSS_GROUP=albatross
+ALBATROSS_USER=		albatross
+ALBATROSS_GROUP=	albatross
 
 FILES_SUBST+=	ALBATROSS_USER=${ALBATROSS_USER:Q}
 FILES_SUBST+=	ALBATROSS_GROUP=${ALBATROSS_GROUP:Q}
@@ -37,10 +37,10 @@ RCD_SCRIPTS=	al_session_daemon
 PKG_GROUPS=	${ALBATROSS_USER}
 PKG_USERS=	${ALBATROSS_USER}:${ALBATROSS_GROUP}
 
-OWN_DIRS_PERMS=	${RUNTIME_DIR} ${ALBATROSS_USER} ${ALBATROSS_GROUP} 0750
-OWN_DIRS_PERMS+=${LOGDIR} ${ALBATROSS_USER} ${ALBATROSS_GROUP} 0750
+OWN_DIRS_PERMS=		${RUNTIME_DIR} ${ALBATROSS_USER} ${ALBATROSS_GROUP} 0750
+OWN_DIRS_PERMS+=	${LOGDIR} ${ALBATROSS_USER} ${ALBATROSS_GROUP} 0750
 
-REPLACE_PYTHON=	samples/extension/cal.py
+REPLACE_PYTHON=		samples/extension/cal.py
 REPLACE_PYTHON+=	samples/form4/form.py
 REPLACE_PYTHON+=	samples/paginate/paginate.py
 REPLACE_PYTHON+=	samples/popview1/popview.py
diff --git a/py-algebraic/Makefile b/py-algebraic/Makefile
index c9ae9f8c93..d226aa1edd 100644
--- a/py-algebraic/Makefile
+++ b/py-algebraic/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.4 2015/02/08 22:11:58 jihbed Exp $
 
-VERSION= 0.3.1.dev-20120112
+VERSION=	0.3.1.dev-20120112
 DISTNAME=	python-algebraic-0.3.1.dev-20120112
 EGG_NAME=	python_algebraic-0.3.1.dev20120112
 PKGNAME=	${PYPKGPREFIX}-algebraic-${VERSION}
diff --git a/py-algebraixlib/Makefile b/py-algebraixlib/Makefile
index 78dd361e81..610f2f3196 100644
--- a/py-algebraixlib/Makefile
+++ b/py-algebraixlib/Makefile
@@ -15,7 +15,7 @@ LICENSE=	gnu-lgpl-v3
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED=  34 35 36
+PYTHON_VERSIONS_ACCEPTED=	34 35 36
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-applpy/Makefile b/py-applpy/Makefile
index 2bdc2ab8bc..1c6db96a1f 100644
--- a/py-applpy/Makefile
+++ b/py-applpy/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 
 .include "../../graphics/py-matplotlib/buildlink3.mk"
diff --git a/py-asciimathml/Makefile b/py-asciimathml/Makefile
index 6db50749b8..7cd7294bf6 100644
--- a/py-asciimathml/Makefile
+++ b/py-asciimathml/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2014/05/09 07:38:45 thomasklausner Exp $
 
 DISTNAME=	asciimathml-0.9.4.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/asciimathml/}
 
diff --git a/py-aspects/Makefile b/py-aspects/Makefile
index 045b5adf2b..d0f07208f4 100644
--- a/py-aspects/Makefile
+++ b/py-aspects/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://www.cs.tut.fi/~ask/aspects/index.shtml
 COMMENT=	Lightweight aspect oriented programming library for Python
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-atmark/Makefile b/py-atmark/Makefile
index 80821f4ca7..f20756964e 100644
--- a/py-atmark/Makefile
+++ b/py-atmark/Makefile
@@ -13,7 +13,7 @@ LICENSE=	modified-bsd
 WRKSRC=		${WRKDIR}/atmark-0.6.0
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-atom/Makefile b/py-atom/Makefile
index 26c0e0254a..d9bc7d7e2f 100644
--- a/py-atom/Makefile
+++ b/py-atom/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2014/07/26 14:07:39 jihbed Exp $
 
 DISTNAME=	atom-0.3.9
-PKGNAME=    	${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/atom/}
 
@@ -12,7 +12,7 @@ LICENSE=	modified-bsd
 
 WRKSRC=		${WRKDIR}/atom-0.3.9
 
-CONFLICTS+=  ${PYPKGPREFIX}-gdata-[0-9]*
+CONFLICTS+=	${PYPKGPREFIX}-gdata-[0-9]*
 
 USE_LANGUAGES=	c c++
 
diff --git a/py-bandit/Makefile b/py-bandit/Makefile
index aefdf7d1e9..4212a09b64 100644
--- a/py-bandit/Makefile
+++ b/py-bandit/Makefile
@@ -10,11 +10,11 @@ HOMEPAGE=	https://wiki.openstack.org/wiki/Security/Projects/Bandit
 COMMENT=	Security oriented static analyser for python code
 LICENSE=	apache-2.0
 
-DEPENDS+=       ${PYPKGPREFIX}-pbr>=1.3.0:../../devel/py-pbr
-DEPENDS+=       ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
-DEPENDS+=       ${PYPKGPREFIX}-yaml>=3.1.0:../../textproc/py-yaml
-DEPENDS+=       ${PYPKGPREFIX}-appdirs>=1.4.0:../../devel/py-appdirs
-DEPENDS+=       ${PYPKGPREFIX}-stevedore>=1.7.0:../../devel/py-stevedore
+DEPENDS+=	${PYPKGPREFIX}-pbr>=1.3.0:../../devel/py-pbr
+DEPENDS+=	${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-yaml>=3.1.0:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-appdirs>=1.4.0:../../devel/py-appdirs
+DEPENDS+=	${PYPKGPREFIX}-stevedore>=1.7.0:../../devel/py-stevedore
 
 USE_LANGUAGES=	# none
 
diff --git a/py-bannock/Makefile b/py-bannock/Makefile
index 397a6abac1..e8d03518d4 100644
--- a/py-bannock/Makefile
+++ b/py-bannock/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	bannock-0.5.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=b/bannock/}
 
diff --git a/py-bigfloat/Makefile b/py-bigfloat/Makefile
index 4d8d4f0570..5aa6d24e53 100644
--- a/py-bigfloat/Makefile
+++ b/py-bigfloat/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=b/bigfloat/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://files.pythonhosted.org/packages/source/b/bigfloat/
-COMMENT= Arbitrary precision correctly-rounded floating point arithmetic
+COMMENT=	Arbitrary precision correctly-rounded floating point arithmetic
 LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v3
 
 WRKSRC=		${WRKDIR}/bigfloat-0.2.1
diff --git a/py-bip/Makefile b/py-bip/Makefile
index 48c4f05e70..3c387ab2f4 100644
--- a/py-bip/Makefile
+++ b/py-bip/Makefile
@@ -19,7 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-openopt>=0.31:../../wip/py-openopt
 
 USE_LANGUAGES=	# none
 
-INSTALLATION_DIRS=	share/doc/py-bip/html
+INSTALLATION_DIRS=		share/doc/py-bip/html
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-multiprocess and py-gnuplot via py-liveplots
 
 post-install:
diff --git a/py-biskit/Makefile b/py-biskit/Makefile
index df02277546..d30e292d62 100644
--- a/py-biskit/Makefile
+++ b/py-biskit/Makefile
@@ -19,7 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline
 USE_TOOLS+=	perl
 USE_LANGUAGES=	# none
 
-REPLACE_PERL+=	Biskit/data/spectrum.pl
+REPLACE_PERL+=		Biskit/data/spectrum.pl
 REPLACE_PYTHON+=	scripts/Biskit/bis2.6 Biskit/data/pdb/remediator_python.1.56.080328.py
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-Numeric
diff --git a/py-bitsets/Makefile b/py-bitsets/Makefile
index 4f47440af4..fade25488b 100644
--- a/py-bitsets/Makefile
+++ b/py-bitsets/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/xflr6/bitsets
 COMMENT=	Ordered subsets over a predefined domain
 LICENSE=	mit
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 do-test:
 	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} run-tests.py
diff --git a/py-blaze/Makefile b/py-blaze/Makefile
index 99610c5add..716649e9ba 100644
--- a/py-blaze/Makefile
+++ b/py-blaze/Makefile
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-pandas>=0.14.1:../../math/py-pandas
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-blist/Makefile b/py-blist/Makefile
index c8f3c93b78..9f8e46dd47 100644
--- a/py-blist/Makefile
+++ b/py-blist/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 DISTNAME=	blist-1.3.6
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_PYPI:=b/blist/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=b/blist/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/DanielStutzbach/blist/
diff --git a/py-booktype/Makefile b/py-booktype/Makefile
index 2c482e25d7..b8de9f9318 100644
--- a/py-booktype/Makefile
+++ b/py-booktype/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=B/Booktype/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://booki-dev.flossmanuals.net/
-COMMENT= FLOSS Manuals collaborative book writing tool
+COMMENT=	FLOSS Manuals collaborative book writing tool
 LICENSE=	gnu-gpl-v3
 
 
diff --git a/py-brian/Makefile b/py-brian/Makefile
index a42ddad70b..d663dcf6d5 100644
--- a/py-brian/Makefile
+++ b/py-brian/Makefile
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-sympy>=0.6.5:../../math/py-sympy
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 USE_LANGUAGES=	c c++
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../devel/py-game/buildlink3.mk"
 .include "../../graphics/py-matplotlib/buildlink3.mk"
diff --git a/py-bruce/Makefile b/py-bruce/Makefile
index 488359a161..ae2067ad4e 100644
--- a/py-bruce/Makefile
+++ b/py-bruce/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	https://storage.googleapis.com/google-code-archive-downloads/v2/co
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://code.google.com/p/bruce-tpt/
-COMMENT= Bruce, the Presentation Tool, puts reStructuredText in your projector
+COMMENT=	Bruce, the Presentation Tool, puts reStructuredText in your projector
 #LICENSE=	# TODO: (see mk/license.mk)
 
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.11:../../textproc/py-docutils
diff --git a/py-calphad/Makefile b/py-calphad/Makefile
index afbc6a3c80..3bfe1f3734 100644
--- a/py-calphad/Makefile
+++ b/py-calphad/Makefile
@@ -10,10 +10,10 @@ HOMEPAGE=	https://github.com/richardotis/pycalphad
 COMMENT=	Thermodynamic models, calculating phase diagrams
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
-DEPENDS+=       ${PYPKGPREFIX}-pandas>=0.16.2:../../math/py-pandas
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-DEPENDS+=       ${PYPKGPREFIX}-sympy>=0.7.4.1:../../math/py-sympy
+DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
+DEPENDS+=	${PYPKGPREFIX}-pandas>=0.16.2:../../math/py-pandas
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.4.1:../../math/py-sympy
 
 WRKSRC=		${WRKDIR}/pycalphad-0.1.1.post1
 
diff --git a/py-calverter/Makefile b/py-calverter/Makefile
index 42d4928857..ec396ee4dc 100644
--- a/py-calverter/Makefile
+++ b/py-calverter/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG=	yes
+PYDISTUTILSPKG=		yes
 REPLACE_PYTHON+=	calverter.py
 
 INSTALLATION_DIRS=	share/doc/py-calverter
diff --git a/py-canonicaljson/Makefile b/py-canonicaljson/Makefile
index 00c80f70ef..13c84f4637 100644
--- a/py-canonicaljson/Makefile
+++ b/py-canonicaljson/Makefile
@@ -1,22 +1,22 @@
 # $NetBSD$
 
 DISTNAME=	canonicaljson-1.0.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 GITHUB_PROJECT=	python-canonicaljson
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=matrix-org/}
-GITHUB_TAG=     v${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
-HOMEPAGE=       https://github.com/matrix-org/
+HOMEPAGE=	https://github.com/matrix-org/
 COMMENT=	Encodes objects and arrays
-LICENSE=        apache-2.0
+LICENSE=	apache-2.0
 
 
-INSTALLATION_DIRS=     ${PYSITELIB}
+INSTALLATION_DIRS=	${PYSITELIB}
 
-WRKSRC=         ${WRKDIR}/python-${DISTNAME}
+WRKSRC=		${WRKDIR}/python-${DISTNAME}
 USE_LANGUAGES=	python
 
 .include "../../lang/python/egg.mk"
diff --git a/py-causalinfo/Makefile b/py-causalinfo/Makefile
index 22e63de915..38ba44085d 100644
--- a/py-causalinfo/Makefile
+++ b/py-causalinfo/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	causalinfo-1.1.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/causalinfo/}
 
diff --git a/py-cbc/Makefile b/py-cbc/Makefile
index 8342c60ab2..82ab8630ca 100644
--- a/py-cbc/Makefile
+++ b/py-cbc/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/ligo-cbc/pycbc
 COMMENT=	Gravitational wave CBC analysis toolkit
 #LICENSE=	# TODO: (see mk/license.mk)
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 WRKSRC=		${WRKDIR}/PyCBC-1.1.0
 
diff --git a/py-cexprtk/Makefile b/py-cexprtk/Makefile
index f1b822321a..7fb07ec70c 100644
--- a/py-cexprtk/Makefile
+++ b/py-cexprtk/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD$
 
 DISTNAME=	cexprtk-0.2.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cexprtk/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://bitbucket.org/mjdr/cexprtk
+HOMEPAGE=	https://bitbucket.org/mjdr/cexprtk
 COMMENT=	Cython wrapper the C++ Mathematical Expression Toolkit Library
 LICENSE=	cpl-1.0
 
diff --git a/py-cf-python/Makefile b/py-cf-python/Makefile
index bb0f12bbe6..cde7e35c89 100644
--- a/py-cf-python/Makefile
+++ b/py-cf-python/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://cfpython.bitbucket.org/
 COMMENT=	Python interface to the CF data model
 LICENSE=	mit
 
-PYTHON_VERSIONS_INCOMPATIBLE= 30 34 35 36
+PYTHON_VERSIONS_INCOMPATIBLE=	30 34 35 36
 
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-psutil-2.1.3:../../sysutils/py-psutil
diff --git a/py-chaintipy/Makefile b/py-chaintipy/Makefile
index 560dfddce3..72dd60c681 100644
--- a/py-chaintipy/Makefile
+++ b/py-chaintipy/Makefile
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 WRKSRC=		${WRKDIR}/ChiantiPy-0.1
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "options.mk"
 
diff --git a/py-chebpy/Makefile b/py-chebpy/Makefile
index 1c3e4a1e3c..8bcd62042b 100644
--- a/py-chebpy/Makefile
+++ b/py-chebpy/Makefile
@@ -2,12 +2,12 @@
 #
 
 DISTNAME=	chebpy-0.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/chebpy/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://bitbucket.org/liuyxpp/chebpy
+HOMEPAGE=	https://bitbucket.org/liuyxpp/chebpy
 COMMENT=	Chebyshev polynomial based spectral methods of PDEs
 LICENSE=	2-clause-bsd
 
diff --git a/py-chinup/Makefile b/py-chinup/Makefile
index 7eca613bae..9ededa4781 100644
--- a/py-chinup/Makefile
+++ b/py-chinup/Makefile
@@ -5,7 +5,7 @@ PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/chinup/}
 
-MAINTAINER= kamelderouiche%yahoo.com@localhost	
+MAINTAINER=	kamelderouiche%yahoo.com@localhost	
 HOMEPAGE=	https://github.com/pagepart/chinup
 COMMENT=	Python Facebook Graph API client
 LICENSE=	mit
diff --git a/py-chompack/Makefile b/py-chompack/Makefile
index 173606a983..f5624d761e 100644
--- a/py-chompack/Makefile
+++ b/py-chompack/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2014/06/17 17:54:14 jihbed Exp $
 
 DISTNAME=	chompack-2.0.0
-PKGNAME=   	${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/chompack/}
 
diff --git a/py-christofides/Makefile b/py-christofides/Makefile
index 92e9b1e9dc..b25764ac1d 100644
--- a/py-christofides/Makefile
+++ b/py-christofides/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	Christofides-1.0.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	math
 MASTER_SITES=	https://pypi.python.org/packages/f5/91/3cc3881ca08ad06d002b513650ed5bccafbc1c2b545601f98e16e2a57502/
 
diff --git a/py-cli/Makefile b/py-cli/Makefile
index 5c3a60e048..1898f62c2e 100644
--- a/py-cli/Makefile
+++ b/py-cli/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	climate-0.4.6
 # py-climate is already reserved
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/mate//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/mate//}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/climate/}
 
diff --git a/py-clickatell/Makefile b/py-clickatell/Makefile
index 7107816f92..152f1be89f 100644
--- a/py-clickatell/Makefile
+++ b/py-clickatell/Makefile
@@ -1,20 +1,20 @@
 # $NetBSD: Makefile,v 1.1 2015/07/16 00:06:13 kethzer-08 Exp $
 
 DISTNAME=	clickatell-0.1.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=     net
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/clickatell/}
 
-MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://files.pythonhosted.org/packages/source/c/clickatell/
-COMMENT=        Library for interacting with the Clickatell SMS Gateway
-LICENSE=        gnu-gpl-v2
+COMMENT=	Library for interacting with the Clickatell SMS Gateway
+LICENSE=	gnu-gpl-v2
 
-EGG_NAME=       ${PKGVERSION}
-USE_LANGUAGES=  # none
+EGG_NAME=	${PKGVERSION}
+USE_LANGUAGES=	# none
 
-DEPENDS+=       ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-DEPENDS+=       ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-clics/Makefile b/py-clics/Makefile
index d721529a1b..b5a9173bb7 100644
--- a/py-clics/Makefile
+++ b/py-clics/Makefile
@@ -15,9 +15,9 @@ DEPENDS+=	${PYPKGPREFIX}-psycopg2>=2.2.2:../../databases/py-psycopg2
 
 WRKSRC=			${WRKDIR}/CLICS-d93a40ceebaa
 
-USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		c c++
-PYDISTUTILSPKG=	yes
+USE_PKGLOCALEDIR=		yes
+USE_LANGUAGES=			c c++
+PYDISTUTILSPKG=			yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-wxWidgets
 
 INSTALLATION_DIRS=	# blank
diff --git a/py-clid/Makefile b/py-clid/Makefile
index a55fde2608..d512f4e2ec 100644
--- a/py-clid/Makefile
+++ b/py-clid/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	pyclid-0.51
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyclid/}
 
diff --git a/py-cligj/Makefile b/py-cligj/Makefile
index 7b3839688b..b36eae076b 100644
--- a/py-cligj/Makefile
+++ b/py-cligj/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cligj/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://github.com/mapbox/cligj
+HOMEPAGE=	https://github.com/mapbox/cligj
 COMMENT=	Click params for commmand line interfaces to GeoJSON
 LICENSE=	modified-bsd
 
diff --git a/py-cloudlib/Makefile b/py-cloudlib/Makefile
index d04585829c..3ffa757d6f 100644
--- a/py-cloudlib/Makefile
+++ b/py-cloudlib/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/01/31 11:52:04 jihbed Exp $
 
 DISTNAME=	cloudlib-0.3.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cloudlib/}
 
diff --git a/py-cma/Makefile b/py-cma/Makefile
index 0ed9607fad..3179211a18 100644
--- a/py-cma/Makefile
+++ b/py-cma/Makefile
@@ -1,15 +1,15 @@
 # $NetBSD: Makefile,v 1.2 2014/08/22 21:12:24 jihbed Exp $
 
 DISTNAME=	cma-1.1.01
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 EGG_NAME=	${DISTNAME:S/1.1.01/1.1.1/}
-CATEGORIES=     math python
-MASTER_SITES=   ${MASTER_SITE_PYPI:=c/cma/}
+CATEGORIES=	math python
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/cma/}
 
-MAINTAINER=     jihbed.research%gmail.com@localhost
-HOMEPAGE=       https://www.lri.fr/~hansen/cmaes_inmatlab.html#python
-COMMENT=        Covariance Matrix Adaptation Evolution Strategy for non-linear
-LICENSE=        mit
+MAINTAINER=	jihbed.research%gmail.com@localhost
+HOMEPAGE=	https://www.lri.fr/~hansen/cmaes_inmatlab.html#python
+COMMENT=	Covariance Matrix Adaptation Evolution Strategy for non-linear
+LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
diff --git a/py-cmtoolkit/Makefile b/py-cmtoolkit/Makefile
index 0edd341fb6..bd88fae171 100644
--- a/py-cmtoolkit/Makefile
+++ b/py-cmtoolkit/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	cmtoolkit-0.0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cmtoolkit/}
 
diff --git a/py-cnfgen/Makefile b/py-cnfgen/Makefile
index 5849b1ab00..6ff5421f6c 100644
--- a/py-cnfgen/Makefile
+++ b/py-cnfgen/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	CNFgen-0.7.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	math
 MASTER_SITES=	https://pypi.python.org/packages/69/77/cc550fb40563ea69341ae17f2a0021f584259b5e885c493fdff570f619e8/
 
diff --git a/py-coala/Makefile b/py-coala/Makefile
index 51729d058c..4a180bbdfe 100644
--- a/py-coala/Makefile
+++ b/py-coala/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	https://coala.io/
 COMMENT=	Unified command-line interface for linting and fixing all your code
 LICENSE=	gnu-agpl-v3
 
-PYTHON_VERSIONS_INCOMPATIBLE=   27
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 INSTALLATION_DIRS+=	${PKGMANDIR}
 
diff --git a/py-cobra/Makefile b/py-cobra/Makefile
index e8f31f5385..8584a75213 100644
--- a/py-cobra/Makefile
+++ b/py-cobra/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://opencobra.github.io/cobrapy
 COMMENT=	Constraints-based modeling of biological networks
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 WRKSRC=	${WRKDIR}/cobra-0.4.0b1
 
diff --git a/py-cogapp/Makefile b/py-cogapp/Makefile
index c699690bdc..673bfdec4d 100644
--- a/py-cogapp/Makefile
+++ b/py-cogapp/Makefile
@@ -12,7 +12,7 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cogent/Makefile b/py-cogent/Makefile
index 79d0c15f59..6176b965e9 100644
--- a/py-cogent/Makefile
+++ b/py-cogent/Makefile
@@ -2,19 +2,19 @@
 
 DISTNAME=	cogent-1.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	 biology python
+CATEGORIES=	biology python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cogent/}
 EXTRACT_SUFX=	.tgz#md5=732d19ab6f4ded2a75a3ae77eaea9872
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://sourceforge.net/projects/pycogent
 COMMENT=	Cogent A toolkit for statistical analysis of biological sequences
-LICENSE=		gnu-gpl-v3
+LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.5.6:../../databases/py-sqlalchemy
 DEPENDS+=	${PYPKGPREFIX}-pyrex-[0-9]*:../../lang/py-pyrex
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-pyrex
 
 do-test:
diff --git a/py-complexsystems/Makefile b/py-complexsystems/Makefile
index 84fb38837f..2c90ee7628 100644
--- a/py-complexsystems/Makefile
+++ b/py-complexsystems/Makefile
@@ -5,10 +5,10 @@ PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=C/ComplexSystems/}
 
-MAINTAINER= jihbed.research%gmail.com@localhost
-HOMEPAGE= http://bitbucket.org/vgauthier/complex-systems/
-COMMENT= Toolbox for Complex Sytems
-LICENSE= mit
+MAINTAINER=	jihbed.research%gmail.com@localhost
+HOMEPAGE=	http://bitbucket.org/vgauthier/complex-systems/
+COMMENT=	Toolbox for Complex Sytems
+LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
diff --git a/py-concepts/Makefile b/py-concepts/Makefile
index de3863fea2..179185edb3 100644
--- a/py-concepts/Makefile
+++ b/py-concepts/Makefile
@@ -14,7 +14,7 @@ LICENSE=	mit
 WRKSRC=		${WRKDIR}/concepts-0.2.2
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 do-test:
 	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} run-tests.py
diff --git a/py-conda/Makefile b/py-conda/Makefile
index 607ccb0bb5..213ad0c04f 100644
--- a/py-conda/Makefile
+++ b/py-conda/Makefile
@@ -11,14 +11,14 @@ HOMEPAGE=	https://github.com/conda/conda
 COMMENT=	Package management tool
 LICENSE=	modified-bsd
 
-DEPENDS+=    	${PYPKGPREFIX}-requests>=2.7.0:../../devel/py-requests
-DEPENDS+=    	${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-requests>=2.7.0:../../devel/py-requests
+DEPENDS+=	${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
 DEPENDS+=	${PYPKGPREFIX}-conda-env>=2.4.2:../../wip/py-conda-env
 DEPENDS+=	${PYPKGPREFIX}-cosat>=0.6.1:../../wip/py-cosat
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 do-test:
 	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} runtests.sh
diff --git a/py-corpus/Makefile b/py-corpus/Makefile
index 4e05d9f1db..fee8db1c8b 100644
--- a/py-corpus/Makefile
+++ b/py-corpus/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD$
 
 DISTNAME=	PyCorpus-0.1
-PKGNAME=   	${PYPKGPREFIX}-${DISTNAME:S/Py//tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Py//tl}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PYPI:=P/PyCorpus/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
-HOMEPAGE=	 http://www.alfanous.org/
+HOMEPAGE=	http://www.alfanous.org/
 COMMENT=	Arabic Quranic Corpus python API
 LICENSE=	gnu-gpl-v3
 
diff --git a/py-corrfitter/Makefile b/py-corrfitter/Makefile
index c0bffdbcda..132cb5553b 100644
--- a/py-corrfitter/Makefile
+++ b/py-corrfitter/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2014/05/12 22:21:49 jihbed Exp $
 
 DISTNAME=	corrfitter-3.7
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/corrfitter/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/gplepage/corrfitter.git
 COMMENT=	Utilities for fitting correlators in lattice QCD
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=       ${PYPKGPREFIX}-lsqfit>=4.8:../../wip/py-lsqfit
+DEPENDS+=	${PYPKGPREFIX}-lsqfit>=4.8:../../wip/py-lsqfit
 
 USE_LANGUAGES=	# none
 
diff --git a/py-cryptoidlib/Makefile b/py-cryptoidlib/Makefile
index d441833f0c..c3fe863f36 100644
--- a/py-cryptoidlib/Makefile
+++ b/py-cryptoidlib/Makefile
@@ -16,7 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-tlslite>=0.3.8:../../security/py-tlslite
 DEPENDS+=	jython>=2.5.1:../../wip/jython
 DEPENDS+=	${PYPKGPREFIX}-gmpy>=1.04:../../math/py-gmpy
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-m2crypto
 
diff --git a/py-csp/Makefile b/py-csp/Makefile
index deeb4ff129..a349781591 100644
--- a/py-csp/Makefile
+++ b/py-csp/Makefile
@@ -17,11 +17,11 @@ EGDIR=			${PREFIX}/share/examples/py-csp
 EGG_NAME=		${DISTNAME:S/-complete//1}
 INSTALLATION_DIRS+=	${EGDIR}
 
-SUBST_CLASSES+=         prefix
-SUBST_STAGE.prefix=     pre-configure
-SUBST_FILES.prefix=     test/runtests.sh
-SUBST_MESSAGE.prefix=   Fixing Python's path
-SUBST_SED.prefix=       -e "s|PYTHON=python|PYTHON=${PYTHONBIN}|1"
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_FILES.prefix=	test/runtests.sh
+SUBST_MESSAGE.prefix=	Fixing Python's path
+SUBST_SED.prefix=	-e "s|PYTHON=python|PYTHON=${PYTHONBIN}|1"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/test/*.py ${DESTDIR}${EGDIR}
diff --git a/py-cutadapt/buildlink3.mk b/py-cutadapt/buildlink3.mk
index 408ce5a54f..ed6b0c5fcc 100644
--- a/py-cutadapt/buildlink3.mk
+++ b/py-cutadapt/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	cutadapt
 CUTADAPT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cutadapt+=	${PYPKGPREFIX}-cutadapt>=1.14
-BUILDLINK_PKGSRCDIR.cutadapt?=	../../wip/py-cutadapt
+BUILDLINK_PKGSRCDIR.cutadapt?=		../../wip/py-cutadapt
 .endif	# CUTADAPT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-cutadapt
diff --git a/py-cva/Makefile b/py-cva/Makefile
index 5b306d8b79..f0e5fb5333 100644
--- a/py-cva/Makefile
+++ b/py-cva/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	cva-0.9.4
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	https://pypi.python.org/packages/12/52/3297aa6eb20d56417e8d02f001d2e3edb72b63762d1f6ee2d042f050797b/
 
diff --git a/py-cythongsl/Makefile b/py-cythongsl/Makefile
index c9b3c8c7d3..2bd9daabd0 100644
--- a/py-cythongsl/Makefile
+++ b/py-cythongsl/Makefile
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/CythonGSL-0.1
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 # work for cython>=1.51.x
 .include "../../devel/py-cython/buildlink3.mk"
diff --git a/py-dana/Makefile b/py-dana/Makefile
index a6705c7675..0f141dcd2b 100644
--- a/py-dana/Makefile
+++ b/py-dana/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=d/dana/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://dana.loria.fr/
-COMMENT= Framework for distributed, asynchronous and adaptive computing
+COMMENT=	Framework for distributed, asynchronous and adaptive computing
 LICENSE=	modified-bsd
 
 #DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
diff --git a/py-dbglog/Makefile b/py-dbglog/Makefile
index 051a412cda..83d18d6332 100644
--- a/py-dbglog/Makefile
+++ b/py-dbglog/Makefile
@@ -2,13 +2,13 @@
 #
 
 DISTNAME=	dbglog-python-1.5.0
-PKGNAME=        ${PYPKGPREFIX}-dbglog-1.5.0
+PKGNAME=	${PYPKGPREFIX}-dbglog-1.5.0
 
 CATEGORIES=	python misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dbglog/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER= 	pkgsrc%blackmouse.biz@localhost
+MAINTAINER=	pkgsrc%blackmouse.biz@localhost
 HOMEPAGE=	http://opensource.seznam.cz/DBGlog
 COMMENT=	Python binding for dbglog
 
@@ -16,8 +16,8 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_LANGUAGES=	c c++
 
-PYDISTUTILSPKG= yes
-PY_PATCHPLIST=  yes
+PYDISTUTILSPKG=	yes
+PY_PATCHPLIST=	yes
 
 .include "../../wip/libdbglog/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/py-dbglog/buildlink3.mk b/py-dbglog/buildlink3.mk
index 866aa3aceb..d5a7f96b5e 100644
--- a/py-dbglog/buildlink3.mk
+++ b/py-dbglog/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	py-dbglog
 PY_DBGLOG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-dbglog+=	${PYPKGPREFIX}-dbglog>=1.5.0
-BUILDLINK_PKGSRCDIR.py-dbglog?=	../../wip/py-dbglog
+BUILDLINK_PKGSRCDIR.py-dbglog?=		../../wip/py-dbglog
 
 .include "../../wip/libdbglog/buildlink3.mk"
 .endif	# PY_DBGLOG_BUILDLINK3_MK
diff --git a/py-deltasigma/Makefile b/py-deltasigma/Makefile
index 85674902d0..028f8b616d 100644
--- a/py-deltasigma/Makefile
+++ b/py-deltasigma/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/ggventurini/python-deltasigma
 COMMENT=	Scale and map to implementable topologies delta sigma modulators
 LICENSE=	modified-bsd
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
diff --git a/py-dependency_management/Makefile b/py-dependency_management/Makefile
index b43256a99c..c57c6a030f 100644
--- a/py-dependency_management/Makefile
+++ b/py-dependency_management/Makefile
@@ -14,8 +14,8 @@ USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-DEPENDS+=       ${PYPKGPREFIX}-coala_utils-[0-9]*:../../wip/py-coala_utils
-DEPENDS+=       ${PYPKGPREFIX}-sarge-[0-9]*:../../wip/py-sarge
+DEPENDS+=	${PYPKGPREFIX}-coala_utils-[0-9]*:../../wip/py-coala_utils
+DEPENDS+=	${PYPKGPREFIX}-sarge-[0-9]*:../../wip/py-sarge
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/py-dependenpy/Makefile b/py-dependenpy/Makefile
index c9eaf0f1ff..621e99e010 100644
--- a/py-dependenpy/Makefile
+++ b/py-dependenpy/Makefile
@@ -12,7 +12,7 @@ LICENSE=	mpl-2.0
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-dexy/Makefile b/py-dexy/Makefile
index 4638c14244..f8a0adc934 100644
--- a/py-dexy/Makefile
+++ b/py-dexy/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2014/05/09 07:38:46 thomasklausner Exp $
 
 DISTNAME=	dexy-0.9.9.5
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/dexy/}
 
@@ -18,9 +18,9 @@ DEPENDS+=	${PYPKGPREFIX}-docutils>=0.11:../../textproc/py-docutils
 DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 DEPENDS+=	${PYPKGPREFIX}-markdown>=2.2.1:../../textproc/py-markdown
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
-DEPENDS+=    	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
-DEPENDS+=    	${PYPKGPREFIX}-dexy_viewer>=0.0.4:../../wip/py-dexy_viewer
-DEPENDS+=    	${PYPKGPREFIX}-inflection>=0.2.0:../../wip/py-inflection
+DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-dexy_viewer>=0.0.4:../../wip/py-dexy_viewer
+DEPENDS+=	${PYPKGPREFIX}-inflection>=0.2.0:../../wip/py-inflection
 
 WRKSRC=		${WRKDIR}/dexy-0.9.9.5
 
diff --git a/py-dexy_viewer/Makefile b/py-dexy_viewer/Makefile
index abce76841a..ad09849076 100644
--- a/py-dexy_viewer/Makefile
+++ b/py-dexy_viewer/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2013/09/05 01:20:36 jihbed Exp $
 
 DISTNAME=	dexy_viewer-0.0.4
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/dexy_viewer/}
 
@@ -10,8 +10,8 @@ HOMEPAGE=	http://dexy.it/
 COMMENT=	Document Automation viewer
 LICENSE=	mit
 
-DEPENDS+=    ${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
-DEPENDS+=    ${PYPKGPREFIX}-inflection>=0.2.0:../../wip/py-inflection
+DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-inflection>=0.2.0:../../wip/py-inflection
 
 WRKSRC=		${WRKDIR}/dexy_viewer-0.0.4
 USE_LANGUAGES=	# none
diff --git a/py-dicom/Makefile b/py-dicom/Makefile
index 348ccb6e5a..7488e18dfd 100644
--- a/py-dicom/Makefile
+++ b/py-dicom/Makefile
@@ -15,10 +15,10 @@ DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.6.2:../../converters/py-simplejson
 USE_TOOLS+=	bash
 USE_LANGUAGES=	# none
 
-REPLACE_BASH+=	dicom/test/shell_all
+REPLACE_BASH+=		dicom/test/shell_all
 REPLACE_PYTHON+=	dicom/contrib/dicom_dao.py
 
-PYTHON_VERSIONS_ACCEPTED= 27
+PYTHON_VERSIONS_ACCEPTED=	27
 
 do-test:
 	${RUN} cd ${WRKSRC}/dicom/test; ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_test.py
diff --git a/py-diffpy-structure/Makefile b/py-diffpy-structure/Makefile
index 3da2b44f69..d2890635de 100644
--- a/py-diffpy-structure/Makefile
+++ b/py-diffpy-structure/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2014/12/31 13:58:27 thomasklausner Exp $
 
-VERS=	1.0-r3067-20090410
+VERS=		1.0-r3067-20090410
 DISTNAME=	diffpy.Structure-${VERS}
 EGG_NAME=	diffpy.Structure-1.0_r3067_20090410
 PKGNAME=	${PYPKGPREFIX}-diffpy-structure-${VERS}
diff --git a/py-dill/Makefile b/py-dill/Makefile
index 879f4b6277..0c10382c7a 100644
--- a/py-dill/Makefile
+++ b/py-dill/Makefile
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/readline
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE= 32 34 35 36
+PYTHON_VERSIONS_INCOMPATIBLE=	32 34 35 36
 
 	
 .include "../../lang/python/egg.mk"
diff --git a/py-divmod-epsilon/Makefile b/py-divmod-epsilon/Makefile
index 57e6dd8444..770874768f 100644
--- a/py-divmod-epsilon/Makefile
+++ b/py-divmod-epsilon/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.16 2014/05/09 07:38:46 thomasklausner Exp $
 
 EPSILON_VERSION=	0.5.12
-DISTNAME=	Epsilon-${EPSILON_VERSION}
-PKGNAME=	${PYPKGPREFIX}-divmod-epsilon-${EPSILON_VERSION}
-CATEGORIES=	time devel python
-MASTER_SITES=	ftp://ftp.osuosl.org/pub/nslu2/sources/
+DISTNAME=		Epsilon-${EPSILON_VERSION}
+PKGNAME=		${PYPKGPREFIX}-divmod-epsilon-${EPSILON_VERSION}
+CATEGORIES=		time devel python
+MASTER_SITES=		ftp://ftp.osuosl.org/pub/nslu2/sources/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://divmod.org/trac/wiki/DivmodNevow
diff --git a/py-django-markwhat/Makefile b/py-django-markwhat/Makefile
index 38d3e58a70..9b8db2fdcd 100644
--- a/py-django-markwhat/Makefile
+++ b/py-django-markwhat/Makefile
@@ -6,15 +6,15 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/django-markwhat/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
-HOMEPAGE=	 http://pypi.python.org/pypi/django-markwhat
+HOMEPAGE=	http://pypi.python.org/pypi/django-markwhat
 COMMENT=	Template filters that implement common markup languages
 LICENSE=	2-clause-bsd
 
-DEPENDS+=       ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
+DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 do-test:
 	${RUN} cd ${WRKSRC}/django_markwhat; ${SETENV} ${TEST_ENV} ${PYTHONBIN} tests.py
diff --git a/py-django-registration/Makefile b/py-django-registration/Makefile
index 84effa7259..ef04238fda 100644
--- a/py-django-registration/Makefile
+++ b/py-django-registration/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 COMMENT=	User-registration application for Django
 LICENSE=	modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-django>=1.4:../../www/py-django
+DEPENDS+=	${PYPKGPREFIX}-django>=1.4:../../www/py-django
 
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		# none
diff --git a/py-dns-clientsubnetoption/Makefile b/py-dns-clientsubnetoption/Makefile
index 0d874c5b0f..89e43a1af4 100644
--- a/py-dns-clientsubnetoption/Makefile
+++ b/py-dns-clientsubnetoption/Makefile
@@ -4,13 +4,13 @@ GITHUB_PROJECT=	dnspython-clientsubnetoption
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	${PYPKGPREFIX}-${GITHUB_PROJECT:S/python-/-/}-2.1.0
 CATEGORIES=	net
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=opendns/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=opendns/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
 GITHUB_TAG=	be8ed04cf208f46eea542504f444982ab6fb4bc1 # master of 2016-04-06
 # which is known as 2.1.0
 
 MAINTAINER=	reed%reedmedia.net@localhost
-HOMEPAGE= 	https://github.com/opendns/dnspython-clientsubnetoption
+HOMEPAGE=	https://github.com/opendns/dnspython-clientsubnetoption
 COMMENT=	EDNS Client Subnet support for python
 LICENSE=	modified-bsd
 
diff --git a/py-downhill/Makefile b/py-downhill/Makefile
index 1d691ed468..ed77335218 100644
--- a/py-downhill/Makefile
+++ b/py-downhill/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	downhill-0.3.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/downhill/}
 
diff --git a/py-duali/Makefile b/py-duali/Makefile
index ed57dcabdc..fdbc004347 100644
--- a/py-duali/Makefile
+++ b/py-duali/Makefile
@@ -22,7 +22,7 @@ SUBST_SED.paths+=	-e 's,/etc,${PREFIX}/etc,g'
 SUBST_FILES.paths+=	setup.py duali.conf
 SUBST_MESSAGE.paths=	Fixing header search paths.
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 INSTALLATION_DIRS=	share/doc/py-duali ${PKGMANDIR}/man1
 
diff --git a/py-dubins/Makefile b/py-dubins/Makefile
index 9e937eb977..13fb32dc80 100644
--- a/py-dubins/Makefile
+++ b/py-dubins/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/dubins/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://github.com/AndrewWalker/pydubins
+HOMEPAGE=	https://github.com/AndrewWalker/pydubins
 COMMENT=	Code to generate and manipulate dubins curves
 LICENSE=	mit
 
diff --git a/py-easymodeler/Makefile b/py-easymodeler/Makefile
index f8424b3d64..2d07f01994 100644
--- a/py-easymodeler/Makefile
+++ b/py-easymodeler/Makefile
@@ -9,9 +9,9 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://pypi.python.org/pypi/EasyModeler
 COMMENT=	Simple ODE Tools for Modelers
-ICENSE=	modified-bsd
+ICENSE=		modified-bsd
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 #DEPENDS+=       ${PYPKGPREFIX}-sas7bdat>=2.0.4:../../wip/py-sas7bdat
 
 
diff --git a/py-ecos/Makefile b/py-ecos/Makefile
index 4f1d704748..54edee5d5a 100644
--- a/py-ecos/Makefile
+++ b/py-ecos/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v3
 
 WRKSRC=	${WRKDIR}/ecos-1.1.0
 
-BUILD_TARGET= _ecos.so
+BUILD_TARGET=	_ecos.so
 
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-eemeter/Makefile b/py-eemeter/Makefile
index 3a8c13249a..0b60639a8f 100644
--- a/py-eemeter/Makefile
+++ b/py-eemeter/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	eemeter-0.5.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	biology
 MASTER_SITES=	https://pypi.python.org/packages/fb/06/8d0cd92b267ef962a6db224d80ea3870df03239fd34c6b25d33dbda20154/
 
diff --git a/py-eigency/Makefile b/py-eigency/Makefile
index 27b30d2764..e70bdf43a8 100644
--- a/py-eigency/Makefile
+++ b/py-eigency/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD$
 
 DISTNAME=	eigency-1.75
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=     math python
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	math python
 MASTER_SITES=	https://pypi.python.org/packages/55/a0/f6101aa64eb3840a2ca853dea2f8995e44a1a7633c5a70dce2b2672db019/
 
-MAINTAINER=     jihbed.research%gmail.com@localhost
+MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://github.com/wouterboomsma/eigency
 COMMENT=	Cython interface between the numpy arrays and the Matrix/Array
 LICENSE=	mit
diff --git a/py-engfmt/Makefile b/py-engfmt/Makefile
index dcbd9befbd..a2017d19c2 100644
--- a/py-engfmt/Makefile
+++ b/py-engfmt/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	engfmt-1.0.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=e/engfmt/}
 
diff --git a/py-enumit/Makefile b/py-enumit/Makefile
index c3b44fa2e9..6391ea39a7 100644
--- a/py-enumit/Makefile
+++ b/py-enumit/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	enumit-1.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=e/enumit/}
 
diff --git a/py-epigrass/Makefile b/py-epigrass/Makefile
index 0184420b5e..37c3a98619 100644
--- a/py-epigrass/Makefile
+++ b/py-epigrass/Makefile
@@ -13,8 +13,8 @@ LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-mysqldb>=1.2.3:../../databases/py-mysqldb
-DEPENDS+=       ${PYPKGPREFIX}-networkx>=1.7:../../math/py-networkx
-DEPENDS+=       ${PYPKGPREFIX}-redis>=2.8.0:../../databases/py-redis
+DEPENDS+=	${PYPKGPREFIX}-networkx>=1.7:../../math/py-networkx
+DEPENDS+=	${PYPKGPREFIX}-redis>=2.8.0:../../databases/py-redis
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-mysqldb
 
diff --git a/py-errorhandler/Makefile b/py-errorhandler/Makefile
index 78134cf0b1..8f3d0d6b8d 100644
--- a/py-errorhandler/Makefile
+++ b/py-errorhandler/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.2 2012/10/07 11:54:32 asau Exp $
 #
 
-VERS=				1.1.1
-DISTNAME=			errorhandler-${VERS}
-PKGNAME=			${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=			textproc
-MASTER_SITES=		${MASTER_SITE_PYPI:=e/errorhandler/}
+VERS=		1.1.1
+DISTNAME=	errorhandler-${VERS}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	textproc
+MASTER_SITES=	${MASTER_SITE_PYPI:=e/errorhandler/}
 
 MAINTAINER=			helgoman%users.sourceforge.net@localhost
 HOMEPAGE=			http://www.simplistix.co.uk/software/python/errorhandler
diff --git a/py-escher/Makefile b/py-escher/Makefile
index 69d7ba2cea..6d6c501e7f 100644
--- a/py-escher/Makefile
+++ b/py-escher/Makefile
@@ -10,9 +10,9 @@ HOMEPAGE=	https://escher.github.io
 COMMENT=	Build, view, share, and embed pathway maps
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
-DEPENDS+=       jsonschema>=2.4.0:../../textproc/py-jsonschema
-DEPENDS+=       ${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
+DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
+DEPENDS+=	jsonschema>=2.4.0:../../textproc/py-jsonschema
+DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
 
 WRKSRC=		${WRKDIR}/Escher-1.1.2.post2
 
diff --git a/py-eventlet/Makefile b/py-eventlet/Makefile
index 518359a900..7dd7592db1 100644
--- a/py-eventlet/Makefile
+++ b/py-eventlet/Makefile
@@ -5,7 +5,7 @@ PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=e/eventlet/}
 
-MAINTAINER= 	kamel.derouiche%gmail.com@localhost
+MAINTAINER=	kamel.derouiche%gmail.com@localhost
 HOMEPAGE=	http://eventlet.net/
 COMMENT=	High performance network library using coroutines
 LICENSE=	mit
diff --git a/py-fancyimpute/Makefile b/py-fancyimpute/Makefile
index a7e36cdfb5..1a5c9ac9c8 100644
--- a/py-fancyimpute/Makefile
+++ b/py-fancyimpute/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	fancyimpute-0.2.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	https://pypi.python.org/packages/b8/4d/f460fe747949d2b84f21cfaebe58fe1de8f4dcd6779d5fc58adb2f885417/
 
@@ -10,8 +10,8 @@ HOMEPAGE=	https://github.com/hammerlab/fancyimpute
 COMMENT=	Matrix completion and feature imputation algorithms
 LICENSE=	apache-2.0
 
-DEPENDS+=       ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-DEPENDS+=       ${PYPKGPREFIX}-keras>=1.0.5:../../wip/py-keras
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-keras>=1.0.5:../../wip/py-keras
 
 USE_LANGUAGES=	# none
 
diff --git a/py-fanova/Makefile b/py-fanova/Makefile
index d45acb7086..95a651270a 100644
--- a/py-fanova/Makefile
+++ b/py-fanova/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Functional ANOVA
 
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.11:../../textproc/py-docutils
 
-PKG_JVMS_ACCEPTED= sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
 
 .include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/py-fatiando/Makefile b/py-fatiando/Makefile
index bfd15e3ddd..bec60f79e0 100644
--- a/py-fatiando/Makefile
+++ b/py-fatiando/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	fatiando-0.0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=f/fatiando/}
 
diff --git a/py-fcn/Makefile b/py-fcn/Makefile
index fcfe5b7a34..24551dcf77 100644
--- a/py-fcn/Makefile
+++ b/py-fcn/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	fcn-4.0.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	https://pypi.python.org/packages/b5/1d/7ede6cf7a6a2ab13b5dcaff9d0ecf4ce1f6d10169fdf0eaf6caa16bd1677/
 
diff --git a/py-fdasrsf/Makefile b/py-fdasrsf/Makefile
index 6df10ea62f..8031842557 100644
--- a/py-fdasrsf/Makefile
+++ b/py-fdasrsf/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=f/fdasrsf/}
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://stat.fsu.edu/~dtucker/research.html
 COMMENT=	Functional data analysis using the square root slope framework
-LICENSE=modified-bsd
+LICENSE=	modified-bsd
 
 PYDISTUTILSPKG=	yes
 
diff --git a/py-fedmsg/Makefile b/py-fedmsg/Makefile
index 04c7c57450..be49a04339 100644
--- a/py-fedmsg/Makefile
+++ b/py-fedmsg/Makefile
@@ -13,10 +13,10 @@ LICENSE=	gnu-lgpl-v2.1
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.5.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-zmq>=14.4.1:../../net/py-zmq
 DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
-DEPENDS+=    	${PYPKGPREFIX}-psutil>=2.1.3:../../sysutils/py-psutil
+DEPENDS+=	${PYPKGPREFIX}-psutil>=2.1.3:../../sysutils/py-psutil
 #DEPENDS+=    	${PYPKGPREFIX}-cryptography>=1.0.1:../../security/py-cryptography
-DEPENDS+=    	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
-DEPENDS+=    	${PYPKGPREFIX}-arrow>=0.4.2:../../time/py-arrow
+DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
+DEPENDS+=	${PYPKGPREFIX}-arrow>=0.4.2:../../time/py-arrow
 DEPENDS+=	${PYPKGPREFIX}-kitchen>=1.2.1:../../wip/py-kitchen
 DEPENDS+=	${PYPKGPREFIX}-moksha-hub>=1.4.4:../../wip/py-moksha-hub
 
diff --git a/py-fiona/Makefile b/py-fiona/Makefile
index ce78e64fb4..4d4ae16fcc 100644
--- a/py-fiona/Makefile
+++ b/py-fiona/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	geography python
 MASTER_SITES=	${MASTER_SITE_PYPI:=F/Fiona/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://github.com/Toblerity/Fiona
+HOMEPAGE=	https://github.com/Toblerity/Fiona
 COMMENT=	Fiona reads and writes spatial data files
 LICENSE=	modified-bsd
 
diff --git a/py-fix-yahoo-finance/Makefile b/py-fix-yahoo-finance/Makefile
index 46c294a977..1bb448973f 100644
--- a/py-fix-yahoo-finance/Makefile
+++ b/py-fix-yahoo-finance/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	fix-yahoo-finance-0.0.19
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_PYPI:=f/fix-yahoo-finance/}
 
diff --git a/py-fjd/Makefile b/py-fjd/Makefile
index 63229bf8d9..c4a6d5386d 100644
--- a/py-fjd/Makefile
+++ b/py-fjd/Makefile
@@ -15,7 +15,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-paramiko
 USE_TOOLS+=	bash:run
 USE_LANGUAGES=	# none
 
-REPLACE_BASH+=	 fjd/scripts/bgscreen
+REPLACE_BASH+=	fjd/scripts/bgscreen
 
 REPLACE_PYTHON+=	fjd/scripts/fjd-recruiter \
 					fjd/scripts/fjd-worker \
diff --git a/py-fluiddyn/Makefile b/py-fluiddyn/Makefile
index 02c4bddae3..a97d99e7e9 100644
--- a/py-fluiddyn/Makefile
+++ b/py-fluiddyn/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/f/fluiddyn/
 COMMENT=	Framework for studying fluid dynamics.
 LICENSE=	modified-bsd
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-DEPENDS+=       ${PYPKGPREFIX}-psutil>=2.1.3:../../sysutils/py-psutil
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-psutil>=2.1.3:../../sysutils/py-psutil
 
 USE_LANGUAGES=	# none
 
diff --git a/py-forthon/Makefile b/py-forthon/Makefile
index 4ea33362e5..0f7b71895c 100644
--- a/py-forthon/Makefile
+++ b/py-forthon/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2014/01/25 10:38:18 thomasklausner Exp $
 
 DISTNAME=	Forthon-0.8.13
-PKGNAME=        ${PYPKGPREFIX}-forthon-0.8.13
+PKGNAME=	${PYPKGPREFIX}-forthon-0.8.13
 PKGREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	http://hifweb.lbl.gov/Forthon/
diff --git a/py-fortpy/Makefile b/py-fortpy/Makefile
index 2ca949fda5..58c4dd763b 100644
--- a/py-fortpy/Makefile
+++ b/py-fortpy/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-paramiko>=1.14.0:../../security/py-paramiko
 #DEPENDS+=	${PYPKGPREFIX}-dateutil>=2.0:../../time/py-dateutil
 
-USE_LANGUAGES=	# none
+USE_LANGUAGES=		# none
 REPLACE_PYTHON+=	fortpy/scripts/*.py*
 
 post-extract:
diff --git a/py-frozendict/Makefile b/py-frozendict/Makefile
index 93f476c3c4..2c757b63ad 100644
--- a/py-frozendict/Makefile
+++ b/py-frozendict/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 DISTNAME=	frozendict-1.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/v//}
-CATEGORIES=     devel python
-MASTER_SITES=   ${MASTER_SITE_PYPI:=f/frozendict/}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/v//}
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITE_PYPI:=f/frozendict/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/slezica/python-frozendict
diff --git a/py-fwm-ensayo/Makefile b/py-fwm-ensayo/Makefile
index 47fbaa2558..cbb85c0dd5 100644
--- a/py-fwm-ensayo/Makefile
+++ b/py-fwm-ensayo/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://pypi.python.org/pypi/fwm_ensayo/
 COMMENT=	Fortran package to work with watersheds and do hydrologic
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy	
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy	
 
 USE_LANGUAGES=	c fortran
 
diff --git a/py-gato/Makefile b/py-gato/Makefile
index 071d0045c6..5facc0890d 100644
--- a/py-gato/Makefile
+++ b/py-gato/Makefile
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 1.2.2
-REPLACE_PYTHON+=	*.py
+REPLACE_PYTHON+=		*.py
 
 post-extract:
 	${MV} ${WRKSRC}/scripts/Gato ${WRKSRC}/scripts/Gato${PYVERSSUFFIX}
diff --git a/py-gbpy/Makefile b/py-gbpy/Makefile
index f6109769df..80aa31d0bd 100644
--- a/py-gbpy/Makefile
+++ b/py-gbpy/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	GBpy-0.1.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/GBpy/}
 
diff --git a/py-gcalendarsync/Makefile b/py-gcalendarsync/Makefile
index a82067aa3d..a3721e1565 100644
--- a/py-gcalendarsync/Makefile
+++ b/py-gcalendarsync/Makefile
@@ -13,7 +13,7 @@ DEPENDS+=	${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject
 DEPENDS+=	${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG=		yes
+PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gdata, py-elementtree
 
 DOCDIR=	${PREFIX}/share/doc/${PKGNAME}
diff --git a/py-gem/Makefile b/py-gem/Makefile
index 30d679b8bd..41edfaa613 100644
--- a/py-gem/Makefile
+++ b/py-gem/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	gem-v0.1.11
 EGG_NAME=	gem-0.1.11
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/gem/}
 
diff --git a/py-gmpy2/Makefile b/py-gmpy2/Makefile
index b42f3c5f2f..a2d57fda2a 100644
--- a/py-gmpy2/Makefile
+++ b/py-gmpy2/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/aleaxit/gmpy/
 COMMENT=	GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x
 LICENSE=	gnu-gpl-v3
 
-BUILD_TARGET= gmpy2.so
+BUILD_TARGET=	gmpy2.so
 
 BUILDLINK_API_DEPENDS.gmp+=		gmp>=4.2.1
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/py-gnm/Makefile b/py-gnm/Makefile
index 9d70041713..762696abdf 100644
--- a/py-gnm/Makefile
+++ b/py-gnm/Makefile
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2
 WRKSRC=		${WRKDIR}/pygnm-0.1
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-golangenv/Makefile b/py-golangenv/Makefile
index 6a476b6a70..fff1db1c26 100644
--- a/py-golangenv/Makefile
+++ b/py-golangenv/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	golangenv-0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/golangenv/}
 
diff --git a/py-gosam/Makefile b/py-gosam/Makefile
index 436e3f6384..838198453a 100644
--- a/py-gosam/Makefile
+++ b/py-gosam/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://gosam.hepforge.org/
 COMMENT=	Automated One-Loop matrix element generator
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=       ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
+DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-700//}
 
diff --git a/py-graphs/Makefile b/py-graphs/Makefile
index b08833d6ed..609ac3e89b 100644
--- a/py-graphs/Makefile
+++ b/py-graphs/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	graphs-0.1.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/graphs/}
 
diff --git a/py-grpy/Makefile b/py-grpy/Makefile
index b0c2268087..97efb1c68e 100644
--- a/py-grpy/Makefile
+++ b/py-grpy/Makefile
@@ -2,7 +2,7 @@
 
 VERSION=	0.2
 DISTNAME=	GRPy0.2
-PKGNAME=       ${PYPKGPREFIX}-grpy-${VERSION}
+PKGNAME=	${PYPKGPREFIX}-grpy-${VERSION}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=G/GRPy/}
 
@@ -15,10 +15,10 @@ WRKSRC=		${WRKDIR} # More than one possibility -- please check manually.
 
 USE_LANGUAGES=	# none
 
-NO_BUILD=       yes
+NO_BUILD=	yes
 GRPy_FILES=	Christoffel.py Riemann.py Tensor.py
-PLIST_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX:Q}
-PY_PATCHPLIST=		yes
+PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX:Q}
+PY_PATCHPLIST=	yes
 
 INSTALLATION_DIRS=	${PYSITELIB}
 
diff --git a/py-guppy/Makefile b/py-guppy/Makefile
index 963af413be..33c21e47e5 100644
--- a/py-guppy/Makefile
+++ b/py-guppy/Makefile
@@ -12,7 +12,7 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
-WRKSRC=	${WRKDIR}/guppy-0.1.9
+WRKSRC=		${WRKDIR}/guppy-0.1.9
 PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
diff --git a/py-gvar/Makefile b/py-gvar/Makefile
index 301ece4ea6..bc1a61c434 100644
--- a/py-gvar/Makefile
+++ b/py-gvar/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=	c
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 
 .include "../../devel/py-cython/buildlink3.mk"
diff --git a/py-gwpy/Makefile b/py-gwpy/Makefile
index e9f919a98c..6762ce0304 100644
--- a/py-gwpy/Makefile
+++ b/py-gwpy/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE=	https://gwpy.github.io/
 COMMENT=	Package to enable gravitational-wave astrophysics in Python
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=       ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-dateutil>=2.4.0:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-astropy>=1.2.1:../../wip/py-astropy
 DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
@@ -25,7 +25,7 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sqlparse-[0-9]*:../../databases/py-sqlparse
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=   34 35 36 # py-m2crypto via py-lscsoft-glue
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-m2crypto via py-lscsoft-glue
 
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-gwsurrogate/Makefile b/py-gwsurrogate/Makefile
index 1932a1968f..9da727c981 100644
--- a/py-gwsurrogate/Makefile
+++ b/py-gwsurrogate/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	gwsurrogate-0.4.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/gwsurrogate/}
 
diff --git a/py-hamilton/Makefile b/py-hamilton/Makefile
index c3a6abff04..db1977659b 100644
--- a/py-hamilton/Makefile
+++ b/py-hamilton/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=H/Hamilton/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://files.pythonhosted.org/packages/source/H/Hamilton/
-COMMENT= Visualize and control mechanic systems through solving these systems
+COMMENT=	Visualize and control mechanic systems through solving these systems
 LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.6:../../math/py-scipy
diff --git a/py-hamnonlineng/Makefile b/py-hamnonlineng/Makefile
index 3a5b92c253..5d308bf0f6 100644
--- a/py-hamnonlineng/Makefile
+++ b/py-hamnonlineng/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	hamnonlineng-0.1.0a3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	https://pypi.python.org/packages/0b/c2/5ab91402f741efcc529ab71d6fa4b53c518dc974024ec261e70358464fda/
 
diff --git a/py-harvestingkit/Makefile b/py-harvestingkit/Makefile
index 282cd90b23..1102ac35f4 100644
--- a/py-harvestingkit/Makefile
+++ b/py-harvestingkit/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	HarvestingKit-0.6.6
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc
 MASTER_SITES=	https://pypi.python.org/packages/36/59/74a881858b0c7e4c98b7f609c824cf2139cb630e90bed506e01e3e316fe3/
 
diff --git a/py-hcluster/Makefile b/py-hcluster/Makefile
index 86dd03fe92..b631ca21e0 100644
--- a/py-hcluster/Makefile
+++ b/py-hcluster/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE=	http://code.google.com/p/scipy-cluster/
 COMMENT=	Hierarchical Clustering Package For Scipy
 LICENSE=	modified-bsd
 
-WRKSRC=	${WRKDIR}/hcluster-0.2.0
+WRKSRC=		${WRKDIR}/hcluster-0.2.0
 USE_LANGUAGES=	c
 
 PYDISTUTILSPKG=	yes
diff --git a/py-hddm/Makefile b/py-hddm/Makefile
index d2d8b5b9c1..d24bda00f4 100644
--- a/py-hddm/Makefile
+++ b/py-hddm/Makefile
@@ -10,10 +10,10 @@ HOMEPAGE=	https://github.com/hddm-devs/hddm
 COMMENT=	Hierarchical Bayesian estimation of Drift Diffusion Models
 LICENSE=	modified-bsd
 
-DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-patsy>=0.3.0:../../math/py-patsy
 
-USE_LANGUAGES= c fortran
+USE_LANGUAGES=	c fortran
 
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/py-healpy/Makefile b/py-healpy/Makefile
index 588d5763f8..1f106298e5 100644
--- a/py-healpy/Makefile
+++ b/py-healpy/Makefile
@@ -17,7 +17,7 @@ USE_LANGUAGES=	c c++ fortran
 
 PKGCONFIG_OVERRIDE+=	cfitsio/cfitsio.pc.in
 
-PY_PATCHPLIST=		yes
+PY_PATCHPLIST=	yes
 PYDISTUTILSPKG=	yes
 
 .include "../../devel/py-cython/buildlink3.mk"
diff --git a/py-helio/Makefile b/py-helio/Makefile
index 9b14ddd80e..92adb43deb 100644
--- a/py-helio/Makefile
+++ b/py-helio/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=h/helio/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	https://github.com/yellowpagesgroup/Helio
-COMMENT=Componentised, hierarchical, notification driven Python web framework
+COMMENT=	Componentised, hierarchical, notification driven Python web framework
 
 WRKSRC=		${WRKDIR}/helio-1.0.0b1
 
diff --git a/py-hessianfree/Makefile b/py-hessianfree/Makefile
index e55b667cea..aaacecc461 100644
--- a/py-hessianfree/Makefile
+++ b/py-hessianfree/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	hessianfree-0.3.7
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=h/hessianfree/}
 EXTRACT_SUFX=	.zip
diff --git a/py-hmf/Makefile b/py-hmf/Makefile
index 098c1af9bd..f751250123 100644
--- a/py-hmf/Makefile
+++ b/py-hmf/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	hmf-2.0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	https://pypi.python.org/packages/68/8b/8c566eb5fcfed49470862cbab4b173cb3d93db34494b3a915dd2dbfaa45a/
 
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/steven-murray/hmf
 COMMENT=	Halo mass function calculator
 LICENSE=	mit
 
-DEPENDS+=     ${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
 
 WRKSRC=		${WRKDIR}/hmf-2.0.1
 
diff --git a/py-htmlparser/Makefile b/py-htmlparser/Makefile
index 4279bb15da..66f9b84973 100644
--- a/py-htmlparser/Makefile
+++ b/py-htmlparser/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	HTMLParser-0.0.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	www
 MASTER_SITES=	https://pypi.python.org/packages/85/d1/46b0a439e88974c99785361069134522dd46012eef9578e1623821368e24/
 
diff --git a/py-icane/Makefile b/py-icane/Makefile
index cd1bddd934..cc5b523cb5 100644
--- a/py-icane/Makefile
+++ b/py-icane/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/predicador37/pyicane
 COMMENT=	Python wrapper for ICANE Statistical Data and Metadata API
 LICENSE=	apache-2.0
 
-DEPENDS+=       ${PYPKGPREFIX}-pandas>=0.16.2:../../math/py-pandas
+DEPENDS+=	${PYPKGPREFIX}-pandas>=0.16.2:../../math/py-pandas
 
 USE_LANGUAGES=	# none
 
diff --git a/py-igraph/Makefile b/py-igraph/Makefile
index 403d096439..c475177bd8 100644
--- a/py-igraph/Makefile
+++ b/py-igraph/Makefile
@@ -5,14 +5,14 @@ PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	https://pypi.python.org/packages/b3/ae/9d956c334b21f404a512b50abeae018a81e5be939a35c73b8291a31f7e24/
 
-MAINTAINER=     kamel.derouiche%gmail.com@localhost
-HOMEPAGE=       http://igraph.org/
-COMMENT=        Manipulating Undirected and Directed Graphs for Python
-LICENSE=        gnu-gpl-v2
+MAINTAINER=	kamel.derouiche%gmail.com@localhost
+HOMEPAGE=	http://igraph.org/
+COMMENT=	Manipulating Undirected and Directed Graphs for Python
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
-USE_TOOLS+=     pkg-config
+USE_TOOLS+=	pkg-config
 
 .include "../../lang/python/egg.mk"
 .include "../../wip/igraph/buildlink3.mk"
diff --git a/py-iisignature/Makefile b/py-iisignature/Makefile
index d64371b159..bdc5378826 100644
--- a/py-iisignature/Makefile
+++ b/py-iisignature/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD$
 
 DISTNAME=	iisignature-0.15
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	https://pypi.python.org/packages/67/63/f1ad74ee52f8232cbd5e85bc5959d2e4cea10ba4a8ed9431194ab81d15e1/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=https://github.com/bottler/iisignature
+HOMEPAGE=	https://github.com/bottler/iisignature
 COMMENT=	Iterated integral signature calculations
 LICENSE=	mit
 
diff --git a/py-inspyred/Makefile b/py-inspyred/Makefile
index 13986d6ba6..fa6729a60a 100644
--- a/py-inspyred/Makefile
+++ b/py-inspyred/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_PYPI:=i/inspyred/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://aarongarrett.github.io/inspyred
+HOMEPAGE=	https://aarongarrett.github.io/inspyred
 COMMENT=	Bio-inspired computational intelligence algorithms in Python
 LICENSE=	mit
 
diff --git a/py-ioflo/Makefile b/py-ioflo/Makefile
index 084b7c9008..c96ab802f7 100644
--- a/py-ioflo/Makefile
+++ b/py-ioflo/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.1 2015/08/05 20:49:23 jihbed Exp $
 
 DISTNAME=	ioflo-1.3.8
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=i/ioflo/}
 
-MAINTAINER=     jihbed.research%gmail.com@localhost
+MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://github.com/ioflo/ioflo
 COMMENT=	TODO: Short description of the package
 LICENSE=	apache-2.0
diff --git a/py-iprogress/Makefile b/py-iprogress/Makefile
index 0ce1d014b8..5c9818843b 100644
--- a/py-iprogress/Makefile
+++ b/py-iprogress/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/08/05 22:00:16 jihbed Exp $
 
 DISTNAME=	IProgress-0.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=I/IProgress/}
 
@@ -10,8 +10,8 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/I/IProgress/
 COMMENT=	Text progress bar library for Python
 LICENSE=	modified-bsd OR gnu-lgpl-v2.1
 
-DEPENDS+=	 ${PYPKGPREFIX}-ipython>=2.0.0:../../devel/py-ipython
-DEPENDS+=	 ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-ipython>=2.0.0:../../devel/py-ipython
+DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 
 USE_LANGUAGES=	# none
 
diff --git a/py-irco/Makefile b/py-irco/Makefile
index 4f564f62d0..0e2ec3600a 100644
--- a/py-irco/Makefile
+++ b/py-irco/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2014/12/31 13:58:32 thomasklausner Exp $
 
 DISTNAME=	irco-0.9.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=i/irco/}
 
diff --git a/py-jabber-aimt/Makefile b/py-jabber-aimt/Makefile
index 5a9af8e59c..8fc05da84e 100644
--- a/py-jabber-aimt/Makefile
+++ b/py-jabber-aimt/Makefile
@@ -24,11 +24,11 @@ DEPENDS+=	${PYPKGPREFIX}-imaging>=1.1.5:../../graphics/py-imaging
 # HAS_CONFIGURE, USE_PKGLOCALEDIR, USE_INSTALL, TEXINFO_REQD, USE_JAVA,
 # USE_PERL5, INFO_FILES, DIST_SUBDIR, etc.
 # EXTRACT_ONLY=		# yes
-NO_BUILD=		yes
-REPLACE_PYTHON+=	PyAIMt.py
-REPLACE_PYTHON+=	tools/infodump.py
-REPLACE_PYTHON+=	tools/managessi.py
-REPLACE_PYTHON+=	tools/migrate.py
+NO_BUILD=			yes
+REPLACE_PYTHON+=		PyAIMt.py
+REPLACE_PYTHON+=		tools/infodump.py
+REPLACE_PYTHON+=		tools/managessi.py
+REPLACE_PYTHON+=		tools/migrate.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-imaging
 
 # always include bsd.prefs.mk before any .if or .ifdef statements
diff --git a/py-jabber-icqt/Makefile b/py-jabber-icqt/Makefile
index 47f8f614a2..f9bfd02d0f 100644
--- a/py-jabber-icqt/Makefile
+++ b/py-jabber-icqt/Makefile
@@ -34,10 +34,10 @@ NO_BUILD=		yes
 
 RCD_SCRIPTS=	pyicqt
 
-REPLACE_PYTHON+=	PyICQt.py
-REPLACE_PYTHON+=	tools/infodump.py
-REPLACE_PYTHON+=	tools/managessi.py
-REPLACE_PYTHON+=	tools/migrate.py
+REPLACE_PYTHON+=		PyICQt.py
+REPLACE_PYTHON+=		tools/infodump.py
+REPLACE_PYTHON+=		tools/managessi.py
+REPLACE_PYTHON+=		tools/migrate.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-imaging
 
 TRANSPORTDIR=		${JABBER_TRANSDIR}/pyicqt
diff --git a/py-jabber-idavoll/Makefile b/py-jabber-idavoll/Makefile
index 515a1ea50e..c924d596e8 100644
--- a/py-jabber-idavoll/Makefile
+++ b/py-jabber-idavoll/Makefile
@@ -32,8 +32,8 @@ PKG_GROUPS_VARS+=	JABBER_GROUP
 
 .include "../../wip/jabberd/transports.mk"
 
-DOCDIR=                 ${PREFIX}/share/doc/idavoll
-DOCFILES=               README INSTALL NEWS LICENSE
+DOCDIR=			${PREFIX}/share/doc/idavoll
+DOCFILES=		README INSTALL NEWS LICENSE
 
 INSTALLATION_DIRS=	share/doc/idavoll
 
diff --git a/py-jabber-punjab/Makefile b/py-jabber-punjab/Makefile
index 8fed9ecc9b..fda6a401e6 100644
--- a/py-jabber-punjab/Makefile
+++ b/py-jabber-punjab/Makefile
@@ -34,8 +34,8 @@ PKG_GROUPS_VARS+=	JABBER_GROUP
 
 .include "../../wip/jabberd/transports.mk"
 
-DOCDIR=                 ${PREFIX}/share/doc/punjab
-DOCFILES=               README.txt INSTALL.txt
+DOCDIR=			${PREFIX}/share/doc/punjab
+DOCFILES=		README.txt INSTALL.txt
 
 INSTALLATION_DIRS=	share/doc/punjab
 
diff --git a/py-jbessel/Makefile b/py-jbessel/Makefile
index a33c86e823..ef3bae4401 100644
--- a/py-jbessel/Makefile
+++ b/py-jbessel/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2014/06/01 12:49:42 thomasklausner Exp $
 
 DISTNAME=	jBessel-0.1.4
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME:tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=j/jBessel/}
 
diff --git a/py-jitcode/Makefile b/py-jitcode/Makefile
index bc7a847689..9fa956fab5 100644
--- a/py-jitcode/Makefile
+++ b/py-jitcode/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	jitcode-0.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=j/jitcode/}
 
diff --git a/py-jsonpath/Makefile b/py-jsonpath/Makefile
index edfcc50e96..6dd8bdefbc 100644
--- a/py-jsonpath/Makefile
+++ b/py-jsonpath/Makefile
@@ -12,7 +12,7 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-kabuki/Makefile b/py-kabuki/Makefile
index d08ba79b83..6d44720dc8 100644
--- a/py-kabuki/Makefile
+++ b/py-kabuki/Makefile
@@ -12,7 +12,7 @@ LICENSE=	2-clause-bsd
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-keras/Makefile b/py-keras/Makefile
index 5e59d527b8..7f590bf848 100644
--- a/py-keras/Makefile
+++ b/py-keras/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	Keras-1.0.5
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=k/keras/}
 
diff --git a/py-kivy/Makefile b/py-kivy/Makefile
index e7dde92c8d..fcc16ac9af 100644
--- a/py-kivy/Makefile
+++ b/py-kivy/Makefile
@@ -2,7 +2,7 @@
 
 VERSION=	1.0.9
 DISTNAME=	Kivy-1.0.9
-PKGNAME=   	${PYPKGPREFIX}-kivy-${VERSION}
+PKGNAME=	${PYPKGPREFIX}-kivy-${VERSION}
 PKGREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=K/Kivy/}
@@ -16,7 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.1.1:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-enchant>=1.6.5:../../textproc/py-enchant
 
-USE_LANGUAGES= c
+USE_LANGUAGES=	c
 
 PYDISTUTILSPKG=		yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-imaging, py-gstreamer0.10, py-gobject
diff --git a/py-knnimpute/Makefile b/py-knnimpute/Makefile
index 72223a4d8d..b6af3ba0d6 100644
--- a/py-knnimpute/Makefile
+++ b/py-knnimpute/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	knnimpute-0.0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=k/knnimpute/}
 
diff --git a/py-knockknock/Makefile b/py-knockknock/Makefile
index 727baa4c8d..f858b4c6e1 100644
--- a/py-knockknock/Makefile
+++ b/py-knockknock/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	knockknock-0.8
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security
 MASTER_SITES=	https://moxie.org/software/knockknock/
 
diff --git a/py-krylov/Makefile b/py-krylov/Makefile
index 26ed2834f8..1c1fe8fa9c 100644
--- a/py-krylov/Makefile
+++ b/py-krylov/Makefile
@@ -5,14 +5,14 @@ PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pykrylov/}
 
-MAINTAINER=     jihbed.research%gmail.com@localhost
-HOMEPAGE=       https://github.com/dpo/pykrylov/tree/master
-COMMENT=        Python package implementing common Krylov methods
-LICENSE=        gnu-lgpl-v2.1
+MAINTAINER=	jihbed.research%gmail.com@localhost
+HOMEPAGE=	https://github.com/dpo/pykrylov/tree/master
+COMMENT=	Python package implementing common Krylov methods
+LICENSE=	gnu-lgpl-v2.1
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
-USE_LANGUAGES=  # none
+USE_LANGUAGES=	# none
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-krypy/Makefile b/py-krypy/Makefile
index 4d94fbd33d..3b687b8c05 100644
--- a/py-krypy/Makefile
+++ b/py-krypy/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=k/krypy/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://github.com/andrenarchy/krypy
+HOMEPAGE=	https://github.com/andrenarchy/krypy
 COMMENT=	Krylov subspace methods for linear systems
 LICENSE=	mit
 
diff --git a/py-lapack/Makefile b/py-lapack/Makefile
index dda35f3649..e9bfa6be24 100644
--- a/py-lapack/Makefile
+++ b/py-lapack/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	http://kochanski.org/gpk/misc/PyLapack.html
 COMMENT=	PyLapack is a python interface to LAPACK
 LICENSE=	gnu-lgpl-v2.1
 
-USE_LANGUAGES= fortran77
+USE_LANGUAGES=	fortran77
 PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-Numeric
 
diff --git a/py-larry/Makefile b/py-larry/Makefile
index fee73e3055..3660ff1eb7 100644
--- a/py-larry/Makefile
+++ b/py-larry/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	http://larry.sourceforge.net/
 COMMENT=	Label the rows, columns, any dimension, of your NumPy arrays
 LICENSE=	modified-bsd
 
-WRKSRC=	${WRKDIR}/la-0.4.0
+WRKSRC=		${WRKDIR}/la-0.4.0
 PYDISTUTILSPKG=	yes
 
 do-test:
diff --git a/py-lds/Makefile b/py-lds/Makefile
index ce1487634a..118285e578 100644
--- a/py-lds/Makefile
+++ b/py-lds/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/mattjj/pylds
 COMMENT=	Learning and inference for Gaussian linear dynamical systems
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 PYDISTUTILSPKG=	yes
 
diff --git a/py-lea/Makefile b/py-lea/Makefile
index d888f3bb1b..88510a4493 100644
--- a/py-lea/Makefile
+++ b/py-lea/Makefile
@@ -1,14 +1,14 @@
 # $NetBSD: Makefile,v 1.5 2015/08/10 22:35:55 jihbed Exp $
 
 DISTNAME=	lea-2.1.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=     math python
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=l/lea/}
 
-MAINTAINER=     jihbed.research%gmail.com@localhost
-HOMEPAGE=       https://bitbucket.org/piedenis/lea
-COMMENT=        Discrete probability distributions in Python
-LICENSE=        gnu-lgpl-v3 AND gnu-gpl-v3
+MAINTAINER=	jihbed.research%gmail.com@localhost
+HOMEPAGE=	https://bitbucket.org/piedenis/lea
+COMMENT=	Discrete probability distributions in Python
+LICENSE=	gnu-lgpl-v3 AND gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 
diff --git a/py-lenstools/Makefile b/py-lenstools/Makefile
index 6ddda56ec2..2795cc0493 100644
--- a/py-lenstools/Makefile
+++ b/py-lenstools/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	lenstools-0.6
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=l/lenstools/}
 
diff --git a/py-lhafile/Makefile b/py-lhafile/Makefile
index a244ba2176..25109370a9 100644
--- a/py-lhafile/Makefile
+++ b/py-lhafile/Makefile
@@ -1,20 +1,20 @@
 # $NetBSD: Makefile,v 1.1 2014/07/13 13:37:01 rhialto Exp $
 
-DISTNAME=       python-lhafile
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/python-//}-0
-CATEGORIES=     python
+DISTNAME=	python-lhafile
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}-0
+CATEGORIES=	python
 
-MAINTAINER=     rhialto%falu.nl@localhost
-HOMEPAGE=       https://github.com/FrodeSolheim/python-lhafile
-COMMENT=        Support (Amiga-style; bugfixed) LHA files
-LICENSE=        modified-bsd
+MAINTAINER=	rhialto%falu.nl@localhost
+HOMEPAGE=	https://github.com/FrodeSolheim/python-lhafile
+COMMENT=	Support (Amiga-style; bugfixed) LHA files
+LICENSE=	modified-bsd
 
-USE_LANGUAGES= c
-PYDISTUTILSPKG= yes
+USE_LANGUAGES=	c
+PYDISTUTILSPKG=	yes
 
-GIT_REPOSITORIES=       github
-GIT_REPO.github=        git://github.com/FrodeSolheim/python-lhafile.git
-GIT_MODULE.github=      python-lhafile
+GIT_REPOSITORIES=	github
+GIT_REPO.github=	git://github.com/FrodeSolheim/python-lhafile.git
+GIT_MODULE.github=	python-lhafile
 # CHECKOUT_DATE=          2014-07-13  # This date is ok.
 
 .include "../../lang/python/extension.mk"
diff --git a/py-lib/Makefile b/py-lib/Makefile
index 384cc86f9e..8c5cf76edb 100644
--- a/py-lib/Makefile
+++ b/py-lib/Makefile
@@ -17,27 +17,27 @@ DEPENDS+=	${PYPKGPREFIX}-docutils>=0.5:../../textproc/py-docutils
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-docutils
-REPLACE_PYTHON+=	py/cmdline/pycleanup.py
-REPLACE_PYTHON+=	py/cmdline/pycountloc.py
-REPLACE_PYTHON+=	py/cmdline/pylookup.py
-REPLACE_PYTHON+=	py/cmdline/pyrest.py
-REPLACE_PYTHON+=	py/cmdline/pysvnwcrevert.py
-REPLACE_PYTHON+=	py/cmdline/pytest.py
-REPLACE_PYTHON+=	py/cmdline/pywhich.py
-REPLACE_PYTHON+=	py/compat/testing/test_optparse.py
-REPLACE_PYTHON+=	py/env.py
-REPLACE_PYTHON+=	py/execnet/script/shell.py
-REPLACE_PYTHON+=	py/execnet/script/socketserver.py
-REPLACE_PYTHON+=	py/misc/cmdline/countloc.py
-REPLACE_PYTHON+=	py/misc/findmissingdocstrings.py
-REPLACE_PYTHON+=	py/bin/_findpy.py
-REPLACE_PYTHON+=	py/bin/py.cleanup
-REPLACE_PYTHON+=	py/bin/py.countloc
-REPLACE_PYTHON+=	py/bin/py.lookup
-REPLACE_PYTHON+=	py/bin/py.rest
-REPLACE_PYTHON+=	py/bin/py.svnwcrevert
-REPLACE_PYTHON+=	py/bin/py.test
-REPLACE_PYTHON+=	py/bin/py.which
+REPLACE_PYTHON+=		py/cmdline/pycleanup.py
+REPLACE_PYTHON+=		py/cmdline/pycountloc.py
+REPLACE_PYTHON+=		py/cmdline/pylookup.py
+REPLACE_PYTHON+=		py/cmdline/pyrest.py
+REPLACE_PYTHON+=		py/cmdline/pysvnwcrevert.py
+REPLACE_PYTHON+=		py/cmdline/pytest.py
+REPLACE_PYTHON+=		py/cmdline/pywhich.py
+REPLACE_PYTHON+=		py/compat/testing/test_optparse.py
+REPLACE_PYTHON+=		py/env.py
+REPLACE_PYTHON+=		py/execnet/script/shell.py
+REPLACE_PYTHON+=		py/execnet/script/socketserver.py
+REPLACE_PYTHON+=		py/misc/cmdline/countloc.py
+REPLACE_PYTHON+=		py/misc/findmissingdocstrings.py
+REPLACE_PYTHON+=		py/bin/_findpy.py
+REPLACE_PYTHON+=		py/bin/py.cleanup
+REPLACE_PYTHON+=		py/bin/py.countloc
+REPLACE_PYTHON+=		py/bin/py.lookup
+REPLACE_PYTHON+=		py/bin/py.rest
+REPLACE_PYTHON+=		py/bin/py.svnwcrevert
+REPLACE_PYTHON+=		py/bin/py.test
+REPLACE_PYTHON+=		py/bin/py.which
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/py-libmpdclient2/Makefile b/py-libmpdclient2/Makefile
index 00b8e95e4e..0a7836124c 100644
--- a/py-libmpdclient2/Makefile
+++ b/py-libmpdclient2/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python bindings to the mpd access library
 WRKSRC=		${WRKDIR}/py-libmpdclient2
 
 PY_PATCHPLIST=	yes
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../audio/libmpd/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/py-libnacl/Makefile b/py-libnacl/Makefile
index 4637a6aed4..efeb2abbb7 100644
--- a/py-libnacl/Makefile
+++ b/py-libnacl/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 DISTNAME=	libnacl-1.5.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python devel
-MASTER_SITES=   ${MASTER_SITE_PYPI:=l/libnacl/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=l/libnacl/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/saltstack/libnacl
diff --git a/py-libtunepimp/Makefile b/py-libtunepimp/Makefile
index d4054669b2..27f94248a4 100644
--- a/py-libtunepimp/Makefile
+++ b/py-libtunepimp/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Python bindings for TunePimp library
 WRKSRC=		${WRKDIR}/${DISTNAME}/python
 
 PY_PATCHPLIST=	yes
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
-BUILD_DEPENDS+= libtunepimp-[0-9]*:../../audio/libtunepimp
+BUILD_DEPENDS+=	libtunepimp-[0-9]*:../../audio/libtunepimp
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-linearalgebra/Makefile b/py-linearalgebra/Makefile
index 07018534be..1202c2c6a2 100644
--- a/py-linearalgebra/Makefile
+++ b/py-linearalgebra/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tools for working with matrices and vectors
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-lmfit/Makefile b/py-lmfit/Makefile
index 3ef5692e1c..b52fc8cca1 100644
--- a/py-lmfit/Makefile
+++ b/py-lmfit/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	lmfit-0.9.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	https://pypi.python.org/packages/c6/4a/75f188877264b6f9e8f2d68f213d2c7329bcb3a86be013fa11c1d256990e/
 
diff --git a/py-logilab-pigg/Makefile b/py-logilab-pigg/Makefile
index 85b0c80dde..1f1aa3078d 100644
--- a/py-logilab-pigg/Makefile
+++ b/py-logilab-pigg/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python Interface Generator for Gtk implementation of the MVC pattern
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2, py-gobject
 
 .include "../../devel/py-gobject/buildlink3.mk"
diff --git a/py-louvain/Makefile b/py-louvain/Makefile
index 67b09e1806..988e7bd432 100644
--- a/py-louvain/Makefile
+++ b/py-louvain/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD$
 
 DISTNAME=	louvain-0.5.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/python-//}
-CATEGORIES=     math python
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
+CATEGORIES=	math python
 MASTER_SITES=	https://pypi.python.org/packages/61/0f/ec441b9d8ccd951dbd1ec0330cafffade67f4ebef6847ff7e5b4d004c4c9/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
diff --git a/py-lrparsing/Makefile b/py-lrparsing/Makefile
index d02f52da14..4769d51978 100644
--- a/py-lrparsing/Makefile
+++ b/py-lrparsing/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-agpl-v3
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 do-test:
 	${RUN} cd ${WRKSRC}/lrparsing; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test.py
diff --git a/py-lsqfit/Makefile b/py-lsqfit/Makefile
index 607cca7d68..a95c2a0f91 100644
--- a/py-lsqfit/Makefile
+++ b/py-lsqfit/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.5 2014/05/12 21:59:10 jihbed Exp $
 
 DISTNAME=	lsqfit-4.8
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=l/lsqfit/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	  https://github.com/gplepage/lsqfit.git
+HOMEPAGE=	https://github.com/gplepage/lsqfit.git
 COMMENT=	Utilities for nonlinear least-squares fits
 LICENSE=	gnu-gpl-v3
 
diff --git a/py-m2ext/Makefile b/py-m2ext/Makefile
index e2c697c7a9..fe82005d12 100644
--- a/py-m2ext/Makefile
+++ b/py-m2ext/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/02/20 19:28:47 jihbed Exp $
 
 DISTNAME=	m2ext-0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/m2ext/}
 
@@ -14,9 +14,9 @@ DEPENDS+=	${PYPKGPREFIX}-m2crypto>=0.22.3:../../security/py-m2crypto
 
 USE_LANGUAGES=	c
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
-BUILD_TARGET= _m2ext.so
+BUILD_TARGET=	_m2ext.so
 
 .include "../../devel/swig/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/py-macaroons/Makefile b/py-macaroons/Makefile
index 3348d62081..7c54c7316b 100644
--- a/py-macaroons/Makefile
+++ b/py-macaroons/Makefile
@@ -1,15 +1,15 @@
 # $NetBSD$
 
 DISTNAME=	pymacaroons-0.9.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=     devel python
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel python
 GITHUB_PROJECT=	pymacaroons
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=matrix-org/}
-GITHUB_TAG=     v${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=     kethzer.dr%gmail.com@localhost
-HOMEPAGE=       https://github.com/matrix-org/
+MAINTAINER=	kethzer.dr%gmail.com@localhost
+HOMEPAGE=	https://github.com/matrix-org/
 COMMENT=	Python implementation of Macaroons
 LICENSE=	mit
 
diff --git a/py-mark/Makefile b/py-mark/Makefile
index 55ff90036f..c770ca9fe7 100644
--- a/py-mark/Makefile
+++ b/py-mark/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=m/mark/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://packages.python.org/mark/
-COMMENT=RDF Bookmarking Utilities
+COMMENT=	RDF Bookmarking Utilities
 LICENSE=	gnu-agpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-argparse>=1.1:../../devel/py-argparse
diff --git a/py-math-snappy/Makefile b/py-math-snappy/Makefile
index c49e67d2d1..d9747e7e6b 100644
--- a/py-math-snappy/Makefile
+++ b/py-math-snappy/Makefile
@@ -12,8 +12,8 @@ HOMEPAGE=	http://snappy.computop.org/get/
 COMMENT=	Program for studying the topology and geometry of 3-manifolds
 LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 
-DEPENDS+=       ${PYPKGPREFIX}-sphinx>=1.2.2:../../textproc/py-sphinx
-DEPENDS+=       ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
+DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.2.2:../../textproc/py-sphinx
+DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 USE_LANGUAGES=	c c++
 
diff --git a/py-matrix-angular-sdk/Makefile b/py-matrix-angular-sdk/Makefile
index f8ec590f65..6dec9c359b 100644
--- a/py-matrix-angular-sdk/Makefile
+++ b/py-matrix-angular-sdk/Makefile
@@ -1,22 +1,22 @@
 # $NetBSD$
 
 DISTNAME=	matrix-angular-sdk-0.6.8
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 GITHUB_PROJECT=	matrix-angular-sdk
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=matrix-org/}
-GITHUB_TAG=     v${PKGVERSION_NOREV}
-EXTRACT_SUFX=   .zip
+MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/matrix-org/
 COMMENT=	AngularJS services for implementing the Client-Server API
 LICENSE=	apache-2.0
 
-DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
-USE_LANGUAGES=	# none
-WRKSRC=		${WRKDIR}/${DISTNAME}
+USE_LANGUAGES=		# none
+WRKSRC=			${WRKDIR}/${DISTNAME}
 INSTALLATION_DIRS=	${PYSITELIB}
 
 .include "../../lang/python/egg.mk"
diff --git a/py-mave/Makefile b/py-mave/Makefile
index 445830046e..eba26fc842 100644
--- a/py-mave/Makefile
+++ b/py-mave/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/m/mave/
 COMMENT=	Library for Measurement and Verification
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=       ${PYPKGPREFIX}-dateutil>=2.4.0:../../time/py-dateutil
+DEPENDS+=	${PYPKGPREFIX}-dateutil>=2.4.0:../../time/py-dateutil
 
 WRKSRC=		${WRKDIR}/mave-0.0.1
 
diff --git a/py-mdanalysis/Makefile b/py-mdanalysis/Makefile
index b247275062..b488c6c702 100644
--- a/py-mdanalysis/Makefile
+++ b/py-mdanalysis/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=M/MDAnalysis/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://www.mdanalysis.org/
-COMMENT=   	Library to analyze and manipulate molecular dynamics trajectories
+COMMENT=	Library to analyze and manipulate molecular dynamics trajectories
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-biopython>=1.63:../../wip/biopython
diff --git a/py-mdtraj/Makefile b/py-mdtraj/Makefile
index ed18608431..bf41469632 100644
--- a/py-mdtraj/Makefile
+++ b/py-mdtraj/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	mdtraj-1.8.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	biology python
 MASTER_SITES=	https://pypi.python.org/packages/cd/9f/027fa58d4e93dd3d700e22d5766961c970f6882c2bffd33daef55219d078/
 
diff --git a/py-mendeleev/Makefile b/py-mendeleev/Makefile
index 4adb203d2f..ec9273529e 100644
--- a/py-mendeleev/Makefile
+++ b/py-mendeleev/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=m/mendeleev/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://bitbucket.org/lukaszmentel/mendeleev
-COMMENT=      Database of atomic properties for elements in the periodic table
+COMMENT=	Database of atomic properties for elements in the periodic table
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.9.9:../../databases/py-sqlalchemy
diff --git a/py-minidb/Makefile b/py-minidb/Makefile
index 5b21540055..252d76e703 100644
--- a/py-minidb/Makefile
+++ b/py-minidb/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	minidb-2.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GITHUB:=thp/}
-GITHUB_PROJECT= minidb
+GITHUB_PROJECT=	minidb
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://thp.io/2010/minidb/
diff --git a/py-monad/Makefile b/py-monad/Makefile
index b5b7c4bbb6..291bedf1b3 100644
--- a/py-monad/Makefile
+++ b/py-monad/Makefile
@@ -12,7 +12,7 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-mox/Makefile b/py-mox/Makefile
index 64596967d2..b4cba807e4 100644
--- a/py-mox/Makefile
+++ b/py-mox/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	mox-0.5.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/mox/}
 
diff --git a/py-msumastro/Makefile b/py-msumastro/Makefile
index 96137b7a47..7d81363da8 100644
--- a/py-msumastro/Makefile
+++ b/py-msumastro/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Process FITS files
 LICENSE=	2-clause-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-astropy>=0.4.6:../../wip/py-astropy
-DEPENDS+=      ${PYPKGPREFIX}-ccdproc>=0.3.1:../../wip/py-ccdproc
+DEPENDS+=	${PYPKGPREFIX}-ccdproc>=0.3.1:../../wip/py-ccdproc
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-astropy
 
diff --git a/py-multiprocess/Makefile b/py-multiprocess/Makefile
index 62963302d2..0fb1cf92a7 100644
--- a/py-multiprocess/Makefile
+++ b/py-multiprocess/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	multiprocess-0.70.4
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	https://pypi.python.org/packages/0b/24/21184ba071263e99655452680943701e5aeb4ac7c25bd8691b150aef64c4/
 EXTRACT_SUFX=	.tgz#md5=587596fff965e66a4f474a283a72f180
diff --git a/py-multitasking/Makefile b/py-multitasking/Makefile
index dcf6b557c0..39d630e3f5 100644
--- a/py-multitasking/Makefile
+++ b/py-multitasking/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	multitasking-0.0.4
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/multitasking/}
 
diff --git a/py-mystic/Makefile b/py-mystic/Makefile
index 9e15b258f7..d114e6d950 100644
--- a/py-mystic/Makefile
+++ b/py-mystic/Makefile
@@ -7,8 +7,8 @@ MASTER_SITES=	http://dev.danse.us/packages/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=        http://trac.mystic.cacr.caltech.edu/project/mystic
-COMMENT=        Simple interactive inversion analysis framework
+HOMEPAGE=	http://trac.mystic.cacr.caltech.edu/project/mystic
+COMMENT=	Simple interactive inversion analysis framework
 LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# none
diff --git a/py-naima/Makefile b/py-naima/Makefile
index 62b9a2a0d0..e826d17a25 100644
--- a/py-naima/Makefile
+++ b/py-naima/Makefile
@@ -10,9 +10,9 @@ HOMEPAGE=	https://github.com/zblz/naima
 COMMENT=	Derivation of non-thermal particle through MCMC spectral fitting
 LICENSE=	2-clause-bsd
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-DEPENDS+=       ${PYPKGPREFIX}-astropy>=0.4.6:../../wip/py-astropy
-DEPENDS+=       ${PYPKGPREFIX}-emcee>=2.1.0:../../wip/py-emcee
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-astropy>=0.4.6:../../wip/py-astropy
+DEPENDS+=	${PYPKGPREFIX}-emcee>=2.1.0:../../wip/py-emcee
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-neovim/Makefile b/py-neovim/Makefile
index 6cecec76f0..83d4f24087 100644
--- a/py-neovim/Makefile
+++ b/py-neovim/Makefile
@@ -13,9 +13,9 @@ LICENSE=	apache-2.0
 WRKSRC=		${WRKDIR}/python-client-${PKGVERSION_NOREV}
 EGG_NAME=	neovim-${PKGVERSION_NOREV}
 
-DEPENDS+=       ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
-DEPENDS+=       ${PYPKGPREFIX}-greenlet-[0-9]*:../../devel/py-greenlet
-DEPENDS+=       ${PYPKGPREFIX}-trollius-[0-9]*:../../wip/py-trollius
+DEPENDS+=	${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
+DEPENDS+=	${PYPKGPREFIX}-greenlet-[0-9]*:../../devel/py-greenlet
+DEPENDS+=	${PYPKGPREFIX}-trollius-[0-9]*:../../wip/py-trollius
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-netcdf/Makefile b/py-netcdf/Makefile
index 34dea52c74..0a90e86c13 100644
--- a/py-netcdf/Makefile
+++ b/py-netcdf/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	http://pypi.python.org/pypi/pynetcdf/0.7
 COMMENT=	Python bindings for netcdf
 #LICENSE=	cecill
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-netflowvizu/Makefile b/py-netflowvizu/Makefile
index 1e4f0de8a3..3b5e34af05 100644
--- a/py-netflowvizu/Makefile
+++ b/py-netflowvizu/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=N/NetFlowVizu/}
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://www.smallbulb.net/netflowvizu
 COMMENT=	Network flow visualizer
-LICENSE=  	mit
+LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
 
diff --git a/py-nilearn/Makefile b/py-nilearn/Makefile
index 6b93e21b53..a6ed18a02f 100644
--- a/py-nilearn/Makefile
+++ b/py-nilearn/Makefile
@@ -10,9 +10,9 @@ HOMEPAGE=	http://nilearn.github.io
 COMMENT=	Statistical learning for neuroimaging in Python
 LICENSE=	modified-bsd
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-DEPENDS+=       ${PYPKGPREFIX}-nibabel>=1.3.0:../../wip/py-nibabel
-DEPENDS+=       ${PYPKGPREFIX}-scikit-learn>=0.15.2:../../math/py-scikit-learn
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-nibabel>=1.3.0:../../wip/py-nibabel
+DEPENDS+=	${PYPKGPREFIX}-scikit-learn>=0.15.2:../../math/py-scikit-learn
 
 USE_LANGUAGES=	# none
 
diff --git a/py-nipy-data/Makefile b/py-nipy-data/Makefile
index 7d50d6e522..088955c9e1 100644
--- a/py-nipy-data/Makefile
+++ b/py-nipy-data/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	http://nipy.sourceforge.net/data-packages/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://neuroimaging.scipy.org
-COMMENT=	 Installation script for nipy data packages
+COMMENT=	Installation script for nipy data packages
 LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# none
diff --git a/py-nipy/Makefile b/py-nipy/Makefile
index 036e0bf6f0..d1a9aa45df 100644
--- a/py-nipy/Makefile
+++ b/py-nipy/Makefile
@@ -12,7 +12,7 @@ LICENSE=	modified-bsd
 
 WRKSRC=	${WRKDIR}/nipy-0.3.0
 
-USE_LANGUAGES=  c fortran
+USE_LANGUAGES=	c fortran
 PYDISTUTILSPKG=	yes
 
 .include "../../devel/py-cython/buildlink3.mk"
diff --git a/py-notify-dev/buildlink3.mk b/py-notify-dev/buildlink3.mk
index dac7a0f772..5e24aa2c8a 100644
--- a/py-notify-dev/buildlink3.mk
+++ b/py-notify-dev/buildlink3.mk
@@ -9,7 +9,7 @@ PY_NOTIFY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-notify+=	${PYPKGPREFIX}-notify>=0.2.0
 BUILDLINK_ABI_DEPENDS.py-notify+=	${PYPKGPREFIX}-notify>=0.2.0
-BUILDLINK_PKGSRCDIR.py-notify?=	../../sysutils/py-notify
+BUILDLINK_PKGSRCDIR.py-notify?=		../../sysutils/py-notify
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/py-ntch/Makefile b/py-ntch/Makefile
index abb676e360..1455ef8e7c 100644
--- a/py-ntch/Makefile
+++ b/py-ntch/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Examine python code and detect possible errors
 
 VERSION=	20090615
 
-PYDISTUTILSPKG= 	yes
+PYDISTUTILSPKG=		yes
 
 DOCDIR=		${PREFIX}/share/doc/py-ntch
 
diff --git a/py-oct2py/Makefile b/py-oct2py/Makefile
index 7fc64bf99d..1d46ed2e9b 100644
--- a/py-oct2py/Makefile
+++ b/py-oct2py/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	oct2py-0.3.4
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=o/oct2py/}
 
diff --git a/py-odeint/Makefile b/py-odeint/Makefile
index b6a3e2359d..ff18e5be29 100644
--- a/py-odeint/Makefile
+++ b/py-odeint/Makefile
@@ -12,7 +12,7 @@ LICENSE=	2-clause-bsd
 
 USE_LANGUAGES=	c c++
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/py-cython/buildlink3.mk"
diff --git a/py-odesys/Makefile b/py-odesys/Makefile
index 5b2717d831..ccf26a0323 100644
--- a/py-odesys/Makefile
+++ b/py-odesys/Makefile
@@ -6,16 +6,16 @@ CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyodesys/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://github.com/bjodah/pyodesys
+HOMEPAGE=	https://github.com/bjodah/pyodesys
 COMMENT=	Straightforward numerical integration of ODE systems from SymPy
 LICENSE=	2-clause-bsd
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-DEPENDS+=       ${PYPKGPREFIX}-sympy>=0.7.4.1:../../math/py-sympy
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.4.1:../../math/py-sympy
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/py-okasha/Makefile b/py-okasha/Makefile
index 5b9ffaab88..a751ebe1bf 100644
--- a/py-okasha/Makefile
+++ b/py-okasha/Makefile
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/okasha-0.2.4
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-okpy/Makefile b/py-okpy/Makefile
index 84ae2489aa..278616e10a 100644
--- a/py-okpy/Makefile
+++ b/py-okpy/Makefile
@@ -13,7 +13,7 @@ LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED= 34 35 36
+PYTHON_VERSIONS_ACCEPTED=	34 35 36
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-openxmllib/Makefile b/py-openxmllib/Makefile
index 05e3278f3c..1bff69263b 100644
--- a/py-openxmllib/Makefile
+++ b/py-openxmllib/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	openxmllib-1.0.6
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	http://openxmllib.googlecode.com/files/
 
diff --git a/py-ordereddict/Makefile b/py-ordereddict/Makefile
index aef487f122..1e669e900b 100644
--- a/py-ordereddict/Makefile
+++ b/py-ordereddict/Makefile
@@ -12,7 +12,7 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-othman/Makefile b/py-othman/Makefile
index 6819573f30..67012f437c 100644
--- a/py-othman/Makefile
+++ b/py-othman/Makefile
@@ -8,15 +8,15 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://othman.ojuba.org/
-COMMENT= Library providing access to Quranic text with a fast search index
+COMMENT=	Library providing access to Quranic text with a fast search index
 
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 WRKSRC=		${WRKDIR}/othman-0.2.7
 
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+=	intltool msgfmt
-USE_LANGUAGES=	# none
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		intltool msgfmt
+USE_LANGUAGES=		# none
 
 PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
diff --git a/py-owslib/Makefile b/py-owslib/Makefile
index 52164fb3f0..b784821715 100644
--- a/py-owslib/Makefile
+++ b/py-owslib/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PYPI:=O/OWSLib/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://geopython.github.io/OWSLib
+HOMEPAGE=	https://geopython.github.io/OWSLib
 COMMENT=	OGC Web Service utility library
 LICENSE=	modified-bsd
 
diff --git a/py-paegan/Makefile b/py-paegan/Makefile
index ea9c6bd3f9..c484acc0e5 100644
--- a/py-paegan/Makefile
+++ b/py-paegan/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	paegan-0.9.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/paegan/}
 
diff --git a/py-paida/Makefile b/py-paida/Makefile
index 3f15635aa9..3ccbf84002 100644
--- a/py-paida/Makefile
+++ b/py-paida/Makefile
@@ -16,7 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-papyon/Makefile b/py-papyon/Makefile
index a6f1a34663..4532faf500 100644
--- a/py-papyon/Makefile
+++ b/py-papyon/Makefile
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-crypto>=2.0:../../security/py-crypto
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gstreamer0.10, py-gobject
 
 do-test:
diff --git a/py-pcapy/Makefile b/py-pcapy/Makefile
index dfcd2aeeb7..acafb25182 100644
--- a/py-pcapy/Makefile
+++ b/py-pcapy/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.12 2012/10/07 13:57:26 asau Exp $
 #
 
-DISTNAME=		pcapy-0.10.5
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=		net
+DISTNAME=	pcapy-0.10.5
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	net
 MASTER_SITES=	http://oss.corest.com/repo/
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
diff --git a/py-peng/Makefile b/py-peng/Makefile
index ee320490a2..ec86b4ac29 100644
--- a/py-peng/Makefile
+++ b/py-peng/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	peng-1.0.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/peng/}
 
@@ -10,9 +10,9 @@ HOMEPAGE=	https://github.com/pmacosta/peng/
 COMMENT=	This package provides engineering-related classes and functions
 LICENSE=	mit
 
-USE_LANGUAGES=	# none
-USE_TOOLS+=	bash:run
-REPLACE_BASH+=	sbin/*.sh
+USE_LANGUAGES=		# none
+USE_TOOLS+=		bash:run
+REPLACE_BASH+=		sbin/*.sh
 REPLACE_PYTHON+=	docs/support/*.py
 REPLACE_PYTHON+=	sbin/*.py
 
diff --git a/py-percol/Makefile b/py-percol/Makefile
index af10be344c..042b9ea232 100644
--- a/py-percol/Makefile
+++ b/py-percol/Makefile
@@ -15,7 +15,7 @@ GIT_REPO.mooz=		git://github.com/mooz/percol.git
 GIT_MODULE.mooz=	percol
 WRKSRC=			${WRKDIR}/percol
 
-SUBST_CLASSES+=	migemo
+SUBST_CLASSES+=		migemo
 SUBST_STAGE.migemo=	pre-build
 SUBST_MESSAGE.migemo=	Replacing path to the migemo dictionary
 SUBST_FILES.migemo=	percol/finder.py
diff --git a/py-peru/Makefile b/py-peru/Makefile
index 7ddc755263..bc002073e9 100644
--- a/py-peru/Makefile
+++ b/py-peru/Makefile
@@ -16,9 +16,9 @@ DEPENDS+=	${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
 USE_TOOLS+=	bash
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_ACCEPTED= 34 35 36
+PYTHON_VERSIONS_ACCEPTED=	34 35 36
 
-REPLACE_BASH+=	 	peru/resources/plugins/rsync/rsync_plugin.sh
+REPLACE_BASH+=		peru/resources/plugins/rsync/rsync_plugin.sh
 
 REPLACE_PYTHON+=	peru/resources/plugins/curl/curl_plugin.py\
 			peru/resources/plugins/cp/cp_plugin.py\
diff --git a/py-piquant/Makefile b/py-piquant/Makefile
index 83a341bf8d..ab9a217ded 100644
--- a/py-piquant/Makefile
+++ b/py-piquant/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.3 2012/10/07 13:57:26 asau Exp $
 #
 
-DISTNAME=	piquant-0.1
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_PYPI:=p/piquant/}
-EXTRACT_SUFX=	.zip
+DISTNAME=		piquant-0.1
+PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=		math
+MASTER_SITES=		${MASTER_SITE_PYPI:=p/piquant/}
+EXTRACT_SUFX=		.zip
 # XXX: all text file are DOS style.
 # XXX: if future version install binary file,
 # XXX: please consider to use another method.
diff --git a/py-plac/Makefile b/py-plac/Makefile
index 46fb1f21f7..33e3d0aca6 100644
--- a/py-plac/Makefile
+++ b/py-plac/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	plac-0.9.6
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/plac/}
 
diff --git a/py-plink/Makefile b/py-plink/Makefile
index e13c19e5a0..b6c3000f85 100644
--- a/py-plink/Makefile
+++ b/py-plink/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE=	http://math.uic.edu/~t3m/plink/
 COMMENT=	Link Projection Editor
 LICENSE=	gnu-gpl-v2
 
-VERSION= 1.1
+VERSION=	1.1
 
 USE_LANGUAGES=	# none
 
diff --git a/py-plucker/Makefile b/py-plucker/Makefile
index 72496155bb..38403108ed 100644
--- a/py-plucker/Makefile
+++ b/py-plucker/Makefile
@@ -28,7 +28,7 @@ SUBST_SED.paths=	-e 's,/usr/local,${PREFIX},g'
 
 REPLACE_PYTHON=	PyPlucker/Spider.py PyPlucker/PluckerDocs.py	\
 			PyPlucker/Decode.py
-PLIST_SUBST+=		PYSITELIB=${PYSITELIB:Q}
+PLIST_SUBST+=	PYSITELIB=${PYSITELIB:Q}
 
 .include "../../lang/python/application.mk"
 
diff --git a/py-postmarkup/Makefile b/py-postmarkup/Makefile
index 75c5b78c0c..d6e5c060c6 100644
--- a/py-postmarkup/Makefile
+++ b/py-postmarkup/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/postmarkup/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
-HOMEPAGE=	 http://code.google.com/p/postmarkup/
+HOMEPAGE=	http://code.google.com/p/postmarkup/
 COMMENT=	BBCode to (X)HTML rendering engine
 LICENSE=	python-software-foundation
 
diff --git a/py-prayertime/Makefile b/py-prayertime/Makefile
index ce0330955e..961bac4834 100644
--- a/py-prayertime/Makefile
+++ b/py-prayertime/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=p/prayertime/}
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://bitbucket.org/xmonader/pyprayertime/
 COMMENT=	Prayertime algorithm implementation in python
-LICENSE=		gnu-gpl-v2
+LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-prel/Makefile b/py-prel/Makefile
index 06b6250e85..33c5186500 100644
--- a/py-prel/Makefile
+++ b/py-prel/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	pyprel-2016.7.12.1553
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	graphics
 MASTER_SITES=	https://pypi.python.org/packages/77/b6/8d83dd30b8d9f8d07b58936811bebc4c7b0490250f2f4f9460078585f93b/
 
diff --git a/py-propyte/Makefile b/py-propyte/Makefile
index a432c926c0..d8e8cfb4a1 100644
--- a/py-propyte/Makefile
+++ b/py-propyte/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	propyte-2016.7.11.1839
-PKGNAME=        ${PYPKGPREFIX}-propyte-20167111839
+PKGNAME=	${PYPKGPREFIX}-propyte-20167111839
 CATEGORIES=	devel
 MASTER_SITES=	https://pypi.python.org/packages/18/53/60f626e6c360b66148ee160df5c65fa9b9f30cf45a8c28ecbde8069bc861/
 
diff --git a/py-pyaiml/Makefile b/py-pyaiml/Makefile
index eeae2ffb55..04c563071c 100644
--- a/py-pyaiml/Makefile
+++ b/py-pyaiml/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/11/12 16:26:49 othyro Exp $
 #
-VERS=	0.8.5
+VERS=		0.8.5
 DISTNAME=	PyAIML-${VERS}
 PKGNAME=	${PYPKGPREFIX}-pyaiml-${VERS}
 CATEGORIES=	devel
diff --git a/py-pyamg/Makefile b/py-pyamg/Makefile
index f32c820f06..b5b1c805a1 100644
--- a/py-pyamg/Makefile
+++ b/py-pyamg/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Algebraic multigrid solvers in Python
 
 USE_LANGUAGES=	c++
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-pycifrw/Makefile b/py-pycifrw/Makefile
index d12dd2262b..54247acabc 100644
--- a/py-pycifrw/Makefile
+++ b/py-pycifrw/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2014/12/31 13:58:38 thomasklausner Exp $
 
-VERS=	3.1.4
+VERS=		3.1.4
 DISTNAME=	PyCifRW-${VERS}
 PKGNAME=	${PYPKGPREFIX}-pycifrw-${VERS}
 CATEGORIES=	devel
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-yapps2>=2.1.1:../../wip/py-yapps2
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-yapps2
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pycryptodomex/Makefile b/py-pycryptodomex/Makefile
index de07f5b521..6117df8c5e 100644
--- a/py-pycryptodomex/Makefile
+++ b/py-pycryptodomex/Makefile
@@ -1,21 +1,21 @@
 # $NetBSD$
 
 DISTNAME=	pycryptodomex-3.4.6
-PKGNAME=        ${DISTNAME:S/^py/${PYPKGPREFIX}-/}
-CATEGORIES=     security python
-MASTER_SITES=   ${MASTER_SITE_PYPI:=p/pycryptodomex/}
+PKGNAME=	${DISTNAME:S/^py/${PYPKGPREFIX}-/}
+CATEGORIES=	security python
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pycryptodomex/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	http://www.pycryptodome.org/
 COMMENT=	Cryptographic library for Python
-LICENSE=        public-domain AND python-software-foundation
+LICENSE=	public-domain AND python-software-foundation
 
 do-test:
 	${RUN}cd ${WRKSRC};${SETENV} ${TEST_ENV} ${PYTHONBIN} ${PYSETUP} test
 
-CFLAGS.SunOS+=  -std=c99 -D_XOPEN_SOURCE=600
+CFLAGS.SunOS+=	-std=c99 -D_XOPEN_SOURCE=600
 
-CONFLICTS+=     ${PYPKGPREFIX}-cryptodome-[0-9]*
+CONFLICTS+=	${PYPKGPREFIX}-cryptodome-[0-9]*
 
 BUILDLINK_API_DEPENDS.gmp+=     gmp>=5.0
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/py-pydenticon/Makefile b/py-pydenticon/Makefile
index fd0c79e1bc..b4cb82f0fc 100644
--- a/py-pydenticon/Makefile
+++ b/py-pydenticon/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 DISTNAME=	pydenticon-0.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=     devel python
-MASTER_SITES=   ${MASTER_SITE_PYPI:=p/pydenticon/}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pydenticon/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/azaghal/pydenticon
@@ -11,7 +11,7 @@ COMMENT=	Library for generating identicons
 LICENSE=	modified-bsd
 
 
-DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 WRKSRC=		${WRKDIR}/pydenticon-0.3
 USE_LANGUAGES=	# none
 
diff --git a/py-pydy/Makefile b/py-pydy/Makefile
index 8b72842df2..b796a527fc 100644
--- a/py-pydy/Makefile
+++ b/py-pydy/Makefile
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-sympy>=0.1:../../math/py-sympy
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36
 
 #py-cython optional dependencie
 .include "../../devel/py-cython/buildlink3.mk"
diff --git a/py-pyecm/Makefile b/py-pyecm/Makefile
index 12473d5253..7214ea0ab3 100644
--- a/py-pyecm/Makefile
+++ b/py-pyecm/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Integer factorization with the Elliptic Curve Method (ECM)
 
 USE_LANGUAGES=	# none
 
-NO_BUILD=yes
+NO_BUILD=	yes
 
-REPLACE_PYTHON+= pycem.py
+REPLACE_PYTHON+=	pycem.py
 
 INSTALLATION_DIRS=	bin
 
diff --git a/py-pyentropy/Makefile b/py-pyentropy/Makefile
index dfa9727c36..d14991e0a4 100644
--- a/py-pyentropy/Makefile
+++ b/py-pyentropy/Makefile
@@ -15,7 +15,7 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-pyfaces/Makefile b/py-pyfaces/Makefile
index f2d192a353..1627a9f7cf 100644
--- a/py-pyfaces/Makefile
+++ b/py-pyfaces/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	pyface-4.2.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	x11 python
 MASTER_SITES=	https://www.enthought.com/repo/ets/
 
diff --git a/py-pygr/Makefile b/py-pygr/Makefile
index 021a53d066..8df882973f 100644
--- a/py-pygr/Makefile
+++ b/py-pygr/Makefile
@@ -11,11 +11,11 @@ HOMEPAGE=	http://code.google.com/p/pygr/
 COMMENT=	Pygr graph database for bioinformatics
 LICENSE=	modified-bsd
 
-DEPENDS+=       ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
+DEPENDS+=	${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	${PYPKGPREFIX}-pyrex-[0-9]*:../../lang/py-pyrex
 
-USE_LANGUAGES= c c++
+USE_LANGUAGES=	c c++
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-mysqldb, py-pyrex
 
 .include "../../databases/py-bsddb3/buildlink3.mk"
diff --git a/py-pylons/Makefile b/py-pylons/Makefile
index aa9e186cc7..5928364401 100644
--- a/py-pylons/Makefile
+++ b/py-pylons/Makefile
@@ -16,9 +16,9 @@ DEPENDS+=	${PYPKGPREFIX}-nose>=0.11.3:../../devel/py-nose
 DEPENDS+=	${PYPKGPREFIX}-WebOb>=0.9.8:../../www/py-WebOb
 DEPENDS+=	${PYPKGPREFIX}-Paste>=1.7.2:../../www/py-paste
 
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=	intltool msgfmt
-USE_LANGUAGES=		# none
+USE_PKGLOCALEDIR=		yes
+USE_TOOLS+=			intltool msgfmt
+USE_LANGUAGES=			# none
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-cheetah
 
 do-test:
diff --git a/py-pymbolic/Makefile b/py-pymbolic/Makefile
index a157570d17..d62c3505a2 100644
--- a/py-pymbolic/Makefile
+++ b/py-pymbolic/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE=	http://mathema.tician.de/software/pymbolic
 COMMENT=	Python package for symbolic computation
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-test>=2.3.5:../../devel/py-test
-DEPENDS+=       ${PYPKGPREFIX}-pytools>=2013.5.6:../../wip/py-pytools
+DEPENDS+=	${PYPKGPREFIX}-test>=2.3.5:../../devel/py-test
+DEPENDS+=	${PYPKGPREFIX}-pytools>=2013.5.6:../../wip/py-pytools
 
 USE_LANGUAGES=	# none
 
diff --git a/py-pymigemo/Makefile b/py-pymigemo/Makefile
index e2abde4130..168bd8e457 100644
--- a/py-pymigemo/Makefile
+++ b/py-pymigemo/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Python bindings for C/Migemo
 LICENSE=	2-clause-bsd
 
 # textproc/cmigemo lacks buildlink3.mk for some reason.
-BUILDLINK_TREE+=	cmigemo
+BUILDLINK_TREE+=		cmigemo
 BUILDLINK_API_DEPENDS.cmigemo+=	cmigemo-[0-9]*
-BUILDLINK_PKGSRCDIR.cmigemo?=		../../textproc/cmigemo
-BUILDLINK_TREE+=	-cmigemo
+BUILDLINK_PKGSRCDIR.cmigemo?=	../../textproc/cmigemo
+BUILDLINK_TREE+=		-cmigemo
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pynn/Makefile b/py-pynn/Makefile
index 7e2d8cdb1e..f024baf523 100644
--- a/py-pynn/Makefile
+++ b/py-pynn/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python package for neuronal network models
 USE_LANGUAGES=	# none
 PYDISTUTILSPKG=	yes
 
-INSTALLATION_DIRS=     share/doc/py-pynn
+INSTALLATION_DIRS=	share/doc/py-pynn
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/py-pynn
diff --git a/py-pypi-browser/Makefile b/py-pypi-browser/Makefile
index 2d7c4d267b..bd16162a59 100644
--- a/py-pypi-browser/Makefile
+++ b/py-pypi-browser/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pyqu/Makefile b/py-pyqu/Makefile
index d27a1c0b45..9c322f105f 100644
--- a/py-pyqu/Makefile
+++ b/py-pyqu/Makefile
@@ -9,13 +9,13 @@ MASTER_SITES=	http://pyqu.googlecode.com/files/
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://code.google.com/p/pyqu/
 COMMENT=	PyQu is an extension module for Python to implement quantum algorithms
-LICENSE=		gnu-gpl-v3
+LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	libquantum>=0.2.4:../../misc/libquantum
 
 CONFIGURE_ARGS+=	--with-libquantum-include=${LIBQUANTUM_PREFIX}/include
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 DOCDIR=	${PREFIX}/share/doc/py-pyqu
 
diff --git a/py-pyquante/Makefile b/py-pyquante/Makefile
index 2bea86d964..1d10826642 100644
--- a/py-pyquante/Makefile
+++ b/py-pyquante/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE=	http://pyquante.sourceforge.net/
 COMMENT=	Quantum chemistry in Python
 LICENSE=	modified-bsd
 
-USE_LANGUAGES= c
-PYDISTUTILSPKG= yes
+USE_LANGUAGES=	c
+PYDISTUTILSPKG=	yes
 
 DOCDIR=	${PREFIX}/share/doc/py-pyquante
 
diff --git a/py-pysaml2/Makefile b/py-pysaml2/Makefile
index 18f50c1651..ce75deb8be 100644
--- a/py-pysaml2/Makefile
+++ b/py-pysaml2/Makefile
@@ -1,24 +1,24 @@
 # $NetBSD$
 
 DISTNAME=	pysaml2-4.4.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	python www
-MASTER_SITES=   ${MASTER_SITE_PYPI:=p/pysaml2/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pysaml2/}
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/rohe/pysaml2
 COMMENT=	Python implementation of SAML Version 2
 LICENSE=	apache-2.0
 
-DEPENDS+= ${PYPKGPREFIX}-decorator-[0-9]*:../../devel/py-decorator
-DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
-DEPENDS+= ${PYPKGPREFIX}-Paste-[0-9]*:../../www/py-paste
-DEPENDS+= ${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
-DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
-DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-decorator-[0-9]*:../../devel/py-decorator
+DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+DEPENDS+=	${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
+DEPENDS+=	${PYPKGPREFIX}-Paste-[0-9]*:../../www/py-paste
+DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
+DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
+DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 USE_LANGUAGES=	# none
 
diff --git a/py-pyside-shiboken/Makefile b/py-pyside-shiboken/Makefile
index c855b86467..1c8576d97d 100644
--- a/py-pyside-shiboken/Makefile
+++ b/py-pyside-shiboken/Makefile
@@ -5,7 +5,7 @@ DISTNAME=	shiboken-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-pyside-shiboken-${VERSION}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=PySide/}
 GITHUB_PROJECT=	Shiboken
-EXTRACT_SUFX=   .tar.gz
+EXTRACT_SUFX=	.tar.gz
 CATEGORIES=	devel
 
 MAINTAINER=	rumko%netbsd.org@localhost
@@ -18,15 +18,15 @@ WRKSRC=		${WRKDIR}/Shiboken-${VERSION}
 USE_TOOLS+=	gmake cmake pkg-config
 USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
-CMAKE_ARGS+=    -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
+CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 
-PLIST_SUBST+=   PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 pre-configure:
 	cd ${WRKSRC} && ${MKDIR} build
diff --git a/py-pyside-tools/Makefile b/py-pyside-tools/Makefile
index e1d6bbad48..f18bcfde33 100644
--- a/py-pyside-tools/Makefile
+++ b/py-pyside-tools/Makefile
@@ -5,7 +5,7 @@ DISTNAME=	tools-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-pyside-tools-${VERSION}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=PySide/}
 GITHUB_PROJECT=	Tools
-EXTRACT_SUFX=   .tar.gz
+EXTRACT_SUFX=	.tar.gz
 CATEGORIES=	devel
 
 MAINTAINER=	rumko%netbsd.org@localhost
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/Tools-${VERSION}
 USE_TOOLS+=	gmake cmake pkg-config
 USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
-CMAKE_ARGS+=    -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
+CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
 
 REPLACE_PYTHON+=	pyside-uic
 
@@ -28,8 +28,8 @@ REPLACE_PYTHON+=	pyside-uic
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 
-PLIST_SUBST+=   PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 pre-configure:
 	cd ${WRKSRC} && ${MKDIR} build
diff --git a/py-pyside/Makefile b/py-pyside/Makefile
index b6cf5f12ac..680c033c83 100644
--- a/py-pyside/Makefile
+++ b/py-pyside/Makefile
@@ -5,7 +5,7 @@ DISTNAME=	pyside-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-pyside-${VERSION}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=PySide/}
 GITHUB_PROJECT=	PySide
-EXTRACT_SUFX=   .tar.gz
+EXTRACT_SUFX=	.tar.gz
 CATEGORIES=	devel
 
 MAINTAINER=	rumko%netbsd.org@localhost
@@ -18,12 +18,12 @@ WRKSRC=		${WRKDIR}/PySide-${VERSION}
 USE_TOOLS+=	gmake cmake pkg-config
 USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
-CMAKE_ARGS+=    -DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
+CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
 
 BUILDLINK_DEPMETHOD.qt4-tools=	full
 
-PLIST_SUBST+=   PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 pre-configure:
 	cd ${WRKSRC} && ${MKDIR} build
diff --git a/py-pyside/buildlink3.mk b/py-pyside/buildlink3.mk
index 7164bff6a9..e0a13aecd5 100644
--- a/py-pyside/buildlink3.mk
+++ b/py-pyside/buildlink3.mk
@@ -9,7 +9,7 @@ PY_PYSIDE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-pyside+=	${PYPKGPREFIX}-pyside>=1.2.4
 BUILDLINK_ABI_DEPENDS.py-pyside+=	${PYPKGPREFIX}-pyside>=1.2.4
-BUILDLINK_PKGSRCDIR.py-pyside?=	../../wip/py-pyside
+BUILDLINK_PKGSRCDIR.py-pyside?=		../../wip/py-pyside
 .endif # PY_PYSIDE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-py-pyside
diff --git a/py-pytools/Makefile b/py-pytools/Makefile
index e37b2e25fe..9336ab8f03 100644
--- a/py-pytools/Makefile
+++ b/py-pytools/Makefile
@@ -12,9 +12,9 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-DEPENDS+=       ${PYPKGPREFIX}-decorator>=3.3.2:../../devel/py-decorator
-DEPENDS+=       ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
-DEPENDS+=       ${PYPKGPREFIX}-appdirs>=1.4.0:../../devel/py-appdirs
+DEPENDS+=	${PYPKGPREFIX}-decorator>=3.3.2:../../devel/py-decorator
+DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-appdirs>=1.4.0:../../devel/py-appdirs
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pyvib2/Makefile b/py-pyvib2/Makefile
index 71730aafb2..6cb39b61ba 100644
--- a/py-pyvib2/Makefile
+++ b/py-pyvib2/Makefile
@@ -18,7 +18,7 @@ PYTHON_VERSIONED_DEPENDENCIES=	Pmw
 WRKSRC=		${WRKDIR}/pyvib2-1.1
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/py-qequ/Makefile b/py-qequ/Makefile
index 979ec053df..49ffcb33c4 100644
--- a/py-qequ/Makefile
+++ b/py-qequ/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	qequ-1.0.2
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=q/qequ/}
 
diff --git a/py-qmath/Makefile b/py-qmath/Makefile
index e4d3dbb82c..a226468445 100644
--- a/py-qmath/Makefile
+++ b/py-qmath/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=q/qmath/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://pypi.python.org/pypi/qmath
-COMMENT= Provides a class for deal with quaternion algebra and 3D rotation
+COMMENT=	Provides a class for deal with quaternion algebra and 3D rotation
 LICENSE=	gnu-gpl-v3 AND gnu-fdl-v1.2
 
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
diff --git a/py-qnet/Makefile b/py-qnet/Makefile
index bb52ef9c88..4bc24dcbe1 100644
--- a/py-qnet/Makefile
+++ b/py-qnet/Makefile
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-quaternions/Makefile b/py-quaternions/Makefile
index e43f8e3365..6b4e83025a 100644
--- a/py-quaternions/Makefile
+++ b/py-quaternions/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	quaternions-0.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=q/quaternions/}
 EXTRACT_SUFX=	.zip#md5=fd7d74eaaed0dc3050bcebc7ac5af9e2
diff --git a/py-qutrub/Makefile b/py-qutrub/Makefile
index 5272542d77..1ca5a2b2d6 100644
--- a/py-qutrub/Makefile
+++ b/py-qutrub/Makefile
@@ -17,7 +17,7 @@ USE_LANGUAGES=	# none
 
 QUTRUB_FILES=	ar_ctype.py arabic_const.py classverb.py mosaref_main.py  conjugate.py conjugatedisplay.py  index.py verb_const.py
 
-PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-sqlite2
 PY_EXEC=	${PREFIX}/bin/python${PYVERSSUFFIX}
 QUTRUBDIR=	${PREFIX}/${PYSITELIB}/py-qutrub
diff --git a/py-raphrase/Makefile b/py-raphrase/Makefile
index a0c0ead5c2..16ae0726b3 100644
--- a/py-raphrase/Makefile
+++ b/py-raphrase/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	pyraphrase-0.1
-PKGNAME=        ${PYPKGPREFIX}-raphrase-0.1
+PKGNAME=	${PYPKGPREFIX}-raphrase-0.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyraphrase/}
 
diff --git a/py-reducer/Makefile b/py-reducer/Makefile
index bf950ceea9..f63cb7743a 100644
--- a/py-reducer/Makefile
+++ b/py-reducer/Makefile
@@ -12,11 +12,11 @@ LICENSE=	2-clause-bsd
 
 USE_LANGUAGES=	# none
 
-DEPENDS+=       ${PYPKGPREFIX}-ipython>=2.0.0:../../devel/py-ipython
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-DEPENDS+=       ${PYPKGPREFIX}-astropy>=0.4.6:../../wip/py-astropy
-DEPENDS+=       ${PYPKGPREFIX}-ccdproc>=0.3.1:../../wip/py-ccdproc
-DEPENDS+=       ${PYPKGPREFIX}-msumastro>=0.8.2:../../wip/py-msumastro
+DEPENDS+=	${PYPKGPREFIX}-ipython>=2.0.0:../../devel/py-ipython
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-astropy>=0.4.6:../../wip/py-astropy
+DEPENDS+=	${PYPKGPREFIX}-ccdproc>=0.3.1:../../wip/py-ccdproc
+DEPENDS+=	${PYPKGPREFIX}-msumastro>=0.8.2:../../wip/py-msumastro
 
 
 .include "../../lang/python/egg.mk"
diff --git a/py-remctl/Makefile b/py-remctl/Makefile
index ce26cde793..e67b8ca686 100644
--- a/py-remctl/Makefile
+++ b/py-remctl/Makefile
@@ -24,10 +24,10 @@ GSSIMPL.mit-krb5=	mit
 CONFIGURE_ARGS+=	--enable-python
 
 BUILDLINK_API_DEPENDS.heimdal+=	heimdal>=0.7
-BUILDLINK_API_DEPENDS.remctl+= remctl>=${PKGVERSION}
+BUILDLINK_API_DEPENDS.remctl+=	remctl>=${PKGVERSION}
 
-PYDISTUTILSPKG=yes
-PYSETUPSUBDIR=python
+PYDISTUTILSPKG=	yes
+PYSETUPSUBDIR=	python
 
 .include "../../lang/python/extension.mk"
 .include "../../wip/remctl/buildlink3.mk"
diff --git a/py-repoze.who/Makefile b/py-repoze.who/Makefile
index 3a696edf3a..0f3de31f3c 100644
--- a/py-repoze.who/Makefile
+++ b/py-repoze.who/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	repoze.who-2.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PYPI:=r/repoze.who/}
 
diff --git a/py-restkit/Makefile b/py-restkit/Makefile
index 03cdbda8fd..c06f14cea5 100644
--- a/py-restkit/Makefile
+++ b/py-restkit/Makefile
@@ -12,11 +12,11 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-http-parser>=0.8.3:../../www/py-http-parser
 DEPENDS+=	${PYPKGPREFIX}-socketpool>=0.5.3:../../net/py-socketpool
-DEPENDS+=       ${PYPKGPREFIX}-simplejson>=2.0.9:../../converters/py-simplejson
-DEPENDS+=       ${PYPKGPREFIX}-pygments>=1.3.1:../../textproc/py-pygments
-DEPENDS+=       ${PYPKGPREFIX}-eventlet>=0.9.7:../../wip/py-eventlet
-DEPENDS+=       ${PYPKGPREFIX}-gevent>=0.13.0:../../net/py-gevent
-DEPENDS+=       ${PYPKGPREFIX}-WebOb>=0.9.8:../../www/py-WebOb
+DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.0.9:../../converters/py-simplejson
+DEPENDS+=	${PYPKGPREFIX}-pygments>=1.3.1:../../textproc/py-pygments
+DEPENDS+=	${PYPKGPREFIX}-eventlet>=0.9.7:../../wip/py-eventlet
+DEPENDS+=	${PYPKGPREFIX}-gevent>=0.13.0:../../net/py-gevent
+DEPENDS+=	${PYPKGPREFIX}-WebOb>=0.9.8:../../www/py-WebOb
 
 USE_LANGUAGES=	# none
 
diff --git a/py-rlcompleter2/Makefile b/py-rlcompleter2/Makefile
index 8d2e22ff9f..6c6e289b60 100644
--- a/py-rlcompleter2/Makefile
+++ b/py-rlcompleter2/Makefile
@@ -15,7 +15,7 @@ LICENSE=	mit
 DEPENDS+=	${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG=		yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-ruffus/Makefile b/py-ruffus/Makefile
index 87c9e01f15..c66c5917eb 100644
--- a/py-ruffus/Makefile
+++ b/py-ruffus/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.ruffus.org.uk/index.html
 COMMENT=	Lightweight python module to run computational pipelines
 LICENSE=	mit
 
-DEPENDS+=  ${PYPKGPREFIX}-simplejson>=2.1.1:../../converters/py-simplejson
+DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.1.1:../../converters/py-simplejson
 
 USE_LANGUAGES=	# none
 
diff --git a/py-sage/Makefile b/py-sage/Makefile
index 349a2786f8..c1f7ca168c 100644
--- a/py-sage/Makefile
+++ b/py-sage/Makefile
@@ -14,7 +14,7 @@ LICENSE=	mit
 DEPENDS+=	${PYPKGPREFIX}-processing>=0.52:../../wip/py-processing
 
 USE_LANGUAGES=	# none
-PYDISTUTILSPKG=		yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sas7bdat/Makefile b/py-sas7bdat/Makefile
index 4843e82935..a02aa05722 100644
--- a/py-sas7bdat/Makefile
+++ b/py-sas7bdat/Makefile
@@ -6,13 +6,13 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/sas7bdat/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
-HOMEPAGE=	 https://bitbucket.org/jaredhobbs/sas7bdat
+HOMEPAGE=	https://bitbucket.org/jaredhobbs/sas7bdat
 COMMENT=	This module will read sas7bdat files using pure Python (2.6+, 3+)
 LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sasa/Makefile b/py-sasa/Makefile
index 94ab72ab2e..c949e73b2b 100644
--- a/py-sasa/Makefile
+++ b/py-sasa/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2014/06/01 12:49:45 thomasklausner Exp $
 
 DISTNAME=	sasa-0.1.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/sasa/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=	https://code.google.com/p/sasa-tool/
 COMMENT=	SAIL/AIL Sentiment Analyzer
 LICENSE=	apache-2.0
 
-DEPENDS+=     ${PYPKGPREFIX}-nltk>=3.0a2:../../wip/py-nltk
+DEPENDS+=	${PYPKGPREFIX}-nltk>=3.0a2:../../wip/py-nltk
 
 
 USE_LANGUAGES=	# none
diff --git a/py-scikit-aero/Makefile b/py-scikit-aero/Makefile
index b586323b62..9789dae5da 100644
--- a/py-scikit-aero/Makefile
+++ b/py-scikit-aero/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2014/06/01 12:49:45 thomasklausner Exp $
 
 DISTNAME=	scikit-aero-v0.1.0
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/v//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/v//}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/scikit-aero/}
 
diff --git a/py-scikits_bvp1lg/Makefile b/py-scikits_bvp1lg/Makefile
index 967e42442b..ea01db09fe 100644
--- a/py-scikits_bvp1lg/Makefile
+++ b/py-scikits_bvp1lg/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Boundary value problem (legacy) solvers for ODEs
 DEPENDS+=	${PYPKGPREFIX}-nose>=0.11.3:../../devel/py-nose
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 
-USE_LANGUAGES= c fortran
+USE_LANGUAGES=	c fortran
 
 do-test:
 	${RUN} cd ${WRKSRC}/scikits/bvp1lg/tests/; ${SETENV} ${TEST_ENV} ${PYTHONBIN} testutils.py
diff --git a/py-scikits_timeseries/Makefile b/py-scikits_timeseries/Makefile
index dc2189007e..e27fa265c2 100644
--- a/py-scikits_timeseries/Makefile
+++ b/py-scikits_timeseries/Makefile
@@ -5,7 +5,7 @@ DISTNAME=	scikits.timeseries-0.91.3
 EGG_NAME=	${DISTNAME}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S|s.|s_|}
 PKGREVISION=	1
-CATEGORIES= math python
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pytseries/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
diff --git a/py-scikits_vectorplot/Makefile b/py-scikits_vectorplot/Makefile
index 03d9699206..bde27cf438 100644
--- a/py-scikits_vectorplot/Makefile
+++ b/py-scikits_vectorplot/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	scikits.vectorplot-0.1.1
 PKGNAME=	${PYPKGPREFIX}-scikits_vectorplot-0.1.1
-CATEGORIES= math python
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/scikits.vectorplot/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
diff --git a/py-sfepy/Makefile b/py-sfepy/Makefile
index 58d4b49b71..b21c1e481c 100644
--- a/py-sfepy/Makefile
+++ b/py-sfepy/Makefile
@@ -14,7 +14,7 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	c c++
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 do-test:
 	( cd ${WRKSRC} && ${PYTHONBIN} runTests.py )
diff --git a/py-signedjson/Makefile b/py-signedjson/Makefile
index 9442a237e9..164f56b352 100644
--- a/py-signedjson/Makefile
+++ b/py-signedjson/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 DISTNAME=	python-signedjson-1.0.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/v//:S/python-//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/v//:S/python-//}
 CATEGORIES=	security
 GITHUB_PROJECT=	python-signedjson
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=matrix-org/}
-GITHUB_TAG=     v${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
diff --git a/py-simpleparse-mxtexttools/Makefile b/py-simpleparse-mxtexttools/Makefile
index b3e852a462..1c0b425711 100644
--- a/py-simpleparse-mxtexttools/Makefile
+++ b/py-simpleparse-mxtexttools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SimpleParse is a Python providing a simple and fast parser generator
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-mxDateTime
 
-INSTALLATION_DIRS+= 	share/doc/py-simpleparse-mxtexttools
+INSTALLATION_DIRS+=	share/doc/py-simpleparse-mxtexttools
 
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/py-simpleparse-mxtexttools
diff --git a/py-smcp/Makefile b/py-smcp/Makefile
index 9149a083ad..aac95a84c4 100644
--- a/py-smcp/Makefile
+++ b/py-smcp/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://cvxopt.github.io/smcp
 COMMENT=	Python extension for solving sparse matrix cone programs
 LICENSE=	gnu-gpl-v3
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 DEPENDS+=	${PYPKGPREFIX}-chompack>=2.0.0:../../wip/py-chompack
diff --git a/py-sode/Makefile b/py-sode/Makefile
index 3a25053e4d..e1616d035b 100644
--- a/py-sode/Makefile
+++ b/py-sode/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/sode/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 https://github.com/oscarbenjamin/sode
+HOMEPAGE=	https://github.com/oscarbenjamin/sode
 COMMENT=	Python/Cython lib for solving Stochastic Ordinary Differential Equations
 LICENSE=	gnu-gpl-v3
 
diff --git a/py-spams/Makefile b/py-spams/Makefile
index 5f16136be5..a9b93f76da 100644
--- a/py-spams/Makefile
+++ b/py-spams/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	http://spams-devel.gforge.inria.fr/hitcounter2.php?file=33816/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://spams-devel.gforge.inria.fr/
-COMMENT= 	SPArse Modeling Software for solving various sparse estimation
+COMMENT=	SPArse Modeling Software for solving various sparse estimation
 LICENSE=	gnu-gpl-v3
 
 #DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
diff --git a/py-sparce/Makefile b/py-sparce/Makefile
index 80a823f69d..51ebe46ad5 100644
--- a/py-sparce/Makefile
+++ b/py-sparce/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Sparse linear algebra extension for Python
 #LICENSE=	# TODO: (see mk/license.mk)
 
 USE_LANGUAGES=	c c++ fortran77
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-Numeric
 
 #.include "../../graphics/vtk-python/buildlink3.mk"
diff --git a/py-spark/Makefile b/py-spark/Makefile
index 0cc90b7643..efcab3cfc8 100644
--- a/py-spark/Makefile
+++ b/py-spark/Makefile
@@ -2,8 +2,8 @@
 #
 
 DISTNAME=	spark-0.6.1
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=		textproc python
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	textproc python
 MASTER_SITES=	http://pages.cpsc.ucalgary.ca/~aycock/spark/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
diff --git a/py-spatialdata/Makefile b/py-spatialdata/Makefile
index 39c850966b..7bf3f45eef 100644
--- a/py-spatialdata/Makefile
+++ b/py-spatialdata/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE=	http://www.geodynamics.org/cig/software/pylith/
 COMMENT=	Spatialdata provides transformations among coordinate systems
 LICENSE=	mit
 
-CHECK_PORTABILITY_SKIP= configure
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c c++
+CHECK_PORTABILITY_SKIP=	configure
+GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c c++
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-speview/Makefile b/py-speview/Makefile
index 9a916847f6..77f46d2413 100644
--- a/py-speview/Makefile
+++ b/py-speview/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2014/10/03 21:12:34 jihbed Exp $
 
 DISTNAME=	speview-0.1.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/speview/}
 
@@ -10,9 +10,9 @@ HOMEPAGE=	https://github.com/ximeg/speview
 COMMENT=	Program to display binary SPE files containing Raman spectra
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
-DEPENDS+=       ${PYPKGPREFIX}-zenity>=0.1.4:../../wip/py-zenity
-DEPENDS+=       ${PYPKGPREFIX}-xcal-raman>=0.1.5:../../wip/py-xcal-raman
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-zenity>=0.1.4:../../wip/py-zenity
+DEPENDS+=	${PYPKGPREFIX}-xcal-raman>=0.1.5:../../wip/py-xcal-raman
 
 USE_LANGUAGES=	# none
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-xcal-raman
diff --git a/py-sphinxreport/Makefile b/py-sphinxreport/Makefile
index ea904f3ff0..d92a0ebec5 100644
--- a/py-sphinxreport/Makefile
+++ b/py-sphinxreport/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2014/12/31 13:58:43 thomasklausner Exp $
 
 DISTNAME=	SphinxReport-2.0
-PKGNAME=        ${PYPKGPREFIX}-sphinxreport-2.0
+PKGNAME=	${PYPKGPREFIX}-sphinxreport-2.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PYPI:=S/SphinxReport/}
 
@@ -11,7 +11,7 @@ COMMENT=	Report generator in python based on Sphinx and matplotlib
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.7:../../databases/py-sqlalchemy
-DEPENDS+=    	${PYPKGPREFIX}-rpy>=2.1.3:../../math/py-rpy
+DEPENDS+=	${PYPKGPREFIX}-rpy>=2.1.3:../../math/py-rpy
 DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 DEPENDS+=	${PYPKGPREFIX}-openpyxl>=1.6.2:../../textproc/py-openpyxl
 
diff --git a/py-spotpy/Makefile b/py-spotpy/Makefile
index 0db811acf5..02cc417178 100644
--- a/py-spotpy/Makefile
+++ b/py-spotpy/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	spotpy-1.2.25
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/spotpy/}
 EXTRACT_SUFX=	.zip#md5=f6185a11ad3099078ee971100bccfeda
diff --git a/py-sqlalchemy-searchable/Makefile b/py-sqlalchemy-searchable/Makefile
index 77edcc1dc9..f12a29cedd 100644
--- a/py-sqlalchemy-searchable/Makefile
+++ b/py-sqlalchemy-searchable/Makefile
@@ -1,22 +1,22 @@
 # $NetBSD: Makefile,v 1.1 2015/07/16 14:40:23 kethzer-08 Exp $
 
 DISTNAME=	SQLAlchemy-Searchable-0.9.3
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PYPI:=S/SQLAlchemy-Searchable/}
 
-MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://files.pythonhosted.org/packages/source/S/SQLAlchemy-Searchable/
-COMMENT=        Provides fulltext search capabilities
+COMMENT=	Provides fulltext search capabilities
 LICENSE=	modified-bsd # TODO: (see mk/license.mk)
 
 USE_LANGUAGES=	# none
-EGG_NAME=       ${DISTNAME:S/-/_/1}
+EGG_NAME=	${DISTNAME:S/-/_/1}
 
-DEPENDS+=       ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
-DEPENDS+=       ${PYPKGPREFIX}-sqlalchemy-[0-9]*:../../databases/py-sqlalchemy
-DEPENDS+=       ${PYPKGPREFIX}-sqlalchemy-utils-[0-9]*:../../databases/py-sqlalchemy-utils
-DEPENDS+=       ${PYPKGPREFIX}-validators-[0-9]*:../../textproc/py-validators
+DEPENDS+=	${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
+DEPENDS+=	${PYPKGPREFIX}-sqlalchemy-[0-9]*:../../databases/py-sqlalchemy
+DEPENDS+=	${PYPKGPREFIX}-sqlalchemy-utils-[0-9]*:../../databases/py-sqlalchemy-utils
+DEPENDS+=	${PYPKGPREFIX}-validators-[0-9]*:../../textproc/py-validators
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-ssh2/Makefile b/py-ssh2/Makefile
index 096f7742e0..7efa7b1792 100644
--- a/py-ssh2/Makefile
+++ b/py-ssh2/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.4 2012/10/07 13:57:30 asau Exp $
 
-DISTNAME=				ssh4py-0.6.9
-EXTRACT_SUFX=			.zip
-PKGNAME=				${PYPKGPREFIX}-ssh2-0.6.9
-CATEGORIES=				security python
-MASTER_SITES=			http://www.keyphrene.com/download/
+DISTNAME=	ssh4py-0.6.9
+EXTRACT_SUFX=	.zip
+PKGNAME=	${PYPKGPREFIX}-ssh2-0.6.9
+CATEGORIES=	security python
+MASTER_SITES=	http://www.keyphrene.com/download/
 
 MAINTAINER=				pmcphee%givex.com@localhost
 COMMENT=				Python wrapper around libssh2
@@ -17,7 +17,7 @@ NO_CONFIGURE=			yes
 
 PYDISTUTILSPKG=	yes
 #PYBINMODULE=	yes
-PYSETUP=				setup_ssh4.py
+PYSETUP=	setup_ssh4.py
 
 .include "../../security/libssh2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/py-sunpy/Makefile b/py-sunpy/Makefile
index 6b1150edf2..4043ae4369 100644
--- a/py-sunpy/Makefile
+++ b/py-sunpy/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	sunpy-0.6.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/sunpy/}
 
diff --git a/py-sydent/Makefile b/py-sydent/Makefile
index 80d8f24c31..89f354b334 100644
--- a/py-sydent/Makefile
+++ b/py-sydent/Makefile
@@ -1,29 +1,29 @@
 # $NetBSD$
 
 DISTNAME=	${PYPKGPREFIX}-sydent-0.1
-CATEGORIES=    	www
+CATEGORIES=	www
 GITHUB_PROJECT=	sydent
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=matrix-org/}
-GITHUB_TAG=     v${PKGVERSION_NOREV}
-GITHUB_TAG=    	3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe
+MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+GITHUB_TAG=	3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe
 #EXTRACT_SUFX=   .zip
 
-MAINTAINER=     kethzer.dr%gmail.com@localhost
-HOMEPAGE=       https://github.com/matrix-org/
-COMMENT=        Matrix Identity Servers
-LICENSE=        apache-2.0
+MAINTAINER=	kethzer.dr%gmail.com@localhost
+HOMEPAGE=	https://github.com/matrix-org/
+COMMENT=	Matrix Identity Servers
+LICENSE=	apache-2.0
 
-DEPENDS+= ${PYPKGPREFIX}-daemonize>=2.4.7:../../devel/py-daemonize
-DEPENDS+= ${PYPKGPREFIX}-phonenumbers-[0-9]*:../../textproc/py-phonenumbers
-DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-DEPENDS+= ${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
-DEPENDS+= ${PYPKGPREFIX}-signedjson-[0-9]*:../../wip/py-signedjson
-DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
-DEPENDS+= ${PYPKGPREFIX}-unpaddedbase64-[0-9]*:../../wip/py-unpaddedbase64
-DEPENDS+= ${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
-DEPENDS+= ${PYPKGPREFIX}-libnacl-[0-9]*:../../wip/py-libnacl
-DEPENDS+= ${PYPKGPREFIX}-nacl-[0-9]*:../../security/py-nacl
-DEPENDS+= ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
+DEPENDS+=	${PYPKGPREFIX}-daemonize>=2.4.7:../../devel/py-daemonize
+DEPENDS+=	${PYPKGPREFIX}-phonenumbers-[0-9]*:../../textproc/py-phonenumbers
+DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
+DEPENDS+=	${PYPKGPREFIX}-signedjson-[0-9]*:../../wip/py-signedjson
+DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-unpaddedbase64-[0-9]*:../../wip/py-unpaddedbase64
+DEPENDS+=	${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
+DEPENDS+=	${PYPKGPREFIX}-libnacl-[0-9]*:../../wip/py-libnacl
+DEPENDS+=	${PYPKGPREFIX}-nacl-[0-9]*:../../security/py-nacl
+DEPENDS+=	${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
 
 
 WRKSRC=		${WRKDIR}/sydent-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe
diff --git a/py-symcxx/Makefile b/py-symcxx/Makefile
index ad52a28c9c..da954e3ed2 100644
--- a/py-symcxx/Makefile
+++ b/py-symcxx/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	symcxx-0.1.5
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/symcxx/}
 
diff --git a/py-tablib-garetjax/Makefile b/py-tablib-garetjax/Makefile
index 00b14d11f5..e2dacefd72 100644
--- a/py-tablib-garetjax/Makefile
+++ b/py-tablib-garetjax/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2014/12/31 13:58:44 thomasklausner Exp $
 
 DISTNAME=	tablib-garetjax-0.9.12
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PYPI:=t/tablib-garetjax/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=	http://python-tablib.org/
 COMMENT=	Format agnostic tabular data library (XLS, JSON, YAML, CSV)
 LICENSE=	mit
 
-DEPENDS+=    	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 0.9.12
 USE_LANGUAGES=	# none
diff --git a/py-tashaphyne/Makefile b/py-tashaphyne/Makefile
index 822ea6ccbc..7dad6a3418 100644
--- a/py-tashaphyne/Makefile
+++ b/py-tashaphyne/Makefile
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=	# none
 
-PYDISTUTILSPKG=  yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-teafiles/Makefile b/py-teafiles/Makefile
index 883320ff28..055fc3818b 100644
--- a/py-teafiles/Makefile
+++ b/py-teafiles/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	teafiles-0.7.4
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math finance
 MASTER_SITES=	${MASTER_SITE_PYPI:=t/teafiles/}
 EXTRACT_SUFX=	.zip#md5=c6a4cca7fff1e5a5d01c2c59b3339b04
diff --git a/py-technicolor/Makefile b/py-technicolor/Makefile
index 1cccea4a7b..c5eaa88679 100644
--- a/py-technicolor/Makefile
+++ b/py-technicolor/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	technicolor-2016.1.12.1823
-PKGNAME=        ${PYPKGPREFIX}-technicolor-20161121823
+PKGNAME=	${PYPKGPREFIX}-technicolor-20161121823
 CATEGORIES=	devel
 MASTER_SITES=	https://pypi.python.org/packages/b5/4c/7fe5f4edf4dc6794f6cff8a116aa63a327ef7b41908159aec20240a915c7/
 
diff --git a/py-telepathy/Makefile b/py-telepathy/Makefile
index d607876bea..c7ba771677 100644
--- a/py-telepathy/Makefile
+++ b/py-telepathy/Makefile
@@ -1,21 +1,21 @@
 # $NetBSD: Makefile,v 1.5 2012/10/07 13:57:31 asau Exp $
 #
 
-DISTNAME=    	telepathy-python-0.15.15
-PKGNAME=    	${PYPKGPREFIX}-telepathy-0.15.15
-CATEGORIES=    	chat
-MASTER_SITES=   http://telepathy.freedesktop.org/releases/telepathy-python/
+DISTNAME=	telepathy-python-0.15.15
+PKGNAME=	${PYPKGPREFIX}-telepathy-0.15.15
+CATEGORIES=	chat
+MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-python/
 
-MAINTAINER= pkgsrc.gnome%gmail.com@localhost
-HOMEPAGE=   http://telepathy.freedesktop.org/releases/telepathy-python/
-COMMENT=    Python bindings for the Telepathy framework
-LICENSE=    gnu-lgpl-v2.1
+MAINTAINER=	pkgsrc.gnome%gmail.com@localhost
+HOMEPAGE=	http://telepathy.freedesktop.org/releases/telepathy-python/
+COMMENT=	Python bindings for the Telepathy framework
+LICENSE=	gnu-lgpl-v2.1
 
-GNU_CONFIGURE=    yes
+GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
-USE_LANGUAGES=    # none
+USE_LANGUAGES=	# none
 
-PY_PATCHPLIST=	 yes
+PY_PATCHPLIST=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
diff --git a/py-teng/Makefile b/py-teng/Makefile
index 64f5df0fb1..cdceccbf66 100644
--- a/py-teng/Makefile
+++ b/py-teng/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	teng-python-2.0.0
-PKGNAME=        ${PYPKGPREFIX}-teng-2.0.0
+PKGNAME=	${PYPKGPREFIX}-teng-2.0.0
 
 CATEGORIES=	python textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=teng/}
@@ -16,8 +16,8 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_LANGUAGES=	c c++
 
-PYDISTUTILSPKG= yes
-PY_PATCHPLIST=  yes
+PYDISTUTILSPKG=	yes
+PY_PATCHPLIST=	yes
 
 .include "../../wip/teng/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/py-teradata/Makefile b/py-teradata/Makefile
index c043419687..4f3c680c1e 100644
--- a/py-teradata/Makefile
+++ b/py-teradata/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	teradata-15.10.0.20
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases
 MASTER_SITES=	https://pypi.python.org/packages/44/90/dba531883fe17d761222cdbd9323058368227bcbc59650a31e527d735d59/
 
diff --git a/py-theano/Makefile b/py-theano/Makefile
index abe3eeb2f6..39e5930815 100644
--- a/py-theano/Makefile
+++ b/py-theano/Makefile
@@ -7,17 +7,17 @@ MASTER_SITES=	https://pypi.python.org/packages/28/03/6af9ff242da966f89de6ab81164
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://deeplearning.net/software/theano/
-COMMENT= 	Optimizing compiler for evaluating mathematical expressions
+COMMENT=	Optimizing compiler for evaluating mathematical expressions
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
-DEPENDS+=       ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
 
 USE_TOOLS+=	bash
 USE_LANGUAGES=	c c++
 
-PY_PATCHPLIST=         yes
+PY_PATCHPLIST=	yes
 
 do-test:
 	${RUN} cd {WRKSRC}/theano/tests ; ${SETENV} {TEST_ENV} ${PYTHONBIN} main.py
diff --git a/py-toscawidgets/Makefile b/py-toscawidgets/Makefile
index 64d5c7ddc0..03126e4803 100644
--- a/py-toscawidgets/Makefile
+++ b/py-toscawidgets/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://toscawidgets.org/
 COMMENT=	Web widget creation toolkit based on TurboGears widgets
-LICENSE=  	mit
+LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.1.1:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-WebOb>=0.9.8:../../www/py-WebOb
diff --git a/py-traitsgui/Makefile b/py-traitsgui/Makefile
index 5e13e63db7..189c8ffacd 100644
--- a/py-traitsgui/Makefile
+++ b/py-traitsgui/Makefile
@@ -9,7 +9,7 @@ PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/T/t/S/GUI/gui/}
 
 HOMEPAGE=	http://code.enthought.com/projects/traits_gui/
 
-COMMENT=	 	Traits-capable windowing framework
+COMMENT=		Traits-capable windowing framework
 
 .include "../../wip/py-traits/Makefile.common"
 
diff --git a/py-translationstring/Makefile b/py-translationstring/Makefile
index cad1594ff8..b0d10e88ee 100644
--- a/py-translationstring/Makefile
+++ b/py-translationstring/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=t/translationstring/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://pylonsproject.org
-COMMENT= 	Library for i18n relied on by various Repoze and Pyramid
+COMMENT=	Library for i18n relied on by various Repoze and Pyramid
 LICENSE=	modified-bsd
 
 WRKSRC=			${WRKDIR}/translationstring-1.3
diff --git a/py-trottersuzuki/Makefile b/py-trottersuzuki/Makefile
index c8cced9a32..3d93160e63 100644
--- a/py-trottersuzuki/Makefile
+++ b/py-trottersuzuki/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=t/trottersuzuki/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 http://trotter-suzuki-mpi.github.io/
+HOMEPAGE=	http://trotter-suzuki-mpi.github.io/
 COMMENT=	Massively parallel implementation of the Trotter-Suzuki decomposition
 LICENSE=	gnu-gpl-v3
 
diff --git a/py-twilio/Makefile b/py-twilio/Makefile
index ada0e49ad2..8ad5018553 100644
--- a/py-twilio/Makefile
+++ b/py-twilio/Makefile
@@ -12,8 +12,8 @@ LICENSE=	mit
 
 #EGG_NAME=       ${PKGVERSION}
 
-DEPENDS+=       ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
-DEPENDS+=       ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-twisted-kqueue/Makefile b/py-twisted-kqueue/Makefile
index 051e357a03..5846498602 100644
--- a/py-twisted-kqueue/Makefile
+++ b/py-twisted-kqueue/Makefile
@@ -9,13 +9,13 @@ MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/jdolecek/
 MAINTAINER=	milos.negovanovic%googlemail.com@localhost
 COMMENT=	Python interface to kqueue, suitable for Twisted
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 # need to get definition of PKG_HAVE_KQUEUE
 .include "../../mk/bsd.prefs.mk"
 
 .if !defined(PKG_HAVE_KQUEUE)
-PKG_FAIL_REASON+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}, needs OS support for kqueue(2)"
+PKG_FAIL_REASON+=	"${PKGNAME} is not available for ${MACHINE_PLATFORM}, needs OS support for kqueue(2)"
 .endif
 
 CONFLICTS+=	${PYPKGPREFIX}-kqueue-[0-9]*
diff --git a/py-twistml/Makefile b/py-twistml/Makefile
index ba96b01967..95c0abffc0 100644
--- a/py-twistml/Makefile
+++ b/py-twistml/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=t/twistml/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=https://bitbucket.org/madmat3001/twistml.git
+HOMEPAGE=	https://bitbucket.org/madmat3001/twistml.git
 COMMENT=	TWItter STock market Machine Learning package
 LICENSE=	mit
 
diff --git a/py-txdbus/Makefile b/py-txdbus/Makefile
index a52d9b9b77..9d71198128 100644
--- a/py-txdbus/Makefile
+++ b/py-txdbus/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/cocagne/txdbus
 COMMENT=	Python implementation of the DBus protocol for the Twisted
 LICENSE=	mit
 
-DEPENDS+=       ${PYPKGPREFIX}-twisted>=13.1.0:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-twisted>=13.1.0:../../net/py-twisted
 
 USE_LANGUAGES=	# none
 
diff --git a/py-unpaddedbase64/Makefile b/py-unpaddedbase64/Makefile
index 07a9305ab6..3632a4b94b 100644
--- a/py-unpaddedbase64/Makefile
+++ b/py-unpaddedbase64/Makefile
@@ -2,20 +2,20 @@
 
 DISTNAME=	unpaddedbase64-${VERSION}
 VERSION=	1.1.0
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=    	devel python
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel python
 GITHUB_PROJECT=	python-unpaddedbase64
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=matrix-org/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-EXTRACT_SUFX=   .zip
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
-HOMEPAGE=       https://github.com/matrix-org/
+HOMEPAGE=	https://github.com/matrix-org/
 COMMENT=	Encode and decode Base64
-LICENSE=        apache-2.0
+LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
-WRKSRC=         ${WRKDIR}/python-${DISTNAME}
+WRKSRC=		${WRKDIR}/python-${DISTNAME}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-vdirsyncer-git/Makefile b/py-vdirsyncer-git/Makefile
index 22cd6c87ef..561d9a721c 100644
--- a/py-vdirsyncer-git/Makefile
+++ b/py-vdirsyncer-git/Makefile
@@ -26,9 +26,9 @@ DEPENDS+=	${PYPKGPREFIX}-requests-toolbelt>=0.3.0:../../devel/py-requests-toolbe
 # optional, but recommended
 DEPENDS+=	${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring
 
-USE_LANGUAGES=	# none
+USE_LANGUAGES=		# none
 INSTALLATION_DIRS=	share/examples/${PKGBASE}
-PLIST_SUBST+=	PKGBASE=${PKGBASE}
+PLIST_SUBST+=		PKGBASE=${PKGBASE}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/example.cfg ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
diff --git a/py-vegas/Makefile b/py-vegas/Makefile
index b27b691908..7e765080f8 100644
--- a/py-vegas/Makefile
+++ b/py-vegas/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v3
 
 PYDISTUTILSPKG=	yes
 
-INSTALLATION_DIRS+= share/doc/vegas
+INSTALLATION_DIRS+=	share/doc/vegas
 
 do-test:
 	${RUN} cd ${WRKSRC}/tests; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test_vegas.py
diff --git a/py-version-control-tools-hg/Makefile b/py-version-control-tools-hg/Makefile
index e2193dff15..1dc9cbbe22 100644
--- a/py-version-control-tools-hg/Makefile
+++ b/py-version-control-tools-hg/Makefile
@@ -10,9 +10,9 @@ HOMEPAGE=	http://mercurial.selenic.com/wiki/MozillaPushlogExtension
 COMMENT=	Mercurial extensions used by the mozilla project (incl. pushlog)
 #LICENSE=	mpl-1.1
 
-HG_REPOSITORIES=	version-control-tools
+HG_REPOSITORIES=		version-control-tools
 HG_REPO.version-control-tools=	https://hg.mozilla.org/hgcustom/version-control-tools/
-WRKSRC=		${WRKDIR}/version-control-tools/hghooks
+WRKSRC=				${WRKDIR}/version-control-tools/hghooks
 
 DEPENDS+=	${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial
 
diff --git a/py-vespa/Makefile b/py-vespa/Makefile
index 9f95e9ea75..9752486809 100644
--- a/py-vespa/Makefile
+++ b/py-vespa/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	VESPA-0.4.7
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	math python
 MASTER_SITES=	https://pypi.python.org/packages/56/91/170b0343dd695104b070d33cf4c808c77f7dca1f2399a8c0af18a0e0f0b1/
 
diff --git a/py-viper/buildlink3.mk b/py-viper/buildlink3.mk
index 963731d410..373b0a5fc6 100644
--- a/py-viper/buildlink3.mk
+++ b/py-viper/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	py-viper
 PY_VIPER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-viper+=	${PYPKGPREFIX}-viper>=1.0.0
-BUILDLINK_PKGSRCDIR.py-viper?=	../../wip/py-viper
+BUILDLINK_PKGSRCDIR.py-viper?=		../../wip/py-viper
 .endif	# PY_VIPER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-py-viper
diff --git a/py-visionegg/Makefile b/py-visionegg/Makefile
index 8f0d9f3bc2..369f495782 100644
--- a/py-visionegg/Makefile
+++ b/py-visionegg/Makefile
@@ -15,14 +15,14 @@ DEPENDS+=	${PYPKGPREFIX}-Pyro4>=3.4:../../devel/py-Pyro
 DEPENDS+=	${PYPKGPREFIX}-OpenGL-[0-9]*:../../graphics/py-OpenGL
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
-USE_LANGUAGES= c c++
+USE_LANGUAGES=	c c++
 
 MAKE_ENV+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-Numeric
-REPLACE_PYTHON+=	check-config.py
-REPLACE_PYTHON+=	test/display_dc_restoration.py
-REPLACE_PYTHON+=	test/opengl_info.py
+REPLACE_PYTHON+=		check-config.py
+REPLACE_PYTHON+=		test/display_dc_restoration.py
+REPLACE_PYTHON+=		test/opengl_info.py
 
 .include "../../devel/py-game/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
diff --git a/py-visionegg/buildlink3.mk b/py-visionegg/buildlink3.mk
index 35ded41caa..42c2f38295 100644
--- a/py-visionegg/buildlink3.mk
+++ b/py-visionegg/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.pyvisionegg+=	${PYPKGPREFIX}-visionegg>=0.9.9
 BUILDLINK_ABI_DEPENDS.pyvisionegg?=	${PYPKGPREFIX}-visionegg>=0.9.9nb2
 BUILDLINK_PKGSRCDIR.pyvisionegg?=	../../wip/py-visionegg
 
-PYTHON_VERSIONS_INCOMPATIBLE=    34 35 36 # py-Numeric
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-Numeric
 
 .if exists(../../mk/opengl.buildlink3.mk)
 # see PR 23845 for details
diff --git a/py-vispy/Makefile b/py-vispy/Makefile
index 72c1984e9b..34599161cb 100644
--- a/py-vispy/Makefile
+++ b/py-vispy/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=v/vispy/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	 http://vispy.org
+HOMEPAGE=	http://vispy.org
 COMMENT=	Interactive visualization in Python
 LICENSE=	modified-bsd
 
diff --git a/py-wahcade/Makefile b/py-wahcade/Makefile
index 73c64e52df..ea0edb29aa 100644
--- a/py-wahcade/Makefile
+++ b/py-wahcade/Makefile
@@ -10,11 +10,11 @@ HOMEPAGE=	http://www.anti-particle.com/wahcade.shtml
 COMMENT=	GNU/Linux-friendly clone of Minwah's MameWAH
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=			${WRKDIR}/wahcade
-USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		# none
-USE_TOOLS+=		bash
-PY_PATCHPLIST=		yes
+WRKSRC=				${WRKDIR}/wahcade
+USE_PKGLOCALEDIR=		yes
+USE_LANGUAGES=			# none
+USE_TOOLS+=			bash
+PY_PATCHPLIST=			yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-imaging
 
 REPLACE_BASH+=		doc/samples/run_mess.sh
diff --git a/py-wasanbon/Makefile b/py-wasanbon/Makefile
index 73abfd48aa..aa8ee4a031 100644
--- a/py-wasanbon/Makefile
+++ b/py-wasanbon/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	wasanbon-1.0.0.post9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/.post9//}
 CATEGORIES=	devel python
-MASTER_SITES=	 ${MASTER_SITE_PYPI:=w/wasanbon/}
+MASTER_SITES=	${MASTER_SITE_PYPI:=w/wasanbon/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://www.sugarsweetrobotics.com/
diff --git a/py-websocket/Makefile b/py-websocket/Makefile
index 4c8eb4c212..b0e9e1b58d 100644
--- a/py-websocket/Makefile
+++ b/py-websocket/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	http://pywebsocket.googlecode.com/files/
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://code.google.com/p/pywebsocket/
-COMMENT=  WebSocket server and extension for Apache HTTP Server for testing
+COMMENT=	WebSocket server and extension for Apache HTTP Server for testing
 LICENSE=	modified-bsd
 
 WRKSRC=		${WRKDIR}/pywebsocket-0.7.9/src
diff --git a/py-wordpress-xmlrpc/Makefile b/py-wordpress-xmlrpc/Makefile
index 38827a1e2a..1d08416612 100644
--- a/py-wordpress-xmlrpc/Makefile
+++ b/py-wordpress-xmlrpc/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-wordpress-xmlrpc/}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
-HOMEPAGE=	 https://github.com/maxcutler/python-wordpress-xmlrpc/
+HOMEPAGE=	https://github.com/maxcutler/python-wordpress-xmlrpc/
 COMMENT=	WordPress XML-RPC API Integration Library
 LICENSE=	modified-bsd
 
diff --git a/py-wxWidgets-unicode/Makefile b/py-wxWidgets-unicode/Makefile
index d375612fd0..6a6a51cfdf 100644
--- a/py-wxWidgets-unicode/Makefile
+++ b/py-wxWidgets-unicode/Makefile
@@ -25,11 +25,11 @@ WXARG=	WXPORT=gtk2 \
 	CONTRIBS_INC="../contrib/include" \
 	UNICODE=1
 
-PYDISTUTILSPKG=	yes
+PYDISTUTILSPKG=		yes
 # no scripts to avoid conflicts
 PYSETUPBUILDARGS=	NO_SCRIPTS=1 ${WXARG}
 PYSETUPINSTALLARGS=	NO_SCRIPTS=1 ${WXARG}
-PYBINMODULE=	yes
+PYBINMODULE=		yes
 
 PLIST_SUBST+=		GTKVER=2
 
diff --git a/py-xlutils/Makefile b/py-xlutils/Makefile
index 14f2e40a9a..6c46d25f42 100644
--- a/py-xlutils/Makefile
+++ b/py-xlutils/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE=	http://www.simplistix.co.uk/software/python/xlutils
 COMMENT=	Utilities for working with Excel files
 LICENSE=	mit
 
-DEPENDS+=      ${PYPKGPREFIX}-xlrd>=0.7.1:../../textproc/py-xlrd
-DEPENDS+=      ${PYPKGPREFIX}-xlwt>=0.7.1:../../textproc/py-xlwt
+DEPENDS+=	${PYPKGPREFIX}-xlrd>=0.7.1:../../textproc/py-xlrd
+DEPENDS+=	${PYPKGPREFIX}-xlwt>=0.7.1:../../textproc/py-xlwt
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-xlwt
 
diff --git a/py-yapf/Makefile b/py-yapf/Makefile
index 98bd1108e4..102e1076db 100644
--- a/py-yapf/Makefile
+++ b/py-yapf/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	yapf-0.16.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
-GITHUB_PROJECT= yapf
+GITHUB_PROJECT=	yapf
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	nils%NetBSD.org@localhost
diff --git a/py-yapgvb/Makefile b/py-yapgvb/Makefile
index 571ecfe5fe..a62e05e5b4 100644
--- a/py-yapgvb/Makefile
+++ b/py-yapgvb/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2015/07/13 15:12:13 thomasklausner Exp $
 
 DISTNAME=	yapgvb-1.2.3-source
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/-source//}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-source//}
 CATEGORIES=	graphics
 MASTER_SITES=	https://yapgvb.googlecode.com/files/
 
@@ -10,14 +10,14 @@ HOMEPAGE=	https://code.google.com/p/yapgvb/
 COMMENT=	Yet Another Python Graphviz Binding
 LICENSE=	modified-bsd
 
-SUBST_CLASSES+=                 fix-paths
-SUBST_STAGE.fix-paths=          pre-configure
-SUBST_MESSAGE.fix-paths=        Fixing absolute paths.
-SUBST_FILES.fix-paths=          config_unix.py
-SUBST_SED.fix-paths=            -e 's,/usr/local,${PREFIX},g'
-SUBST_SED.fix-paths+=           -e 's,/usr/include,${PREFIX}/include,g'
-SUBST_SED.fix-paths+=           -e 's,/usr/lib,${PREFIX}/lib,g'
-SUBST_SED.fix-paths+=           -e 's,boost_python,boost_python-mt,g'
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
+SUBST_FILES.fix-paths=		config_unix.py
+SUBST_SED.fix-paths=		-e 's,/usr/local,${PREFIX},g'
+SUBST_SED.fix-paths+=		-e 's,/usr/include,${PREFIX}/include,g'
+SUBST_SED.fix-paths+=		-e 's,/usr/lib,${PREFIX}/lib,g'
+SUBST_SED.fix-paths+=		-e 's,boost_python,boost_python-mt,g'
 
 USE_LANGUAGES=	c c++
 EGG_NAME=	${DISTNAME:S/-source//}
diff --git a/py-yapps2/Makefile b/py-yapps2/Makefile
index c374c10262..e644689675 100644
--- a/py-yapps2/Makefile
+++ b/py-yapps2/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2014/12/31 13:58:47 thomasklausner Exp $
 
-VERS=	2.1.1
+VERS=		2.1.1
 DISTNAME=	yapps${VERS}
 PKGNAME=	${PYPKGPREFIX}-yapps2-${VERS}
 CATEGORIES=	textproc python
@@ -16,7 +16,7 @@ USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 2.1.1
 
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-yaprt/Makefile b/py-yaprt/Makefile
index 80ccce1a89..eb19127f07 100644
--- a/py-yaprt/Makefile
+++ b/py-yaprt/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/01/31 12:11:07 jihbed Exp $
 
 DISTNAME=	yaprt-0.0.7
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=y/yaprt/}
 
diff --git a/py-yellowhiggs/Makefile b/py-yellowhiggs/Makefile
index 34d9535303..db9ba5079a 100644
--- a/py-yellowhiggs/Makefile
+++ b/py-yellowhiggs/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	yellowhiggs-1.0a4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= math
+CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_PYPI:=y/yellowhiggs/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
diff --git a/py-z2pack/Makefile b/py-z2pack/Makefile
index 72f4d5bb5f..31003549aa 100644
--- a/py-z2pack/Makefile
+++ b/py-z2pack/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE=	http://z2pack.ethz.ch
 COMMENT=	Computation of topological numbers of band-structures
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=       ${PYPKGPREFIX}-decorator>=3.4.0:../../devel/py-decorator
-DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-decorator>=3.4.0:../../devel/py-decorator
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
diff --git a/py-zipline/Makefile b/py-zipline/Makefile
index 1d6a9c0b30..2ca95a8119 100644
--- a/py-zipline/Makefile
+++ b/py-zipline/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	zipline-1.1.1
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_PYPI:=z/zipline/}
 
diff --git a/py-zope.deprecation/Makefile b/py-zope.deprecation/Makefile
index 3d6f04bf05..0628025a43 100644
--- a/py-zope.deprecation/Makefile
+++ b/py-zope.deprecation/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=z/zope.deprecation/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
-HOMEPAGE=	 http://pypi.python.org/pypi/zope.deprecation
+HOMEPAGE=	http://pypi.python.org/pypi/zope.deprecation
 COMMENT=	Zope Deprecation Infrastructure
 LICENSE=	zpl-2.0
 
diff --git a/pydb/Makefile b/pydb/Makefile
index 1e104a81c4..63f72e3bb3 100644
--- a/pydb/Makefile
+++ b/pydb/Makefile
@@ -11,12 +11,12 @@ COMMENT=	The Extended Python Debugger
 
 DEPENDS+=	${PYPKGPREFIX}-ipython-[0-9]*:../../devel/py-ipython
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
 USE_LANGUAGES=	# none
 
-PKG_OPTIONS_VAR=                PKG_OPTIONS.pydb
-PKG_SUPPORTED_OPTIONS=          pyreadline
-PKG_SUGGESTED_OPTIONS=          pyreadline
+PKG_OPTIONS_VAR=		PKG_OPTIONS.pydb
+PKG_SUPPORTED_OPTIONS=		pyreadline
+PKG_SUGGESTED_OPTIONS=		pyreadline
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/pythia6/Makefile b/pythia6/Makefile
index 57a9d816d9..13c9c66ea9 100644
--- a/pythia6/Makefile
+++ b/pythia6/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://www.hepforge.org/archive/pythia6/
 COMMENT=	Program can be used to generate high-energy-physics events
 
-NO_BUILD= yes
+NO_BUILD=	yes
 USE_LANGUAGES=	fortran77
 
 INSTALLATION_DIRS=	include


Home | Main Index | Thread Index | Old Index