wip/*: order standard variables

[Roland Illig <roland.illig%gmx.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Mon Feb 19 01:42:02 2018 +0000
Changeset:	bbd9e2ccb62960b233feafb216aff8fcd79d4ad3

Modified Files:
	7kaa/Makefile
	Terminal/Makefile
	TextEdit/Makefile
	acme-client/Makefile
	acpid/Makefile
	adjustmtu/Makefile
	alsa-plugins/Makefile
	android-tools-adb/Makefile
	android-tools-adb8/Makefile
	anura/Makefile
	aquaria/Makefile
	aslc86k/Makefile
	basepkg/Makefile
	beanstalkd/Makefile
	blasr/Makefile
	bolt-lmm/Makefile
	boost-mp11/Makefile
	boost-threadpool/Makefile
	bowtie/Makefile
	bstone/Makefile
	bugzilla/Makefile
	bullet/Makefile
	cblas/Makefile
	cdbfasta/Makefile
	cgal/Makefile
	cgterm/Makefile
	coturn/Makefile
	cpdup/Makefile
	cpuminer-multi/Makefile
	crm114/Makefile
	daligner/Makefile
	dazz_db/Makefile
	deforaos-accessories/Makefile
	deforaos-framer/Makefile
	deforaos-init/Makefile
	deforaos-keyboard/Makefile
	deforaos-libdesktop/Makefile
	deforaos-probe/Makefile
	devkitARM-buildrules/Makefile
	devkitARM-tools/Makefile
	disque/Makefile
	dma/Makefile
	dovecot-antispam/Makefile
	dpic/Makefile
	dsk2rom/Makefile
	dunelegacy/Makefile
	eciadsl-usermode/Makefile
	ecore/Makefile
	eet/Makefile
	efreet/Makefile
	eina/Makefile
	elinks-libmm/Makefile
	elixir/Makefile
	emokit/Makefile
	es40-firmware/Makefile
	esmart/Makefile
	evas_generic_loaders17/Makefile
	execline/Makefile
	fairymax/Makefile
	fallingtime/Makefile
	freecell/Makefile
	fs2open/Makefile
	fsom/Makefile
	fvcom2/Makefile
	fvwm265/Makefile
	gmap/Makefile
	gmp-ecm/Makefile
	google-perftools/Makefile
	gst-plugins0.10-farsight/Makefile
	gtextutils/Makefile
	gtk2-engines-aurora/Makefile
	gtuxnes/Makefile
	hashcat-utils/Makefile
	htslib/Makefile
	ical2pcal/Makefile
	ifuse/Makefile
	ilbc-rfc3951/Makefile
	ioping/Makefile
	ioquake3-snapshot/Makefile
	jemboss-standalone/Makefile
	jgraphx/Makefile
	koha/Makefile
	lcdis/Makefile
	lci/Makefile
	ldapuseradd/Makefile
	libcgi/Makefile
	libcli/Makefile
	libdbglog/Makefile
	libgtkstylus/Makefile
	libifstat/Makefile
	libilbc/Makefile
	libjingle/Makefile
	libosmocore/Makefile
	libretro-4do/Makefile
	libretro-beetle-lynx/Makefile
	libretro-beetle-ngp/Makefile
	libretro-beetle-pce-fast/Makefile
	libretro-beetle-psx/Makefile
	libretro-beetle-saturn/Makefile
	libretro-beetle-sgx/Makefile
	libretro-beetle-vb/Makefile
	libretro-beetle-wswan/Makefile
	libretro-bluemsx/Makefile
	libretro-cap32/Makefile
	libretro-core-info/Makefile
	libretro-database/Makefile
	libretro-fbalpha/Makefile
	libretro-fceumm/Makefile
	libretro-fmsx/Makefile
	libretro-fuse/Makefile
	libretro-gambatte/Makefile
	libretro-genesis-plus-gx/Makefile
	libretro-glsl-shaders/Makefile
	libretro-mame2003/Makefile
	libretro-melonds/Makefile
	libretro-mgba/Makefile
	libretro-nestopia/Makefile
	libretro-o2em/Makefile
	libretro-parallel-n64/Makefile
	libretro-pcsx-rearmed/Makefile
	libretro-prboom/Makefile
	libretro-prosystem/Makefile
	libretro-px68k/Makefile
	libretro-snes9x/Makefile
	libretro-snes9x2005/Makefile
	libretro-snes9x2010/Makefile
	libretro-stella/Makefile
	libretro-tyrquake/Makefile
	libretro-vecx/Makefile
	libretro-virtualjaguar/Makefile
	libretro-yabause/Makefile
	libspt/Makefile
	libvidstab/Makefile
	libvips/Makefile
	libzrtp/Makefile
	lzs-lkm/Makefile
	mac-icon-standard/Makefile
	makedict/Makefile
	marathon-scenarios/Makefile
	mime-support/Makefile
	mule11/Makefile
	multiminer/Makefile
	mygui-git/Makefile
	ncbi-bin/Makefile
	ncbi-lib/Makefile
	nestopia-rpi/Makefile
	netbsd-build-tools/Makefile
	netbsd-light-desktop-artwork/Makefile
	nq/Makefile
	nullpop/Makefile
	ocaml-biniou/Makefile
	ocaml-camomile/Makefile
	ocaml-easy-format/Makefile
	ocaml-ounit/Makefile
	ocaml-zed/Makefile
	olsrd/Makefile
	openbsc/Makefile
	opensips/Makefile
	osg/Makefile
	osxinfo/Makefile
	otrtool/Makefile
	p6-Grammar-Profiler-Simple/Makefile
	p6-Perl6-MIME-Base64/Makefile
	p6-Template-Mustache/Makefile
	p6-json/Makefile
	p6-json_fast/Makefile
	p6-perl6-digest-md5/Makefile
	p6-perl6-encode/Makefile
	p6-perl6-http-status/Makefile
	p6-uri/Makefile
	p6-xml-writer/Makefile
	pentagram/Makefile
	pgstudio/Makefile
	phaethon/Makefile
	polarssl11/Makefile
	quantlib/Makefile
	quickfix/Makefile
	redshift/Makefile
	residualvm/Makefile
	retroarch-assets/Makefile
	rhapsody/Makefile
	rocksdb/Makefile
	s6-dns/Makefile
	s6-portable-utils/Makefile
	s6/Makefile
	scorched3d/Makefile
	sds/Makefile
	service/Makefile
	sfml+/Makefile
	skinlf/Makefile
	slowhttptest/Makefile
	smap/Makefile
	sollya/Makefile
	speedx/Makefile
	stardict-tools/Makefile
	structure/Makefile
	suitesparse/Makefile
	syncthing-inotify/Makefile
	tc-hasida-table/Makefile
	tcc/Makefile
	teng/Makefile
	testssl/Makefile
	tr2latex/Makefile
	tuxtype2/Makefile
	u-boot/Makefile
	ubit/Makefile
	unicorn5hc/Makefile
	unimrcp/Makefile
	uthash/Makefile
	vcg/Makefile
	vcsh/Makefile
	vee/Makefile
	vis/Makefile
	vista-fonts/Makefile
	vncselector/Makefile
	vpr/Makefile
	vreng/Makefile
	wanderer/Makefile
	watch/Makefile
	wise3/Makefile
	xalan-c-1.10/Makefile
	xalan-c/Makefile
	xerces-c-2.8.0/Makefile
	xonotic/Makefile
	xoreos/Makefile
	xtrackcad/Makefile
	xxhash/Makefile
	zbackup/Makefile
	ziparchive/Makefile
	zmap/Makefile

Log Message:
wip/*: order standard variables

pkglint has marked these packages as violating the standard order.
All changes have been done manually since there is no autofix mode.

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

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

diffstat:
 7kaa/Makefile                         |  4 ++--
 Terminal/Makefile                     |  2 +-
 TextEdit/Makefile                     |  3 +--
 acme-client/Makefile                  |  5 ++---
 acpid/Makefile                        |  2 +-
 adjustmtu/Makefile                    |  2 +-
 alsa-plugins/Makefile                 |  2 +-
 android-tools-adb/Makefile            |  2 +-
 android-tools-adb8/Makefile           |  2 +-
 anura/Makefile                        |  4 ++--
 aquaria/Makefile                      |  6 +++---
 aslc86k/Makefile                      | 11 ++++++-----
 basepkg/Makefile                      |  4 ++--
 beanstalkd/Makefile                   |  2 +-
 blasr/Makefile                        |  1 -
 bolt-lmm/Makefile                     |  1 -
 boost-mp11/Makefile                   |  2 +-
 boost-threadpool/Makefile             |  2 +-
 bowtie/Makefile                       |  3 +--
 bstone/Makefile                       |  2 +-
 bugzilla/Makefile                     |  1 -
 bullet/Makefile                       |  4 ++--
 cblas/Makefile                        |  2 +-
 cdbfasta/Makefile                     |  1 -
 cgal/Makefile                         |  2 +-
 cgterm/Makefile                       |  4 +---
 coturn/Makefile                       |  2 +-
 cpdup/Makefile                        |  1 -
 cpuminer-multi/Makefile               |  3 +--
 crm114/Makefile                       |  9 ++++-----
 daligner/Makefile                     |  1 -
 dazz_db/Makefile                      |  1 -
 deforaos-accessories/Makefile         |  1 -
 deforaos-framer/Makefile              |  1 -
 deforaos-init/Makefile                |  2 --
 deforaos-keyboard/Makefile            |  1 -
 deforaos-libdesktop/Makefile          |  1 -
 deforaos-probe/Makefile               |  1 -
 devkitARM-buildrules/Makefile         |  5 ++---
 devkitARM-tools/Makefile              |  2 +-
 disque/Makefile                       |  2 +-
 dma/Makefile                          |  5 ++---
 dovecot-antispam/Makefile             |  2 --
 dpic/Makefile                         |  2 +-
 dsk2rom/Makefile                      |  2 +-
 dunelegacy/Makefile                   |  2 +-
 eciadsl-usermode/Makefile             |  4 ++--
 ecore/Makefile                        |  1 -
 eet/Makefile                          |  1 -
 efreet/Makefile                       |  1 -
 eina/Makefile                         |  1 -
 elinks-libmm/Makefile                 |  2 +-
 elixir/Makefile                       |  3 +--
 emokit/Makefile                       |  9 +++++----
 es40-firmware/Makefile                |  2 +-
 esmart/Makefile                       |  2 +-
 evas_generic_loaders17/Makefile       |  3 +--
 execline/Makefile                     |  4 ++--
 fairymax/Makefile                     |  4 ++--
 fallingtime/Makefile                  |  4 ++--
 freecell/Makefile                     |  1 -
 fs2open/Makefile                      |  2 +-
 fsom/Makefile                         |  3 +--
 fvcom2/Makefile                       |  2 +-
 fvwm265/Makefile                      |  2 +-
 gmap/Makefile                         |  5 ++---
 gmp-ecm/Makefile                      |  2 +-
 google-perftools/Makefile             |  1 -
 gst-plugins0.10-farsight/Makefile     |  2 +-
 gtextutils/Makefile                   |  1 -
 gtk2-engines-aurora/Makefile          |  4 ++--
 gtuxnes/Makefile                      |  4 ++--
 hashcat-utils/Makefile                |  3 +--
 htslib/Makefile                       |  5 ++---
 ical2pcal/Makefile                    |  6 +++---
 ifuse/Makefile                        |  2 +-
 ilbc-rfc3951/Makefile                 |  4 ++--
 ioping/Makefile                       |  8 +++-----
 ioquake3-snapshot/Makefile            |  4 ++--
 jemboss-standalone/Makefile           |  4 +---
 jgraphx/Makefile                      |  4 ++--
 koha/Makefile                         |  2 --
 lcdis/Makefile                        |  3 ++-
 lci/Makefile                          |  2 +-
 ldapuseradd/Makefile                  |  3 +--
 libcgi/Makefile                       |  3 ++-
 libcli/Makefile                       |  6 ++----
 libdbglog/Makefile                    |  1 -
 libgtkstylus/Makefile                 |  1 -
 libifstat/Makefile                    |  2 +-
 libilbc/Makefile                      |  2 +-
 libjingle/Makefile                    |  1 -
 libosmocore/Makefile                  |  3 +--
 libretro-4do/Makefile                 |  5 ++---
 libretro-beetle-lynx/Makefile         |  5 ++---
 libretro-beetle-ngp/Makefile          |  5 ++---
 libretro-beetle-pce-fast/Makefile     |  5 ++---
 libretro-beetle-psx/Makefile          |  5 ++---
 libretro-beetle-saturn/Makefile       |  5 ++---
 libretro-beetle-sgx/Makefile          |  5 ++---
 libretro-beetle-vb/Makefile           |  5 ++---
 libretro-beetle-wswan/Makefile        |  5 ++---
 libretro-bluemsx/Makefile             |  5 ++---
 libretro-cap32/Makefile               |  3 +--
 libretro-core-info/Makefile           |  1 -
 libretro-database/Makefile            |  3 +--
 libretro-fbalpha/Makefile             |  5 ++---
 libretro-fceumm/Makefile              |  5 ++---
 libretro-fmsx/Makefile                |  5 ++---
 libretro-fuse/Makefile                |  5 ++---
 libretro-gambatte/Makefile            |  5 ++---
 libretro-genesis-plus-gx/Makefile     |  5 ++---
 libretro-glsl-shaders/Makefile        |  5 ++---
 libretro-mame2003/Makefile            |  5 ++---
 libretro-melonds/Makefile             |  4 ++--
 libretro-mgba/Makefile                |  3 +--
 libretro-nestopia/Makefile            |  3 +--
 libretro-o2em/Makefile                |  3 +--
 libretro-parallel-n64/Makefile        |  5 ++---
 libretro-pcsx-rearmed/Makefile        |  1 -
 libretro-prboom/Makefile              |  2 +-
 libretro-prosystem/Makefile           |  5 ++---
 libretro-px68k/Makefile               |  5 ++---
 libretro-snes9x/Makefile              |  3 +--
 libretro-snes9x2005/Makefile          |  5 ++---
 libretro-snes9x2010/Makefile          |  5 ++---
 libretro-stella/Makefile              |  5 ++---
 libretro-tyrquake/Makefile            |  5 ++---
 libretro-vecx/Makefile                |  3 +--
 libretro-virtualjaguar/Makefile       |  5 ++---
 libretro-yabause/Makefile             |  5 ++---
 libspt/Makefile                       |  2 --
 libvidstab/Makefile                   |  5 ++---
 libvips/Makefile                      |  9 ++++-----
 libzrtp/Makefile                      |  2 +-
 lzs-lkm/Makefile                      |  3 ++-
 mac-icon-standard/Makefile            |  3 +--
 makedict/Makefile                     |  3 +--
 marathon-scenarios/Makefile           |  6 +++---
 mime-support/Makefile                 |  2 +-
 mule11/Makefile                       |  2 +-
 multiminer/Makefile                   |  2 +-
 mygui-git/Makefile                    |  5 ++---
 ncbi-bin/Makefile                     |  4 ++--
 ncbi-lib/Makefile                     |  4 ++--
 nestopia-rpi/Makefile                 |  1 -
 netbsd-build-tools/Makefile           |  4 ++--
 netbsd-light-desktop-artwork/Makefile |  2 +-
 nq/Makefile                           |  2 +-
 nullpop/Makefile                      |  3 +--
 ocaml-biniou/Makefile                 |  2 +-
 ocaml-camomile/Makefile               |  2 +-
 ocaml-easy-format/Makefile            |  2 +-
 ocaml-ounit/Makefile                  |  2 +-
 ocaml-zed/Makefile                    |  2 +-
 olsrd/Makefile                        |  1 -
 openbsc/Makefile                      |  3 +--
 opensips/Makefile                     |  1 -
 osg/Makefile                          |  5 ++---
 osxinfo/Makefile                      |  5 ++---
 otrtool/Makefile                      |  5 +++--
 p6-Grammar-Profiler-Simple/Makefile   |  2 +-
 p6-Perl6-MIME-Base64/Makefile         |  2 +-
 p6-Template-Mustache/Makefile         |  2 +-
 p6-json/Makefile                      |  2 +-
 p6-json_fast/Makefile                 |  2 +-
 p6-perl6-digest-md5/Makefile          |  2 +-
 p6-perl6-encode/Makefile              |  2 +-
 p6-perl6-http-status/Makefile         |  2 +-
 p6-uri/Makefile                       |  2 +-
 p6-xml-writer/Makefile                |  2 +-
 pentagram/Makefile                    |  6 +++---
 pgstudio/Makefile                     |  2 +-
 phaethon/Makefile                     |  4 ++--
 polarssl11/Makefile                   |  2 +-
 quantlib/Makefile                     |  5 ++---
 quickfix/Makefile                     |  2 +-
 redshift/Makefile                     |  4 ++--
 residualvm/Makefile                   |  2 +-
 retroarch-assets/Makefile             |  4 ++--
 rhapsody/Makefile                     |  2 +-
 rocksdb/Makefile                      |  4 ++--
 s6-dns/Makefile                       |  2 +-
 s6-portable-utils/Makefile            |  2 +-
 s6/Makefile                           |  4 ++--
 scorched3d/Makefile                   |  2 +-
 sds/Makefile                          |  4 ++--
 service/Makefile                      |  5 +++--
 sfml+/Makefile                        |  2 +-
 skinlf/Makefile                       |  2 +-
 slowhttptest/Makefile                 |  2 +-
 smap/Makefile                         |  2 +-
 sollya/Makefile                       |  2 +-
 speedx/Makefile                       |  4 +---
 stardict-tools/Makefile               |  3 +--
 structure/Makefile                    |  4 +---
 suitesparse/Makefile                  |  1 -
 syncthing-inotify/Makefile            |  1 -
 tc-hasida-table/Makefile              |  3 +--
 tcc/Makefile                          |  3 +--
 teng/Makefile                         |  1 -
 testssl/Makefile                      |  5 ++---
 tr2latex/Makefile                     |  5 ++---
 tuxtype2/Makefile                     |  3 +--
 u-boot/Makefile                       |  1 -
 ubit/Makefile                         |  2 --
 unicorn5hc/Makefile                   |  3 +--
 unimrcp/Makefile                      |  2 +-
 uthash/Makefile                       |  2 +-
 vcg/Makefile                          |  1 -
 vcsh/Makefile                         |  2 +-
 vee/Makefile                          |  2 +-
 vis/Makefile                          | 10 ++++------
 vista-fonts/Makefile                  |  7 +++----
 vncselector/Makefile                  |  3 +--
 vpr/Makefile                          |  2 +-
 vreng/Makefile                        |  1 -
 wanderer/Makefile                     |  4 ++--
 watch/Makefile                        |  2 +-
 wise3/Makefile                        |  2 +-
 xalan-c-1.10/Makefile                 |  2 +-
 xalan-c/Makefile                      |  2 +-
 xerces-c-2.8.0/Makefile               |  2 +-
 xonotic/Makefile                      |  2 +-
 xoreos/Makefile                       |  2 +-
 xtrackcad/Makefile                    |  2 +-
 xxhash/Makefile                       |  6 +++---
 zbackup/Makefile                      |  1 -
 ziparchive/Makefile                   |  3 +--
 zmap/Makefile                         |  3 +--
 230 files changed, 294 insertions(+), 415 deletions(-)

diffs:
diff --git a/7kaa/Makefile b/7kaa/Makefile
index a592f15af2..98a4fcafc5 100644
--- a/7kaa/Makefile
+++ b/7kaa/Makefile
@@ -2,12 +2,12 @@
 
 DISTNAME=	7kaa-2.14.6
 CATEGORIES=	games
-GITHUB_TAG=	v${PKGVERSION_NOREV}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=the3dfxdude/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	Seven Kingdoms: Ancient Adversaries
 HOMEPAGE=	https://7kfans.com/
+COMMENT=	Seven Kingdoms: Ancient Adversaries
 LICENSE=	gnu-gpl-v2
 
 BUILD_DEPENDS+=	gettext-m4-[0-9]*:../../devel/gettext-m4
diff --git a/Terminal/Makefile b/Terminal/Makefile
index e490aa5177..915aa0993a 100644
--- a/Terminal/Makefile
+++ b/Terminal/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.5 2012/09/24 16:56:29 asau Exp $
 #
 
-PKGNAME=	Terminal-0.9.4
 DISTNAME=	terminal.app_0.9.4+cvs20051125.orig
+PKGNAME=	Terminal-0.9.4
 PKGREVISION=	2
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	ftp://ftp.it.debian.org/debian/pool/main/t/terminal.app/
diff --git a/TextEdit/Makefile b/TextEdit/Makefile
index b52ef6b0f2..0ed6011b25 100644
--- a/TextEdit/Makefile
+++ b/TextEdit/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.4 2012/09/24 16:56:29 asau Exp $
 #
 
-PKGNAME=	TextEdit-4.0
 DISTNAME=	textedit.app_4.0.orig
+PKGNAME=	TextEdit-4.0
 PKGREVISION=	2
 CATEGORIES=	editors gnustep
 MASTER_SITES=	http://www.gtlib.cc.gatech.edu/pub/debian/pool/main/t/textedit.app/
@@ -11,7 +11,6 @@ MAINTAINER=	metaridley%mchsi.com@localhost
 HOMEPAGE=	http://www.nongnu.org/backbone/apps.html
 COMMENT=	GNUstep text editor
 
-
 WRKSRC=		${WRKDIR}/textedit-4.0
 NO_CONFIGURE=	yes
 USE_LANGUAGES=	objc
diff --git a/acme-client/Makefile b/acme-client/Makefile
index 3a5a15ac87..bfb57a75ec 100644
--- a/acme-client/Makefile
+++ b/acme-client/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	acme-client-0.1.16
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=kristapsdz/}
+GITHUB_PROJECT=	acme-client-portable
+GITHUB_TAG=	VERSION_${PKGVERSION_NOREV:S/./_/g}
 
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	https://github.com/kristapsdz/acme-client/
 COMMENT=	Secure Let's Encrypt client
 LICENSE=	modified-bsd
 
-GITHUB_PROJECT=	acme-client-portable
-GITHUB_TAG=	VERSION_${PKGVERSION_NOREV:S/./_/g}
-
 USE_TOOLS+=	gmake
 MAKE_FILE=	GNUmakefile
 
diff --git a/acpid/Makefile b/acpid/Makefile
index 872f500295..c574b98ec8 100644
--- a/acpid/Makefile
+++ b/acpid/Makefile
@@ -2,9 +2,9 @@
 #
 
 DISTNAME=		acpid-1.0.4
+PKGREVISION=		2
 CATEGORIES=		linux sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=acpid/}
-PKGREVISION=		2
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://acpid.sourceforge.net/
diff --git a/adjustmtu/Makefile b/adjustmtu/Makefile
index 831bc0f18e..1239957420 100644
--- a/adjustmtu/Makefile
+++ b/adjustmtu/Makefile
@@ -5,11 +5,11 @@ DISTNAME=	adjustmtu-1.00
 PKGNAME=	${DISTNAME:S/00/0/}
 CATEGORIES=	net
 MASTER_SITES=	http://www.nerv.org/~ryo/files/programs/adjustmtu/
-LICENSE=	2-clause-bsd
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	${MASTER_SITES}
 COMMENT=	Detect MTU size and set MTU size of routing table
+LICENSE=	2-clause-bsd
 
 #ONLY_FOR_PLATFORM=	FreeBSD-* NetBSD-* OpenBSD-*
 
diff --git a/alsa-plugins/Makefile b/alsa-plugins/Makefile
index 0522167b05..70344465e7 100644
--- a/alsa-plugins/Makefile
+++ b/alsa-plugins/Makefile
@@ -2,8 +2,8 @@
 #
 
 DISTNAME=	alsa-plugins-1.0.18
-CATEGORIES=	audio
 PKGREVISION=	1
+CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/plugins/
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/android-tools-adb/Makefile b/android-tools-adb/Makefile
index 32cdc19283..11e7a48969 100644
--- a/android-tools-adb/Makefile
+++ b/android-tools-adb/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.4 2015/03/07 21:39:40 tnn2 Exp $
 
-MASTER_SITES=	https://github.com/android/
 DISTNAME=	${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=	android-tools-adb-5.0.2
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/android/
 GITHUB_PROJECT=	platform_system_core
 GITHUB_TAG=	android-5.0.2_r1
 
diff --git a/android-tools-adb8/Makefile b/android-tools-adb8/Makefile
index 6a521479c0..f717780580 100644
--- a/android-tools-adb8/Makefile
+++ b/android-tools-adb8/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.4 2015/03/07 21:39:40 tnn2 Exp $
 
-MASTER_SITES=	https://github.com/android/
 DISTNAME=	${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=	android-tools-adb-8.0.0.r11
 CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=android/}
 GITHUB_PROJECT=	platform_system_core
 GITHUB_TAG=	android-8.0.0_r11
 
diff --git a/anura/Makefile b/anura/Makefile
index 5651f8188f..2f4e2b8cea 100644
--- a/anura/Makefile
+++ b/anura/Makefile
@@ -3,12 +3,12 @@
 DISTNAME=	anura
 PKGNAME=	anura-0
 CATEGORIES=	games
-GITHUB_TAG=	6185d6d5f0774610375f4277d0e39d4f6f239202
 MASTER_SITES=	${MASTER_SITE_GITHUB:=anura-engine/}
-LICENSE=	modified-bsd AND mit
+GITHUB_TAG=	6185d6d5f0774610375f4277d0e39d4f6f239202
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
 COMMENT=	Fully-featured game engine
+LICENSE=	modified-bsd AND mit
 
 USE_LANGUAGES=	c c++
 GCC_REQD=	4.8
diff --git a/aquaria/Makefile b/aquaria/Makefile
index dff5ad199f..ff27ed09bf 100644
--- a/aquaria/Makefile
+++ b/aquaria/Makefile
@@ -3,13 +3,13 @@
 DISTNAME=	Aquaria
 PKGNAME=	aquaria-1.1.3
 CATEGORIES=	games
-GITHUB_TAG=	d8da8576e8321fd989cbb865c0e4d19d295a36b1
-GITHUB_PROJECT=	Aquaria
 MASTER_SITES=	${MASTER_SITE_GITHUB:=AquariaOSE/}
-LICENSE=	gnu-gpl-v2
+GITHUB_PROJECT=	Aquaria
+GITHUB_TAG=	d8da8576e8321fd989cbb865c0e4d19d295a36b1
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
 COMMENT=	Aquaria Open Source Edition
+LICENSE=	gnu-gpl-v2
 
 EXTRACT_USING=	gtar
 USE_CMAKE=	yes
diff --git a/aslc86k/Makefile b/aslc86k/Makefile
index b6aefa5703..cf9772fdfc 100644
--- a/aslc86k/Makefile
+++ b/aslc86k/Makefile
@@ -1,14 +1,15 @@
 # $NetBSD$
 
-PKGNAME=	aslc86k-1.9
 DISTNAME=	aslc86k
+PKGNAME=	aslc86k-1.9
 CATEGORIES=	devel
 MASTER_SITES=	http://mc.pp.se/dc/files/
 
-MAINTAINER=		tr%vispaul.me@localhost
-HOMEPAGE=		http://mc.pp.se/dc/files/
-COMMENT=		Macro assembler that can assemble programs of the Visual Memory System
-LICENSE=		mit
+MAINTAINER=	tr%vispaul.me@localhost
+HOMEPAGE=	http://mc.pp.se/dc/files/
+COMMENT=	Macro assembler that can assemble programs of the Visual Memory System
+LICENSE=	mit
+
 WRKSRC=			${WRKDIR}/as
 USE_TOOLS+=		gmake
 INSTALLATION_DIRS=	bin
diff --git a/basepkg/Makefile b/basepkg/Makefile
index 6a53db66ae..ecd36e93de 100644
--- a/basepkg/Makefile
+++ b/basepkg/Makefile
@@ -1,7 +1,5 @@
 # $NetBSD$
 
-DEPENDS+=	pkg_install>=20170419:../../pkgtools/pkg_install
-
 DISTNAME=	basepkg-1.3
 CATEGORIES=	pkgtools
 MASTER_SITES=	${MASTER_SITE_GITHUB:=user340/}
@@ -11,6 +9,8 @@ HOMEPAGE=	https://github.com/user340/
 COMMENT=	Framework of system packages of NetBSD
 LICENSE=	2-clause-bsd
 
+DEPENDS+=	pkg_install>=20170419:../../pkgtools/pkg_install
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 AUTO_MKDIRS=	yes
diff --git a/beanstalkd/Makefile b/beanstalkd/Makefile
index fef949d4c2..36e64550c0 100644
--- a/beanstalkd/Makefile
+++ b/beanstalkd/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.3 2014/06/01 12:49:34 thomasklausner Exp $
 #
 
-GITHUB_TAG=	v1.10
 GITHUB_PROJECT=	beanstalkd
+GITHUB_TAG=	v1.10
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	${GITHUB_PROJECT}${DISTNAME:S/v/-/1}
 CATEGORIES=	net
diff --git a/blasr/Makefile b/blasr/Makefile
index 4c1111c23b..0985636cbd 100644
--- a/blasr/Makefile
+++ b/blasr/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	http://acadix.biz/Ports/distfiles/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-
 COMMENT=	PacBio(R) long read aligner
 # Double-check this
 LICENSE=	modified-bsd
diff --git a/bolt-lmm/Makefile b/bolt-lmm/Makefile
index 6c1f20bf08..21c217eb63 100644
--- a/bolt-lmm/Makefile
+++ b/bolt-lmm/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	https://data.broadinstitute.org/alkesgroup/BOLT-LMM/downloads/ \
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	https://data.broadinstitute.org/alkesgroup/BOLT-LMM/
 COMMENT=	Statistics for testing association between phenotype and genotypes
-
 # Check this
 LICENSE=	gnu-gpl-v3
 
diff --git a/boost-mp11/Makefile b/boost-mp11/Makefile
index e943b05d6d..16fd387b6f 100644
--- a/boost-mp11/Makefile
+++ b/boost-mp11/Makefile
@@ -5,8 +5,8 @@ DISTNAME=	develop
 PKGNAME=	${GITHUB_PROJECT}-20170622
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pdimov/}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	${GITHUB_PROJECT}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/pdimov/mp11/
diff --git a/boost-threadpool/Makefile b/boost-threadpool/Makefile
index 525dc868aa..7f6508a74c 100644
--- a/boost-threadpool/Makefile
+++ b/boost-threadpool/Makefile
@@ -4,13 +4,13 @@ DISTNAME=	threadpool-0_2_5-src
 PKGNAME=	boost-${DISTNAME:S/_/./g:S/-src//}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=threadpool/}
+EXTRACT_SUFX=		.zip
 
 MAINTAINER=	tonnerre%NetBSD.org@localhost
 HOMEPAGE=	http://threadpool.sourceforge.net/
 COMMENT=	Cross-platform C++ thread pool library
 LICENSE=	boost-license
 
-EXTRACT_SUFX=		.zip
 WRKSRC=			${WRKDIR}/${DISTNAME}/threadpool
 INSTALLATION_DIRS=	include/boost
 INSTALLATION_DIRS+=	include/boost/threadpool
diff --git a/bowtie/Makefile b/bowtie/Makefile
index 2b48d4b82f..74c69da469 100644
--- a/bowtie/Makefile
+++ b/bowtie/Makefile
@@ -13,12 +13,11 @@
 # .include <bsd.port.post.mk>
 
 DISTNAME=	bowtie-1.0.1
-GITHUB_TAG=	v${PKGVERSION_NOREV}
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_GITHUB:=BenLangmead/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-
 COMMENT=	Ultrafast, memory-efficient short read aligner
 LICENSE=	artistic
 
diff --git a/bstone/Makefile b/bstone/Makefile
index 1de51ca2e6..5dd3d70276 100644
--- a/bstone/Makefile
+++ b/bstone/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.4 2015/09/13 20:07:57 yhardy Exp $
 
 GITHUB_PROJECT=	bstone
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	${GITHUB_PROJECT}-1.1.9
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bibendovsky/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://bibendovsky.github.io/bstone/
diff --git a/bugzilla/Makefile b/bugzilla/Makefile
index fed8fb98ca..513cba4a24 100644
--- a/bugzilla/Makefile
+++ b/bugzilla/Makefile
@@ -25,7 +25,6 @@ DEPENDS+=	p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils
 DEPENDS+=	p5-Math-Random-ISAAC-[0-9]*:../../math/p5-Math-Random-ISAAC
 DEPENDS+=	p5-File-Slurp-[0-9]*:../../devel/p5-File-Slurp
 DEPENDS+=	p5-JSON-XS-[0-9]*:../../converters/p5-JSON-XS
-
 DEPENDS+=	p5-GD-[0-9]*:../../graphics/p5-GD
 DEPENDS+=	p5-Chart-[0-9]*:../../graphics/p5-Chart
 DEPENDS+=	libwww-[0-9]*:../../www/libwww
diff --git a/bullet/Makefile b/bullet/Makefile
index ba38d11269..e7bf81ca9e 100644
--- a/bullet/Makefile
+++ b/bullet/Makefile
@@ -4,14 +4,14 @@
 DISTNAME=	bullet-2.87
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bulletphysics/}
+GITHUB_PROJECT=	bullet3
+GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://bulletphysics.org/wordpress/
 COMMENT=	Collision detection, soft body and rigid body dynamics library
 LICENSE=	mit
 
-GITHUB_PROJECT=	bullet3
-GITHUB_TAG=	${PKGVERSION_NOREV}
 
 USE_TOOLS+=	pkg-config
 USE_CMAKE=	yes
diff --git a/cblas/Makefile b/cblas/Makefile
index 11ce8a60d7..4bae5b4097 100644
--- a/cblas/Makefile
+++ b/cblas/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-PKGNAME=	cblas-1.0
 DISTNAME=	cblas
+PKGNAME=	cblas-1.0
 CATEGORIES=	math
 MASTER_SITES=	http://www.netlib.org/blas/blast-forum/
 EXTRACT_SUFX=	.tgz
diff --git a/cdbfasta/Makefile b/cdbfasta/Makefile
index 3f74365833..ef949e4814 100644
--- a/cdbfasta/Makefile
+++ b/cdbfasta/Makefile
@@ -9,7 +9,6 @@ CATEGORIES=	biology
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-
 COMMENT=	Fast indexing and retrieval of fasta records from flat file databases
 # LICENSE=	Unspecified
 
diff --git a/cgal/Makefile b/cgal/Makefile
index ba7ad44861..3cfb8b808e 100644
--- a/cgal/Makefile
+++ b/cgal/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.34 2017/08/24 20:03:00 adam Exp $
 
-PKGNAME=	cgal-4.11
 DISTNAME=	CGAL-4.11
+PKGNAME=	cgal-4.11
 CATEGORIES=	wip
 MASTER_SITES=	https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.11/
 EXTRACT_SUFX=	.tar.xz
diff --git a/cgterm/Makefile b/cgterm/Makefile
index af1d8cb6c9..b206e11338 100644
--- a/cgterm/Makefile
+++ b/cgterm/Makefile
@@ -8,9 +8,7 @@ MASTER_SITES=	http://www.paradroid.net/cgterm/
 MAINTAINER=	rodo%zlug.org@localhost
 HOMEPAGE=	http://www.paradroid.net/cgterm/
 COMMENT=	Commodore Graphics Telnet Client
-#LICENSE=	# TODO: (see mk/license.mk)
-
-LICENSE=		2-clause-bsd
+LICENSE=	2-clause-bsd
 
 NO_CONFIGURE=	yes
 
diff --git a/coturn/Makefile b/coturn/Makefile
index 9e30118356..090a80491f 100644
--- a/coturn/Makefile
+++ b/coturn/Makefile
@@ -2,8 +2,8 @@
 
 DISTNAME=	coturn-4.5.0.6
 CATEGORIES=	net
-GITHUB_PROJECT=	coturn
 MASTER_SITES=	${MASTER_SITE_GITHUB:=coturn/}
+GITHUB_PROJECT=	coturn
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
diff --git a/cpdup/Makefile b/cpdup/Makefile
index ee6f4a10c0..4e0749ebaa 100644
--- a/cpdup/Makefile
+++ b/cpdup/Makefile
@@ -10,7 +10,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	matthias%rampke.de@localhost
 HOMEPAGE=	http://apollo.backplane.com/FreeSrc/
 COMMENT=	Designed to make exact mirrors of directory trees
-
 LICENSE=	2-clause-bsd
 
 WRKSRC=	${WRKDIR}/cpdup
diff --git a/cpuminer-multi/Makefile b/cpuminer-multi/Makefile
index f050272f5d..f9c7ff3547 100644
--- a/cpuminer-multi/Makefile
+++ b/cpuminer-multi/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD$
 
-PKGNAME=	cpuminer-multi-1.3.1
-CATEGORIES=	finance
 DISTNAME=	cpuminer-multi-1.3.1
+CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tpruvot/}
 GITHUB_PROJECT=	cpuminer-multi
 GITHUB_TAG=	v${PKGVERSION_NOREV}-multi
diff --git a/crm114/Makefile b/crm114/Makefile
index 4462be4309..a9e60455b2 100644
--- a/crm114/Makefile
+++ b/crm114/Makefile
@@ -1,18 +1,17 @@
 # $NetBSD: Makefile,v 1.10 2012/09/24 18:26:55 asau Exp $
 
-PKGNAME=		crm114-20070810
 DISTNAME=		${PKGNAME}-BlameTheSegfault.src
+PKGNAME=		crm114-20070810
 CATEGORIES=		mail
+# For some reason, later versions are just being placed on the home page
+#   MASTER_SITES=		${MASTER_SITE_SOURCEFORGET:=crm114/}
+MASTER_SITES=		http://crm114.sourceforge.net/tarballs/
 
 MAINTAINER=		bsd%cs.ubc.ca@localhost
 HOMEPAGE=		http://crm114.sourceforge.net/
 COMMENT=		Fast and accurate learning classifier, good for spam
 LICENSE=		gnu-gpl-v2
 
-# For some reason, later versions are just being placed on the home page
-#   MASTER_SITES=		${MASTER_SITE_SOURCEFORGET:=crm114/}
-MASTER_SITES=		http://crm114.sourceforge.net/tarballs/
-
 USE_TOOLS+=		msgfmt
 
 DOCDIR=			${PREFIX}/share/doc/crm114
diff --git a/daligner/Makefile b/daligner/Makefile
index f7a89813b9..f59dbff757 100644
--- a/daligner/Makefile
+++ b/daligner/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES=	http://acadix.biz/Ports/distfiles/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-
 COMMENT=	Find all significant local alignments between reads
 # Double-check this
 LICENSE=	modified-bsd
diff --git a/dazz_db/Makefile b/dazz_db/Makefile
index edb698339d..67f6da8578 100644
--- a/dazz_db/Makefile
+++ b/dazz_db/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES=	http://acadix.biz/Ports/distfiles/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-
 COMMENT=	Dresden assembler for long read DNA projects
 # Double-check this
 LICENSE=	modified-bsd
diff --git a/deforaos-accessories/Makefile b/deforaos-accessories/Makefile
index 9ef3925e47..1985fc24d6 100644
--- a/deforaos-accessories/Makefile
+++ b/deforaos-accessories/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES=	https://www.defora.org/os/download/download/3700/
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	https://www.defora.org/
 COMMENT=	DeforaOS Accessories
-
 LICENSE=	gnu-gpl-v3
 
 USE_TOOLS+=	pkg-config
diff --git a/deforaos-framer/Makefile b/deforaos-framer/Makefile
index 2f45b63c7a..82a72b3f16 100644
--- a/deforaos-framer/Makefile
+++ b/deforaos-framer/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	https://www.defora.org/os/download/download/3291/
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	https://www.defora.org/
 COMMENT=	DeforaOS desktop window manager
-
 LICENSE=	gnu-gpl-v3
 
 USE_TOOLS+=	pkg-config
diff --git a/deforaos-init/Makefile b/deforaos-init/Makefile
index aba12f3b4e..c29a12cf43 100644
--- a/deforaos-init/Makefile
+++ b/deforaos-init/Makefile
@@ -1,6 +1,5 @@
 # $NetBSD: Makefile,v 1.3 2015/01/27 00:10:05 khorben Exp $
 
-
 DISTNAME=	Init-0.0.0
 PKGNAME=	deforaos-init-0.0.0
 CATEGORIES=	net
@@ -9,7 +8,6 @@ MASTER_SITES=	https://www.defora.org/os/download/download/3337/
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	https://www.defora.org/
 COMMENT=	DeforaOS system session
-
 LICENSE=	gnu-gpl-v3
 
 MAKE_FLAGS+=	PREFIX=${PREFIX}
diff --git a/deforaos-keyboard/Makefile b/deforaos-keyboard/Makefile
index 818a6ba129..c3712251bb 100644
--- a/deforaos-keyboard/Makefile
+++ b/deforaos-keyboard/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	https://www.defora.org/os/download/download/3696/
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	https://www.defora.org/
 COMMENT=	DeforaOS desktop virtual keyboard
-
 LICENSE=	gnu-gpl-v3
 
 CONFLICTS+=	gnome-control-center>=2.20.1
diff --git a/deforaos-libdesktop/Makefile b/deforaos-libdesktop/Makefile
index 59289e25e1..9afa0b00a0 100644
--- a/deforaos-libdesktop/Makefile
+++ b/deforaos-libdesktop/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	https://www.defora.org/os/download/download/4355/
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	https://www.defora.org/
 COMMENT=	DeforaOS desktop library
-
 LICENSE=	2-clause-bsd
 
 USE_TOOLS+=	pkg-config
diff --git a/deforaos-probe/Makefile b/deforaos-probe/Makefile
index 197ce2d337..4ac14e7ad8 100644
--- a/deforaos-probe/Makefile
+++ b/deforaos-probe/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES=	https://www.defora.org/os/download/download/3335/
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	https://www.defora.org/
 COMMENT=	DeforaOS system monitoring infrastructure
-
 LICENSE=	gnu-gpl-v3
 
 MAKE_FLAGS+=	PREFIX=${PREFIX}
diff --git a/devkitARM-buildrules/Makefile b/devkitARM-buildrules/Makefile
index c07e8c1c88..a298983919 100644
--- a/devkitARM-buildrules/Makefile
+++ b/devkitARM-buildrules/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD$
 
-DISTNAME=		devkitARM-buildrules-45
-CATEGORIES=		cross
-
+DISTNAME=	devkitARM-buildrules-45
+CATEGORIES=	cross
 MASTER_SITES=	${MASTER_SITE_GITHUB:=devkitPro/}
 GITHUB_PROJECT=	buildscripts
 GITHUB_TAG=	v20151213
diff --git a/devkitARM-tools/Makefile b/devkitARM-tools/Makefile
index 063e5c3e91..ccf9a81122 100644
--- a/devkitARM-tools/Makefile
+++ b/devkitARM-tools/Makefile
@@ -2,7 +2,6 @@
 
 DISTNAME=	devkitARM-tools-45
 CATEGORIES=	cross
-
 MASTER_SITES=	${MASTER_SITE_GITHUB:=devkitPro/}
 GITHUB_PROJECT=	general-tools
 GITHUB_TAG=	36c900196bbc3cf58375c8ae5f6ee46b3324b0a1
@@ -13,6 +12,7 @@ COMMENT=	General tools for devkitARM
 # They currently don't have a license:
 # https://github.com/devkitPro/general-tools/issues/1
 LICENSE=	devkitpro-license
+
 WRKSRC=		${WRKDIR}/general-tools-${GITHUB_TAG}
 USE_LANGUAGES=	c c++
 
diff --git a/disque/Makefile b/disque/Makefile
index ca9d30979e..b0f9b64957 100644
--- a/disque/Makefile
+++ b/disque/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-PKGNAME=	disque-1.0rc1
 DISTNAME=	disque-1.0-rc1
+PKGNAME=	disque-1.0rc1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=antirez/}
 GITHUB_PROJECT=	disque
diff --git a/dma/Makefile b/dma/Makefile
index 35a87c725e..e59dc65ddb 100644
--- a/dma/Makefile
+++ b/dma/Makefile
@@ -4,15 +4,14 @@ DISTNAME=	dma-${GITHUB_TAG}
 PKGNAME=	dma-0.11
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=corecode/}
+GITHUB_PROJECT=	dma
+GITHUB_TAG=	v0.11
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
 HOMEPAGE=	https://github.com/corecode/dma
 COMMENT=	The DragonFly Mail Agent
 LICENSE=	modified-bsd
 
-GITHUB_PROJECT=	dma
-GITHUB_TAG=	v0.11
-
 BUILD_DEFS+=		VARBASE
 
 PKG_SYSCONFSUBDIR=	dma
diff --git a/dovecot-antispam/Makefile b/dovecot-antispam/Makefile
index 4cbbd06d14..ee670b98b9 100644
--- a/dovecot-antispam/Makefile
+++ b/dovecot-antispam/Makefile
@@ -9,10 +9,8 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://johannes.sipsolutions.net/Projects/dovecot-antispam
 COMMENT=	Antispam plugin for Dovecot
-
 LICENSE=	gnu-gpl-v2
 
-
 USE_TOOLS+=		gmake
 #MAKE_DIRS+=		lib/dovecot/imap
 
diff --git a/dpic/Makefile b/dpic/Makefile
index ee1ae8e83e..12cbb27253 100644
--- a/dpic/Makefile
+++ b/dpic/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.5 2012/09/28 21:24:38 asau Exp $
 #
 
-PKGNAME=		dpic-07.2.2
 DISTNAME=		dpic
+PKGNAME=		dpic-07.2.2
 CATEGORIES=		textproc
 MASTER_SITES=		http://www.ece.uwaterloo.ca/~aplevich/dpic/
 
diff --git a/dsk2rom/Makefile b/dsk2rom/Makefile
index d4440bddbf..3120160606 100644
--- a/dsk2rom/Makefile
+++ b/dsk2rom/Makefile
@@ -4,8 +4,8 @@ DISTNAME=	dsk2rom-0.80
 CATEGORIES=	converters
 MASTER_SITES=	http://home.kabelfoon.nl/~vincentd/download/
 
-COMMENT=	MSX disk image conversion utility
 HOMEPAGE=	http://home.kabelfoon.nl/~vincentd/
+COMMENT=	MSX disk image conversion utility
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
diff --git a/dunelegacy/Makefile b/dunelegacy/Makefile
index b1e4610ec3..a4df851785 100644
--- a/dunelegacy/Makefile
+++ b/dunelegacy/Makefile
@@ -3,9 +3,9 @@
 
 DISTNAME=		dunelegacy-0.96.2-src
 PKGNAME=		${DISTNAME:S/-src//}
+CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dunelegacy/}
 EXTRACT_SUFX=		.tar.bz2
-CATEGORIES=		games
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://dunelegacy.sourceforge.net/
diff --git a/eciadsl-usermode/Makefile b/eciadsl-usermode/Makefile
index f8f3781931..88e2887fdc 100644
--- a/eciadsl-usermode/Makefile
+++ b/eciadsl-usermode/Makefile
@@ -8,10 +8,10 @@ MASTER_SITES=		http://benoit.is-a-geek.net/bsd-tmp/
 MAINTAINER=		imil%gcu.info@localhost
 COMMENT=		Driver for Globespan chipset-based ADSL USB modems
 
-BUILD_DEPENDS+=		userppp>=001107:../../net/userppp
-
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+BUILD_DEPENDS+=		userppp>=001107:../../net/userppp
+
 CHECK_PORTABILITY_SKIP=	configure.sav
 
 USE_TOOLS+=		gmake msgfmt
diff --git a/ecore/Makefile b/ecore/Makefile
index 6cb86876d7..0f08021858 100644
--- a/ecore/Makefile
+++ b/ecore/Makefile
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	dieter.NetBSD%pandora.be@localhost
 HOMEPAGE=	http://enlightenment.org/
 COMMENT=	Event Abstraction and Modular Convenience Library
-
 LICENSE=	2-clause-bsd
 
 PKGCONFIG_OVERRIDE=	ecore-con.pc.in ecore-evas.pc.in ecore-file.pc.in \
diff --git a/eet/Makefile b/eet/Makefile
index 0d3d403ba9..166417207a 100644
--- a/eet/Makefile
+++ b/eet/Makefile
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	dieter.NetBSD%pandora.be@localhost
 HOMEPAGE=	https://www.enlightenment.org/
 COMMENT=	Data encode/decode and storage library
-
 LICENSE=	2-clause-bsd
 
 USE_TOOLS+=	pkg-config
diff --git a/efreet/Makefile b/efreet/Makefile
index 1da6975ec7..3b0078f7c3 100644
--- a/efreet/Makefile
+++ b/efreet/Makefile
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	dieter.NetBSD%pandora.be@localhost
 HOMEPAGE=	http://enlightenment.org/
 COMMENT=	Interface Abstraction Library and Toolset
-
 LICENSE=	2-clause-bsd
 
 GNU_CONFIGURE=	yes
diff --git a/eina/Makefile b/eina/Makefile
index e788bdf8e6..d736c30c3b 100644
--- a/eina/Makefile
+++ b/eina/Makefile
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	dieter.NetBSD%pandora.be@localhost
 HOMEPAGE=	http://enlightenment.org/
 COMMENT=	Core data structure library
-
 LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
diff --git a/elinks-libmm/Makefile b/elinks-libmm/Makefile
index 46548a488c..a76a069669 100644
--- a/elinks-libmm/Makefile
+++ b/elinks-libmm/Makefile
@@ -5,8 +5,8 @@ PKGNAME=		elinks-0.13
 PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.or.cz/download/
-EXTRACT_SUFX=		.tar.bz2
 DIST_SUBDIR=		elinks-libmm
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://elinks.or.cz/
diff --git a/elixir/Makefile b/elixir/Makefile
index 7db375bf86..6b563fb32a 100644
--- a/elixir/Makefile
+++ b/elixir/Makefile
@@ -4,6 +4,7 @@ DISTNAME=	elixir-1.6.1
 PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=elixir-lang/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -11,8 +12,6 @@ HOMEPAGE=	http://elixir-lang.org/
 COMMENT=	Functional, meta-programming aware language built on top of Erlang VM
 LICENSE=	apache-2.0
 
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
 DEPENDS+=	erlang>=19.0:../../lang/erlang
 
 WRKSRC=				${WRKDIR}/${PKGBASE}-${PKGVERSION_NOREV}
diff --git a/emokit/Makefile b/emokit/Makefile
index b90e0c286e..2d6dc46312 100644
--- a/emokit/Makefile
+++ b/emokit/Makefile
@@ -1,17 +1,18 @@
 # $NetBSD: Makefile,v 1.2 2014/06/01 12:49:35 thomasklausner Exp $
+
 DISTNAME=	emokit-0.5
-EXTRACT_SUFX=	.zip
 CATEGORIES=	devel
+MASTER_SITES=	-https://github.com/openyou/emokit/archive/0.5.zip
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	nathanialsloss%yahoo.com.au@localhost
-LICENSE=	public-domain
 HOMEPAGE=	https://www.openyou.org
-MASTER_SITES=	-https://github.com/openyou/emokit/archive/0.5.zip
 COMMENT=	Emotive EPOC EEG development library
+LICENSE=	public-domain
 
-AUTO_MKDIRS=	yes
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
+AUTO_MKDIRS=	yes
 
 post-install:
 	${INSTALL} ${WRKSRC}/include/emokit/* ${DESTDIR}${PREFIX}/include/emokit
diff --git a/es40-firmware/Makefile b/es40-firmware/Makefile
index e4edff6681..b5cb241f35 100644
--- a/es40-firmware/Makefile
+++ b/es40-firmware/Makefile
@@ -5,6 +5,7 @@ DISTNAME=	es40
 PKGNAME=	${DISTNAME}-firmware-7.3
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.hp.com/pub/alphaserver/firmware/current_platforms/v7.3_release/ES40_series/ES40/
+DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -18,7 +19,6 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none
 
diff --git a/esmart/Makefile b/esmart/Makefile
index 0e6b5b3593..71b11b1ee7 100644
--- a/esmart/Makefile
+++ b/esmart/Makefile
@@ -5,8 +5,8 @@ DISTNAME=	esmart-0.9.0.042
 PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ezunix.org/pkgsrc/e17/snapshots/2008-09-25/
-
 EXTRACT_SUFX=	.tar.bz2
+
 MAINTAINER=	yazzy%yazzy.org@localhost
 HOMEPAGE=	http://enlightenment.org/
 COMMENT=	Collection of evas smart objects
diff --git a/evas_generic_loaders17/Makefile b/evas_generic_loaders17/Makefile
index 5b33af8e4f..454fe932d4 100644
--- a/evas_generic_loaders17/Makefile
+++ b/evas_generic_loaders17/Makefile
@@ -2,15 +2,14 @@
 #
 
 DISTNAME=	evas_generic_loaders-1.7.9
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	1
 
 MAINTAINER=	dieter.NetBSD%pandora.be@localhost
 HOMEPAGE=	https://www.enlightenment.org/
 COMMENT=	Extra loaders for GPL loaders and unstable libraries
-
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
diff --git a/execline/Makefile b/execline/Makefile
index a5f4e0be37..f7dcafe3b4 100644
--- a/execline/Makefile
+++ b/execline/Makefile
@@ -3,11 +3,11 @@
 DISTNAME=	execline-2.3.0.3
 CATEGORIES=	devel
 MASTER_SITES=	http://skarnet.org/software/execline/
-LICENSE=	isc
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	The execline scripting language
 HOMEPAGE=	http://skarnet.org/software/execline/
+COMMENT=	The execline scripting language
+LICENSE=	isc
 
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
diff --git a/fairymax/Makefile b/fairymax/Makefile
index 4945a7452d..af00cdf840 100644
--- a/fairymax/Makefile
+++ b/fairymax/Makefile
@@ -1,14 +1,14 @@
 # $NetBSD: Makefile,v 1.1 2014/11/13 19:58:09 krytarowski Exp $
 
-PKGNAME=	fairymax-4.8S
 DISTNAME=	${PKGBASE}
+PKGNAME=	fairymax-4.8S
 CATEGORIES=	games
 MASTER_SITES=	http://hgm.nubati.net/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://home.hccnet.nl/h.g.muller/CVfairy.html
 COMMENT=	AI for playing user-defined Chess variants
-# Uncommon permisive license
+# Uncommon permissive license
 #LICENSE=	fairymax
 
 USE_TOOLS+=	pod2man
diff --git a/fallingtime/Makefile b/fallingtime/Makefile
index 0185ef06bb..a531087991 100644
--- a/fallingtime/Makefile
+++ b/fallingtime/Makefile
@@ -3,12 +3,12 @@
 DISTNAME=	FallingTime-${GITHUB_TAG}
 PKGNAME=	fallingtime-${GITHUB_TAG}
 CATEGORIES=	games
-GITHUB_TAG=	1.0.1	
 MASTER_SITES=	${MASTER_SITE_GITHUB:=cxong/}
+GITHUB_TAG=	1.0.1
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	Arcade game inspired by Fall Down
 HOMEPAGE=	https://github.com/cxong/FallingTime/
+COMMENT=	Arcade game inspired by Fall Down
 LICENSE=	gnu-gpl-v2
 
 EXTRACT_USING=	gtar
diff --git a/freecell/Makefile b/freecell/Makefile
index d394c3efe7..93ab055a2f 100644
--- a/freecell/Makefile
+++ b/freecell/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES=	http://www.linusakesson.net/files/
 MAINTAINER=	esg%sdf.lonestar.org@localhost
 HOMEPAGE=	http://www.linusakesson.net/software/freecell.php
 COMMENT=	Console version of the solitaire game Freecell
-
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
diff --git a/fs2open/Makefile b/fs2open/Makefile
index 4979af26e0..5d9c7e9d04 100644
--- a/fs2open/Makefile
+++ b/fs2open/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.9 2015/08/18 20:48:41 yhardy Exp $
 #
 
-PKGNAME=	fs2_open-3.7.4
 DISTNAME=	fs2_open_${PKGVERSION_NOREV:S/./_/g}_src
+PKGNAME=	fs2_open-3.7.4
 CATEGORIES=	games
 MASTER_SITES=	http://swc.fs2downloads.com/builds/
 EXTRACT_SUFX=	.tgz
diff --git a/fsom/Makefile b/fsom/Makefile
index ef2837101d..f2bb0e75c9 100644
--- a/fsom/Makefile
+++ b/fsom/Makefile
@@ -7,14 +7,13 @@
 DISTNAME=	fsom-${PORTVERSION}
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_GITHUB:=outpaddling/}
+GITHUB_TAG=	${PORTVERSION}
 
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/ekg/fsom
 COMMENT=	Tiny C library for managing SOM (Self-Organizing Maps) neural networks
 LICENSE=	gnu-gpl-v3
 
-GITHUB_TAG=	${PORTVERSION}
-
 USE_LANGUAGES=	c c++
 
 CXXFLAGS+=	-fomit-frame-pointer -ffast-math
diff --git a/fvcom2/Makefile b/fvcom2/Makefile
index 474e8ad42a..63bba86044 100644
--- a/fvcom2/Makefile
+++ b/fvcom2/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.7 2013/01/27 22:12:38 outpaddling Exp $
 #
 
-PKGNAME=	fvcom-2.7.1
 DISTNAME=	sourcecode1
+PKGNAME=	fvcom-2.7.1
 CATEGORIES=	science
 MASTER_SITES=	http://fvcom.smast.umassd.edu/FVCOM/password_required/t2/
 
diff --git a/fvwm265/Makefile b/fvwm265/Makefile
index 3cc69653b3..de390587b1 100644
--- a/fvwm265/Makefile
+++ b/fvwm265/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2013/01/20 09:46:48 makoto Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -12,7 +13,6 @@ COMMENT=	Newer version of X11 Virtual window manager
 LICENSE=	gnu-gpl-v2
 
 #DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
-PKGREVISION=	1
 
 CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]* xpmroot-[0-9]*
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
diff --git a/gmap/Makefile b/gmap/Makefile
index d765de39e5..881a2115c6 100644
--- a/gmap/Makefile
+++ b/gmap/Makefile
@@ -4,14 +4,13 @@
 #               Generated by fbsd2pkg                     #
 ###########################################################
 
-PKGNAME=	gmap-${PORTVERSION}
 DISTNAME=	gmap-${PORTVERSION:C|\.|-|g}
-DISTFILES=	gmap-gsnap-${PORTVERSION:C|\.|-|g}${EXTRACT_SUFX}
+PKGNAME=	gmap-${PORTVERSION}
 CATEGORIES=	biology
 MASTER_SITES=	http://research-pub.gene.com/gmap/src/
+DISTFILES=	gmap-gsnap-${PORTVERSION:C|\.|-|g}${EXTRACT_SUFX}
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-
 COMMENT=	Genomic Mapping and Alignment Program for mRNA and EST Sequences
 #LICENSE=	
 
diff --git a/gmp-ecm/Makefile b/gmp-ecm/Makefile
index ea2be2ec4c..20071e4ee3 100644
--- a/gmp-ecm/Makefile
+++ b/gmp-ecm/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.8 2012/09/29 00:50:35 asau Exp $
 #
 
-PKGNAME=	gmp-${DISTNAME}
 DISTNAME=	ecm-6.2.2
+PKGNAME=	gmp-${DISTNAME}
 CATEGORIES=	math
 MASTER_SITES=	http://gforge.inria.fr/frs/download.php/4663/
 
diff --git a/google-perftools/Makefile b/google-perftools/Makefile
index 993acc51b3..3b430d3661 100644
--- a/google-perftools/Makefile
+++ b/google-perftools/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES=	http://google-perftools.googlecode.com/files/
 MAINTAINER=	cheusov%NetBSD.org@localhost
 HOMEPAGE=	http://google-perftools.googlecode.com/
 COMMENT=	Multi-threaded malloc() and nifty performance analysis tools
-
 LICENSE=	modified-bsd
 
 USE_TOOLS+=		perl:run
diff --git a/gst-plugins0.10-farsight/Makefile b/gst-plugins0.10-farsight/Makefile
index 77663fc344..495c0b1487 100644
--- a/gst-plugins0.10-farsight/Makefile
+++ b/gst-plugins0.10-farsight/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.5 2012/09/29 00:50:40 asau Exp $
 #
 
-PKGNAME=	gst-plugins0.10-farsight-0.12.11
 DISTNAME=	gst-plugins-farsight-0.12.11
+PKGNAME=	gst-plugins0.10-farsight-0.12.11
 PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://farsight.freedesktop.org/releases/gst-plugins-farsight/
diff --git a/gtextutils/Makefile b/gtextutils/Makefile
index 884dc72fd3..511031a4ac 100644
--- a/gtextutils/Makefile
+++ b/gtextutils/Makefile
@@ -9,7 +9,6 @@ CATEGORIES=	biology
 MASTER_SITES=	https://github.com/agordon/libgtextutils/releases/download/0.7/
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-
 COMMENT=	Gordon text utilities
 # LICENSE=	AGPLv3
 
diff --git a/gtk2-engines-aurora/Makefile b/gtk2-engines-aurora/Makefile
index d0453da826..b211f98dbc 100644
--- a/gtk2-engines-aurora/Makefile
+++ b/gtk2-engines-aurora/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
 PKGNAME=	gtk2-engines-aurora-1.5.1
-DISTFILES=	gtk2-engines-aurora_${PKGVERSION_NOREV}.orig.tar.gz	\
-		gtk2-engines-aurora_${PKGVERSION_NOREV}.orig-Aurora.tar.bz2
 CATEGORIES=	x11
 MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/universe/g/gtk2-engines-aurora/
+DISTFILES=	gtk2-engines-aurora_${PKGVERSION_NOREV}.orig.tar.gz	\
+		gtk2-engines-aurora_${PKGVERSION_NOREV}.orig-Aurora.tar.bz2
 
 MAINTAINER=	js%heap.zone@localhost
 COMMENT=	Aurora Gtk+ 2 theme engine
diff --git a/gtuxnes/Makefile b/gtuxnes/Makefile
index c35b3f16e6..4675d00de1 100644
--- a/gtuxnes/Makefile
+++ b/gtuxnes/Makefile
@@ -8,10 +8,10 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.scottweber.com/projects/gtk/gtuxnes/
 COMMENT=		Graphical launcher for TuxNES
 
-DEPENDS+=		tuxnes>=0.75:../../emulators/tuxnes
-
 ONLY_FOR_PLATFORM=	*-*-i386
 
+DEPENDS+=		tuxnes>=0.75:../../emulators/tuxnes
+
 BUILD_TARGET=		${EMPTY}
 
 USE_LIBTOOL=		yes
diff --git a/hashcat-utils/Makefile b/hashcat-utils/Makefile
index dd9988cafb..ad062527bb 100644
--- a/hashcat-utils/Makefile
+++ b/hashcat-utils/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	hashcat-utils-1.8
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=hashcat/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/hashcat/hashcat/
 COMMENT=	Set of small utilities that are useful in advanced password cracking
 LICENSE=	mit
 
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
 USE_TOOLS+=	perl
 BUILD_DIRS=	src
 BUILD_TARGET=	native
diff --git a/htslib/Makefile b/htslib/Makefile
index d9e7d452c1..cd158e4775 100644
--- a/htslib/Makefile
+++ b/htslib/Makefile
@@ -8,15 +8,14 @@
 DISTNAME=	htslib-${PORTVERSION}
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_GITHUB:=samtools/}
+GITHUB_PROJECT=	htslib
+GITHUB_TAG=	${PORTVERSION}
 
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	http://www.htslib.org/
 COMMENT=	C library for high-throughput sequencing data formats
 LICENSE=	mit
 
-GITHUB_PROJECT=	htslib
-GITHUB_TAG=	${PORTVERSION}
-
 USE_TOOLS+=	autoconf automake autoreconf gmake perl
 GNU_CONFIGURE=	yes
 REPLACE_PERL=	test/compare_sam.pl test/test.pl
diff --git a/ical2pcal/Makefile b/ical2pcal/Makefile
index c6bf8652ff..0e96e57d35 100644
--- a/ical2pcal/Makefile
+++ b/ical2pcal/Makefile
@@ -1,14 +1,14 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	ical2pcal
 DISTNAME=	862912973dc5404e3f98e7f8b546eca43d56e14b
 # version number is inside the script
 PKGNAME=	${GITHUB_PROJECT}-0.0.7
 CATEGORIES=	time
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pmarin/}
-EXTRACT_SUFX=	.zip
-DIST_SUBDIR=	${GITHUB_PROJECT}
+GITHUB_PROJECT=	ical2pcal
 GITHUB_TAG=	862912973dc5404e3f98e7f8b546eca43d56e14b
+DIST_SUBDIR=	${GITHUB_PROJECT}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	cherry%zyx.in@localhost
 HOMEPAGE=	https://github.com/pmarin/ical2pcal/
diff --git a/ifuse/Makefile b/ifuse/Makefile
index e52fab25dc..8a72b73b07 100644
--- a/ifuse/Makefile
+++ b/ifuse/Makefile
@@ -6,8 +6,8 @@ MASTER_SITES=	http://www.libimobiledevice.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	FUSE filesystem to access the contents of iOS devices
 HOMEPAGE=	http://www.libimobiledevice.org/
+COMMENT=	FUSE filesystem to access the contents of iOS devices
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
diff --git a/ilbc-rfc3951/Makefile b/ilbc-rfc3951/Makefile
index 2119e2209c..10621e44fb 100644
--- a/ilbc-rfc3951/Makefile
+++ b/ilbc-rfc3951/Makefile
@@ -12,10 +12,10 @@ COMMENT=		Internet Low Bit Rate Codec
 LICENSE=		GIPS-iLBC-license
 
 RESTRICTED=		Personal distribution only.
-NO_SRC_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/ioping/Makefile b/ioping/Makefile
index 3a3d15c01a..930cd61fa1 100755
--- a/ioping/Makefile
+++ b/ioping/Makefile
@@ -1,18 +1,16 @@
 # $NetBSD$
 
-CATEGORIES=	net
-
-COMMENT=	Monitor I/O latency in real time
-LICENSE=	gnu-gpl-v3
-
 GITHUB_PROJECT=	ioping
 DISTNAME=	v1.0
 PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
+CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=koct9i/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	miwarin%gmail.com@localhost
 HOMEPAGE=	https://github.com/koct9i/ioping/
+COMMENT=	Monitor I/O latency in real time
+LICENSE=	gnu-gpl-v3
 
 WRKSRC=	${WRKDIR}/${PKGNAME_NOREV:S/v//}
 
diff --git a/ioquake3-snapshot/Makefile b/ioquake3-snapshot/Makefile
index c58a7faff9..242b4f7ed0 100644
--- a/ioquake3-snapshot/Makefile
+++ b/ioquake3-snapshot/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	ioq3
-PKGNAME=	ioquake3-20170521
+GITHUB_TAG=	c65d2c2657fa6aecf498a5e1c20ffa706a80e818
 DISTNAME=	${GITHUB_TAG}
+PKGNAME=	ioquake3-20170521
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ioquake/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-GITHUB_TAG=	c65d2c2657fa6aecf498a5e1c20ffa706a80e818
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
diff --git a/jemboss-standalone/Makefile b/jemboss-standalone/Makefile
index d0936d061e..23343c95de 100644
--- a/jemboss-standalone/Makefile
+++ b/jemboss-standalone/Makefile
@@ -6,6 +6,7 @@ PKGNAME=		jemboss-standalone-2.9.0
 PKGREVISION=		1
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.uk.embnet.org/pub/EMBOSS/old/2.9.0/
+DIST_SUBDIR=		emboss/emboss-2.9.0
 
 MAINTAINER=	dprice%cs.nmsu.edu@localhost
 HOMEPAGE=	http://www.emboss.org/
@@ -17,9 +18,6 @@ DEPENDS+=	xerces-j>=1.2.0:../../textproc/xerces-j
 #DEPENDS+=	iasp>=2.1.1:../../www/iasp
 DEPENDS+=	apache-ant>=1.5.3.1:../../devel/apache-ant
 
-DIST_SUBDIR=		emboss/emboss-2.9.0
-
-
 PKG_DEFAULT_JVM=	sun-jdk13
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
diff --git a/jgraphx/Makefile b/jgraphx/Makefile
index 0d64102c77..d512535ca8 100644
--- a/jgraphx/Makefile
+++ b/jgraphx/Makefile
@@ -4,12 +4,12 @@ DISTNAME=	jgraphx-3_1_0_1
 PKGNAME=	${DISTNAME:C/_/./g}
 CATEGORIES=	graphics
 MASTER_SITES=	http://downloads.jgraph.com/downloads/jgraphx/archive/
-LICENSE=	modified-bsd
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/jgraph/jgraphx
 COMMENT=	Java Swing diagramming (graph visualisation) library
-EXTRACT_SUFX=	.zip
+LICENSE=	modified-bsd
 
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
 
diff --git a/koha/Makefile b/koha/Makefile
index 68a5f830cc..5997fb0759 100644
--- a/koha/Makefile
+++ b/koha/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Koha is an integrated library system
 
 DEPENDS+=	mysql-client>=5.5:../../databases/mysql55-client
 DEPENDS+=	apache>=2.4:../../www/apache24
-
 DEPENDS+=	p5-Date-Calc>=5.4:../../devel/p5-Date-Calc
 DEPENDS+=	p5-Date-Manip>=5.44:../../devel/p5-Date-Manip
 DEPENDS+=	p5-Digest-MD5>=2.35:../../security/p5-Digest-MD5
@@ -23,7 +22,6 @@ DEPENDS+=	p5-Mail-Sendmail>=0.79:../../mail/p5-Mail-Sendmail
 DEPENDS+=	p5-PDF-API2>=0.65:../../textproc/p5-PDF-API2
 DEPENDS+=	p5-XML-Simple>=2.18:../../textproc/p5-XML-Simple
 DEPENDS+=	p5-libwww>=5.808:../../www/p5-libwww
-
 DEPENDS+=	p5-Data-Random>=0.05:../../devel/p5-Data-Random
 DEPENDS+=	p5-GD-Barcode>=1.15:../../graphics/p5-GD-Barcode
 DEPENDS+=	p5-MARC-Record>=2.0.0:../../databases/p5-MARC-Record
diff --git a/lcdis/Makefile b/lcdis/Makefile
index 0f55c9dce6..7634ffc70c 100644
--- a/lcdis/Makefile
+++ b/lcdis/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-PKGNAME=	lcdis-1.04
 DISTNAME=	LCDISSRC
+PKGNAME=	lcdis-1.04
 CATEGORIES=	devel
 MASTER_SITES=	https://travispaul.me/distfiles/
 EXTRACT_SUFX=	.ZIP
@@ -10,6 +10,7 @@ MAINTAINER=		tr%vispaul.me@localhost
 HOMEPAGE=		https://web.archive.org/web/20110927100411/http://www.maushammer.com/vmu.html
 COMMENT=		Disassembler for the Sega VMU/VMS
 LICENSE=		gnu-gpl-v2
+
 WRKSRC=			${WRKDIR}
 INSTALLATION_DIRS=	bin
 
diff --git a/lci/Makefile b/lci/Makefile
index 61138335d7..60d5d50c8a 100644
--- a/lci/Makefile
+++ b/lci/Makefile
@@ -7,8 +7,8 @@ MASTER_SITES=	${MASTER_SITE_GITHUB:=justinmeza/}
 GITHUB_TAG=	v0.11.2
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	A LOLCODE interpreter written in C
 HOMEPAGE=	http://lolcode.org/
+COMMENT=	A LOLCODE interpreter written in C
 LICENSE=	gnu-gpl-v3
 
 EXTRACT_USING=	gtar
diff --git a/ldapuseradd/Makefile b/ldapuseradd/Makefile
index bbc4fa9f23..ebe75b4725 100644
--- a/ldapuseradd/Makefile
+++ b/ldapuseradd/Makefile
@@ -2,11 +2,10 @@
 
 DISTNAME=	ldapuseradd-0.9.2
 CATEGORIES=	databases
+MASTER_SITES=	http://ftp.unixdev.net/pub/unixdev/ldapuseradd/0.9.2/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	inittab%unixdev.net@localhost
-MASTER_SITES=	http://ftp.unixdev.net/pub/unixdev/ldapuseradd/0.9.2/
-
 HOMEPAGE=	http://www.unixdev.net/projects/ldapuseradd/
 COMMENT=	LDAP User/Group Management Toolset
 
diff --git a/libcgi/Makefile b/libcgi/Makefile
index 9efbcb6358..c74d7aae9f 100644
--- a/libcgi/Makefile
+++ b/libcgi/Makefile
@@ -1,12 +1,13 @@
 # $NetBSD: Makefile,v 1.1 2013/03/08 12:36:39 makoto Exp $
+
 DISTNAME=	libcgi-1.0
 CATEGORIES=	www
 MASTER_SITES=	http://prdownloads.sourceforge.net/libcgi/
-LICENSE=	generic-nonlicense
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://libcgi.sourceforge.net/
 COMMENT=	Library for authoring cgi
+LICENSE=	generic-nonlicense
 
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
diff --git a/libcli/Makefile b/libcli/Makefile
index 50748fd1d2..4932a0ed2f 100644
--- a/libcli/Makefile
+++ b/libcli/Makefile
@@ -7,13 +7,11 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libcli/}
 
 MAINTAINER=	haaaad%gmail.com@localhost
 HOMEPAGE=	http://libcli.sourceforge.net/
-
-COMMENT=	"Provides a shared library for including a Cisco-like CLI."
-
+COMMENT=	Provides a shared library for including a Cisco-like CLI.
 
 USE_LANGUAGES+=	c
 
-WRKSRC=			${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 INSTALLATION_DIRS=	lib share/examples
 
diff --git a/libdbglog/Makefile b/libdbglog/Makefile
index 499af01d4d..2692cc9f0c 100644
--- a/libdbglog/Makefile
+++ b/libdbglog/Makefile
@@ -4,7 +4,6 @@
 DISTNAME=	libdbglog-1.5.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dbglog/}
-
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ondrej.tuma%firma.seznam.cz@localhost
diff --git a/libgtkstylus/Makefile b/libgtkstylus/Makefile
index a9a36fa812..11db20e7c3 100644
--- a/libgtkstylus/Makefile
+++ b/libgtkstylus/Makefile
@@ -8,7 +8,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	http://gpe.linuxtogo.org/
 COMMENT=	Gtk+ 2 third-button emulation library
-
 LICENSE=	gnu-lgpl-v2.1
 
 USE_TOOLS+=	pkg-config
diff --git a/libifstat/Makefile b/libifstat/Makefile
index 5fa52e3d45..7e3092c1a2 100644
--- a/libifstat/Makefile
+++ b/libifstat/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.1 2013/03/29 22:23:30 florian-geiges Exp $
 #
 
-PKGNAME=		libifstat-1.1
 DISTNAME=		ifstat-1.1
+PKGNAME=		libifstat-1.1
 CATEGORIES=		net devel
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/libilbc/Makefile b/libilbc/Makefile
index a5898138da..728da01697 100644
--- a/libilbc/Makefile
+++ b/libilbc/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.2 2015/08/10 22:37:52 yhardy Exp $
 
 GITHUB_PROJECT=	libilbc
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	${GITHUB_PROJECT}-2.0.2
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_GITHUB:=TimothyGu/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/TimothyGu/libilbc/
diff --git a/libjingle/Makefile b/libjingle/Makefile
index 36973e9be8..977d1f2ae2 100644
--- a/libjingle/Makefile
+++ b/libjingle/Makefile
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	yacht%users.sourceforge.net@localhost
 HOMEPAGE=	http://code.google.com/p/libjingle/
 COMMENT=	Google Talk Voice and P2P Interoperability Library
-
 LICENSE=	modified-bsd
 
 #GNU_CONFIGURE=	yes
diff --git a/libosmocore/Makefile b/libosmocore/Makefile
index ee5604d32b..3747840d96 100644
--- a/libosmocore/Makefile
+++ b/libosmocore/Makefile
@@ -2,14 +2,13 @@
 #
 
 DISTNAME=	libosmocore-0.1.30
-EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	devel
 MASTER_SITES=	http://openbsc.osmocom.org/trac/raw-attachment/wiki/Tarballs/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	http://www.osmocom.org/
 COMMENT=	This is the libosmocore library
-
 LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake
diff --git a/libretro-4do/Makefile b/libretro-4do/Makefile
index 35c1ed42ad..518b1f6cc3 100644
--- a/libretro-4do/Makefile
+++ b/libretro-4do/Makefile
@@ -3,13 +3,12 @@
 DISTNAME=	libretro-4do-20170724
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	4do-libretro
+GITHUB_TAG=	368a8eb2b8eb61a17d1d5be6edc37775820634c7
 
 HOMEPAGE=	https://wiki.libretro.com/index.php?title=4DO
 COMMENT=	Libretro core for 3DO emulation
 
-GITHUB_PROJECT=	4do-libretro
-GITHUB_TAG=	368a8eb2b8eb61a17d1d5be6edc37775820634c7
-
 USE_TOOLS=	gmake
 
 .include "../../mk/endian.mk"
diff --git a/libretro-beetle-lynx/Makefile b/libretro-beetle-lynx/Makefile
index 98e49d6e88..c1829db8d2 100644
--- a/libretro-beetle-lynx/Makefile
+++ b/libretro-beetle-lynx/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-beetle-lynx-20170929
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	beetle-lynx-libretro
+GITHUB_TAG=	0225ca4e2429a82378476f4e4d5f8b303c1a7cb3
 
 HOMEPAGE=	https://docs.libretro.com/library/beetle_handy/
 COMMENT=	Libretro core based on the Mednafen Atari Lynx emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	beetle-lynx-libretro
-GITHUB_TAG=	0225ca4e2429a82378476f4e4d5f8b303c1a7cb3
-
 USE_TOOLS=	gmake
 USE_LANGUAGES=	c c++
 
diff --git a/libretro-beetle-ngp/Makefile b/libretro-beetle-ngp/Makefile
index a24a3228ec..e0e45dd89e 100644
--- a/libretro-beetle-ngp/Makefile
+++ b/libretro-beetle-ngp/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-beetle-ngp-20171024
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	beetle-ngp-libretro
+GITHUB_TAG=	ab5d1d5933134c97d4c04a9a045887bf3bdb5aba
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 HOMEPAGE=	https://docs.libretro.com/library/beetle_neopop/
 COMMENT=	Libretro core based on the Mednafen Neo Geo Pocket emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	beetle-ngp-libretro
-GITHUB_TAG=	ab5d1d5933134c97d4c04a9a045887bf3bdb5aba
-
 USE_TOOLS=	gmake
 USE_LANGUAGES=	c c++
 
diff --git a/libretro-beetle-pce-fast/Makefile b/libretro-beetle-pce-fast/Makefile
index 087cc833f1..568b6db69e 100644
--- a/libretro-beetle-pce-fast/Makefile
+++ b/libretro-beetle-pce-fast/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-beetle-pce-fast-20171202
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	beetle-pce-fast-libretro
+GITHUB_TAG=	0f1326a24a6cc802f7a6ece75a3d95232101f240
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 HOMEPAGE=	https://docs.libretro.com/library/beetle_pce_fast/
 COMMENT=	Libretro core based on the Mednafen PC Engine emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	beetle-pce-fast-libretro
-GITHUB_TAG=	0f1326a24a6cc802f7a6ece75a3d95232101f240
-
 EXTRACT_USING=	bsdtar
 
 USE_TOOLS+=	gmake
diff --git a/libretro-beetle-psx/Makefile b/libretro-beetle-psx/Makefile
index a351353465..3c9404fe30 100644
--- a/libretro-beetle-psx/Makefile
+++ b/libretro-beetle-psx/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-beetle-psx-20171207
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	beetle-psx-libretro
+GITHUB_TAG=	c9a566475e4cc2ba072a97cbae315c97fe971867
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 HOMEPAGE=	https://docs.libretro.com/library/beetle_psx/
 COMMENT=	Libretro core based on the Mednafen PlayStation emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	beetle-psx-libretro
-GITHUB_TAG=	c9a566475e4cc2ba072a97cbae315c97fe971867
-
 EXTRACT_USING=	bsdtar
 
 USE_TOOLS=	gmake
diff --git a/libretro-beetle-saturn/Makefile b/libretro-beetle-saturn/Makefile
index 45cc1b9c1a..249b1f7e04 100644
--- a/libretro-beetle-saturn/Makefile
+++ b/libretro-beetle-saturn/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-beetle-saturn-20171209
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	beetle-saturn-libretro
+GITHUB_TAG=	b5ee7662683051ba11a4c383734d9ddaf3b1e37a
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 HOMEPAGE=	https://docs.libretro.com/library/beetle_saturn/
 COMMENT=	Libretro core based on the Mednafen Sega Saturn emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	beetle-saturn-libretro
-GITHUB_TAG=	b5ee7662683051ba11a4c383734d9ddaf3b1e37a
-
 EXTRACT_USING=	bsdtar
 
 USE_TOOLS=	gmake
diff --git a/libretro-beetle-sgx/Makefile b/libretro-beetle-sgx/Makefile
index 00e96b1418..207314e5b7 100644
--- a/libretro-beetle-sgx/Makefile
+++ b/libretro-beetle-sgx/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-beetle-sgx-20170917
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	beetle-supergrafx-libretro
+GITHUB_TAG=	673a8260521f76467a6967aceb9a0cdbad60c137
 
 HOMEPAGE=	https://docs.libretro.com/library/beetle_sgx/
 COMMENT=	Libretro core based on the Mednafen SuperGrafx emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	beetle-supergrafx-libretro
-GITHUB_TAG=	673a8260521f76467a6967aceb9a0cdbad60c137
-
 EXTRACT_USING+=	bsdtar
 
 USE_TOOLS=	gmake
diff --git a/libretro-beetle-vb/Makefile b/libretro-beetle-vb/Makefile
index 8bcaa4256b..bef9ee964c 100644
--- a/libretro-beetle-vb/Makefile
+++ b/libretro-beetle-vb/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-beetle-vb-20171024
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	beetle-vb-libretro
+GITHUB_TAG=	2b8353257abd61786b80ad5a7de006f65521a8ba
 
 HOMEPAGE=	https://wiki.libretro.com/index.php?title=Beetle/Mednafen_VB
 COMMENT=	Libretro core based on the Mednafen VirtualBoy emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	beetle-vb-libretro
-GITHUB_TAG=	2b8353257abd61786b80ad5a7de006f65521a8ba
-
 USE_TOOLS=	gmake
 USE_LANGUAGES=	c c++
 
diff --git a/libretro-beetle-wswan/Makefile b/libretro-beetle-wswan/Makefile
index 2ffed32c86..bb5ac898cd 100644
--- a/libretro-beetle-wswan/Makefile
+++ b/libretro-beetle-wswan/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-beetle-wswan-20171024
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	beetle-wswan-libretro
+GITHUB_TAG=	ff4bbff7597b772bb5aec38dfada0b915840fb39
 
 HOMEPAGE=	https://docs.libretro.com/library/beetle_cygne/
 COMMENT=	Libretro core based on the Mednafen Wonderswan emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	beetle-wswan-libretro
-GITHUB_TAG=	ff4bbff7597b772bb5aec38dfada0b915840fb39
-
 USE_TOOLS=	gmake
 USE_LANGUAGES=	c c++
 
diff --git a/libretro-bluemsx/Makefile b/libretro-bluemsx/Makefile
index 60831aaece..7bfbb96321 100644
--- a/libretro-bluemsx/Makefile
+++ b/libretro-bluemsx/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-bluemsx-20171116
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	blueMSX-libretro
+GITHUB_TAG=	cb6133979ea624c7ce1247051bc185a42fa9d342
 
 HOMEPAGE=	https://docs.libretro.com/library/bluemsx/
 COMMENT=	Libretro core for accurate MSX/MSX2/ColecoVision/SVI/SG-1000 emulation
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	blueMSX-libretro
-GITHUB_TAG=	cb6133979ea624c7ce1247051bc185a42fa9d342
-
 EXTRACT_USING=	bsdtar
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS=	gmake
diff --git a/libretro-cap32/Makefile b/libretro-cap32/Makefile
index 502b9bd325..165a354af4 100644
--- a/libretro-cap32/Makefile
+++ b/libretro-cap32/Makefile
@@ -3,13 +3,12 @@
 DISTNAME=	libretro-cap32-20171109
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_TAG=	3e14cebabb3d58dd33990158a2379f3759975409
 
 HOMEPAGE=	https://docs.libretro.com/library/caprice32/
 COMMENT=	Libretro core based on the Caprice32 Amstrad CPC emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_TAG=	3e14cebabb3d58dd33990158a2379f3759975409
-
 USE_TOOLS=	gmake
 
 .include "../../mk/endian.mk"
diff --git a/libretro-core-info/Makefile b/libretro-core-info/Makefile
index ae0432d987..74f945932a 100644
--- a/libretro-core-info/Makefile
+++ b/libretro-core-info/Makefile
@@ -3,7 +3,6 @@
 DISTNAME=	libretro-core-info-1.7.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
-
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 HOMEPAGE=	https://www.libretro.com/
diff --git a/libretro-database/Makefile b/libretro-database/Makefile
index e28999cf0a..f700d1dda4 100644
--- a/libretro-database/Makefile
+++ b/libretro-database/Makefile
@@ -3,12 +3,11 @@
 DISTNAME=	libretro-database-20171109
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_TAG=	8f258d16dc35bd0ba4f1f538b035116f308165c7
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 COMMENT=	ROM scanning data and cheats provided by the libretro project
 
-GITHUB_TAG=	8f258d16dc35bd0ba4f1f538b035116f308165c7
-
 EXTRACT_USING=	bsdtar
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
diff --git a/libretro-fbalpha/Makefile b/libretro-fbalpha/Makefile
index d3262c5d48..972dca666e 100644
--- a/libretro-fbalpha/Makefile
+++ b/libretro-fbalpha/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-fbalpha-0.2.97.42.20171123
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	fbalpha
+GITHUB_TAG=	7332926d40c376a716c973bb1ea39171e4437b53
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 HOMEPAGE=	https://wiki.libretro.com/index.php?title=Final_Burn_Alpha
 COMMENT=	Libretro core based on the FB Alpha arcade emulator
 LICENSE=	no-commercial-use
 
-GITHUB_PROJECT=	fbalpha
-GITHUB_TAG=	7332926d40c376a716c973bb1ea39171e4437b53
-
 USE_TOOLS=	gmake
 
 MAKE_FILE=	makefile.libretro
diff --git a/libretro-fceumm/Makefile b/libretro-fceumm/Makefile
index e070b167d3..9d297567fb 100644
--- a/libretro-fceumm/Makefile
+++ b/libretro-fceumm/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-fceumm-20171204
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	libretro-fceumm
+GITHUB_TAG=	56b786df6c3dcfbe6221bcbfed3e66acc7ccb24b
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 HOMEPAGE=	https://docs.libretro.com/library/fceumm/
 COMMENT=	Libretro core based on the FCEUmm Famicom/NES emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	libretro-fceumm
-GITHUB_TAG=	56b786df6c3dcfbe6221bcbfed3e66acc7ccb24b
-
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS+=	gmake
 
diff --git a/libretro-fmsx/Makefile b/libretro-fmsx/Makefile
index 2e8350395d..ec0ee3d3ac 100644
--- a/libretro-fmsx/Makefile
+++ b/libretro-fmsx/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-fmsx-20170703
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	fmsx-libretro
+GITHUB_TAG=	7c0c7333a02ebe885c2f469a4dac362faaf23189
 
 HOMEPAGE=	https://docs.libretro.com/library/fmsx/
 COMMENT=	Libretro core for emulation of the MSX family of home computers
 LICENSE=	no-commercial-use
 
-GITHUB_PROJECT=	fmsx-libretro
-GITHUB_TAG=	7c0c7333a02ebe885c2f469a4dac362faaf23189
-
 USE_TOOLS=	gmake
 
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
diff --git a/libretro-fuse/Makefile b/libretro-fuse/Makefile
index 1a069a6cd8..e846ab236f 100644
--- a/libretro-fuse/Makefile
+++ b/libretro-fuse/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-fuse-20171202
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	fuse-libretro
+GITHUB_TAG=	a990e57c5fc3f425fa5185d627723a6525eeba16
 
 HOMEPAGE=	https://docs.libretro.com/library/fuse/
 COMMENT=	Libretro core based on the FUSE ZX Spectrum emulator
 LICENSE=	gnu-gpl-v3
 
-GITHUB_PROJECT=	fuse-libretro
-GITHUB_TAG=	a990e57c5fc3f425fa5185d627723a6525eeba16
-
 USE_TOOLS=	gmake
 
 .include "../../mk/endian.mk"
diff --git a/libretro-gambatte/Makefile b/libretro-gambatte/Makefile
index 38013a9c9a..a919b523bc 100644
--- a/libretro-gambatte/Makefile
+++ b/libretro-gambatte/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-gambatte-20171024
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	gambatte-libretro
+GITHUB_TAG=	bcfd2df6d946c200fc6e50b0956b209582221492
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://docs.libretro.com/library/gambatte/
 COMMENT=	Libretro core based on the Gambatte Game Boy Color emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	gambatte-libretro
-GITHUB_TAG=	bcfd2df6d946c200fc6e50b0956b209582221492
-
 USE_LANGUAGES=	c c++
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS+=	gmake
diff --git a/libretro-genesis-plus-gx/Makefile b/libretro-genesis-plus-gx/Makefile
index 11bb7e0415..eaeadcba22 100644
--- a/libretro-genesis-plus-gx/Makefile
+++ b/libretro-genesis-plus-gx/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-genesis-plus-gx-20171128
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	Genesis-Plus-GX
+GITHUB_TAG=	4e1b797e86f5f4d1113063037a69ef5dc351aca7
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 HOMEPAGE=	https://docs.libretro.com/library/genesis_plus_gx/
 COMMENT=	Libretro core based on the Genesis Plus Sega 8/16 bit emulator
 LICENSE=	picodrive-license
 
-GITHUB_PROJECT=	Genesis-Plus-GX
-GITHUB_TAG=	4e1b797e86f5f4d1113063037a69ef5dc351aca7
-
 EXTRACT_USING=	bsdtar
 USE_TOOLS=	gmake
 
diff --git a/libretro-glsl-shaders/Makefile b/libretro-glsl-shaders/Makefile
index 7d52fee3f4..de2fc92c29 100644
--- a/libretro-glsl-shaders/Makefile
+++ b/libretro-glsl-shaders/Makefile
@@ -3,13 +3,12 @@
 DISTNAME=	libretro-glsl-shaders-20171011
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	glsl-shaders
+GITHUB_TAG=	6565f3d5e9a34103a7dce34eec8a7f5332d6f9d1
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 COMMENT=	Libretro GLSL shaders
 
-GITHUB_PROJECT=	glsl-shaders
-GITHUB_TAG=	6565f3d5e9a34103a7dce34eec8a7f5332d6f9d1
-
 EXTRACT_USING=	bsdtar
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
diff --git a/libretro-mame2003/Makefile b/libretro-mame2003/Makefile
index 087a747815..3e7c946058 100644
--- a/libretro-mame2003/Makefile
+++ b/libretro-mame2003/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-mame2003-20171204
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	mame2003-libretro
+GITHUB_TAG=	830402e63d645e5477b3be84e0c11db36d620498
 
 HOMEPAGE=	https://docs.libretro.com/library/mame_2003/
 COMMENT=	Libretro core based on the Multiple Arcade Machine Emulator (v0.78)
 LICENSE=	no-commercial-use
 
-GITHUB_PROJECT=	mame2003-libretro
-GITHUB_TAG=	830402e63d645e5477b3be84e0c11db36d620498
-
 USE_TOOLS=	gmake
 EXTRACT_USING=	bsdtar
 
diff --git a/libretro-melonds/Makefile b/libretro-melonds/Makefile
index 8a4ae05ae6..fd30d27911 100644
--- a/libretro-melonds/Makefile
+++ b/libretro-melonds/Makefile
@@ -3,13 +3,13 @@
 DISTNAME=	libretro-melonds-20171207
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	melonDS
+GITHUB_TAG=	72959ea6074035eaaf4ab3736dfad502f1ff5bb5
 
 HOMEPAGE=	https://docs.libretro.com/library/melonds/
 COMMENT=	Libretro core based on the melonDS emulator
 LICENSE=	gnu-gpl-v3
 
-GITHUB_PROJECT=	melonDS
-GITHUB_TAG=	72959ea6074035eaaf4ab3736dfad502f1ff5bb5
 
 USE_TOOLS=	gmake
 USE_LANGUAGES=	c c++
diff --git a/libretro-mgba/Makefile b/libretro-mgba/Makefile
index 8f2a1d6646..ebf95724ba 100644
--- a/libretro-mgba/Makefile
+++ b/libretro-mgba/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-mgba-0.6.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mgba-emu/}
+GITHUB_PROJECT=	mgba
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 HOMEPAGE=	https://mgba.io/
 COMMENT=	Libretro core based on the mGBA emulator
 LICENSE=	mpl-2.0
 
-GITHUB_PROJECT=	mgba
-
 WRKSRC=		${WRKDIR}/mgba-${PKGVERSION_NOREV}
 
 USE_CMAKE=	yes
diff --git a/libretro-nestopia/Makefile b/libretro-nestopia/Makefile
index 95e50ec887..8811f61460 100644
--- a/libretro-nestopia/Makefile
+++ b/libretro-nestopia/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-nestopia-1.48
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rdanbrook/}
+GITHUB_PROJECT=	nestopia
 
 MAINTAINER=	snj%NetBSD.org@localhost
 HOMEPAGE=	http://0ldsk00l.ca/nestopia
 COMMENT=	Libretro core based on the Nestopia UE emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	nestopia
-
 BUILD_DIRS=	libretro
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
diff --git a/libretro-o2em/Makefile b/libretro-o2em/Makefile
index e0deb4e331..fc51ff8506 100644
--- a/libretro-o2em/Makefile
+++ b/libretro-o2em/Makefile
@@ -3,13 +3,12 @@
 DISTNAME=	libretro-o2em-20170124
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_TAG=	1d62d4ed86e6c1a7d65dff49e4368edb30690665
 
 HOMEPAGE=	https://docs.libretro.com/library/o2em/
 COMMENT=	Libretro core for Magnavox Odyssey 2 and VideoPac emulation
 LICENSE=	artistic
 
-GITHUB_TAG=	1d62d4ed86e6c1a7d65dff49e4368edb30690665
-
 USE_TOOLS=	gmake
 
 .include "../../mk/endian.mk"
diff --git a/libretro-parallel-n64/Makefile b/libretro-parallel-n64/Makefile
index 025ddc50fc..171f86fc43 100644
--- a/libretro-parallel-n64/Makefile
+++ b/libretro-parallel-n64/Makefile
@@ -3,13 +3,12 @@
 DISTNAME=	libretro-parallel-n64-20171104
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	parallel-n64
+GITHUB_TAG=	db08e9c35cf690ac2241b772aa26ee5360fd55f0
 
 COMMENT=	Libretro core for Nintendo 64 emulation
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	parallel-n64
-GITHUB_TAG=	db08e9c35cf690ac2241b772aa26ee5360fd55f0
-
 USE_TOOLS=	gmake
 USE_LANGUAGES=	c c++
 EXTRACT_USING=	bsdtar
diff --git a/libretro-pcsx-rearmed/Makefile b/libretro-pcsx-rearmed/Makefile
index bd2ef7066f..0adc7220aa 100644
--- a/libretro-pcsx-rearmed/Makefile
+++ b/libretro-pcsx-rearmed/Makefile
@@ -3,7 +3,6 @@
 DISTNAME=	libretro-pcsx-rearmed-20170901
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
-
 GITHUB_PROJECT=	pcsx_rearmed
 GITHUB_TAG=	09d454e73bc251b44848abba4026efcd452df752
 
diff --git a/libretro-prboom/Makefile b/libretro-prboom/Makefile
index 27ad7a86f2..8b83c0f792 100644
--- a/libretro-prboom/Makefile
+++ b/libretro-prboom/Makefile
@@ -3,12 +3,12 @@
 DISTNAME=	libretro-prboom-20170707
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_TAG=	1b5c4e469fb87fa87c0f130f53096ebe78268cad
 
 HOMEPAGE=	https://docs.libretro.com/library/prboom/
 COMMENT=	Libretro core for Doom
 LICENSE=	gnu-gpl-v2
 
-GITHUB_TAG=	1b5c4e469fb87fa87c0f130f53096ebe78268cad
 EXTRACT_USING=	bsdtar
 
 USE_TOOLS=	gmake
diff --git a/libretro-prosystem/Makefile b/libretro-prosystem/Makefile
index 4c929a355f..aae577d53f 100644
--- a/libretro-prosystem/Makefile
+++ b/libretro-prosystem/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-prosystem-20171206
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	prosystem-libretro
+GITHUB_TAG=	b8e9241046dc0e5ef9475cad03cd68ee7fe792a5
 
 HOMEPAGE=	https://docs.libretro.com/library/prosystem/
 COMMENT=	Libretro core based on the ProSystem Atari 7800 emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	prosystem-libretro
-GITHUB_TAG=	b8e9241046dc0e5ef9475cad03cd68ee7fe792a5
-
 USE_TOOLS=	gmake
 
 .include "../../mk/endian.mk"
diff --git a/libretro-px68k/Makefile b/libretro-px68k/Makefile
index 47e7f79f29..581fa7d128 100644
--- a/libretro-px68k/Makefile
+++ b/libretro-px68k/Makefile
@@ -3,13 +3,12 @@
 DISTNAME=	libretro-px68k-20170806
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	px68k-libretro
+GITHUB_TAG=	8f6be979ca47396e5b692d288b31825fb1d45c92
 
 HOMEPAGE=	https://github.com/libretro/px68k-libretro
 COMMENT=	Libretro core based on the PX68K SHARP X68000 emulator
 
-GITHUB_PROJECT=	px68k-libretro
-GITHUB_TAG=	8f6be979ca47396e5b692d288b31825fb1d45c92
-
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS=	gmake
 USE_LANGUAGES=	c c++
diff --git a/libretro-snes9x/Makefile b/libretro-snes9x/Makefile
index cf55e67cda..4546a2f623 100644
--- a/libretro-snes9x/Makefile
+++ b/libretro-snes9x/Makefile
@@ -3,13 +3,12 @@
 DISTNAME=	libretro-snes9x-1.55
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=snes9xgit/}
+GITHUB_PROJECT=	snes9x
 
 HOMEPAGE=	https://docs.libretro.com/library/snes9x/
 COMMENT=	Libretro core based on the snes9x Super Nintendo emulator
 LICENSE=	no-commercial-use
 
-GITHUB_PROJECT=	snes9x
-
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
 BUILD_DIRS=	libretro
 
diff --git a/libretro-snes9x2005/Makefile b/libretro-snes9x2005/Makefile
index c4a06f9655..cc02d21f5d 100644
--- a/libretro-snes9x2005/Makefile
+++ b/libretro-snes9x2005/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-snes9x2005-20170826
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	snes9x2005
+GITHUB_TAG=	12b1ae1a13434dd0bdc5305d36811643306d8e3e
 
 MAINTAINER=	nia.alarie%gmail.com@localhost
 HOMEPAGE=	https://docs.libretro.com/library/snes9x_2005/
 COMMENT=	Libretro core based on the snes9x Super Nintendo emulator
 LICENSE=	no-commercial-use
 
-GITHUB_PROJECT=	snes9x2005
-GITHUB_TAG=	12b1ae1a13434dd0bdc5305d36811643306d8e3e
-
 USE_TOOLS=	gmake
 
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
diff --git a/libretro-snes9x2010/Makefile b/libretro-snes9x2010/Makefile
index 080ea198c4..33e1c0ae73 100644
--- a/libretro-snes9x2010/Makefile
+++ b/libretro-snes9x2010/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-snes9x2010-20171112
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	snes9x2010
+GITHUB_TAG=	cdc2a1f30a08b9e46c14d64de89b250907ec46c7
 
 HOMEPAGE=	https://docs.libretro.com/library/snes9x_2010/
 COMMENT=	Libretro core based on the snes9x Super Nintendo emulator
 LICENSE=	no-commercial-use
 
-GITHUB_PROJECT=	snes9x2010
-GITHUB_TAG=	cdc2a1f30a08b9e46c14d64de89b250907ec46c7
-
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS=	gmake
 
diff --git a/libretro-stella/Makefile b/libretro-stella/Makefile
index db6a8aba68..cec79b8027 100644
--- a/libretro-stella/Makefile
+++ b/libretro-stella/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	libretro-stella-20170124
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	stella-libretro
+GITHUB_TAG=	cdbc9cc4e105ef884ac441cbd3f14d2d4eb47ba4
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://docs.libretro.com/library/stella/
 COMMENT=	Libretro core based on the Stella Atari 2600 (VCS) emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	stella-libretro
-GITHUB_TAG=	cdbc9cc4e105ef884ac441cbd3f14d2d4eb47ba4
-
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
diff --git a/libretro-tyrquake/Makefile b/libretro-tyrquake/Makefile
index e57aaf2bcf..bd62810567 100644
--- a/libretro-tyrquake/Makefile
+++ b/libretro-tyrquake/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-tyrquake-20170802
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	tyrquake
+GITHUB_TAG=	4525ad4dcd58e402f548b3adb8800b9c4b076e40
 
 HOMEPAGE=	https://docs.libretro.com/library/tyrquake/
 COMMENT=	Libretro core for the TyrQuake interpreter for Quake and Quakeworld
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	tyrquake
-GITHUB_TAG=	4525ad4dcd58e402f548b3adb8800b9c4b076e40
-
 USE_TOOLS=	gmake
 
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
diff --git a/libretro-vecx/Makefile b/libretro-vecx/Makefile
index 08ded059c7..06011b0f59 100644
--- a/libretro-vecx/Makefile
+++ b/libretro-vecx/Makefile
@@ -3,13 +3,12 @@
 DISTNAME=	libretro-vecx-20170718
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_TAG=	eb30b0cc200f32651f402192d8e5516d72f05dc5
 
 HOMEPAGE=	https://docs.libretro.com/library/vecx/
 COMMENT=	Libretro core for Vectrex emulation
 LICENSE=	gnu-gpl-v3
 
-GITHUB_TAG=	eb30b0cc200f32651f402192d8e5516d72f05dc5
-
 MAKE_FILE=	Makefile.libretro
 
 USE_TOOLS=	gmake
diff --git a/libretro-virtualjaguar/Makefile b/libretro-virtualjaguar/Makefile
index 58dd87d9b1..8f1924f87d 100644
--- a/libretro-virtualjaguar/Makefile
+++ b/libretro-virtualjaguar/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-virtualjaguar-20170218
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	virtualjaguar-libretro
+GITHUB_TAG=	4f92ba68a64371c97cfd1cc0530d1a4625ec3aef
 
 HOMEPAGE=	https://docs.libretro.com/library/virtual_jaguar/
 COMMENT=	Libretro core for Atari Jaguar emulation
 LICENSE=	gnu-gpl-v3
 
-GITHUB_PROJECT=	virtualjaguar-libretro
-GITHUB_TAG=	4f92ba68a64371c97cfd1cc0530d1a4625ec3aef
-
 USE_TOOLS=	gmake
 
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
diff --git a/libretro-yabause/Makefile b/libretro-yabause/Makefile
index 066f38c180..1079375353 100644
--- a/libretro-yabause/Makefile
+++ b/libretro-yabause/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	libretro-yabause-20171107
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libretro/}
+GITHUB_PROJECT=	yabause
+GITHUB_TAG=	c55eef9796f1612bab60824685e66ee58657e576
 
 HOMEPAGE=	https://docs.libretro.com/library/yabause/
 COMMENT=	Libretro core based on the Yabause Sega Saturn emulator
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	yabause
-GITHUB_TAG=	c55eef9796f1612bab60824685e66ee58657e576
-
 USE_TOOLS=	gmake
 
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
diff --git a/libspt/Makefile b/libspt/Makefile
index 3c8fb739af..79124ef739 100644
--- a/libspt/Makefile
+++ b/libspt/Makefile
@@ -1,10 +1,8 @@
 # $NetBSD: Makefile,v 1.2 2012/10/03 09:10:40 asau Exp $
 
 DISTNAME=	libspt-1.1
-
 CATEGORIES=	devel
 MASTER_SITES=	http://www.j10n.org/libspt/
-
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg-ja%jp.NetBSD.org@localhost
diff --git a/libvidstab/Makefile b/libvidstab/Makefile
index 25c10f5685..e5512fef5e 100644
--- a/libvidstab/Makefile
+++ b/libvidstab/Makefile
@@ -1,13 +1,12 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	vid.stab
 DISTNAME=	release-0.98b
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
 PKGNAME=	libvidstab-0.98b
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=georgmartius/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
+GITHUB_PROJECT=	vid.stab
 GITHUB_TAG=	${DISTNAME}
+DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://public.hronopik.de/vid.stab/
diff --git a/libvips/Makefile b/libvips/Makefile
index 12586663c1..46ec6469fa 100644
--- a/libvips/Makefile
+++ b/libvips/Makefile
@@ -1,18 +1,17 @@
 # $NetBSD$
 
-DISTNAME= vips-8.6.2
-PKGNAME= lib${DISTNAME}
+DISTNAME=	vips-8.6.2
+PKGNAME=	lib${DISTNAME}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jcupitt/}
+GITHUB_PROJECT=	libvips
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	base%atomicules.co.uk@localhost
 HOMEPAGE=	http://jcupitt.github.io/libvips/
 COMMENT=	Libvips is a demand-driven, horizontally threaded image processing lib
 LICENSE=	gnu-lgpl-v2.1
 
-GITHUB_PROJECT=	libvips
-GITHUB_RELEASE=	v${PKGVERSION_NOREV}
-
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config gmake
diff --git a/libzrtp/Makefile b/libzrtp/Makefile
index dbfbd1b0a6..e29c2fe163 100644
--- a/libzrtp/Makefile
+++ b/libzrtp/Makefile
@@ -4,8 +4,8 @@ DISTNAME=	libzrtp
 PKGNAME=	${DISTNAME}-0.7.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=traviscross/}
-EXTRACT_SUFX=	.zip
 GITHUB_TAG=	4cb5110147d2bb7e0466eec8ec838d8372ef54c9
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	angelmadames%gmail.com@localhost
 HOMEPAGE=	https://github.com/traviscross/libzrtp/
diff --git a/lzs-lkm/Makefile b/lzs-lkm/Makefile
index d70f5e0af8..7952411610 100644
--- a/lzs-lkm/Makefile
+++ b/lzs-lkm/Makefile
@@ -9,10 +9,11 @@ MAINTAINER=		plunky%rya-online.net@localhost
 HOMEPAGE=		http://homepages.rya-online.net/plunky/lzs.html
 COMMENT=		NetBSD kernel module for LZS decompression with PPP
 
+ONLY_FOR_PLATFORM=	NetBSD-*-*
+
 # TODO - verify version (nbsomething most likely)
 DEPENDS+=		pppd>=2.4.3:../../net/pppd
 
-ONLY_FOR_PLATFORM=	NetBSD-*-*
 MESSAGE_SUBST+=		PREFIX=${PREFIX}
 
 NO_CONFIGURE=		yes
diff --git a/mac-icon-standard/Makefile b/mac-icon-standard/Makefile
index e5849bb2fc..fc70e5781d 100644
--- a/mac-icon-standard/Makefile
+++ b/mac-icon-standard/Makefile
@@ -2,8 +2,7 @@
 
 DISTNAME=	mac-icon-standard-201401
 CATEGORIES=	fonts
-
-DISTFILES+=	mac-icon-standard.ttf
+DISTFILES=	mac-icon-standard.ttf
 SITES.mac-icon-standard.ttf=	http://images.apple.com/v/30-years/a/fonts/mac-icons/
 
 MAINTAINER=	christtrekker%users.sourceforge.net@localhost
diff --git a/makedict/Makefile b/makedict/Makefile
index 9dc1327d73..9fee854927 100644
--- a/makedict/Makefile
+++ b/makedict/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xdxf/}
 MAINTAINER=	cheusov%NetBSD.org@localhost
 HOMEPAGE=	http://sourceforge.net/projects/xdxf/
 COMMENT=	Dictionary converting tool
-
-LICENSE=		gnu-gpl-v2
+LICENSE=	gnu-gpl-v2
 
 USE_CMAKE=		yes
 USE_TOOLS=		pkg-config
diff --git a/marathon-scenarios/Makefile b/marathon-scenarios/Makefile
index f656171a1e..1c54763019 100644
--- a/marathon-scenarios/Makefile
+++ b/marathon-scenarios/Makefile
@@ -36,10 +36,10 @@ LICENSE=	generic-nonlicense
 #DEPENDS+=	:../../games/alephone
 
 RESTRICTED=		Individual scenarios are subject to various licenses, so play it safe.
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
 
 SCENARIO_BASE=		share/AlephOne/Scenarios
 .for scenario in TheGrayIncident Rubicon \
diff --git a/mime-support/Makefile b/mime-support/Makefile
index 594f2c82c2..cbd6f17b33 100644
--- a/mime-support/Makefile
+++ b/mime-support/Makefile
@@ -3,8 +3,8 @@
 
 DISTNAME=		mime-support_3.9-1.3
 PKGNAME=		mime-support-3.9
-MASTER_SITES=		http://security.debian.org/pool/updates/main/m/mime-support/
 CATEGORIES=		mail
+MASTER_SITES=		http://security.debian.org/pool/updates/main/m/mime-support/
 
 MAINTAINER=		bsd%cs.ubc.ca@localhost
 COMMENT=		Support commands for manipulating files using MIME and mailcap
diff --git a/mule11/Makefile b/mule11/Makefile
index 4a5050a3c9..9432afdf83 100644
--- a/mule11/Makefile
+++ b/mule11/Makefile
@@ -3,9 +3,9 @@
 DISTNAME=		mule-p20151011
 #                                 mule-p20151011 -> mule11-20151011
 PKGNAME=		${DISTNAME:C/e-p/e11-/}
+CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_GITHUB:=tsutsui/}
 GITHUB_PROJECT=		mule1.1-netbsd
-CATEGORIES=		editors
 
 MAINTAINER=		makoto%ki.nu@localhost
 HOMEPAGE=		https://github.com/tsutsui/mule1.1-netbsd
diff --git a/multiminer/Makefile b/multiminer/Makefile
index 6980b1f8a4..555708e964 100644
--- a/multiminer/Makefile
+++ b/multiminer/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.2 2014/10/26 18:25:41 noud4 Exp $
 
 DISTNAME=	multiminer-3.6.2
-GITHUB_TAG=	v${PKGVERSION_NOREV}
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_GITHUB:=nwoolls/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	noud4%users.sourceforge.net@localhost
 HOMEPAGE=	https://github.com/nwoolls/MultiMiner
diff --git a/mygui-git/Makefile b/mygui-git/Makefile
index 8161cf1fd7..96763f62f4 100644
--- a/mygui-git/Makefile
+++ b/mygui-git/Makefile
@@ -3,14 +3,13 @@
 DISTNAME=	mygui-git-20171012
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=MyGUI/}
+GITHUB_PROJECT=	mygui
+GITHUB_TAG=	b1e4bc802a63fef015fc1d213d45a520eddc99b3
 
 HOMEPAGE=	http://mygui.info/
 COMMENT=	Cross-platform library for creating GUIs for games and 3D programs
 LICENSE=	mit
 
-GITHUB_PROJECT=	mygui
-GITHUB_TAG=	b1e4bc802a63fef015fc1d213d45a520eddc99b3
-
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
diff --git a/ncbi-bin/Makefile b/ncbi-bin/Makefile
index 59e219b2ea..75ffe0a7b8 100644
--- a/ncbi-bin/Makefile
+++ b/ncbi-bin/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.11 2012/10/14 17:55:00 asau Exp $
 #
 
-PKGNAME=		ncbi-bin-20120620
 DISTNAME=		ncbi
-DIST_SUBDIR=		ncbi-${PKGVERSION_NOREV}
+PKGNAME=		ncbi-bin-20120620
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools/old/${PKGVERSION_NOREV}/
+DIST_SUBDIR=		ncbi-${PKGVERSION_NOREV}
 
 MAINTAINER=		mchittur%cs.nmsu.edu@localhost
 HOMEPAGE=		http://www.ncbi.nlm.nih.gov/IEB/ToolBox/
diff --git a/ncbi-lib/Makefile b/ncbi-lib/Makefile
index 938db92d2f..fb8cc454e2 100644
--- a/ncbi-lib/Makefile
+++ b/ncbi-lib/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.16 2012/10/14 17:57:23 asau Exp $
 #
 
-PKGNAME=		ncbi-lib-20120620
 DISTNAME=		ncbi
-DIST_SUBDIR=		ncbi-${PKGVERSION_NOREV}
+PKGNAME=		ncbi-lib-20120620
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools/old/${PKGVERSION_NOREV}/
+DIST_SUBDIR=		ncbi-${PKGVERSION_NOREV}
 
 MAINTAINER=		mchittur%cs.nmsu.edu@localhost
 HOMEPAGE=		http://www.ncbi.nlm.nih.gov/IEB/ToolBox/
diff --git a/nestopia-rpi/Makefile b/nestopia-rpi/Makefile
index ccf928bdb9..59de10a155 100644
--- a/nestopia-rpi/Makefile
+++ b/nestopia-rpi/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nestopia/}
 EXTRACT_SUFX=	.zip
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} nst140_lnx_release_h.zip
-
 SITES.nst140_lnx_release_h.zip=	http://rbelmont.mameworld.info/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
diff --git a/netbsd-build-tools/Makefile b/netbsd-build-tools/Makefile
index 6c8c5da9d9..ecb5f57b57 100644
--- a/netbsd-build-tools/Makefile
+++ b/netbsd-build-tools/Makefile
@@ -1,17 +1,17 @@
 # $NetBSD$
 
 PKGNAME=	netbsd-build-tools-7.0.2
+CATEGORIES=	cross
 MASTER_SITES=	http://cdn.netbsd.org/pub/NetBSD/NetBSD-${PKGVERSION_NOREV}/source/sets/
 EXTRACT_SUFX=	.tgz
 DISTFILES+=	gnusrc${EXTRACT_SUFX}
 DISTFILES+=	sharesrc${EXTRACT_SUFX}
 DISTFILES+=	src${EXTRACT_SUFX}
 DISTFILES+=	syssrc${EXTRACT_SUFX}
-CATEGORIES=	cross
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	NetBSD cross-toolchain
 HOMEPAGE=	http://netbsd.org/
+COMMENT=	NetBSD cross-toolchain
 
 WRKSRC=		${WRKDIR}/usr/src
 NO_CONFIGURE=	yes
diff --git a/netbsd-light-desktop-artwork/Makefile b/netbsd-light-desktop-artwork/Makefile
index 00fa1f3261..5cf96e7bfc 100644
--- a/netbsd-light-desktop-artwork/Makefile
+++ b/netbsd-light-desktop-artwork/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.4 2012/11/13 23:20:30 othyro Exp $
 #
 
+DISTNAME=	lubuntu-artwork_0.27
 PKGNAME=	netbsd-light-desktop-artwork-0.0
 PKGREVISION=	1
-DISTNAME=	lubuntu-artwork_0.27
 CATEGORIES=	graphics
 MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/universe/l/lubuntu-artwork/
 
diff --git a/nq/Makefile b/nq/Makefile
index f5e17be21b..e8226e5334 100644
--- a/nq/Makefile
+++ b/nq/Makefile
@@ -6,8 +6,8 @@ CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=christiank/}
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	Command line queueing utility
 HOMEPAGE=	https://github.com/chneukirchen/nq/
+COMMENT=	Command line queueing utility
 LICENSE=	public-domain
 
 EXTRACT_USING=	gtar
diff --git a/nullpop/Makefile b/nullpop/Makefile
index 886c6be605..d21f858c38 100644
--- a/nullpop/Makefile
+++ b/nullpop/Makefile
@@ -4,9 +4,8 @@ DISTNAME=	nullpop-0.3
 CATEGORIES=	mail
 MASTER_SITES=	http://thewalter.net/stef/software/nullpop/
 
-HOMEPAGE=	http://thewalter.net/stef/software/nullpop/
-
 MAINTAINER=	shaun%inerd.com@localhost
+HOMEPAGE=	http://thewalter.net/stef/software/nullpop/
 COMMENT=	POP3 server that allows logins, but never returns any email
 
 GNU_CONFIGURE=	yes
diff --git a/ocaml-biniou/Makefile b/ocaml-biniou/Makefile
index a370a5ddc2..7e7e4e24cd 100644
--- a/ocaml-biniou/Makefile
+++ b/ocaml-biniou/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2014/11/21 06:01:35 jgoamakf Exp $
 
-PKGNAME=	ocaml-${DISTNAME}
 DISTNAME=	biniou-1.0.9
+PKGNAME=	ocaml-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://mjambon.com/releases/biniou/
 
diff --git a/ocaml-camomile/Makefile b/ocaml-camomile/Makefile
index 517acd188f..b1d0632dd4 100644
--- a/ocaml-camomile/Makefile
+++ b/ocaml-camomile/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2014/11/21 06:14:26 jgoamakf Exp $
 
-PKGNAME=	ocaml-${DISTNAME}
 DISTNAME=	camomile-0.8.4
+PKGNAME=	ocaml-${DISTNAME}
 CATEGORIES=	converters
 MASTER_SITES=	https://github.com/downloads/yoriyuki/Camomile/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/ocaml-easy-format/Makefile b/ocaml-easy-format/Makefile
index 542cbaf2d2..837babf53f 100644
--- a/ocaml-easy-format/Makefile
+++ b/ocaml-easy-format/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2014/11/21 05:51:07 jgoamakf Exp $
 
-PKGNAME=	ocaml-${DISTNAME}
 DISTNAME=	easy-format-1.0.2
+PKGNAME=	ocaml-${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	http://mjambon.com/releases/easy-format/
 
diff --git a/ocaml-ounit/Makefile b/ocaml-ounit/Makefile
index 743c02fab6..d9f4a59a1e 100644
--- a/ocaml-ounit/Makefile
+++ b/ocaml-ounit/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2014/10/21 06:41:57 jgoamakf Exp $
 
-PKGNAME=	ocaml-${DISTNAME}
 DISTNAME=	ounit-2.0.0
+PKGNAME=	ocaml-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1258/
 
diff --git a/ocaml-zed/Makefile b/ocaml-zed/Makefile
index 3017d87d0e..ed54a1f61d 100644
--- a/ocaml-zed/Makefile
+++ b/ocaml-zed/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2015/04/18 20:05:34 jgoamakf Exp $
 
-PKGNAME=	ocaml-${DISTNAME}
 DISTNAME=	zed-1.2
+PKGNAME=	ocaml-${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/944/
 
diff --git a/olsrd/Makefile b/olsrd/Makefile
index fb5684ef39..7db856297e 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES=	http://www.olsr.org/releases/0.6/
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	http://www.olsr.org/
 COMMENT=	Ad-hoc wireless mesh routing daemon
-
 LICENSE=	modified-bsd
 
 USE_TOOLS+=	bison
diff --git a/openbsc/Makefile b/openbsc/Makefile
index 830f44715f..cfc2a40d9d 100644
--- a/openbsc/Makefile
+++ b/openbsc/Makefile
@@ -2,14 +2,13 @@
 #
 
 DISTNAME=	openbsc-0.9.13
-EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	devel
 MASTER_SITES=	http://openbsc.osmocom.org/trac/raw-attachment/wiki/Tarballs/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	http://openbsc.osmocom.org/
 COMMENT=	Free software implementation for GSM/3GPP protocol stack and elements
-
 LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake
diff --git a/opensips/Makefile b/opensips/Makefile
index c4554cb0b6..61f4b556de 100644
--- a/opensips/Makefile
+++ b/opensips/Makefile
@@ -8,7 +8,6 @@ MASTER_SITES=		http://opensips.org/pub/opensips/${VER}/src/
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.opensips.org/
 COMMENT=		Open Source implementation of a SIP server
-
 LICENSE=		gnu-gpl-v2
 
 VER=			1.6.2
diff --git a/osg/Makefile b/osg/Makefile
index c7cf8ba37f..64569ea7d1 100644
--- a/osg/Makefile
+++ b/osg/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	osg-3.4.1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openscenegraph/}
+GITHUB_PROJECT=	OpenSceneGraph
+GITHUB_TAG=	OpenSceneGraph-${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.openscenegraph.org/
 COMMENT=	High performance 3D graphics toolkit
 LICENSE=	gnu-lgpl-v2.1
 
-GITHUB_PROJECT=		OpenSceneGraph
-GITHUB_TAG=		OpenSceneGraph-${PKGVERSION_NOREV}
-
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
diff --git a/osxinfo/Makefile b/osxinfo/Makefile
index f81a2220a5..13c0f506db 100644
--- a/osxinfo/Makefile
+++ b/osxinfo/Makefile
@@ -3,15 +3,14 @@
 DISTNAME=	osxinfo-0.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=nbyouri/}
+GITHUB_PROJECT=	osxinfo
+GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	youri%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/nbyouri/osxinfo
 COMMENT=	Small Mac OS X Info Program
 LICENSE=	mit
 
-GITHUB_PROJECT=	osxinfo
-GITHUB_TAG=	${PKGVERSION_NOREV}
-
 ONLY_FOR_PLATFORM=	Darwin-*-*
 
 MAKE_ENV+=	DBDIR=${PKG_DBDIR}
diff --git a/otrtool/Makefile b/otrtool/Makefile
index 5bf327b9a6..13f2a0c288 100644
--- a/otrtool/Makefile
+++ b/otrtool/Makefile
@@ -1,14 +1,15 @@
 # $NetBSD$
 
 DISTNAME=	otrtool-1.2.0
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=otrtool/}
 GITHUB_PROJECT=	otrtool
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-COMMENT=	Decrypter for videos (otrkey) from onlinetvrecorder.com
-HOMEPAGE=	https://github.com/otrtool/otrtool/
 MAINTAINER=	dominik.muth%gmx.de@localhost
+HOMEPAGE=	https://github.com/otrtool/otrtool/
+COMMENT=	Decrypter for videos (otrkey) from onlinetvrecorder.com
 LICENSE=	cc0-1.0-universal
 
 BUILD_MAKE_FLAGS+=	VERSION=${GITHUB_TAG}-pkgsrc
diff --git a/p6-Grammar-Profiler-Simple/Makefile b/p6-Grammar-Profiler-Simple/Makefile
index fa00bc3f0c..0cfa15c64f 100644
--- a/p6-Grammar-Profiler-Simple/Makefile
+++ b/p6-Grammar-Profiler-Simple/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	Grammar-Profiler-Simple
 GITHUB_TAG=	c0aca5fab323b2974821dabd6b89330c609e0b7d
-PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=perlpilot/}
 
diff --git a/p6-Perl6-MIME-Base64/Makefile b/p6-Perl6-MIME-Base64/Makefile
index 29e96bf879..f36bde3cbd 100644
--- a/p6-Perl6-MIME-Base64/Makefile
+++ b/p6-Perl6-MIME-Base64/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	Perl6-MIME-Base64
 GITHUB_TAG=	26302c6ac2dd8c234faa88729bed0a26cfbbd11f
-PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=perl6/}
 
diff --git a/p6-Template-Mustache/Makefile b/p6-Template-Mustache/Makefile
index 1a3773445d..5367fc8f0c 100644
--- a/p6-Template-Mustache/Makefile
+++ b/p6-Template-Mustache/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	p6-Template-Mustache
 GITHUB_TAG=	2ffcb06e5417aadcfd3e3f663fdb2e738a165dfb
-PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=softmoth/}
 
diff --git a/p6-json/Makefile b/p6-json/Makefile
index df1045b2b0..63c05323b0 100644
--- a/p6-json/Makefile
+++ b/p6-json/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	json
 GITHUB_TAG=	f6fe07850504e06a9422adb246e4326251004ad8
-PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=moritz/}
 
diff --git a/p6-json_fast/Makefile b/p6-json_fast/Makefile
index 2fe0a2b476..8c10b97be7 100644
--- a/p6-json_fast/Makefile
+++ b/p6-json_fast/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	json_fast
 GITHUB_TAG=	36e7b1f4d24f519b994be4e0a18a216387d5315d
-PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=timo/}
 
diff --git a/p6-perl6-digest-md5/Makefile b/p6-perl6-digest-md5/Makefile
index 9995cb5b59..832f4f65cd 100644
--- a/p6-perl6-digest-md5/Makefile
+++ b/p6-perl6-digest-md5/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	perl6-digest-md5
 GITHUB_TAG=	2194250ff2d50a37f92d4f82fac216729f4eba87
-PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=cosimo/}
 
diff --git a/p6-perl6-encode/Makefile b/p6-perl6-encode/Makefile
index cd67ed5515..90f031533c 100644
--- a/p6-perl6-encode/Makefile
+++ b/p6-perl6-encode/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	perl6-encode
 GITHUB_TAG=	702214dcedd05ea62d815ffb4c287e1596cee4c9
-PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sergot/}
 
diff --git a/p6-perl6-http-status/Makefile b/p6-perl6-http-status/Makefile
index 26226b215c..5e1e0623c5 100644
--- a/p6-perl6-http-status/Makefile
+++ b/p6-perl6-http-status/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	perl6-http-status
 GITHUB_TAG=	20486489dfb9b3a81300e0ad068edf96855ba22b
-PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=supernovus/}
 
diff --git a/p6-uri/Makefile b/p6-uri/Makefile
index 84af369ac6..075d7cb562 100644
--- a/p6-uri/Makefile
+++ b/p6-uri/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	uri
 GITHUB_TAG=	bac75821337a2142c0f364a5deefc5ecbddd8ee4
-PKGREVISION=	1
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=perl6-community-modules/}
 
diff --git a/p6-xml-writer/Makefile b/p6-xml-writer/Makefile
index 3268968cb3..a3ecc94570 100644
--- a/p6-xml-writer/Makefile
+++ b/p6-xml-writer/Makefile
@@ -2,8 +2,8 @@
 
 GITHUB_PROJECT=	xml-writer
 GITHUB_TAG=	4d30a9d8e06033ca97387971b653817becd5a759
-PKGREVISION=	2
 DISTNAME=	p6-${GITHUB_PROJECT}-${GITHUB_TAG:S/v//}
+PKGREVISION=	2
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=masak/}
 
diff --git a/pentagram/Makefile b/pentagram/Makefile
index bf4e3a1978..bfe592704e 100644
--- a/pentagram/Makefile
+++ b/pentagram/Makefile
@@ -1,13 +1,13 @@
 # $NetBSD$
 #
 
-PKGNAME=	${GITHUB_PROJECT}-20161127
-DISTNAME=	${GITHUB_TAG}
 GITHUB_PROJECT=	pentagram
+GITHUB_TAG=	e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5
+DISTNAME=	${GITHUB_TAG}
+PKGNAME=	${GITHUB_PROJECT}-20161127
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pentagram-u8/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-GITHUB_TAG=	e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://pentagram.sf.net/
diff --git a/pgstudio/Makefile b/pgstudio/Makefile
index cc0f792c0f..1b73a91b3f 100644
--- a/pgstudio/Makefile
+++ b/pgstudio/Makefile
@@ -11,9 +11,9 @@ HOMEPAGE=	http://www.postgresqlstudio.org/about/
 COMMENT=	GUI to manage PostgreSQL database
 LICENSE=	postgresql-license
 
+BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
 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
 
diff --git a/phaethon/Makefile b/phaethon/Makefile
index 8246b4f25f..e68fcc7b42 100644
--- a/phaethon/Makefile
+++ b/phaethon/Makefile
@@ -3,12 +3,12 @@
 DISTNAME=	phaethon-${GITHUB_TAG}
 PKGNAME=	phaethon-${GITHUB_TAG:S/v//}
 CATEGORIES=	games devel
-GITHUB_TAG=	v0.0.4
 MASTER_SITES=	${MASTER_SITE_GITHUB:=xoreos/}
+GITHUB_TAG=	v0.0.4
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	"A FLOSS resource explorer for BioWare's Aurora engine games"
 HOMEPAGE=	https://xoreos.org/
+COMMENT=	"A FLOSS resource explorer for BioWare's Aurora engine games"
 LICENSE=	gnu-lgpl-v2.1
 
 EXTRACT_USING=	gtar
diff --git a/polarssl11/Makefile b/polarssl11/Makefile
index d8ba94cb6f..748878ed51 100644
--- a/polarssl11/Makefile
+++ b/polarssl11/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.2 2014/06/01 12:49:38 thomasklausner Exp $
 
 DISTNAME=	polarssl-1.1.4
-DISTFILES=	polarssl-1.1.4-gpl.tgz
 CATEGORIES=	security
 MASTER_SITES=	http://polarssl.org/code/download/
 EXTRACT_SUFX=	.tgz
+DISTFILES=	polarssl-1.1.4-gpl.tgz
 
 MAINTAINER=	wongk%apt.homeunix.net@localhost
 HOMEPAGE=	https://polarssl.org/download/
diff --git a/quantlib/Makefile b/quantlib/Makefile
index 7c34f0fa9c..c770ec3c32 100644
--- a/quantlib/Makefile
+++ b/quantlib/Makefile
@@ -5,11 +5,10 @@ DISTNAME=	QuantLib-1.1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=quantlib/}
 
-COMMENT=	Framework for quantitative finance
-LICENSE=	modified-bsd
-
 MAINTAINER=	slitvinov%gmail.com@localhost
 HOMEPAGE=	http://quantlib.sourceforge.net/
+COMMENT=	Framework for quantitative finance
+LICENSE=	modified-bsd
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/quickfix/Makefile b/quickfix/Makefile
index 46fcecce3d..76a8cc9ec9 100644
--- a/quickfix/Makefile
+++ b/quickfix/Makefile
@@ -3,8 +3,8 @@
 DISTNAME=	quickfix-1.14.4
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_GITHUB:=quickfix/}
-GITHUB_TAG=	v.${PKGVERSION}
 GITHUB_PROJECT=	${DISTNAME:S/-${PKGVERSION}//}
+GITHUB_TAG=	v.${PKGVERSION}
 
 MAINTAINER=	alnsn%yandex.ru@localhost
 HOMEPAGE=	http://www.quickfixengine.org/
diff --git a/redshift/Makefile b/redshift/Makefile
index 819e586d77..dd4491245f 100644
--- a/redshift/Makefile
+++ b/redshift/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
+GITHUB_PROJECT=	redshift
+GITHUB_TAG=	v1.11
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	${GITHUB_PROJECT}${DISTNAME:S/v/-/1}
-GITHUB_TAG=	v1.11
-GITHUB_PROJECT=	redshift
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jonls/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
diff --git a/residualvm/Makefile b/residualvm/Makefile
index 8b4f6448b7..a25165991f 100644
--- a/residualvm/Makefile
+++ b/residualvm/Makefile
@@ -2,8 +2,8 @@
 
 DISTNAME=	residualvm-0.2.1-sources
 PKGNAME=	${DISTNAME:S/-sources//}
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=residualvm/}
 CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=residualvm/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
diff --git a/retroarch-assets/Makefile b/retroarch-assets/Makefile
index 709868de98..c04bda9681 100644
--- a/retroarch-assets/Makefile
+++ b/retroarch-assets/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
-PKGNAME=		retroarch-assets-1.7.0
 DISTNAME=		RetroArch
-EXTRACT_SUFX=		.7z
+PKGNAME=		retroarch-assets-1.7.0
 CATEGORIES=		emulators
 MASTER_SITES=		http://buildbot.libretro.com/stable/${PKGVERSION_NOREV}/windows-msvc2010/x86_64/
+EXTRACT_SUFX=		.7z
 
 MAINTAINER=		nia.alarie%gmail.com@localhost
 HOMEPAGE=		http://www.retroarch.com/
diff --git a/rhapsody/Makefile b/rhapsody/Makefile
index cb16af61b4..eeff9d497d 100644
--- a/rhapsody/Makefile
+++ b/rhapsody/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.5 2012/11/25 23:32:30 othyro Exp $
 #
 
-PKGNAME=		rhapsody-0.28b
 DISTNAME=		rhapsody_0.28b
+PKGNAME=		rhapsody-0.28b
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rhapsody/}
 EXTRACT_SUFX=		.tgz
diff --git a/rocksdb/Makefile b/rocksdb/Makefile
index ff14fd661b..12634bf7f2 100644
--- a/rocksdb/Makefile
+++ b/rocksdb/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	rocksdb
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-5.9.2
+CATEGORIES=	database
 MASTER_SITES=	${MASTER_SITE_GITHUB:=facebook/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-CATEGORIES=	database
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.rocksdb.org/
diff --git a/s6-dns/Makefile b/s6-dns/Makefile
index 60288bce0f..80cb88409c 100644
--- a/s6-dns/Makefile
+++ b/s6-dns/Makefile
@@ -5,8 +5,8 @@ CATEGORIES=	misc
 MASTER_SITES=	http://www.skarnet.org/software/s6-dns/
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	Suite of DNS client programs and libraries
 HOMEPAGE=	http://www.skarnet.org/software/s6-dns/
+COMMENT=	Suite of DNS client programs and libraries
 LICENSE=	isc
 
 USE_TOOLS+=		gmake
diff --git a/s6-portable-utils/Makefile b/s6-portable-utils/Makefile
index 6e4eb33258..fc7f460b42 100644
--- a/s6-portable-utils/Makefile
+++ b/s6-portable-utils/Makefile
@@ -5,8 +5,8 @@ CATEGORIES=	misc
 MASTER_SITES=	http://www.skarnet.org/software/s6-portable-utils/
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	Tiny portable generic utilties
 HOMEPAGE=	http://www.skarnet.org/software/s6-portable-utils/
+COMMENT=	Tiny portable generic utilties
 LICENSE=	isc
 
 USE_TOOLS+=		gmake
diff --git a/s6/Makefile b/s6/Makefile
index 2cc57c8d24..24a8cadf95 100644
--- a/s6/Makefile
+++ b/s6/Makefile
@@ -3,11 +3,11 @@
 DISTNAME=	s6-2.6.1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://skarnet.org/software/s6/
-LICENSE=	isc
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	The s6 supervision suite
 HOMEPAGE=	http://skarnet.org/software/s6/
+COMMENT=	The s6 supervision suite
+LICENSE=	isc
 
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
diff --git a/scorched3d/Makefile b/scorched3d/Makefile
index f61bb088dc..3c043c0e57 100644
--- a/scorched3d/Makefile
+++ b/scorched3d/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.6 2012/11/12 16:51:39 othyro Exp $
 #
 
-PKGNAME=	scorched3d-42.1
 DISTNAME=	Scorched3D-42.1-src
+PKGNAME=	scorched3d-42.1
 PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scorched3d/}
diff --git a/sds/Makefile b/sds/Makefile
index 1925117cc1..160ec9ee7b 100644
--- a/sds/Makefile
+++ b/sds/Makefile
@@ -2,13 +2,13 @@
 # vim: noexpandtab:
 
 GITHUB_PROJECT=	sds
-PKGNAME=	${GITHUB_PROJECT}-0.d86a9b8
 GITHUB_TAG=	d86a9b85cb4fb96430c7479ae6c956f2b605bbd1
 DISTNAME=	master
+PKGNAME=	${GITHUB_PROJECT}-0.d86a9b8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=antirez/}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	${GITHUB_PROJECT}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	Tr%visPaul.me@localhost
 HOMEPAGE=	https://github.com/antirez/sds/
diff --git a/service/Makefile b/service/Makefile
index 941045c4ef..8f5dbb4d37 100644
--- a/service/Makefile
+++ b/service/Makefile
@@ -1,12 +1,13 @@
 # $NetBSD: Makefile,v 1.2 2012/10/07 16:22:56 asau Exp $
 
-PKGNAME=		service-0.8
 DISTNAME=		# empty
-COMMENT=		Small tool to handle rc.d service scripts
+PKGNAME=		service-0.8
 CATEGORIES=		sysutils
 
 MAINTAINER=		adam.hoka%gmail.com@localhost
 HOMEPAGE=		http://irkmaffia.com/~replaced/
+COMMENT=		Small tool to handle rc.d service scripts
+
 NO_CHECKSUM=		yes
 
 INSTALLATION_DIRS=	bin
diff --git a/sfml+/Makefile b/sfml+/Makefile
index ce2d273a1c..5ab9910f10 100644
--- a/sfml+/Makefile
+++ b/sfml+/Makefile
@@ -4,12 +4,12 @@ DISTNAME=	SFML-2.3.2-sources
 PKGNAME=	sfml+-2.3.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.sfml-dev.org/files/
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.sfml-dev.org/
 COMMENT=	Free multimedia C++ API
 LICENSE=	zlib
-EXTRACT_SUFX=	.zip
 
 WRKSRC=			${WRKDIR}/SFML-2.3.2
 USE_CMAKE=		yes
diff --git a/skinlf/Makefile b/skinlf/Makefile
index 0600d3d19d..fce0a86b91 100644
--- a/skinlf/Makefile
+++ b/skinlf/Makefile
@@ -3,12 +3,12 @@
 DISTNAME=	skinlf-1.2.3-20020729
 CATEGORIES=	devel
 MASTER_SITES=	http://sourceforge.net/projects/skinlf/files/SkinLF/1.2.3/
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://sourceforge.net/projects/skinlf/
 COMMENT=
 LICENSE=	skin-look-and-feel-license
-EXTRACT_SUFX=	.zip
 
 AUTO_MKDIRS=	yes
 WRKSRC=		${WRKDIR}/${PKGBASE}
diff --git a/slowhttptest/Makefile b/slowhttptest/Makefile
index ba4be9deb5..de82e81849 100644
--- a/slowhttptest/Makefile
+++ b/slowhttptest/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.2 2015/06/10 13:43:17 ahp-nils Exp $
 
 DISTNAME=	slowhttptest-1.7
-GITHUB_TAG=	v${PKGVERSION_NOREV}
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=shekyan/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	nils%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/shekyan/slowhttptest
diff --git a/smap/Makefile b/smap/Makefile
index a4457ecded..731d9a954f 100644
--- a/smap/Makefile
+++ b/smap/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2015/04/30 06:46:46 gschwarz Exp $
 
-PKGNAME=	smap-0.6.0
 DISTNAME=	smap-20081016
+PKGNAME=	smap-0.6.0
 CATEGORIES=	security
 MASTER_SITES=	https://downloads.openwrt.org/sources/
 MASTER_SITES+=	http://mirror2.openwrt.org/sources/
diff --git a/sollya/Makefile b/sollya/Makefile
index d29162b659..2dd1330b65 100644
--- a/sollya/Makefile
+++ b/sollya/Makefile
@@ -11,9 +11,9 @@ LICENSE=	cecil-1.0 AND gnu-gpl-v3
 
 # XXX Form is optional, check the licence terms if distribution is allowed
 RESTRICTED=		Optional form on download page
-NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
 GNU_CONFIGURE=	yes
diff --git a/speedx/Makefile b/speedx/Makefile
index 372221fbe5..a29bbcefdb 100644
--- a/speedx/Makefile
+++ b/speedx/Makefile
@@ -6,14 +6,12 @@ PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU:=speedx/}
 DISTFILES=	${DEFAULT_DISTFILES} mercrain.s3m.zip
+SITES.mercrain.s3m.zip=	http://www.modarchive.com/cgi-bin/download.cgi/M/
 
 MAINTAINER=	reed%reedmedia.net@localhost
 HOMEPAGE=	http://medernac.home.cern.ch/medernac/SpeedX/index_en.html
 COMMENT=	Car racing game for X
 
-SITES.mercrain.s3m.zip=	http://www.modarchive.com/cgi-bin/download.cgi/M/
-
-
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake
 
diff --git a/stardict-tools/Makefile b/stardict-tools/Makefile
index f02024dad0..fca7252616 100644
--- a/stardict-tools/Makefile
+++ b/stardict-tools/Makefile
@@ -10,8 +10,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	cheusov%NetBSD.org@localhost
 HOMEPAGE=	http://stardict.sourceforge.net/
 COMMENT=	StarDict tools for dictionary conversions
-
-LICENSE=		gnu-gpl-v3
+LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
diff --git a/structure/Makefile b/structure/Makefile
index 5e10d05a47..bea8e99851 100644
--- a/structure/Makefile
+++ b/structure/Makefile
@@ -4,15 +4,13 @@
 #               Generated by fbsd2pkg                     #
 ###########################################################
 
-PKGNAME=	structure-2.3.4
 DISTNAME=	structure_kernel_source
+PKGNAME=	structure-2.3.4
 CATEGORIES=	biology
 MASTER_SITES=	http://pritchardlab.stanford.edu/structure_software/release_versions/v2.3.4/
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-
 COMMENT=	Multi-locus genotype data to investigate population structure
-
 LICENSE=	generic-nonlicense
 
 # Pessimistic assumption.  Test and change if possible.
diff --git a/suitesparse/Makefile b/suitesparse/Makefile
index dea434b593..380662a520 100644
--- a/suitesparse/Makefile
+++ b/suitesparse/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES=	http://faculty.cse.tamu.edu/davis/SuiteSparse/
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	http://www.cise.ufl.edu/research/sparse/SuiteSparse/
 COMMENT=	SuiteSparse is a set of packages for sparse matrices calculation
-
 # Actually uses a combination of gpl and lgpl
 # Not sure how to specify 2 licenses, so just listing the stricter one
 LICENSE=	gnu-gpl-v2
diff --git a/syncthing-inotify/Makefile b/syncthing-inotify/Makefile
index 822f78dcd5..df7847ba8c 100644
--- a/syncthing-inotify/Makefile
+++ b/syncthing-inotify/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Inotify file watcher intended for use with Syncthing
 LICENSE=	mpl-2.0
 
 BUILD_DEPENDS+=	go-[0-9]*:../../lang/go
-
 DEPENDS+=	syncthing>=0.11.0:../../net/syncthing
 
 MAKE_ENV+=	GOPATH=${PREFIX}/gopkg
diff --git a/tc-hasida-table/Makefile b/tc-hasida-table/Makefile
index f4d914b4dd..a7a95c38f9 100644
--- a/tc-hasida-table/Makefile
+++ b/tc-hasida-table/Makefile
@@ -1,14 +1,13 @@
 # $NetBSD: Makefile,v 1.3 2013/12/15 04:12:49 makoto Exp $
 
 DISTNAME=	hasida-table-0.8
-
 CATEGORIES=	inputmethod
 MASTER_SITES=	ftp://ftp.ki.nu/pub/
-LICENSE=	2-clause-bsd
 
 MAINTAINER=	makoto%ki.nu@localhost
 HOMEPAGE=	http://www.ki.nu/~makoto/tcode/
 COMMENT=	Kanji table for t-code input (PostScript and PDF)
+LICENSE=	2-clause-bsd
 
 USE_TOOLS+=	perl
 REPLACE_PERL=	hasida-table
diff --git a/tcc/Makefile b/tcc/Makefile
index a908330c47..d5f579a1b2 100644
--- a/tcc/Makefile
+++ b/tcc/Makefile
@@ -9,9 +9,8 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.tinycc.org/
 COMMENT=	The Smallest ANSI C compiler
 
-ONLY_FOR_PLATFORM=	*-*-i386
 NOT_FOR_PLATFORM=	NetBSD-1.6.2-*
-
+ONLY_FOR_PLATFORM=	*-*-i386
 
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
diff --git a/teng/Makefile b/teng/Makefile
index ba0d09438c..81d5afd2fc 100644
--- a/teng/Makefile
+++ b/teng/Makefile
@@ -4,7 +4,6 @@
 DISTNAME=	teng-2.1.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=teng/}
-
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ondrej.tuma%firma.seznam.cz@localhost
diff --git a/testssl/Makefile b/testssl/Makefile
index de93fff726..fca8044cba 100644
--- a/testssl/Makefile
+++ b/testssl/Makefile
@@ -4,15 +4,14 @@ DISTNAME=	${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=	testssl-2.8
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=drwetter/}
+GITHUB_PROJECT=	testssl.sh
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	https://testssl.sh/
 COMMENT=	Checks servers for TLS/SSL flaws
 LICENSE=	gnu-gpl-v2
 
-GITHUB_PROJECT=	testssl.sh
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
 DEPENDS+=	bash-[0-9]*:../../shells/bash
 
 NO_BUILD=		yes
diff --git a/tr2latex/Makefile b/tr2latex/Makefile
index 65e535be91..029cae22fd 100644
--- a/tr2latex/Makefile
+++ b/tr2latex/Makefile
@@ -5,15 +5,14 @@ PKGNAME=	${DISTNAME}-2.2
 PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=support/}
+DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_SUFX=	.tgz
+# the download servers archive this on the fly
 
 MAINTAINER=	reed%reedmedia.net@localhost
 HOMEPAGE=	ftp://ctan.tug.org/tex-archive/support/tr2latex/README
 COMMENT=	Troff to LaTeX converter
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
-# the download servers archive this on the fly
-
 # todo: restricted because of "no profit is made by copying the files"
 # see README
 
diff --git a/tuxtype2/Makefile b/tuxtype2/Makefile
index 1e2325a038..f7994e75a7 100644
--- a/tuxtype2/Makefile
+++ b/tuxtype2/Makefile
@@ -7,12 +7,11 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxtype/}
 
 MAINTAINER=	reed%reedmedia.net@localhost
-COMMENT=	Educational typing tutorial game for children
 HOMEPAGE=	http://tuxtype.sourceforge.net/
+COMMENT=	Educational typing tutorial game for children
 
 VERSION=	1.5.0
 
-
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
diff --git a/u-boot/Makefile b/u-boot/Makefile
index 60c7aa612e..074f712e21 100644
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -10,7 +10,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	noud4%users.sourceforge.net@localhost
 HOMEPAGE=	http://www.denx.de/wiki/UBoot
 COMMENT=	The mkimage utility of the u-boot bootloader
-
 LICENSE=	gnu-gpl-v2
 
 MAKE_FLAGS+=	PREFIX=${PREFIX}
diff --git a/ubit/Makefile b/ubit/Makefile
index 7466ad7eb4..269ca07a1f 100644
--- a/ubit/Makefile
+++ b/ubit/Makefile
@@ -4,7 +4,6 @@
 DISTNAME=	ubit-5.5.0
 PKGREVISION=	2
 CATEGORIES=	x11
-
 MASTER_SITES=	ftp://ftp.enst.fr/pub/ubit/
 DISTFILES=	${DISTNAME}.tar.gz
 #EXTRACT_SUFX=	.tar.gz
@@ -13,7 +12,6 @@ MAINTAINER=	dauphin%enst.fr@localhost
 HOMEPAGE=	http://perso.enst.fr/~elc/ubit/
 COMMENT=	Ubiquitous Brick Interactive Toolkit
 
-
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
diff --git a/unicorn5hc/Makefile b/unicorn5hc/Makefile
index 772dd61e83..f7147d8126 100644
--- a/unicorn5hc/Makefile
+++ b/unicorn5hc/Makefile
@@ -4,6 +4,7 @@ DISTNAME=	unicorn5hc
 PKGNAME=	unicorn5hc-5.7
 CATEGORIES=	games
 MASTER_SITES=	http://www.elf-emulation.com/rcs/unicorn5/
+DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -11,8 +12,6 @@ HOMEPAGE=	http://www.elf-emulation.com/rcs/unicorn5/index.html
 COMMENT=	Quest for the Unicorn version 5, a rogue-like game, Hard Core edition
 #LICENSE=	no-commercial-use
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
-
 WRKSRC=			${WRKDIR}/unicorn5RL
 USE_LANGUAGES=		c
 BUILD_TARGET=		unicorn5
diff --git a/unimrcp/Makefile b/unimrcp/Makefile
index 486495446d..cabe7b4943 100644
--- a/unimrcp/Makefile
+++ b/unimrcp/Makefile
@@ -3,8 +3,8 @@
 DISTNAME=	unimrcp-1.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=unispeech/}
-EXTRACT_SUFX=	.zip
 GITHUB_TAG=	unimrcp-${PKGVERSION_NOREV}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	angelmadames%gmail.com@localhost
 HOMEPAGE=	https://github.com/unispeech/unimrcp/
diff --git a/uthash/Makefile b/uthash/Makefile
index d29136f417..2cf71d6800 100644
--- a/uthash/Makefile
+++ b/uthash/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD$
 
+DISTNAME=		${PKGNAME_NOREV}
 PKGNAME=		uthash-2.0.2
 CATEGORIES=		devel
-DISTNAME=		${PKGNAME_NOREV}
 MASTER_SITES=		${MASTER_SITE_GITHUB:=troydhanson/}
 GITHUB_PROJECT=		uthash
 GITHUB_TAG=		v${PKGVERSION_NOREV}
diff --git a/vcg/Makefile b/vcg/Makefile
index 43b9c12c5a..1290e368c1 100644
--- a/vcg/Makefile
+++ b/vcg/Makefile
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 COMMENT=	Visualization Tool for compiler graphs
-
 LICENSE=	gnu-gpl-v2
 
 MAKE_JOBS_SAFE=		no
diff --git a/vcsh/Makefile b/vcsh/Makefile
index b0a53cdadd..29d5e8a7da 100644
--- a/vcsh/Makefile
+++ b/vcsh/Makefile
@@ -10,11 +10,11 @@ HOMEPAGE=	https://github.com/RichiH/vcsh/
 COMMENT=	Version Control System for the home directory
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 # TEST_DEPENDS
 BUILD_DEPENDS+=	p5-Shell-Command-[0-9]*:../../wip/p5-Shell-Command
 BUILD_DEPENDS+=	p5-Test-Most-[0-9]*:../../wip/p5-Test-Most
 BUILD_DEPENDS+=	p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
+DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
 USE_LANGUAGES=	c
 USE_TOOLS=	perl
diff --git a/vee/Makefile b/vee/Makefile
index 4a80cc74a4..2b840aaec2 100644
--- a/vee/Makefile
+++ b/vee/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.4 2012/10/07 17:34:22 asau Exp $
 #
 
-PKGNAME=	vee-0.9.9
 DISTNAME=	vee-0.9.9-zeta
+PKGNAME=	vee-0.9.9
 CATEGORIES=	www
 MASTER_SITES=	http://vee.googlecode.com/files/
 EXTRACT_SUFX=	.tgz
diff --git a/vis/Makefile b/vis/Makefile
index 52e496aaa7..2eac0c8cae 100644
--- a/vis/Makefile
+++ b/vis/Makefile
@@ -4,21 +4,19 @@
 DISTNAME=	vis-2.1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://vlsi.colorado.edu/pub/vis/
+DISTFILES=	vis-2.1.tar.gz glu-2.1.tar.gz
 
 MAINTAINER=	dhowland%users.sourceforge.net@localhost
 HOMEPAGE=	http://vlsi.colorado.edu/~vis/
 COMMENT=	Classic logic verification tool
 
-DISTFILES=	vis-2.1.tar.gz glu-2.1.tar.gz
-
 DEPENDS+=	bison>=1.22:../../devel/bison
 
 CONFLICTS=	vis<=0.1
 
+CONFIGURE_DIRS=	../glu-2.1 .
 
-CONFIGURE_DIRS=		../glu-2.1 .
-
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/vista-fonts/Makefile b/vista-fonts/Makefile
index c51b7825b2..b8f14330d8 100644
--- a/vista-fonts/Makefile
+++ b/vista-fonts/Makefile
@@ -13,13 +13,12 @@ HOMEPAGE=	http://www.microsoft.com/download/en/details.aspx?id=6
 COMMENT=	TrueType fonts from Microsoft Windows Vista
 LICENSE=	ms-ttf-license
 
-RESTRICTED=	No redistribution in altered form
-
-BUILD_DEPENDS+=	cabextract-[0-9]*:../../archivers/cabextract
-
+RESTRICTED=		No redistribution in altered form
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+BUILD_DEPENDS+=	cabextract-[0-9]*:../../archivers/cabextract
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/vncselector/Makefile b/vncselector/Makefile
index b5994b4132..abd6f7cff3 100644
--- a/vncselector/Makefile
+++ b/vncselector/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.8 2012/10/07 17:41:43 asau Exp $
 #
 
-PKGNAME=		vncselector-1.6.1
 DISTNAME=		vncselector_1.6.1
+PKGNAME=		vncselector-1.6.1
 PKGREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vncselector/}
@@ -11,7 +11,6 @@ MAINTAINER=		dhowland%users.sourceforge.net@localhost
 HOMEPAGE=		http://vncselector.sourceforge.net/
 COMMENT=		Tool for managing VNC sessions
 
-
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++ fortran77
 USE_LIBTOOL=		yes
diff --git a/vpr/Makefile b/vpr/Makefile
index d7c27a184e..b2e93ed547 100644
--- a/vpr/Makefile
+++ b/vpr/Makefile
@@ -5,12 +5,12 @@ DISTNAME=	vpr-4.30
 PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.eecg.toronto.edu/~vaughn/vpr/downloadfiles/
+DISTFILES=	vpr_430_tar.gz
 
 MAINTAINER=	dhowland%users.sourceforge.net@localhost
 HOMEPAGE=	http://www.eecg.toronto.edu/~vaughn/vpr/vpr.html
 COMMENT=	Classic place and route tool for FPGAs
 
-DISTFILES=	vpr_430_tar.gz
 EXTRACT_OPTS+=	-d ${WRKSRC}
 
 BUILD_DIRS=	t-vpack vpr
diff --git a/vreng/Makefile b/vreng/Makefile
index 50b11ad3a0..7babf74a20 100644
--- a/vreng/Makefile
+++ b/vreng/Makefile
@@ -4,7 +4,6 @@
 DISTNAME=	vreng-6.8.12
 PKGREVISION=	5
 CATEGORIES=	x11
-
 MASTER_SITES=	ftp://ftp.enst.fr/pub/vreng/
 DISTFILES=	${DISTNAME}.tar.gz
 #EXTRACT_SUFX=	.tar.gz
diff --git a/wanderer/Makefile b/wanderer/Makefile
index 1f8928a848..d0263c48b0 100644
--- a/wanderer/Makefile
+++ b/wanderer/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD$
 
 DISTNAME=	wanderer_dev-3.2.1
-PKGREVISION=	1
 PKGNAME=	${DISTNAME:S/_dev//}
-DIST_SUBDIR=	${PKGVERSION_NOREV}
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://e271.net/~marina/
+DIST_SUBDIR=	${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	catskillmarina%gmail.com@localhost
diff --git a/watch/Makefile b/watch/Makefile
index 1bc2d487f3..b995a57c76 100644
--- a/watch/Makefile
+++ b/watch/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/05/08 12:43:31 jonthn Exp $
 
-PKGNAME=	watch-3.3.10
 DISTNAME=	procps-ng-3.3.10
+PKGNAME=	watch-3.3.10
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=procps-ng/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/wise3/Makefile b/wise3/Makefile
index 09dca27b82..8cef6fc73c 100644
--- a/wise3/Makefile
+++ b/wise3/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
-PKGNAME=	wise-3
 DISTNAME=	master
+PKGNAME=	wise-3
 CATEGORIES=	biology
 MASTER_SITES=	https://github.com/birney/wise3/archive/
 EXTRACT_SUFX=	.zip
diff --git a/xalan-c-1.10/Makefile b/xalan-c-1.10/Makefile
index bc8a0c8687..7879f864d1 100755
--- a/xalan-c-1.10/Makefile
+++ b/xalan-c-1.10/Makefile
@@ -7,9 +7,9 @@ PKGREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://archive.apache.org/dist/xml/xalan-c/source/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-
 DISTFILES+=	xerces-c-src_2_8_0.tar.gz
 SITES.xerces-c-src_2_8_0.tar.gz=	${MASTER_SITE_APACHE:=xerces/c/2/sources/}
+
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://xml.apache.org/xalan-c/l
 COMMENT=	XSLT processor of the Apache Project
diff --git a/xalan-c/Makefile b/xalan-c/Makefile
index 6bc8a90d15..98875f3631 100755
--- a/xalan-c/Makefile
+++ b/xalan-c/Makefile
@@ -6,9 +6,9 @@ PKGNAME=	${DISTNAME:S|_c|-c|:S|-src||}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_APACHE:=xalan/xalan-c/sources/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-
 DISTFILES+=	xerces-c-3.1.1.tar.gz
 SITES.xerces-c-3.1.1.tar.gz=	${MASTER_SITE_APACHE:=xerces/c/3/sources/}
+
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://xml.apache.org/xalan-c/
 COMMENT=	XSLT processor of the Apache Project
diff --git a/xerces-c-2.8.0/Makefile b/xerces-c-2.8.0/Makefile
index 9698393577..c7d1dcf315 100755
--- a/xerces-c-2.8.0/Makefile
+++ b/xerces-c-2.8.0/Makefile
@@ -2,8 +2,8 @@
 #
 
 DISTNAME=	xerces-c-src_2_8_0
-PKGREVISION=	2
 PKGNAME=	${DISTNAME:S/-src_/-/:S/_/./g}
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_APACHE:=xerces/c/2/sources/}
 
diff --git a/xonotic/Makefile b/xonotic/Makefile
index b0a8b6bd0c..a340a4e64d 100644
--- a/xonotic/Makefile
+++ b/xonotic/Makefile
@@ -6,8 +6,8 @@ MASTER_SITES=	http://nl.dl.xonotic.org/
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	The free and fast arena shooter
 HOMEPAGE=	http://xonotic.org/
+COMMENT=	The free and fast arena shooter
 LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake
diff --git a/xoreos/Makefile b/xoreos/Makefile
index 23f325d657..898492b8d3 100644
--- a/xoreos/Makefile
+++ b/xoreos/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.3 2015/09/05 21:49:59 yhardy Exp $
 
 GITHUB_PROJECT=	xoreos
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	${GITHUB_PROJECT}-0.0.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=xoreos/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/xoreos/xoreos/
diff --git a/xtrackcad/Makefile b/xtrackcad/Makefile
index 5ad86c2e1e..88498b8ad5 100644
--- a/xtrackcad/Makefile
+++ b/xtrackcad/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2015/07/12 00:35:40 thomasklausner Exp $
 
-PKGNAME=	${DISTNAME:C/source-//:C/-beta/b/}
 DISTNAME=	xtrkcad-source-4.2.0-beta1
+PKGNAME=	${DISTNAME:C/source-//:C/-beta/b/}
 CATEGORIES=	cad
 MASTER_SITES=	http://sourceforge.net/projects/xtrkcad-fork/files/XTrackCad/Version%204.2.0-beta1/
 
diff --git a/xxhash/Makefile b/xxhash/Makefile
index b82d9e896f..5f35e7cf42 100644
--- a/xxhash/Makefile
+++ b/xxhash/Makefile
@@ -1,14 +1,14 @@
 # $NetBSD$
 
-PKGNAME=	xxhash-0.6.2
 DISTNAME=	xxHash-${PKGVERSION_NOREV}
+PKGNAME=	xxhash-0.6.2
 CATEGORIES=	misc
-GITHUB_TAG=	v${PKGVERSION_NOREV}
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Cyan4973/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	cfkoch%edgebsd.org@localhost
-COMMENT=	Extremely fast non-cryptographic hash algorithm
 HOMEPAGE=	https://github.com/Cyan4973/xxHash/
+COMMENT=	Extremely fast non-cryptographic hash algorithm
 LICENSE=	2-clause-bsd AND gnu-gpl-v2
 
 EXTRACT_USING=	gtar
diff --git a/zbackup/Makefile b/zbackup/Makefile
index 08f721bf8e..182511199a 100644
--- a/zbackup/Makefile
+++ b/zbackup/Makefile
@@ -2,7 +2,6 @@
 
 GITHUB_PROJECT=	zbackup
 DISTNAME=	1.4.4
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
 PKGNAME=	zbackup-1.4.4
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=zbackup/}
diff --git a/ziparchive/Makefile b/ziparchive/Makefile
index d270631331..5c11521ca8 100644
--- a/ziparchive/Makefile
+++ b/ziparchive/Makefile
@@ -5,6 +5,7 @@ DISTNAME=	ziparchive
 PKGNAME=	ziparchive-4.1.0
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.artpol-software.com/Downloads/
+DIST_SUBDIR=	ziparchive-4.1.0
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ryoon%NetBSD.org@localhost
@@ -12,8 +13,6 @@ HOMEPAGE=	http://www.artpol-software.com/Download.aspx
 COMMENT=	Library for ZIP compression and decompression
 LICENSE=	gnu-gpl-v2
 
-DIST_SUBDIR=		ziparchive-4.1.0
-
 WRKSRC=		${WRKDIR} # More than one possibility -- please check manually.
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
diff --git a/zmap/Makefile b/zmap/Makefile
index e0868baae1..bb6862474c 100644
--- a/zmap/Makefile
+++ b/zmap/Makefile
@@ -4,6 +4,7 @@ DISTNAME=	v1.2.1
 PKGNAME=	${DISTNAME:S/v/zmap-/}
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/zmap/zmap/archive/
+DIST_SUBDIR=	zmap
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://zmap.io/
@@ -12,8 +13,6 @@ LICENSE=	apache-2.0
 
 BUILD_DEPENDS+=	gengetopt-[0-9]*:../../devel/gengetopt
 
-DIST_SUBDIR=	zmap
-
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 USE_CMAKE=	yes