diff --git a/srcpkgs/alephone/template b/srcpkgs/alephone/template
index 90fa56c..3034030 100644
--- a/srcpkgs/alephone/template
+++ b/srcpkgs/alephone/template
@@ -2,6 +2,7 @@
 pkgname=alephone
 version=20190331
 revision=2
+wrksrc=AlephOne-${version}
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel libcurl-devel expat-devel ffmpeg-devel libpng-devel
@@ -14,4 +15,3 @@ homepage="https://alephone.lhowon.org/"
 changelog="https://github.com/Aleph-One-Marathon/alephone/releases/tag/${version}"
 distfiles="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/AlephOne-${version}.tar.bz2"
 checksum=02bcbe02aea3d3ffb7d1ad13ac7bbfa2b3bfe3c2bd37c65b637b9883b9114c96
-wrksrc=AlephOne-${version}
diff --git a/srcpkgs/alpine-passfile/template b/srcpkgs/alpine-passfile/template
index d91f478..190cd54 100644
--- a/srcpkgs/alpine-passfile/template
+++ b/srcpkgs/alpine-passfile/template
@@ -11,7 +11,6 @@ configure_args="--with-passfile=.pine-passfile --without-tcl --disable-shared
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr alpine_SSLPROVIDER=libressl
  --with-system-pinerc=/etc/${_pkgname}.d/pine.conf
  --with-system-fixed-pinerc=/etc/${_pkgname}.d/pine.conf.fixed"
-conflicts=alpine
 hostmakedepends="hunspell"
 makedepends="pam-devel ncurses-devel gettext-devel libldap-devel mit-krb5-devel"
 short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
@@ -20,6 +19,7 @@ license="Apache-2.0"
 homepage="http://repo.or.cz/alpine.git"
 distfiles="http://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
 checksum=983f04e1c5f1beba767877303c682d3c995e0cd93ad6888f2d9933ef4236c25f
+conflicts=alpine
 
 post_extract() {
 	sed -i -e '/run test program/s/^/: /' \
diff --git a/srcpkgs/applyppf/template b/srcpkgs/applyppf/template
index 9f98557..c1c4f83 100644
--- a/srcpkgs/applyppf/template
+++ b/srcpkgs/applyppf/template
@@ -2,8 +2,8 @@
 pkgname=applyppf
 version=3.0
 revision=3
-hostmakedepends="unzip"
 create_wrksrc=yes
+hostmakedepends="unzip"
 short_desc="PlayStation Patch File application tool"
 maintainer="Alison Watson <marrub@greyserv.net>"
 license="custom:applyppf"
diff --git a/srcpkgs/ericw-tools/template b/srcpkgs/ericw-tools/template
index b4af142..6245746 100644
--- a/srcpkgs/ericw-tools/template
+++ b/srcpkgs/ericw-tools/template
@@ -1,18 +1,18 @@
 # Template file for 'ericw-tools'
 pkgname=ericw-tools
 version=0.18.2rc1
-_version=${version%rc1}-rc1
 revision=1
+_version=${version%rc1}-rc1
+wrksrc=${pkgname}-${_version}
 build_style=cmake
 hostmakedepends="groff"
 makedepends="embree-devel"
-short_desc="Map compilation tools for Quake, Hexen 2 et al."
+short_desc="Map compilation tools for Quake, Hexen 2 et al"
 maintainer="Alison Watson <marrub@greyserv.net>"
 license="GPL-2.0-or-later"
 homepage="http://ericwa.github.io/ericw-tools/"
 distfiles="https://github.com/ericwa/ericw-tools/archive/v${_version}.tar.gz"
 checksum=1905752a582882f587b822e4186a7126522833b32b9777dcd46fe0f3c7cedf87
-wrksrc=${pkgname}-${_version}
 
 post_patch() {
 	for f in bspinfo bsputil light qbsp vis
diff --git a/srcpkgs/eternity-engine-git/template b/srcpkgs/eternity-engine-git/template
index 3cdb21f..320212a 100644
--- a/srcpkgs/eternity-engine-git/template
+++ b/srcpkgs/eternity-engine-git/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="git"
 makedepends="SDL2-devel SDL2_mixer-devel SDL2_net-devel libogg-devel
              libvorbis-devel libflac-devel libmpeg2-devel libmodplug-devel"
-short_desc="An advanced Doom source port"
+short_desc="Advanced Doom source port"
 maintainer="Alison Watson <marrub@greyserv.net>"
 license="GPL-3.0-or-later"
 homepage="http://eternity.youfailit.net/wiki/Main_Page"
diff --git a/srcpkgs/macemu-git/template b/srcpkgs/macemu-git/template
index dd02555..9eaa3b9 100644
--- a/srcpkgs/macemu-git/template
+++ b/srcpkgs/macemu-git/template
@@ -3,6 +3,7 @@ pkgname=macemu-git
 version=20190405
 revision=3
 _git_hash=01052ca89d22882c870b84c5498cd0ee9a843b6b
+archs="i686* x86_64*"
 wrksrc="macemu-${_git_hash}"
 hostmakedepends="make automake libtool pkg-config"
 makedepends="gtk+-devel SDL-devel vde2-devel"
@@ -13,7 +14,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/cebix/macemu"
 distfiles="https://github.com/cebix/macemu/archive/${_git_hash}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=65aa7c4f7b6bcf1f83b2c44589fcdeded10104a14532fa98ad2b04b31827a599
-archs="i686* x86_64*"
 dkms_modules="sheep_net ${version}"
 _dkms_name="sheep_net-${version}"
 nopie=yes
diff --git a/srcpkgs/maxcso/template b/srcpkgs/maxcso/template
index 702be3e..df128eb 100644
--- a/srcpkgs/maxcso/template
+++ b/srcpkgs/maxcso/template
@@ -4,7 +4,7 @@ version=1.11.0
 revision=1
 build_style=gnu-makefile
 makedepends="libuv-devel liblz4-devel zlib-devel"
-short_desc="A fast ISO to CSO compression program"
+short_desc="Fast ISO to CSO compression program"
 maintainer="Alison Watson <marrub@greyserv.net>"
 license="ISC"
 homepage="https://github.com/unknownbrackets/maxcso"
diff --git a/srcpkgs/qjoypad/template b/srcpkgs/qjoypad/template
index 79b7ad6..9fb24df 100644
--- a/srcpkgs/qjoypad/template
+++ b/srcpkgs/qjoypad/template
@@ -3,8 +3,6 @@ pkgname=qjoypad
 version=4.3.1
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libao-devel"
 hostmakedepends="qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-tools-devel qt5-x11extras-devel eudev-libudev-devel
              libXtst-devel"
diff --git a/srcpkgs/zdbsp/template b/srcpkgs/zdbsp/template
index d8ae7d9..50866ca 100644
--- a/srcpkgs/zdbsp/template
+++ b/srcpkgs/zdbsp/template
@@ -2,6 +2,7 @@
 pkgname=zdbsp
 version=1.19t
 revision=2
+wrksrc=zdbsp-tolerance
 build_style=cmake
 makedepends="zlib-devel"
 short_desc="ZDoom's internal node builder"
@@ -10,7 +11,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/alexey-lysiuk/zdbsp/tree/tolerance"
 distfiles="https://github.com/alexey-lysiuk/zdbsp/archive/tolerance.tar.gz"
 checksum=bfe1a2bcd80aaea3caaec59a44b04ecc3ad527df9b33eb4b67bb86be08d2bf37
-wrksrc=zdbsp-tolerance
 
 do_install() {
 	vbin ${cmake_builddir:=build}/zdbsp
diff --git a/srcpkgs/zennode/template b/srcpkgs/zennode/template
index 739f8e8..10882a8 100644
--- a/srcpkgs/zennode/template
+++ b/srcpkgs/zennode/template
@@ -2,16 +2,16 @@
 pkgname=zennode
 version=1.2.1
 revision=3
+create_wrksrc=yes
+build_wrksrc=src/ZenNode
 build_style=gnu-makefile
 hostmakedepends="unzip"
-create_wrksrc=yes
-short_desc="A GPL node builder for Doom"
+short_desc="GPL node builder for Doom"
 maintainer="Alison Watson <marrub@greyserv.net>"
 license="GPL-2.0-or-later"
 homepage="http://www.mrousseau.org/programs/ZenNode"
 distfiles="http://www.mrousseau.org/programs/ZenNode/archives/zennode-${version}.zip"
 checksum=137b50f9bc6efc69aebca4233bd3924a9ed21260855e6e37ed098486f90bd212
-build_wrksrc=src/ZenNode
 
 post_extract() {
 	cd ZenNode-1.2.1
diff --git a/srcpkgs/zokumbsp/template b/srcpkgs/zokumbsp/template
index af126d6..7a9a052 100644
--- a/srcpkgs/zokumbsp/template
+++ b/srcpkgs/zokumbsp/template
@@ -3,15 +3,15 @@ pkgname=zokumbsp
 version=1.1
 revision=1
 _git_hash=2c7efa402a5b7a941230395fd33db3d139343563
+wrksrc=${pkgname}-${_git_hash}
+build_wrksrc=src/zokumbsp
 build_style=gnu-makefile
-short_desc="A blockmap, reject and node builder for Doom engine games"
+short_desc="Blockmap, reject and node builder for Doom engine games"
 maintainer="Alison Watson <marrub@greyserv.net>"
 license="GPL-2.0-or-later"
 homepage="http://www.doom2.net/zokum/zokumbsp/"
 distfiles="https://github.com/zokum-no/zokumbsp/archive/${_git_hash}.tar.gz"
 checksum=b0a18140d7741574ec2d71599e1c0530022fae93684a4e1aa4ac791cd92ce64b
-wrksrc=${pkgname}-${_git_hash}
-build_wrksrc=src/zokumbsp
 
 do_install() {
 	vbin ${wrksrc}/${build_wrksrc}/zokumbsp