main/*: rebuild stale packages, modernize

151 files changed, 499 insertions, 1384 deletions

diff --git a/main/aaudit/APKBUILD b/main/aaudit/APKBUILD
index a7b44e9e95a..c8e187921f1 100644
--- a/main/aaudit/APKBUILD
+++ b/main/aaudit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=aaudit
 pkgver=0.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Alpine Auditor"
 url="https://alpinelinux.org"
 arch="noarch"
diff --git a/main/abi-compliance-checker/APKBUILD b/main/abi-compliance-checker/APKBUILD
index cdb13ccc660..f46a7dd9a0b 100644
--- a/main/abi-compliance-checker/APKBUILD
+++ b/main/abi-compliance-checker/APKBUILD
@@ -2,27 +2,17 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=abi-compliance-checker
 pkgver=2.3
-pkgrel=0
+pkgrel=1
 pkgdesc="A tool for checking backward compatibility of a C/C++ library"
 url="https://github.com/lvc/abi-compliance-checker"
 arch="noarch"
 license="LGPL-2.0-or-later"
 depends="perl build-base"
-depends_dev=""
-makedepends="$depends_dev perl-dev"
+makedepends="perl-dev"
 options="!check"
-install=""
-subpackages=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/lvc/abi-compliance-checker/archive/$pkgver.tar.gz"
 
-builddir="${srcdir}"/$pkgname-$pkgver
-
-build() {
-	return 0
-}
-
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir"/usr
 	perl Makefile.pl -install --prefix=/usr --destdir="$pkgdir"
 }
diff --git a/main/alpine-git-mirror-syncd/APKBUILD b/main/alpine-git-mirror-syncd/APKBUILD
index d465f2e7006..13d981d32f6 100644
--- a/main/alpine-git-mirror-syncd/APKBUILD
+++ b/main/alpine-git-mirror-syncd/APKBUILD
@@ -3,14 +3,13 @@
 pkgname=alpine-git-mirror-syncd
 _shortname=git-mirror-syncd
 pkgver=0.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua script that listens on MQTT and synchronizes Git mirrors when notified about changes"
 url="https://github.com/jirutka/alpine-git-mirror-syncd"
 arch="noarch"
 license="MIT"
 depends="ca-certificates git lua5.1 lua5.1-cjson lua5.1-mosquitto"
 source="https://github.com/jirutka/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
 options="!check"  # upstream does not provide any tests yet
 
 prepare() {
@@ -20,8 +19,6 @@ prepare() {
 }
 
 package() {
-	cd "$builddir"
-
 	install -D -m 755 $_shortname.lua "$pkgdir"/usr/bin/$_shortname
 	install -D -m 644 config.lua.example "$pkgdir"/etc/$_shortname/config.lua
 	install -D -m 755 etc/init.d/$_shortname "$pkgdir"/etc/init.d/$_shortname
diff --git a/main/apache-mod-auth-ntlm-winbind/APKBUILD b/main/apache-mod-auth-ntlm-winbind/APKBUILD
index 8685a24c3a4..43b7f304f0e 100644
--- a/main/apache-mod-auth-ntlm-winbind/APKBUILD
+++ b/main/apache-mod-auth-ntlm-winbind/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <natanael.copa@gmail.com>
 pkgname=apache-mod-auth-ntlm-winbind
 pkgver=0.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Authentication module for Apache using NTLM protocol with winbind helper"
 url="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/"
 arch="all"
@@ -10,19 +10,19 @@ license="Apache-2.0"
 depends="apache2 samba samba-winbind"
 makedepends="autoconf apache2-dev apr-util-dev apr-dev"
 source="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c
-http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/configure.in
-http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/Makefile.in
-mod-auth-ntlm-winbind.conf"
+	http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/configure.in
+	http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/Makefile.in
+	mod-auth-ntlm-winbind.conf
+	"
+builddir="$srcdir"
 
 build() {
-	cd "$srcdir"
 	autoconf
 	./configure
-	make DESTDIR="$pkgdir" || return 1
+	make DESTDIR="$pkgdir"
 }
 
 package() {
-	cd "$srcdir"
 	mkdir -p "$pkgdir"/etc/apache2/conf.d
 	mkdir -p "$pkgdir"/usr/lib/apache2
 	install mod-auth-ntlm-winbind.conf "$pkgdir"/etc/apache2/conf.d/mod-auth-ntlm-winbind.conf
diff --git a/main/apache-mod-auth-radius/APKBUILD b/main/apache-mod-auth-radius/APKBUILD
index a0e2a4c6cb9..4cd0bafa390 100644
--- a/main/apache-mod-auth-radius/APKBUILD
+++ b/main/apache-mod-auth-radius/APKBUILD
@@ -3,14 +3,13 @@
 pkgname=apache-mod-auth-radius
 _pkgname=mod_auth_radius
 pkgver=1.6.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Apache authentication module to become RADIUS client for AAA requests"
 url="http://freeradius.org/mod_auth_radius/"
 arch="all"
 license="BSD"
 depends="apache2"
 makedepends="apache2-dev freeradius-dev"
-install=""
 options="!check"
 source="$pkgname_$pkgver.tar.gz::https://github.com/FreeRADIUS/mod_auth_radius/archive/v$pkgver.tar.gz
 	mod-auth-radius.conf"
diff --git a/main/api-sanity-checker/APKBUILD b/main/api-sanity-checker/APKBUILD
index dbdee62a9ca..9753867e555 100644
--- a/main/api-sanity-checker/APKBUILD
+++ b/main/api-sanity-checker/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=api-sanity-checker
 pkgver=1.98.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for creating automated test suites from any set of C sources"
 url="https://lvc.github.io/api-sanity-checker/"
 arch="noarch"
diff --git a/main/argon2/APKBUILD b/main/argon2/APKBUILD
index b3eb0b1e8a5..40d1211f549 100644
--- a/main/argon2/APKBUILD
+++ b/main/argon2/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=argon2
 _pkgname=phc-winner-argon2
 pkgver=20190702
-pkgrel=1
+pkgrel=2
 pkgdesc="The password hash Argon2, winner of PHC"
 url="https://github.com/P-H-C/phc-winner-argon2"
 arch="all"
diff --git a/main/argp-standalone/APKBUILD b/main/argp-standalone/APKBUILD
index 5799c19d1fc..bf4b0af1f10 100644
--- a/main/argp-standalone/APKBUILD
+++ b/main/argp-standalone/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=argp-standalone
 pkgver=1.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Hierarchial argument parsing library broken out from glibc"
 url="http://www.lysator.liu.se/~nisse/misc/"
 arch="all"
diff --git a/main/aspell-fr/APKBUILD b/main/aspell-fr/APKBUILD
index 458c2065e10..ac95afb3cc0 100644
--- a/main/aspell-fr/APKBUILD
+++ b/main/aspell-fr/APKBUILD
@@ -2,25 +2,22 @@
 pkgname=aspell-fr
 pkgver=0.50_p3
 _ver=${pkgver/_p/-}
-pkgrel=1
+pkgrel=2
 pkgdesc="French dictionary for aspell"
 url="http://aspell.net/"
 arch="noarch"
 license="GPL-2.0"
-depends=""
 makedepends="aspell-dev"
 source="https://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_ver.tar.bz2"
+builddir="$srcdir"/aspell-fr-$_ver
 
-_builddir="$srcdir"/aspell-fr-$_ver
 build () {
-	cd "$_builddir"
-	./configure || return 1
-	make || return 1
+	./configure
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b  aspell-fr-0.50-3.tar.bz2"
diff --git a/main/aspell-ru/APKBUILD b/main/aspell-ru/APKBUILD
index d6e6636d436..35b743514bb 100644
--- a/main/aspell-ru/APKBUILD
+++ b/main/aspell-ru/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=aspell-ru
 pkgver=0.99f7
-pkgrel=0
+pkgrel=1
 _lang=${pkgname##*-}
 _name=${pkgname%%-*}6-$_lang-$pkgver-1
 pkgdesc="Russian dictionary for aspell"
@@ -15,15 +15,13 @@ source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
 builddir="$srcdir"/$_name
 
 build () {
-	cd "$builddir"
 	./configure
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	install -Dm644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 sha512sums="789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430  aspell6-ru-0.99f7-1.tar.bz2"
diff --git a/main/aspell-uk/APKBUILD b/main/aspell-uk/APKBUILD
index 47552196133..910d6380d20 100644
--- a/main/aspell-uk/APKBUILD
+++ b/main/aspell-uk/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=aspell-uk
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 _lang=${pkgname##*-}
 _name=${pkgname%%-*}6-$_lang-$pkgver-0
 pkgdesc="Ukrainian dictionary for aspell"
@@ -14,15 +14,13 @@ source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
 builddir="$srcdir"/$_name
 
 build () {
-	cd "$builddir"
 	./configure
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	install -Dm644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 sha512sums="2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799  aspell6-uk-1.4.0-0.tar.bz2"
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index 85803b78033..b8cdd567ec8 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=augeas
 pkgver=1.12.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A configuration editing tool"
 url="http://augeas.net"
 arch="all"
diff --git a/main/bc/APKBUILD b/main/bc/APKBUILD
index d311816fbf6..4235a1b5b72 100644
--- a/main/bc/APKBUILD
+++ b/main/bc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bc
 pkgver=1.07.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An arbitrary precision numeric processing language (calculator)"
 url="https://www.gnu.org/software/bc/bc.html"
 arch="all"
@@ -10,10 +10,8 @@ license="GPL-2.0-or-later"
 makedepends="ed flex bison readline-dev texinfo"
 subpackages="$pkgname-doc"
 source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/bdftopcf/APKBUILD b/main/bdftopcf/APKBUILD
index 5bc70925800..0b54eb32c3b 100644
--- a/main/bdftopcf/APKBUILD
+++ b/main/bdftopcf/APKBUILD
@@ -1,20 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bdftopcf
 pkgver=1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org font utility"
 url="http://xorg.freedesktop.org"
 arch="all"
 license="MIT"
 options="!check" # No test suite.
-depends=""
 makedepends="libxfont-dev util-macros"
-install=""
 subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +23,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/bridge/APKBUILD b/main/bridge/APKBUILD
index 48ce59ba826..71dd7f0e954 100644
--- a/main/bridge/APKBUILD
+++ b/main/bridge/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bridge
 pkgver=1.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Scripts for configuring network bridge interfaces"
 url="https://wiki.alpinelinux.org/wiki/Bridge"
 arch="noarch"
@@ -20,7 +20,6 @@ builddir="$srcdir"
 #     - CVE-2021-42725
 
 package() {
-	cd "$builddir"
 	install -Dm755 "$srcdir"/bridge.pre-up \
 		"$pkgdir"/etc/network/if-pre-up.d/bridge
 	install -d "$pkgdir"/etc/network/if-post-down.d
diff --git a/main/bzip2/APKBUILD b/main/bzip2/APKBUILD
index 4b0d4da0802..1628eb8d0e3 100644
--- a/main/bzip2/APKBUILD
+++ b/main/bzip2/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bzip2
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-quality data compression program"
 url="http://sources.redhat.com/bzip2"
 arch="all"
diff --git a/main/chrpath/APKBUILD b/main/chrpath/APKBUILD
index f2bc440be44..0c77afca667 100644
--- a/main/chrpath/APKBUILD
+++ b/main/chrpath/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=chrpath
 pkgver=0.16
-pkgrel=2
+pkgrel=3
 pkgdesc="Modify rpath of compiled programs"
 url="https://tracker.debian.org/pkg/chrpath"
 arch="all"
@@ -15,7 +15,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" docdir=/usr/share/doc/$pkgname-$pkgver \
 		install
 }
diff --git a/main/cmph/APKBUILD b/main/cmph/APKBUILD
index 74a20752f7f..202affe42dd 100644
--- a/main/cmph/APKBUILD
+++ b/main/cmph/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=cmph
 pkgver=2.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A minimal hash C library - utility application"
 url="http://cmph.sourceforge.net/"
 arch="all"
@@ -10,7 +10,6 @@ subpackages="$pkgname-dev $pkgname-doc libcmph:lib"
 source="https://downloads.sourceforge.net/cmph/cmph-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--disable-static \
 		--build=$CBUILD \
@@ -23,12 +22,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/command-not-found/APKBUILD b/main/command-not-found/APKBUILD
index 137947fdc51..da8e136add6 100644
--- a/main/command-not-found/APKBUILD
+++ b/main/command-not-found/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ariadne Conill <ariadne@dereferenced.org>
 pkgname=command-not-found
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="friendly command not found handling"
 url="https://github.com/kaniini/command-not-found"
 arch="noarch"
diff --git a/main/compat-pvgrub/APKBUILD b/main/compat-pvgrub/APKBUILD
index 0b46906f38e..899028120cb 100644
--- a/main/compat-pvgrub/APKBUILD
+++ b/main/compat-pvgrub/APKBUILD
@@ -1,25 +1,18 @@
-# Contributor: 
-# Maintainer: 
+# Contributor:
+# Maintainer:
 pkgname=compat-pvgrub
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="compatibility support for PV-GRUB 1.x"
 url="https://www.alpinelinux.org/"
 arch="noarch"
 license="ISC"
-depends=""
-depends_dev=""
 makedepends="$depends_dev"
 triggers="compat-pvgrub.trigger=/boot"
-install=""
-subpackages=""
 source="update-pvgrub"
-
-_builddir="$srcdir"
+builddir="$srcdir"
 
 package() {
-	cd "$_builddir"
-
 	mkdir -p "$pkgdir"/boot/grub "$pkgdir"/sbin
 	touch "$pkgdir"/boot/grub/.keep-compat-pvgrub
 
diff --git a/main/cppunit/APKBUILD b/main/cppunit/APKBUILD
index d5e483ac4cf..9fc4a574b9a 100644
--- a/main/cppunit/APKBUILD
+++ b/main/cppunit/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cppunit
 pkgver=1.15.1
-pkgrel=0
+pkgrel=1
 pkgdesc="C++ unit testing framework"
 url="http://www.freedesktop.org/wiki/Software/cppunit/"
 arch="all"
diff --git a/main/cramfs/APKBUILD b/main/cramfs/APKBUILD
index 854df0ecf03..b51a935730b 100644
--- a/main/cramfs/APKBUILD
+++ b/main/cramfs/APKBUILD
@@ -1,25 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cramfs
 pkgver=1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Linux filesystem designed to be simple, small, and to compress things well"
 arch="all"
 url="https://sourceforge.net/projects/cramfs/"
-license='GPL'
-depends=
+license="GPL"
 makedepends="zlib-dev linux-headers"
 source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	mkcramfs-include-sysmacros.patch"
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make CFLAGS="$CFLAGS -D_GNU_SOURCE" || return 1
+	make CFLAGS="$CFLAGS -D_GNU_SOURCE"
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	install -d "$pkgdir"/sbin
-	install mkcramfs cramfsck "$pkgdir"/sbin
+	install -Dm755 mkcramfs cramfsck "$pkgdir"/sbin
 }
 
 sha512sums="6c18dbe32df57f7d132fb2a59a917ad381156ca1f720c1ad0997ca81c62e82fd43ebb0339c5a66d5b144a72ce5c7ae93596522fe2698259f2b68c31db26e3b63  cramfs-1.1.tar.gz
diff --git a/main/cunit/APKBUILD b/main/cunit/APKBUILD
index ae369ebcb62..0e218e765c2 100644
--- a/main/cunit/APKBUILD
+++ b/main/cunit/APKBUILD
@@ -4,7 +4,7 @@ pkgname=cunit
 _pkgname=CUnit
 pkgver=2.1.3
 _pkgver=${pkgver%.*}-${pkgver##*.}
-pkgrel=2
+pkgrel=3
 pkgdesc="Automated testing framework for C"
 url="http://cunit.sourceforge.net/"
 arch="all"
@@ -17,7 +17,6 @@ builddir="$srcdir/$_pkgname-$_pkgver"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	libtoolize --force --copy
 	aclocal
 	autoheader
@@ -28,7 +27,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -46,12 +44,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/cutter/APKBUILD b/main/cutter/APKBUILD
index 8d2a310b4e3..bcf88fc4cd7 100644
--- a/main/cutter/APKBUILD
+++ b/main/cutter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=cutter
 pkgver=1.04
-pkgrel=1
+pkgrel=2
 pkgdesc="A program that allows firewall administrators to abort TCP/IP connections"
 url="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
 arch="all"
@@ -12,15 +12,11 @@ options="!check"
 source="http://www.digitage.co.uk/digitage/files/cutter/$pkgname-$pkgver.tgz
 	musl-fix.patch"
 
-builddir="$srcdir/$pkgname-$pkgver"
-
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	install -m755 -D $pkgname "$pkgdir"/usr/sbin/$pkgname
 }
 
diff --git a/main/dansguardian/APKBUILD b/main/dansguardian/APKBUILD
index 294bd96d80d..b7e208f0858 100644
--- a/main/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dansguardian
 pkgver=2.12.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Web content filter"
 url="http://dansguardian.org"
 arch="all"
@@ -19,29 +19,21 @@ source="https://downloads.sourceforge.net/project/dansguardian/dansguardian-$pkg
 	ftp-credential.patch
 	dansguardian-2.10.1.1-pcre830.patch
 	fix-includes.patch
-	gcc11.patch
 	"
 
-_builddir="$srcdir"/dansguardian-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	update_config_sub
+
 	# do not block "microsoft...clustimg=..." and similar
-	sed -i -e 's:\.\*:.{1,10}:g' configs/lists/bannedregexpurllist \
-		|| return 1
+	sed -i -e 's:\.\*:.{1,10}:g' configs/lists/bannedregexpurllist
 
 	# bind to 127.0.0.1 by default
 	sed -i -e 's:^filterip =.*:filterip = 127.0.0.1:' \
-		configs/dansguardian.conf.in || return 1
+		configs/dansguardian.conf.in
 }
 
 build() {
-	cd "$_builddir"
+	CXXFLAGS="$CXXFLAGS -std=gnu++11" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -53,18 +45,16 @@ build() {
 		--with-proxygroup=dansguar \
 		--with-logdir=/var/log/dansguardian \
 		--with-piddir=/var/run/ \
-		--enable-ntlm \
-		|| return 1
-	make || return 1
+		--enable-ntlm
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m 755 "$srcdir"/dansguardian.initd \
-		"$pkgdir"/etc/init.d/dansguardian || return 1
-	install -D -m 644 "$srcdir"/dansguardian.logrotate \
-		"$pkgdir"/etc/logrotate.d/dansguardian || return 1
+	make DESTDIR="$pkgdir" install
+	install -Dm755 "$srcdir"/dansguardian.initd \
+		"$pkgdir"/etc/init.d/dansguardian
+	install -Dm644 "$srcdir"/dansguardian.logrotate \
+		"$pkgdir"/etc/logrotate.d/dansguardian
 	install -d -o dansguar -g dansguar "$pkgdir"/var/log/dansguardian
 }
 
@@ -75,5 +65,4 @@ cc23178755365a3cceff08d9eb5c26dd440648b22af15377a30d2032f71cf0bd8ed3ab59c8a671f2
 07b62441363534f39a1400389c702bbd5a53317526a18b3fc929f00bd854706c56b891d7fecb4151e200448f8ba012729e712e9cfdbbd683a3d2634fdc095bd1  ftp-credential.patch
 d3d9af038ff5a91d1f9dc6cf4175b0da2a791386ca624f4a639338ed189a274eba720e9771986e7ded517e2623185e8b61ef3689414197c47a6ae3220be99d57  dansguardian-2.10.1.1-pcre830.patch
 2eb17ef01a0b7d626f50197e0ddd160ae4ed17a813af00ceb9f6c54610d84b03b5c819bc2d8799f683e68dc16a65cbac5a8e36f0c43737d8ea82c7354e852d78  fix-includes.patch
-7ff0232e185e09b561a73496bb68a5fad11d97c02dde4436c993af454e5cfba5124c20b54c18bc864a21818df170fa8306a67419752ca75ea8a3cc797e88c1fe  gcc11.patch
 "
diff --git a/main/dansguardian/gcc11.patch b/main/dansguardian/gcc11.patch
deleted file mode 100644
index b7a11a746ea..00000000000
--- a/main/dansguardian/gcc11.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff --git a/src/BaseSocket.cpp b/src/BaseSocket.cpp
-index 18c8030..4992647 100644
---- a/src/BaseSocket.cpp
-+++ b/src/BaseSocket.cpp
-@@ -210,7 +210,7 @@ bool BaseSocket::checkForInput()
- }
- 
- // blocking check for waiting data - blocks for up to given timeout, can be told to break on signal-triggered config reloads
--void BaseSocket::checkForInput(int timeout, bool honour_reloadconfig) throw(std::exception)
-+void BaseSocket::checkForInput(int timeout, bool honour_reloadconfig) noexcept(false)
- {
- #ifdef DGDEBUG
- 		std::cout << "BaseSocket::checkForInput: starting for sck:" << sck << std::endl;
-@@ -249,7 +249,7 @@ bool BaseSocket::readyForOutput()
- }
- 
- // blocking equivalent of above, can be told to break on signal-triggered reloads
--void BaseSocket::readyForOutput(int timeout, bool honour_reloadconfig) throw(std::exception)
-+void BaseSocket::readyForOutput(int timeout, bool honour_reloadconfig) noexcept(false)
- {
- 	// blocks if socket blocking
- 	// until timeout
-@@ -266,7 +266,7 @@ void BaseSocket::readyForOutput(int timeout, bool honour_reloadconfig) throw(std
- }
- 
- // read a line from the socket, can be told to break on config reloads
--int BaseSocket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig, bool *chopped, bool *truncated) throw(std::exception)
-+int BaseSocket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig, bool *chopped, bool *truncated) noexcept(false)
- {
- 	// first, return what's left from the previous buffer read, if anything
- 	int i = 0;
-@@ -347,7 +347,7 @@ int BaseSocket::getLine(char *buff, int size, int timeout, bool honour_reloadcon
- }
- 
- // write line to socket
--void BaseSocket::writeString(const char *line) throw(std::exception)
-+void BaseSocket::writeString(const char *line) noexcept(false)
- {
- 	int l = strlen(line);
- 	if (!writeToSocket(line, l, 0, timeout)) {
-@@ -356,7 +356,7 @@ void BaseSocket::writeString(const char *line) throw(std::exception)
- }
- 
- // write data to socket - throws exception on failure, can be told to break on config reloads
--void BaseSocket::writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig) throw(std::exception)
-+void BaseSocket::writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig) noexcept(false)
- {
- 	if (!writeToSocket(buff, len, flags, timeout, honour_reloadconfig)) {
- 		throw std::runtime_error(std::string("Can't write to socket: ") + strerror(errno));
-diff --git a/src/BaseSocket.hpp b/src/BaseSocket.hpp
-index cffcf7d..bbbeac2 100644
---- a/src/BaseSocket.hpp
-+++ b/src/BaseSocket.hpp
-@@ -48,17 +48,17 @@ public:
- 	// non-blocking check for input data
- 	bool checkForInput();
- 	// blocking check for data, can be told to break on signal triggered config reloads (-r)
--	void checkForInput(int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+	void checkForInput(int timeout, bool honour_reloadconfig = false) noexcept(false);
- 	// non-blocking check for writable socket
- 	bool readyForOutput();
- 	// blocking check, can break on config reloads
--	void readyForOutput(int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+	void readyForOutput(int timeout, bool honour_reloadconfig = false) noexcept(false);
- 	
- 	// get a line from the socket - can break on config reloads
--	int getLine(char *buff, int size, int timeout, bool honour_reloadconfig = false, bool *chopped = NULL, bool *truncated = NULL) throw(std::exception);
-+	int getLine(char *buff, int size, int timeout, bool honour_reloadconfig = false, bool *chopped = NULL, bool *truncated = NULL) noexcept(false);
- 	
- 	// write buffer to string - throws std::exception on error
--	void writeString(const char *line) throw(std::exception);
-+	void writeString(const char *line) noexcept(false);
- 	// write buffer to string - can be told not to do an initial readyForOutput, and told to break on -r
- 	bool writeToSocket(const char *buff, int len, unsigned int flags, int timeout, bool check_first = true, bool honour_reloadconfig = false);
- 	// read from socket, returning number of bytes read
-@@ -66,7 +66,7 @@ public:
- 	// read from socket, returning error status - can be told to skip initial checkForInput, and to break on -r
- 	int readFromSocket(char *buff, int len, unsigned int flags, int timeout, bool check_first = true, bool honour_reloadconfig = false);
- 	// write to socket, throwing std::exception on error - can be told to break on -r
--	void writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+	void writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig = false) noexcept(false);
- 
- protected:
- 	// socket-wide timeout (is this actually used?)
-diff --git a/src/DataBuffer.cpp b/src/DataBuffer.cpp
-index 3bb8349..0fc1da7 100644
---- a/src/DataBuffer.cpp
-+++ b/src/DataBuffer.cpp
-@@ -236,7 +236,7 @@ bool DataBuffer::in(Socket * sock, Socket * peersock, HTTPHeader * requestheader
- }
- 
- // send the request body to the client after having been handled by a DM plugin
--void DataBuffer::out(Socket * sock) throw(std::exception)
-+void DataBuffer::out(Socket * sock) noexcept(false)
- {
- 	if (dontsendbody) {
- #ifdef DGDEBUG
-diff --git a/src/DataBuffer.hpp b/src/DataBuffer.hpp
-index dd0b8fc..e8f16aa 100644
---- a/src/DataBuffer.hpp
-+++ b/src/DataBuffer.hpp
-@@ -40,7 +40,7 @@ public:
- 	// gives true if it pauses due to too much data
- 	bool in(Socket * sock, Socket * peersock, class HTTPHeader * requestheader, class HTTPHeader * docheader, bool runav, int *headersent);
- 	// send body to client
--	void out(Socket * sock) throw(std::exception);
-+	void out(Socket * sock) noexcept(false);
- 
- 	void setTimeout(int t) { timeout = t; };
- 	void setDecompress(String d) { decompress = d; };
-diff --git a/src/HTTPHeader.cpp b/src/HTTPHeader.cpp
-index 383a7e5..5ffcc45 100644
---- a/src/HTTPHeader.cpp
-+++ b/src/HTTPHeader.cpp
-@@ -1602,7 +1602,7 @@ int HTTPHeader::decode1b64(char c)
- // - this allows us to re-open the proxy connection on pconns if squid's end has
- // timed out but the client's end hasn't. not much use with NTLM, since squid
- // will throw a 407 and restart negotiation, but works well with basic & others.
--void HTTPHeader::out(Socket * peersock, Socket * sock, int sendflag, bool reconnect) throw(std::exception)
-+void HTTPHeader::out(Socket * peersock, Socket * sock, int sendflag, bool reconnect) noexcept(false)
- {
- 	String l;  // for amalgamating to avoid conflict with the Nagel algorithm
- 
-diff --git a/src/HTTPHeader.hpp b/src/HTTPHeader.hpp
-index ce30779..c237463 100644
---- a/src/HTTPHeader.hpp
-+++ b/src/HTTPHeader.hpp
-@@ -45,7 +45,7 @@ public:
- 	// - this allows us to re-open the proxy connection on pconns if squid's end has
- 	// timed out but the client's end hasn't. not much use with NTLM, since squid
- 	// will throw a 407 and restart negotiation, but works well with basic & others.
--	void out(Socket *peersock, Socket *sock, int sendflag, bool reconnect = false) throw(std::exception);
-+	void out(Socket *peersock, Socket *sock, int sendflag, bool reconnect = false) noexcept(false);
- 
- 	// discard remainder of POST data
- 	// amount to discard can be passed in, or will default to contentLength()
-diff --git a/src/Socket.cpp b/src/Socket.cpp
-index 990f30f..8212622 100644
---- a/src/Socket.cpp
-+++ b/src/Socket.cpp
-@@ -654,7 +654,7 @@ bool Socket::checkForInput()
- }
- 
- // blocking check for waiting data - blocks for up to given timeout, can be told to break on signal-triggered config reloads
--void Socket::checkForInput(int timeout, bool honour_reloadconfig) throw(std::exception)
-+void Socket::checkForInput(int timeout, bool honour_reloadconfig) noexcept(false)
- {
- 	if (!isssl){
- 		BaseSocket::checkForInput(timeout, honour_reloadconfig);
-@@ -676,7 +676,7 @@ bool Socket::readyForOutput()
- 	return true;
- }
- 
--void Socket::readyForOutput(int timeout, bool honour_reloadconfig) throw(std::exception)
-+void Socket::readyForOutput(int timeout, bool honour_reloadconfig) noexcept(false)
- {
- 	if (!isssl){
- 		BaseSocket::readyForOutput(timeout,honour_reloadconfig);
-@@ -689,7 +689,7 @@ void Socket::readyForOutput(int timeout, bool honour_reloadconfig) throw(std::ex
- }
- 
- // read a line from the socket, can be told to break on config reloads
--int Socket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig, bool *chopped, bool *truncated) throw(std::exception)
-+int Socket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig, bool *chopped, bool *truncated) noexcept(false)
- {
- 	if (!isssl){
- 		return BaseSocket::getLine(buff, size,timeout, honour_reloadconfig, chopped, truncated);
-@@ -765,7 +765,7 @@ int Socket::getLine(char *buff, int size, int timeout, bool honour_reloadconfig,
- }
- 
- // write line to socket
--void Socket::writeString(const char *line) throw(std::exception)
-+void Socket::writeString(const char *line) noexcept(false)
- {
- 	int l = strlen(line);
- 	if (!writeToSocket(line, l, 0, timeout)) {
-@@ -774,7 +774,7 @@ void Socket::writeString(const char *line) throw(std::exception)
- }
- 
- // write data to socket - throws exception on failure, can be told to break on config reloads
--void Socket::writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig) throw(std::exception)
-+void Socket::writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig) noexcept(false)
- {
- 	if (!writeToSocket(buff, len, flags, timeout, honour_reloadconfig)) {
- 		throw std::runtime_error(std::string("Can't write to socket: ") + strerror(errno));
-diff --git a/src/Socket.hpp b/src/Socket.hpp
-index 0917cbf..e78ae9b 100644
---- a/src/Socket.hpp
-+++ b/src/Socket.hpp
-@@ -82,19 +82,19 @@ public:
- 	// non-blocking check for writable socket
- 	bool readyForOutput();
- 	// blocking check, can break on config reloads
--	void readyForOutput(int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+	void readyForOutput(int timeout, bool honour_reloadconfig = false) noexcept(false);
- 	
- 	// non-blocking check for input data
- 	bool checkForInput();
- 	
- 	// blocking check for data, can be told to break on signal triggered config reloads (-r)
--	void checkForInput(int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+	void checkForInput(int timeout, bool honour_reloadconfig = false) noexcept(false);
- 	
- 	// get a line from the socket - can break on config reloads
--	int getLine(char *buff, int size, int timeout, bool honour_reloadconfig = false, bool *chopped = NULL, bool *truncated = NULL) throw(std::exception);
-+	int getLine(char *buff, int size, int timeout, bool honour_reloadconfig = false, bool *chopped = NULL, bool *truncated = NULL) noexcept(false);
- 	
- 	// write buffer to string - throws std::exception on error
--	void writeString(const char *line) throw(std::exception);
-+	void writeString(const char *line) noexcept(false);
- 	// write buffer to string - can be told not to do an initial readyForOutput, and told to break on -r
- 	bool writeToSocket(const char *buff, int len, unsigned int flags, int timeout, bool check_first = true, bool honour_reloadconfig = false);
- 	// read from socket, returning number of bytes read
-@@ -102,7 +102,7 @@ public:
- 	// read from socket, returning error status - can be told to skip initial checkForInput, and to break on -r
- 	int readFromSocket(char *buff, int len, unsigned int flags, int timeout, bool check_first = true, bool honour_reloadconfig = false);
- 	// write to socket, throwing std::exception on error - can be told to break on -r
--	void writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig = false) throw(std::exception);
-+	void writeToSockete(const char *buff, int len, unsigned int flags, int timeout, bool honour_reloadconfig = false) noexcept(false);
- #endif //__SSLMITM
- 
- 
diff --git a/main/db/APKBUILD b/main/db/APKBUILD
index ce746403ad4..6b091ce5186 100644
--- a/main/db/APKBUILD
+++ b/main/db/APKBUILD
@@ -1,29 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=db
 pkgver=5.3.28
-_ver=${pkgver}
-pkgrel=1
+pkgrel=2
 pkgdesc="The Berkeley DB embedded database system"
 url="https://www.oracle.com/technology/software/products/berkeley-db/index.html"
 arch="all"
 license="custom"
 options="!check"  # "check target not available"
-depends=
-makedepends=
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-c++:cxx"
 source="https://download.oracle.com/berkeley-db/db-$pkgver.tar.gz
 	atomic.patch
 	"
 
-builddir="$srcdir/db-$_ver"
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build () {
-	cd "$builddir"
 	cd build_unix
 	../dist/configure \
 		--build=$CBUILD \
@@ -38,13 +32,12 @@ build () {
 }
 
 package() {
-	cd "$builddir"/build_unix
-	make DESTDIR="$pkgdir" install
+	make -C build_unix DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"/usr/share/doc
 	mv "$pkgdir"/usr/docs "$pkgdir"/usr/share/doc/$pkgname
 
-	install -D -m644 "$srcdir"/db-$_ver/LICENSE \
+	install -Dm644 LICENSE \
 		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
@@ -61,5 +54,7 @@ cxx() {
 	mv "$pkgdir"/usr/lib/libdb_cxx*.so "$subpkgdir"/usr/lib/
 }
 
-sha512sums="e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090  db-5.3.28.tar.gz
-e9fedc5b870b95fe772a8121fca8b3642327d960441fe40a1090375efd37eec397a508e6e9100c2817c02bb4380421eb8ea400aeb060fe46a8bdac83a1abfbeb  atomic.patch"
+sha512sums="
+e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090  db-5.3.28.tar.gz
+e9fedc5b870b95fe772a8121fca8b3642327d960441fe40a1090375efd37eec397a508e6e9100c2817c02bb4380421eb8ea400aeb060fe46a8bdac83a1abfbeb  atomic.patch
+"
diff --git a/main/dejagnu/APKBUILD b/main/dejagnu/APKBUILD
index b974176acb6..54ad23a79c5 100644
--- a/main/dejagnu/APKBUILD
+++ b/main/dejagnu/APKBUILD
@@ -1,9 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer:
-
 pkgname=dejagnu
 pkgver=1.6.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A framework for testing other programs"
 url="https://www.gnu.org/software/dejagnu/"
 arch="noarch"
@@ -14,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index e0ee5b26184..8680b4e4b35 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=47
+pkgrel=48
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 arch="all"
@@ -23,32 +23,26 @@ https://www.fefe.de/dns/djbdns-1.05-test25.diff.bz2
 	dnscache.monthly
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	default_prepare
-	cd "$builddir"
 	# remove all the generated headers. they came with the jumbo patch and should
 	# never have been there...
 	sed -n 's/^\([a-z0-9]\+\.h\):.*/\1/gp' Makefile Makefile.sig | xargs rm -f
 }
 
 build() {
-	cd "$builddir"
-	echo "${CC:-"gcc"} ${CFLAGS}" > conf-cc
-	echo "${CC:-"gcc"} ${LDFLAGS}" > conf-ld
+	echo "${CC:-"gcc"} $CFLAGS" > conf-cc
+	echo "${CC:-"gcc"} $LDFLAGS" > conf-ld
 	echo "/usr" > conf-home
 	make -j1
 }
 
 package() {
-	cd "$builddir"
-	mkdir -p "$pkgdir"/etc/
-	cp dnsroots.global "$pkgdir"/etc/
-	mkdir -p "$pkgdir"/usr/bin
-	cp *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+	install -Dm644 dnsroots.global -t "$pkgdir"/etc/
+	install -Dm755 *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
 		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
 		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort \
-		"$pkgdir"/usr/bin/
+		-t "$pkgdir"/usr/bin/
 	mkdir -p "$pkgdir"/usr/share/doc/djbdns
 }
 
@@ -56,18 +50,16 @@ common() {
 	pkgdesc="Base utilities of djbdns"
 	replaces="djbdns"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/dnsqr "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/dnsip "$subpkgdir"/usr/bin
+	amove usr/bin/dnsqr usr/bin/dnsip
 }
 
 tinydns() {
 	pkgdesc="A small and secure DNS server"
 	install=tinydns.pre-install
 
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/etc/tinydns \
+	amove usr/bin/tinydns*
+	mkdir -p "$subpkgdir"/etc/tinydns \
 		"$subpkgdir"/var/cache/tinydns
-	mv "$pkgdir"/usr/bin/tinydns* "$subpkgdir"/usr/bin
 	install -D -m755 "$srcdir"/tinydns.initd \
 		"$subpkgdir"/etc/init.d/tinydns
 	install -D -m644 "$srcdir"/tinydns.confd \
diff --git a/main/dkimproxy/APKBUILD b/main/dkimproxy/APKBUILD
index dbec8b06a15..8b4f2cd7918 100644
--- a/main/dkimproxy/APKBUILD
+++ b/main/dkimproxy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=dkimproxy
 pkgver=1.4.1
-pkgrel=5
+pkgrel=6
 pkgdesc="SMTP-proxy that signs and/or verifies emails, using the Mail::DKIM module"
 url="http://dkimproxy.sourceforge.net/"
 arch="noarch"
@@ -17,11 +17,8 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	dkimproxy.in.confd
 	dkimproxy.out.confd
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
-
 	local vendorlib=$(perl -V:vendorlib | sed -En "s|vendorlib='([^']+)';|\1|p")
 
 	perllibdir="$vendorlib" ./configure --prefix=/usr \
@@ -33,8 +30,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	cd "$pkgdir"
diff --git a/main/dnssec-root/APKBUILD b/main/dnssec-root/APKBUILD
index c868c7a1716..a9d4f889a3a 100644
--- a/main/dnssec-root/APKBUILD
+++ b/main/dnssec-root/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dnssec-root
 pkgver=20190225
-pkgrel=1
+pkgrel=2
 _commit=67c11662510f5e2db6e6517228e80b794950c43f
 pkgdesc="The DNSSEC root key(s)"
 url="https://www.iana.org/dnssec/"
diff --git a/main/docbook-xml/APKBUILD b/main/docbook-xml/APKBUILD
index 5ece603158c..7ba2a3d0c6d 100644
--- a/main/docbook-xml/APKBUILD
+++ b/main/docbook-xml/APKBUILD
@@ -1,13 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=docbook-xml
 pkgver=4.5
-pkgrel=6
+pkgrel=7
 pkgdesc="A widely used XML scheme for writing documentation and help"
 url="http://scrollkeeper.sourceforge.net/docbook.shtml"
 arch="noarch"
 license="MIT"
 depends="libxml2-utils"
-makedepends=
 options="!check"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
 source="https://www.docbook.org/xml/$pkgver/$pkgname-$pkgver.zip
@@ -25,9 +24,9 @@ unpack() {
 			4.1.2) _filename=docbkx412.zip;;
 			*) _filename=docbook-xml-$ver.zip;;
 		esac
-		mkdir -p "$srcdir"/docbook-xml-${ver}
-		cd "$srcdir"/docbook-xml-${ver}
-		msg "extracting ${_filename}"
+		mkdir -p "$srcdir"/docbook-xml-$ver
+		cd "$srcdir"/docbook-xml-$ver
+		msg "extracting $_filename"
 		unzip "$srcdir"/$_filename
 	done
 }
@@ -35,9 +34,9 @@ unpack() {
 package () {
 	local ver
 	for ver in $_versions; do
-		cd "$srcdir"/docbook-xml-${ver}
-		mkdir -p "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver}
-		cp -af docbook.cat *.dtd ent/ *.mod "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver}/
+		cd "$srcdir"/docbook-xml-$ver
+		mkdir -p "$pkgdir"/usr/share/xml/docbook/xml-dtd-$ver
+		cp -af docbook.cat *.dtd ent/ *.mod "$pkgdir"/usr/share/xml/docbook/xml-dtd-$ver/
 	done
 
 	chmod 755 "$pkgdir"/usr/share/xml/docbook/xml-dtd-*/ent
diff --git a/main/docbook2x/APKBUILD b/main/docbook2x/APKBUILD
index e0024ccc309..7f02b7ce350 100644
--- a/main/docbook2x/APKBUILD
+++ b/main/docbook2x/APKBUILD
@@ -2,15 +2,13 @@
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=docbook2x
 pkgver=0.8.8
-pkgrel=6
+pkgrel=7
 pkgdesc="DocBook converter to UNIX manpage and GNU Texinfo format"
 url="http://docbook2x.sourceforge.net"
 arch="all"
 license="MIT"
 depends="texinfo openjade docbook-xml docbook-xsl perl-xml-sax libxslt"
-depends_dev=""
 makedepends="autoconf automake"
-install=""
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
 	01_fix_static_datadir_evaluation.patch
@@ -20,19 +18,9 @@ source="https://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
 	05_fix_439214_error_on_missing_refentry.patch
 	06_fix_man_typo.patch"
 
-_builddir="$srcdir"/docbook2X-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;;
-		esac
-	done
-}
+builddir="$srcdir"/docbook2X-$pkgver
 
 build() {
-	cd "$_builddir"
 	autoreconf --install
 	./configure \
 		--build=$CBUILD \
@@ -42,14 +30,12 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--program-transform-name 's/docbook2/docbook2x-/' \
-		|| return 1
-	make || return 1
+		--program-transform-name 's/docbook2/docbook2x-/'
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c  docbook2X-0.8.8.tar.gz
diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD
index 39db59e4e6a..5bdf7017ba4 100644
--- a/main/ez-ipupdate/APKBUILD
+++ b/main/ez-ipupdate/APKBUILD
@@ -2,50 +2,37 @@
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=ez-ipupdate
 pkgver=3.0.10
-pkgrel=9
+pkgrel=10
 pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)"
 url="http://ez-ipupdate.com/"
 arch="all"
 license="GPL"
-depends=""
-makedepends=""
 pkgusers="ipupdate"
 pkggroups="ipupdate"
 install="$pkgname.pre-install"
-subpackages=""
 source="https://dev.alpinelinux.org/archive/ez-ipupdate/$pkgname-$pkgver.tar.gz
 	ez-ipupdate.confd
 	ez-ipupdate.initd
 	errno.patch
 	"
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for A in ../*.patch ; do
-		patch -p1 < $A
-	done
-}
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-        install -d -o ipupdate -g ipupdate "$pkgdir"/var/lib/$pkgname
+	install -d -o ipupdate -g ipupdate "$pkgdir"/var/lib/$pkgname
 }
 
 sha512sums="dfcbdb2f6a53c3781c31d04269e36819b6bcdb53dfcf065f66c36de310420da7c7dc107a18bc8c7d75cfe1e2964bc9a1e3289502295ad386eee12e8a83a6b388  ez-ipupdate-3.0.10.tar.gz
diff --git a/main/font-adobe-100dpi/APKBUILD b/main/font-adobe-100dpi/APKBUILD
index 2075737c5fd..19e6b9c621d 100644
--- a/main/font-adobe-100dpi/APKBUILD
+++ b/main/font-adobe-100dpi/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-100dpi
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org adobe 100dpi font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/100dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987  font-adobe-100dpi-1.0.3.tar.bz2"
diff --git a/main/font-adobe-75dpi/APKBUILD b/main/font-adobe-75dpi/APKBUILD
index 196014e9e1e..c7136e52a55 100644
--- a/main/font-adobe-75dpi/APKBUILD
+++ b/main/font-adobe-75dpi/APKBUILD
@@ -1,39 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-75dpi
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org adobe 75dpi font"
 url="http://xorg.freedesktop.org/"
 arch="noarch"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/75dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d  font-adobe-75dpi-1.0.3.tar.bz2"
diff --git a/main/font-adobe-utopia-100dpi/APKBUILD b/main/font-adobe-utopia-100dpi/APKBUILD
index d3e27dfa677..1eaf4c90382 100644
--- a/main/font-adobe-utopia-100dpi/APKBUILD
+++ b/main/font-adobe-utopia-100dpi/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-utopia-100dpi
 pkgver=1.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org adobe 100dpi font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/100dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b  font-adobe-utopia-100dpi-1.0.4.tar.bz2"
diff --git a/main/font-adobe-utopia-75dpi/APKBUILD b/main/font-adobe-utopia-75dpi/APKBUILD
index 50fbbd5a057..589d5155e9d 100644
--- a/main/font-adobe-utopia-75dpi/APKBUILD
+++ b/main/font-adobe-utopia-75dpi/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-utopia-75dpi
 pkgver=1.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org adobe 75dpi font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/75dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92  font-adobe-utopia-75dpi-1.0.4.tar.bz2"
diff --git a/main/font-adobe-utopia-type1/APKBUILD b/main/font-adobe-utopia-type1/APKBUILD
index 76b499dcfe9..f64d2762395 100644
--- a/main/font-adobe-utopia-type1/APKBUILD
+++ b/main/font-adobe-utopia-type1/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-utopia-type1
 pkgver=1.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org adobe utopia-type1 fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/utopia-type1 \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/utopia-type1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6  font-adobe-utopia-type1-1.0.4.tar.bz2"
diff --git a/main/font-arabic-misc/APKBUILD b/main/font-arabic-misc/APKBUILD
index 6f404877aa5..c53a0c289d0 100644
--- a/main/font-arabic-misc/APKBUILD
+++ b/main/font-arabic-misc/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-arabic-misc
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0  font-arabic-misc-1.0.3.tar.bz2"
diff --git a/main/font-bh-100dpi/APKBUILD b/main/font-bh-100dpi/APKBUILD
index b2ddde5bcb8..29cb73a60fb 100644
--- a/main/font-bh-100dpi/APKBUILD
+++ b/main/font-bh-100dpi/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-100dpi
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org Bigelow & Holmes bitmap fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/100dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2  font-bh-100dpi-1.0.3.tar.bz2"
diff --git a/main/font-bh-75dpi/APKBUILD b/main/font-bh-75dpi/APKBUILD
index 01802d80953..3b3ded3e52e 100644
--- a/main/font-bh-75dpi/APKBUILD
+++ b/main/font-bh-75dpi/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-75dpi
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org Bigelow & Holmes bitmap fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/75dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50  font-bh-75dpi-1.0.3.tar.bz2"
diff --git a/main/font-bh-lucidatypewriter-100dpi/APKBUILD b/main/font-bh-lucidatypewriter-100dpi/APKBUILD
index 574f62ec49a..d9701fc88c6 100644
--- a/main/font-bh-lucidatypewriter-100dpi/APKBUILD
+++ b/main/font-bh-lucidatypewriter-100dpi/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-lucidatypewriter-100dpi
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org Bigelow & Holmes Lucida bitmap fonts"
 url="http://xorg.freedesktop.org/"
 arch="noarch"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev font-util bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/100dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f  font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"
diff --git a/main/font-bh-lucidatypewriter-75dpi/APKBUILD b/main/font-bh-lucidatypewriter-75dpi/APKBUILD
index c13fb03e2dd..76bfb5adde2 100644
--- a/main/font-bh-lucidatypewriter-75dpi/APKBUILD
+++ b/main/font-bh-lucidatypewriter-75dpi/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-lucidatypewriter-75dpi
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org Bigelow & Holmes Lucida bitmap fonts"
 url="http://xorg.freedesktop.org/"
 arch="noarch"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev font-util bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/75dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13  font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"
diff --git a/main/font-bh-type1/APKBUILD b/main/font-bh-type1/APKBUILD
index 583d988532c..64407b67a85 100644
--- a/main/font-bh-type1/APKBUILD
+++ b/main/font-bh-type1/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-type1
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org bh Type1 fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1 \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/Type1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da  font-bh-type1-1.0.3.tar.bz2"
diff --git a/main/font-bitstream-100dpi/APKBUILD b/main/font-bitstream-100dpi/APKBUILD
index e4e65428032..87c59e16057 100644
--- a/main/font-bitstream-100dpi/APKBUILD
+++ b/main/font-bitstream-100dpi/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-100dpi
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org Bitstream bitmap fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/100dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd  font-bitstream-100dpi-1.0.3.tar.bz2"
diff --git a/main/font-bitstream-75dpi/APKBUILD b/main/font-bitstream-75dpi/APKBUILD
index cd91e62fbdf..b4df4921c43 100644
--- a/main/font-bitstream-75dpi/APKBUILD
+++ b/main/font-bitstream-75dpi/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-75dpi
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org Bitstream bitmap fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/75dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650  font-bitstream-75dpi-1.0.3.tar.bz2"
diff --git a/main/font-bitstream-speedo/APKBUILD b/main/font-bitstream-speedo/APKBUILD
index 5cc23a9ef5a..7817c570c97 100644
--- a/main/font-bitstream-speedo/APKBUILD
+++ b/main/font-bitstream-speedo/APKBUILD
@@ -1,38 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-speedo
 pkgver=1.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org bitstream Speedo fonts"
 url="http://xorg.freedesktop.org/"
 arch="noarch"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Speedo \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/Speedo
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install
 }
 
 sha512sums="78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb  font-bitstream-speedo-1.0.2.tar.bz2"
diff --git a/main/font-bitstream-type1/APKBUILD b/main/font-bitstream-type1/APKBUILD
index 4af564b6a34..360eeb0c609 100644
--- a/main/font-bitstream-type1/APKBUILD
+++ b/main/font-bitstream-type1/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-type1
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org bitstream Type1 fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1 \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/Type1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61  font-bitstream-type1-1.0.3.tar.bz2"
diff --git a/main/font-cronyx-cyrillic/APKBUILD b/main/font-cronyx-cyrillic/APKBUILD
index 95610eef63e..9408d875194 100644
--- a/main/font-cronyx-cyrillic/APKBUILD
+++ b/main/font-cronyx-cyrillic/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-cronyx-cyrillic
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org cronyx cyrillic fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/cyrillic
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456  font-cronyx-cyrillic-1.0.3.tar.bz2"
diff --git a/main/font-cursor-misc/APKBUILD b/main/font-cursor-misc/APKBUILD
index 5c31009e73e..09073380cbe 100644
--- a/main/font-cursor-misc/APKBUILD
+++ b/main/font-cursor-misc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-cursor-misc
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="noarch"
@@ -9,17 +9,14 @@ license="custom"
 options="!check"  # No test suite.
 depends="encodings font-alias mkfontscale mkfontdir fontconfig util-macros"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +26,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
diff --git a/main/font-daewoo-misc/APKBUILD b/main/font-daewoo-misc/APKBUILD
index 9e9389c114d..4497a3fdfc8 100644
--- a/main/font-daewoo-misc/APKBUILD
+++ b/main/font-daewoo-misc/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-daewoo-misc
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06  font-daewoo-misc-1.0.3.tar.bz2"
diff --git a/main/font-dec-misc/APKBUILD b/main/font-dec-misc/APKBUILD
index cfcef8d2e1a..53b904568ca 100644
--- a/main/font-dec-misc/APKBUILD
+++ b/main/font-dec-misc/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-dec-misc
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6  font-dec-misc-1.0.3.tar.bz2"
diff --git a/main/font-ibm-type1/APKBUILD b/main/font-ibm-type1/APKBUILD
index d5073a3311f..1fa0b7dd5d4 100644
--- a/main/font-ibm-type1/APKBUILD
+++ b/main/font-ibm-type1/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-ibm-type1
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org ibm Type1 fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1 \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/Type1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f  font-ibm-type1-1.0.3.tar.bz2"
diff --git a/main/font-isas-misc/APKBUILD b/main/font-isas-misc/APKBUILD
index 4b0850f0905..2748ca92648 100644
--- a/main/font-isas-misc/APKBUILD
+++ b/main/font-isas-misc/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-isas-misc
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
 		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b  font-isas-misc-1.0.3.tar.bz2"
diff --git a/main/font-jis-misc/APKBUILD b/main/font-jis-misc/APKBUILD
index 6a6c0acce6b..9e1214b3f56 100644
--- a/main/font-jis-misc/APKBUILD
+++ b/main/font-jis-misc/APKBUILD
@@ -1,39 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-jis-misc
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 sha512sums="3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c  font-jis-misc-1.0.3.tar.bz2"
diff --git a/main/font-micro-misc/APKBUILD b/main/font-micro-misc/APKBUILD
index 913a3e68777..52e1f594f06 100644
--- a/main/font-micro-misc/APKBUILD
+++ b/main/font-micro-misc/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-micro-misc
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/mis
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69  font-micro-misc-1.0.3.tar.bz2"
diff --git a/main/font-misc-cyrillic/APKBUILD b/main/font-misc-cyrillic/APKBUILD
index 0c7d59ecb53..f9108b3cf52 100644
--- a/main/font-misc-cyrillic/APKBUILD
+++ b/main/font-misc-cyrillic/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-cyrillic
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc cyrillic fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/cyrillic
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf  font-misc-cyrillic-1.0.3.tar.bz2"
diff --git a/main/font-misc-meltho/APKBUILD b/main/font-misc-meltho/APKBUILD
index 88c4929d6c8..54cfc0775b2 100644
--- a/main/font-misc-meltho/APKBUILD
+++ b/main/font-misc-meltho/APKBUILD
@@ -1,42 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-meltho
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc meltho fonts"
 url="http://xorg.freedesktop.org/"
 arch="noarch"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/meltho \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/meltho
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" \
 		FCCACHE=: \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
-		install || return 1
+		install
 }
 
 sha512sums="3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56  font-misc-meltho-1.0.3.tar.bz2"
diff --git a/main/font-misc-misc/APKBUILD b/main/font-misc-misc/APKBUILD
index e60fc7bdd99..c1494e88b6d 100644
--- a/main/font-misc-misc/APKBUILD
+++ b/main/font-misc-misc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-misc
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="noarch"
@@ -9,17 +9,14 @@ license="custom"
 options="!check"  # No test suite.
 depends="encodings font-alias mkfontscale mkfontdir fontconfig util-macros"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +26,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 \
 		DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
diff --git a/main/font-mutt-misc/APKBUILD b/main/font-mutt-misc/APKBUILD
index 3a5560df0f5..14c65f13e39 100644
--- a/main/font-mutt-misc/APKBUILD
+++ b/main/font-mutt-misc/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-mutt-misc
 pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.org misc font"
+pkgrel=1
+pkgdesc="X.orgmiscfont"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+prepare(){
+	update_config_sub
 }
 
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
+build(){
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
+package(){
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
-sha512sums="7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db  font-mutt-misc-1.0.3.tar.bz2"
+sha512sums="
+7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db  font-mutt-misc-1.0.3.tar.bz2
+"
diff --git a/main/font-schumacher-misc/APKBUILD b/main/font-schumacher-misc/APKBUILD
index 7b4899ac716..7e05129df36 100644
--- a/main/font-schumacher-misc/APKBUILD
+++ b/main/font-schumacher-misc/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-schumacher-misc
 pkgver=1.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a  font-schumacher-misc-1.1.2.tar.bz2"
diff --git a/main/font-screen-cyrillic/APKBUILD b/main/font-screen-cyrillic/APKBUILD
index 8a72a5b234f..c2a35c17a93 100644
--- a/main/font-screen-cyrillic/APKBUILD
+++ b/main/font-screen-cyrillic/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-screen-cyrillic
 pkgver=1.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org screen cyrillic fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/cyrillic
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51  font-screen-cyrillic-1.0.4.tar.bz2"
diff --git a/main/font-sony-misc/APKBUILD b/main/font-sony-misc/APKBUILD
index 613b4124bf3..1c2f18b0424 100644
--- a/main/font-sony-misc/APKBUILD
+++ b/main/font-sony-misc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-sony-misc
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Sony fonts"
 url="http://xorg.freedesktop.org/"
 arch="noarch"
@@ -9,17 +9,14 @@ license="MIT"
 options="!check"  # Cannot test a font.
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +26,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
diff --git a/main/font-sun-misc/APKBUILD b/main/font-sun-misc/APKBUILD
index 6f589b99f9f..64b36e6c4de 100644
--- a/main/font-sun-misc/APKBUILD
+++ b/main/font-sun-misc/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-sun-misc
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org misc font"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275  font-sun-misc-1.0.3.tar.bz2"
diff --git a/main/font-vollkorn/APKBUILD b/main/font-vollkorn/APKBUILD
index 56f9fb3cb48..d94c2819d4d 100644
--- a/main/font-vollkorn/APKBUILD
+++ b/main/font-vollkorn/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=font-vollkorn
 _pkgname=${pkgname##*-}
 pkgver=4.105
-pkgrel=0
+pkgrel=1
 pkgdesc="Vollkorn typeface by Friedrich Althausen"
 url="http://vollkorn-typeface.com/"
 arch="noarch"
@@ -12,10 +12,6 @@ options="!check" # upstream doesn't have a test suite
 source="$pkgname-$pkgver.zip::http://vollkorn-typeface.com/download/$_pkgname-${pkgver/./-}.zip"
 builddir="$srcdir/TTF"
 
-build() {
-	return 0
-}
-
 package() {
 	mkdir -p "$pkgdir"/usr/share/fonts/$_pkgname/
 	install -m644 "$builddir"/*.ttf \
diff --git a/main/font-winitzki-cyrillic/APKBUILD b/main/font-winitzki-cyrillic/APKBUILD
index 9aa82ec715e..3bfbf1c372f 100644
--- a/main/font-winitzki-cyrillic/APKBUILD
+++ b/main/font-winitzki-cyrillic/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-winitzki-cyrillic
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org winitzki cyrillic fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/cyrillic
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7  font-winitzki-cyrillic-1.0.3.tar.bz2"
diff --git a/main/font-xfree86-type1/APKBUILD b/main/font-xfree86-type1/APKBUILD
index d5fb5f30bb3..042238fa803 100644
--- a/main/font-xfree86-type1/APKBUILD
+++ b/main/font-xfree86-type1/APKBUILD
@@ -1,40 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-xfree86-type1
 pkgver=1.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org xfree86 Type1 fonts"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 depends="encodings font-alias mkfontscale mkfontdir fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
 source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1 \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/Type1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
 sha512sums="2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c  font-xfree86-type1-1.0.4.tar.bz2"
diff --git a/main/fprobe-ulog/APKBUILD b/main/fprobe-ulog/APKBUILD
index 17bc9f7a342..856295068e6 100644
--- a/main/fprobe-ulog/APKBUILD
+++ b/main/fprobe-ulog/APKBUILD
@@ -1,14 +1,12 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=fprobe-ulog
 pkgver=1.2
-pkgrel=4
+pkgrel=5
 pkgdesc="netfilter-based tool that collect network traffic"
 url="https://github.com/opoplawski/fprobe-ulog"
 arch="all"
 license="GPL"
-depends=
 makedepends="libnfnetlink-dev libnetfilter_log-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://github.com/opoplawski/fprobe-ulog/releases/download/v$pkgver/fprobe-ulog-$pkgver.tar.gz
 	fprobe-ulog.confd
@@ -18,20 +16,11 @@ source="https://github.com/opoplawski/fprobe-ulog/releases/download/v$pkgver/fpr
 	fprobe-nflog.patch
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	cd $_builddir
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	CFLAGS="$CFLAGS -std=gnu89" \
 	./configure \
 		--build=$CBUILD \
@@ -39,18 +28,15 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-
 }
 
 sha512sums="c393c0705bd6c7cee998fccc48dede3568063b5130971f36c08f580c7678cf52fdf446c02cc4df3d5a2ead68cb2d14434e0847bfff27b6a0c5ef5ec7d6f61145  fprobe-ulog-1.2.tar.gz
diff --git a/main/fts/APKBUILD b/main/fts/APKBUILD
index 95b188f2eb1..714eaa0fd4c 100644
--- a/main/fts/APKBUILD
+++ b/main/fts/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: 
-# Maintainer: 
+# Contributor:
+# Maintainer:
 pkgname=fts
 pkgver=1.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides the fts(3) functions, which are missing in musl libc"
 url="https://github.com/pullmoll/musl-fts/"
 arch="all"
@@ -10,16 +10,14 @@ license="BSD-3-Clause"
 makedepends="automake autoconf libtool"
 subpackages="$pkgname-dev"
 source="https://github.com/pullmoll/musl-fts/archive/v$pkgver.zip"
-
 builddir="$srcdir/musl-$pkgname-$pkgver"
+
 prepare() {
 	default_prepare
-	cd "$builddir"
 	./bootstrap.sh
 }
 
 build() {
-	cd "$builddir"
 	CFLAGS=-fPIC ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,16 +29,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
-	mkdir -p "$pkgdir"/usr/lib/pkgconfig
-	cp "$builddir"/musl-fts.pc "$pkgdir"/usr/lib/pkgconfig/libfts.pc
+	install -Dm644 musl-fts.pc "$pkgdir"/usr/lib/pkgconfig/libfts.pc
 }
 
 sha512sums="69aceaa7a8dc7ab5845d3288e315357f92ac32fac55c3d670186f2c5756f665a11471fc81f67126755a707058a8d293ba926d906f542c1360a49ca3c9b357976  v1.2.7.zip"
diff --git a/main/gengetopt/APKBUILD b/main/gengetopt/APKBUILD
index b4370b9f56e..e16d9f8b0a1 100644
--- a/main/gengetopt/APKBUILD
+++ b/main/gengetopt/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=gengetopt
 pkgver=2.23
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool to write command line option parsing code for C programs"
 url="https://www.gnu.org/software/gengetopt/"
 arch="all"
@@ -10,10 +10,9 @@ license="GPL-3.0-or-later"
 depends_dev="gengetopt"
 makedepends="$depends_dev texinfo"
 subpackages="$pkgname-doc $pkgname-dev"
-source="https://ftp.gnu.org/gnu/gengetopt/${pkgname}-${pkgver}.tar.xz"
+source="https://ftp.gnu.org/gnu/gengetopt/gengetopt-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/giflib/APKBUILD b/main/giflib/APKBUILD
index 0fa6d02dd54..a8dea712c8a 100644
--- a/main/giflib/APKBUILD
+++ b/main/giflib/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=giflib
 pkgver=5.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A library for reading and writing GIF images"
 url="https://sourceforge.net/projects/giflib/"
 arch="all"
@@ -13,25 +13,22 @@ source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.
 	giflib-restore-deprecated-functions.patch"
 
 build() {
-	cd "$builddir"
 	make CFLAGS="-fPIC"
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" PREFIX=/usr install
 	rm -f "$pkgdir"/usr/lib/*.a
 }
 
 utils() {
 	pkgdesc="Programs for manipulating GIF format image files"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
 sha512sums="4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736  giflib-5.2.1.tar.gz
diff --git a/main/gperf/APKBUILD b/main/gperf/APKBUILD
index cb08f86fbde..20062d55912 100644
--- a/main/gperf/APKBUILD
+++ b/main/gperf/APKBUILD
@@ -1,19 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gperf
 pkgver=3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Perfect hash function generator."
 url="https://www.gnu.org/software/gperf/"
 arch="all"
-license="GPL-3.0+"
+license="GPL-3.0-or-later"
 subpackages="$pkgname-doc"
-depends=
-makedepends=
 source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
-build ()
-{
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,12 +18,11 @@ build ()
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
+
 sha512sums="855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4  gperf-3.1.tar.gz"
diff --git a/main/hicolor-icon-theme/APKBUILD b/main/hicolor-icon-theme/APKBUILD
index f414df9ecd0..1b1318bfff5 100644
--- a/main/hicolor-icon-theme/APKBUILD
+++ b/main/hicolor-icon-theme/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hicolor-icon-theme
 pkgver=0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org Hicolor icon theme"
 url="https://www.freedesktop.org/wiki/Software/icon-theme/"
 arch="noarch"
@@ -10,7 +10,6 @@ license="GPL-2.0-only"
 source="https://icon-theme.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -19,7 +18,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/imake/APKBUILD b/main/imake/APKBUILD
index c0d2f256873..f1f0c613ea9 100644
--- a/main/imake/APKBUILD
+++ b/main/imake/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imake
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="X Windows make utility"
 url="https://www.x.org"
 arch="all"
@@ -12,13 +12,11 @@ subpackages="$pkgname-doc"
 source="https://ftp.x.org/pub/individual/util/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/iniparser/APKBUILD b/main/iniparser/APKBUILD
index 316aa74cd83..b553fcaa325 100644
--- a/main/iniparser/APKBUILD
+++ b/main/iniparser/APKBUILD
@@ -1,32 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iniparser
 pkgver=4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="C library for parsing "INI-style" files"
 url="http://ndevilla.free.fr/iniparser/"
 arch="all"
 license="MIT"
-depends=""
 makedepends="bash"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz
 	rpath.patch"
-builddir="$srcdir"/iniparser-$pkgver
 
 build() {
-	cd "$builddir"
-#	make CC="${CC:-gcc}" CFLAGS="${CFLAGS} -fPIC" LDFLAGS="$LDFLAGS" \
-#		libiniparser.so
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	install -d "$pkgdir"/usr/lib "$pkgdir"/usr/include
 	install -m 644 src/dictionary.h "$pkgdir"/usr/include/dictionary.h
 	install -m 644 src/iniparser.h "$pkgdir"/usr/include/iniparser.h
diff --git a/main/intltool/APKBUILD b/main/intltool/APKBUILD
index 1595bb5a49e..a3f5853a971 100644
--- a/main/intltool/APKBUILD
+++ b/main/intltool/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=intltool
 pkgver=0.51.0
-pkgrel=4
+pkgrel=5
 pkgdesc="The internationalization tool collection"
 url="http://freedesktop.org/wiki/Software/intltool"
 arch="noarch"
@@ -10,10 +10,8 @@ depends="perl perl-xml-parser gettext file"
 subpackages="$pkgname-doc"
 source="https://edge.launchpad.net/intltool/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
 	intltool-perl-regexp.patch"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build () {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,12 +20,10 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD
index 4cd4863d8d1..c356bd9a6c0 100644
--- a/main/iproute2-qos/APKBUILD
+++ b/main/iproute2-qos/APKBUILD
@@ -2,19 +2,14 @@
 # Maintainer: Iilluzion <iilluzion@gmail.com>
 pkgname=iproute2-qos
 pkgver=0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Scripts to set up quality of service with iproute2"
 url="https://git.alpinelinux.org/cgit/aports"
 arch="noarch"
 license="GPL-2.0"
 depends="iproute2"
-makedepends=""
 source="qos.initd qos.eth0.sample qos.ifb0.sample setup-qos"
 
-build() {
-	return 0
-}
-
 package() {
 	install -m755 -D "$srcdir"/setup-qos "$pkgdir"/usr/sbin/setup-qos
 	install -m755 -D "$srcdir"/qos.initd "$pkgdir"/etc/init.d/qos
diff --git a/main/ipvsadm/APKBUILD b/main/ipvsadm/APKBUILD
index afba9e043ba..e0aa7e9d007 100644
--- a/main/ipvsadm/APKBUILD
+++ b/main/ipvsadm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ipvsadm
 pkgver=1.31
-pkgrel=0
+pkgrel=1
 pkgdesc="The IP Virtual Server administration utility"
 url="http://www.linuxvirtualserver.org/software/ipvs.html"
 arch="all"
diff --git a/main/ivykis/APKBUILD b/main/ivykis/APKBUILD
index 051b95761ba..0a656628569 100644
--- a/main/ivykis/APKBUILD
+++ b/main/ivykis/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ivykis
 pkgver=0.42.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for asynchronous I/O readiness notification"
 url="http://libivykis.sourceforge.net"
 arch="all"
diff --git a/main/joe/APKBUILD b/main/joe/APKBUILD
index 14959329f07..739b9812d98 100644
--- a/main/joe/APKBUILD
+++ b/main/joe/APKBUILD
@@ -2,25 +2,21 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=joe
 pkgver=4.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Full featured terminal-based screen editor"
 url="http://joe-editor.sourceforge.net/"
 arch="all"
 license="GPL"
-depends=""
 makedepends="ncurses-dev"
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/project/joe-editor/JOE%20sources/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD
index 75a21d54843..ac7d5cefbcf 100644
--- a/main/lame/APKBUILD
+++ b/main/lame/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lame
 pkgver=3.100
-pkgrel=0
+pkgrel=1
 pkgdesc="An MP3 encoder and graphical frame analyzer"
 url="http://lame.sourceforge.net/"
 arch="all"
@@ -9,7 +9,6 @@ license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="nasm ncurses-dev autoconf automake libtool"
 source="https://downloads.sourceforge.net/project/lame/lame/$pkgver/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
 
 # secfixes:
 #   3.99.5-r6:
@@ -21,8 +20,6 @@ builddir="$srcdir"/$pkgname-$pkgver
 #     - CVE-2017-11720
 
 prepare() {
-	cd "$builddir"
-
 	default_prepare
 
 	# fix for parallel builds
@@ -35,7 +32,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -44,18 +40,14 @@ build() {
 		--disable-mp3x \
 		--enable-shared \
 		--with-pic
-
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/lddtree/APKBUILD b/main/lddtree/APKBUILD
index 3856f0f3e22..b5d1cc82ecc 100644
--- a/main/lddtree/APKBUILD
+++ b/main/lddtree/APKBUILD
@@ -1,28 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lddtree
 pkgver=1.26
-pkgrel=2
+pkgrel=3
 pkgdesc="List dynamic dependencies as a tree"
 url="https://github.com/ncopa/lddtree"
 arch="noarch"
 license="GPL-2.0"
 depends="scanelf"
-depends_dev=""
 replaces="pax-utils"
-makedepends="$depends_dev"
-install=""
-subpackages=""
 options="!check"
 source="lddtree-$pkgver.tar.gz::https://github.com/ncopa/lddtree/archive/v$pkgver.tar.gz
 	0001-use-musl-ldso-conf.patch
 	"
 
-build() {
-	return 0
-}
-
 package() {
-	cd "$builddir"
 	install -Dm755 lddtree.sh "$pkgdir"/usr/bin/lddtree
 }
 
diff --git a/main/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
index ff7603ac6fe..d0648068b62 100644
--- a/main/libart-lgpl/APKBUILD
+++ b/main/libart-lgpl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libart-lgpl
 pkgver=2.3.21
-pkgrel=6
+pkgrel=7
 pkgdesc="A library for high-performance 2D graphics"
 url="https://www.levien.com/libart/"
 arch="all"
diff --git a/main/libdbi/APKBUILD b/main/libdbi/APKBUILD
index 262aeba5c82..da224bf48ba 100644
--- a/main/libdbi/APKBUILD
+++ b/main/libdbi/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=libdbi
 pkgver=0.9.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Database independent abstraction layer for C"
 options="libtool"
 url="http://libdbi.sourceforge.net/"
diff --git a/main/libestr/APKBUILD b/main/libestr/APKBUILD
index f65b19c4b72..46348b01c47 100644
--- a/main/libestr/APKBUILD
+++ b/main/libestr/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=libestr
 pkgver=0.1.11
-pkgrel=1
+pkgrel=2
 pkgdesc="essentials for string handling (and a bit more)"
 options="!check" # No testsuite
 url="https://libestr.adiscon.com/"
@@ -12,7 +12,6 @@ subpackages="$pkgname-dev"
 source="http://libestr.adiscon.com/files/download/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,7 +21,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libfontenc/APKBUILD b/main/libfontenc/APKBUILD
index ad6b2ba4eb9..ac8c79ddc77 100644
--- a/main/libfontenc/APKBUILD
+++ b/main/libfontenc/APKBUILD
@@ -1,19 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libfontenc
 pkgver=1.1.4
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 font encoding library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check"  # No test suite.
-depends=
 makedepends="util-macros xorgproto zlib-dev"
 subpackages="$pkgname-dev"
 source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +24,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libice/APKBUILD b/main/libice/APKBUILD
index f0423a57c5b..dd71a214871 100644
--- a/main/libice/APKBUILD
+++ b/main/libice/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libice
 pkgver=1.0.10
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 Inter-Client Exchange library"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -41,4 +41,5 @@ check() {
 package() {
 	make DESTDIR="$pkgdir" install
 }
+
 sha512sums="2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468  libICE-1.0.10.tar.bz2"
diff --git a/main/liblognorm/APKBUILD b/main/liblognorm/APKBUILD
index 64415ddb7bc..b86078662fc 100644
--- a/main/liblognorm/APKBUILD
+++ b/main/liblognorm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=liblognorm
 pkgver=2.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A fast log-normalization library"
 url="https://www.liblognorm.com/"
 arch="all"
@@ -16,7 +16,6 @@ source="http://www.liblognorm.com/files/download/$pkgname-$pkgver.tar.gz
 	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libmemcached/APKBUILD b/main/libmemcached/APKBUILD
index 2755e650650..62d25bd619d 100644
--- a/main/libmemcached/APKBUILD
+++ b/main/libmemcached/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libmemcached
 pkgver=1.0.18
-pkgrel=4
+pkgrel=5
 pkgdesc="Client library and command line tools for memcached server"
 url="https://libmemcached.org/libMemcached.html"
 arch="all"
diff --git a/main/libnl/APKBUILD b/main/libnl/APKBUILD
index 8e2aaf59830..69b3808eeaa 100644
--- a/main/libnl/APKBUILD
+++ b/main/libnl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnl
 pkgver=1.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for applications dealing with netlink sockets"
 url="https://www.infradead.org/~tgr/libnl/"
 arch="all"
@@ -15,14 +15,11 @@ source="https://www.infradead.org/~tgr/libnl/files/$pkgname-$pkgver.tar.gz
 	fix-includes.patch"
 
 # tests does not work on s390x builder
-# or mips
 case "$CARCH" in
 s390x) options="$options !check";;
-mips*) options="$options !check";;
 esac
 
 build() {
-	cd "$builddir"
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	./configure \
 		--build=$CBUILD \
@@ -32,12 +29,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"/tests
+	cd tests
 	LD_LIBRARY_PATH=$(pwd)/../lib ./test-genl
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libpciaccess/APKBUILD b/main/libpciaccess/APKBUILD
index 504715127ff..52e3355fb25 100644
--- a/main/libpciaccess/APKBUILD
+++ b/main/libpciaccess/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libpciaccess
 pkgver=0.16
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 PCI access library"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -13,7 +13,6 @@ source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2
 	limits_h.patch"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,7 +21,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/main/libpri/APKBUILD b/main/libpri/APKBUILD
index 6bc9d153816..44f9180881c 100644
--- a/main/libpri/APKBUILD
+++ b/main/libpri/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=libpri
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Primary Rate ISDN (PRI) library"
 options="!check" # No testsuite
 url="https://github.com/asterisk/libpri"
diff --git a/main/libsm/APKBUILD b/main/libsm/APKBUILD
index 35f9eebfd46..bdf57d9fc09 100644
--- a/main/libsm/APKBUILD
+++ b/main/libsm/APKBUILD
@@ -1,12 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsm
 pkgver=1.2.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 Session Management library"
 url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
-depends=
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="libice-dev xorgproto xtrans util-linux-dev util-macros xmlto"
 checkdepends="check-dev"
@@ -15,7 +14,6 @@ source="https://www.x.org/releases/individual/lib/libSM-$pkgver.tar.bz2"
 builddir="$srcdir"/libSM-$pkgver
 
 build () {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +27,10 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/main/libsodium/APKBUILD b/main/libsodium/APKBUILD
index 45d2bfaf7a4..5dd7046a81a 100644
--- a/main/libsodium/APKBUILD
+++ b/main/libsodium/APKBUILD
@@ -3,13 +3,20 @@
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=libsodium
 pkgver=1.0.18
-pkgrel=0
+pkgrel=1
 pkgdesc="P(ortable|ackageable) NaCl-based crypto library"
 url="https://github.com/jedisct1/libsodium"
 arch="all"
 license="ISC"
+makedepends="autoconf automake libtool"
 subpackages="$pkgname-static $pkgname-dev"
-source="https://download.libsodium.org/$pkgname/releases/$pkgname-$pkgver.tar.gz"
+source="$pkgname-$pkgver-2.tar.gz::https://github.com/jedisct1/libsodium/archive/refs/tags/$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+
+	autoreconf -fi
+}
 
 build() {
 	./configure \
@@ -23,15 +30,10 @@ check() {
 	make check
 }
 
-static() {
-	pkgdesc="libsodium static libraries"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
-}
-
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef  libsodium-1.0.18.tar.gz"
+sha512sums="
+727fe50a5fb1df86ec5d807770f408a52609cbeb8510b4f4183b2a35a537905719bdb6348afcb103ff00ce946a8094ac9559b6e3e5b2ccc2a2d0c08f75577eeb  libsodium-1.0.18-2.tar.gz
+"
diff --git a/main/libtxc_dxtn/APKBUILD b/main/libtxc_dxtn/APKBUILD
index 89057d55e9f..8fee81ea311 100644
--- a/main/libtxc_dxtn/APKBUILD
+++ b/main/libtxc_dxtn/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: 
-# Maintainer: 
+# Contributor:
+# Maintainer:
 pkgname=libtxc_dxtn
 pkgver=1.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="S3TC texture decompression helper library"
 url="http://dri.freedesktop.org/wiki/S3TC"
 arch="all"
@@ -11,7 +11,6 @@ depends_dev="mesa-dev"
 makedepends="$depends_dev automake autoconf libtool"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver-r$pkgrel.tar.bz2::https://people.freedesktop.org/~cbrill/$pkgname/$pkgname-$pkgver.tar.bz2"
-builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	default_prepare
@@ -20,20 +19,19 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		|| return 1
+		--sysconfdir=/etc
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm "$pkgdir"/usr/lib/libtxc_dxtn.la
 }
 
-sha512sums="56714a8c947d9b1f47e3ccb23cff9e4e57bd131907a82968de521d094a000275b3aaeecff28e9184bcc4f3932baa1a8bfbbefbc970fcd034ff953d0617148479  libtxc_dxtn-1.0.1-r5.tar.bz2"
+sha512sums="
+56714a8c947d9b1f47e3ccb23cff9e4e57bd131907a82968de521d094a000275b3aaeecff28e9184bcc4f3932baa1a8bfbbefbc970fcd034ff953d0617148479  libtxc_dxtn-1.0.1-r6.tar.bz2
+"
diff --git a/main/libxau/APKBUILD b/main/libxau/APKBUILD
index 8bd22dc5c51..d22ee5f39ae 100644
--- a/main/libxau/APKBUILD
+++ b/main/libxau/APKBUILD
@@ -1,12 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxau
 pkgver=1.0.9
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 authorisation library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
-depends=
 makedepends="xorgproto util-macros"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://www.x.org/releases/individual/lib/libXau-$pkgver.tar.bz2"
@@ -14,7 +13,6 @@ source="https://www.x.org/releases/individual/lib/libXau-$pkgver.tar.bz2"
 builddir="$srcdir"/libXau-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,15 +22,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
-	install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
 sha512sums="3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562  libXau-1.0.9.tar.bz2"
diff --git a/main/libxcomposite/APKBUILD b/main/libxcomposite/APKBUILD
index e4741c2fd5f..dad9b41ddc9 100644
--- a/main/libxcomposite/APKBUILD
+++ b/main/libxcomposite/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxcomposite
 pkgver=0.4.5
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 Composite extension library"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -16,7 +16,6 @@ source="https://www.x.org/releases/individual/lib/libXcomposite-$pkgver.tar.bz2"
 builddir="$srcdir"/libXcomposite-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/main/libxdmcp/APKBUILD b/main/libxdmcp/APKBUILD
index 37a53dd7a2c..400b65c47e1 100644
--- a/main/libxdmcp/APKBUILD
+++ b/main/libxdmcp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxdmcp
 pkgver=1.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 Display Manager Control Protocol library"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -31,4 +31,5 @@ check() {
 package() {
 	make -j1 DESTDIR="$pkgdir" install
 }
+
 sha512sums="cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec  libXdmcp-1.1.3.tar.bz2"
diff --git a/main/libxext/APKBUILD b/main/libxext/APKBUILD
index b811247bdbc..6fdb20a38de 100644
--- a/main/libxext/APKBUILD
+++ b/main/libxext/APKBUILD
@@ -1,12 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxext
 pkgver=1.3.4
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 miscellaneous extensions library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
-depends=
 depends_dev="libxau-dev"
 makedepends="$depends_dev libx11-dev xorgproto util-macros xmlto"
 subpackages="$pkgname-dev $pkgname-doc"
@@ -17,7 +16,6 @@ source="https://www.x.org/releases/individual/lib/libXext-$pkgver.tar.bz2
 builddir="$srcdir"/libXext-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +27,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libxfont/APKBUILD b/main/libxfont/APKBUILD
index 76917a8ebcb..1f874fd4e0c 100644
--- a/main/libxfont/APKBUILD
+++ b/main/libxfont/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxfont
 pkgver=1.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 font rasterisation library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev"
-depends=""
 makedepends="xorgproto libfontenc-dev freetype-dev xtrans zlib-dev util-macros"
 source="https://www.x.org/archive/individual/lib/libXfont-$pkgver.tar.bz2"
 builddir="$srcdir/libXfont-$pkgver"
@@ -18,7 +17,6 @@ builddir="$srcdir/libXfont-$pkgver"
 #     - CVE-2017-16611
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,7 +26,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 sha512sums="864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3  libXfont-1.5.4.tar.bz2"
diff --git a/main/libxinerama/APKBUILD b/main/libxinerama/APKBUILD
index 07661b4bf40..e7e9d5b3e42 100644
--- a/main/libxinerama/APKBUILD
+++ b/main/libxinerama/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxinerama
 pkgver=1.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Xinerama extension library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
-depends=
 makedepends="libx11-dev libxext-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/lib/libXinerama-$pkgver.tar.bz2
 	"
@@ -16,7 +15,6 @@ source="https://www.x.org/releases/individual/lib/libXinerama-$pkgver.tar.bz2
 builddir="$srcdir"/libXinerama-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,7 +23,7 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
+
 sha512sums="cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14  libXinerama-1.1.4.tar.bz2"
diff --git a/main/libxkbfile/APKBUILD b/main/libxkbfile/APKBUILD
index 24a42a5442a..0ea82e24bd8 100644
--- a/main/libxkbfile/APKBUILD
+++ b/main/libxkbfile/APKBUILD
@@ -1,20 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxkbfile
 pkgver=1.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 keyboard file manipulation library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
-depends=
 makedepends="libx11-dev util-macros"
 subpackages="$pkgname-dev"
 source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
 
-builddir="$srcdir/$pkgname-$pkgver"
-
 build () {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,14 +20,12 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING \
+	install -D -m644 COPYING \
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
diff --git a/main/libxmu/APKBUILD b/main/libxmu/APKBUILD
index 6fc2c7689a3..fd15a62cb0d 100644
--- a/main/libxmu/APKBUILD
+++ b/main/libxmu/APKBUILD
@@ -1,22 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxmu
 pkgver=1.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 miscellaneous micro-utility library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
-depends=
 depends_dev="util-linux-dev"
 makedepends="libxext-dev libxt-dev libx11-dev libsm-dev util-linux-dev
 	util-macros xmlto"
 source="https://www.x.org/releases/individual/lib/libXmu-$pkgver.tar.bz2"
-
 builddir="$srcdir"/libXmu-$pkgver
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/main/libxpm/APKBUILD b/main/libxpm/APKBUILD
index de514b92ac3..9aaeb60889e 100644
--- a/main/libxpm/APKBUILD
+++ b/main/libxpm/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxpm
 pkgver=3.5.13
-pkgrel=0
+pkgrel=1
 pkgdesc="X11 pixmap library"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -27,4 +27,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
+
 sha512sums="3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5  libXpm-3.5.13.tar.bz2"
diff --git a/main/libxrender/APKBUILD b/main/libxrender/APKBUILD
index 82e918afb0e..2ab1c473491 100644
--- a/main/libxrender/APKBUILD
+++ b/main/libxrender/APKBUILD
@@ -1,25 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxrender
 pkgver=0.9.10
-pkgrel=3
+pkgrel=4
 pkgdesc="X Rendering Extension client library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
 options="!check"  # No test suite.
-depends=
 makedepends="xorgproto libx11-dev util-macros"
 source="https://www.x.org/releases/individual/lib/libXrender-$pkgver.tar.bz2"
+builddir="$srcdir"/libXrender-$pkgver
 
 prepare() {
 	default_prepare
 	update_config_sub
 }
 
-builddir="$srcdir"/libXrender-$pkgver
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,7 +29,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libxtst/APKBUILD b/main/libxtst/APKBUILD
index 5402a513343..a4bb01030de 100644
--- a/main/libxtst/APKBUILD
+++ b/main/libxtst/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxtst
 pkgver=1.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="X11 Testing -- Resource extension library"
 url="https://wiki.freedesktop.org/xorg/"
 arch="all"
@@ -11,15 +11,14 @@ subpackages="$pkgname-dev $pkgname-doc"
 makedepends="xorgproto libx11-dev libxext-dev libxi-dev util-macros"
 source="https://www.x.org/releases/individual/lib/libXtst-$pkgver.tar.bz2
 	"
+builddir="$srcdir"/libXtst-$pkgver
 
 prepare() {
 	default_prepare
 	update_config_sub
 }
 
-builddir="$srcdir"/libXtst-$pkgver
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +31,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/main/libxv/APKBUILD b/main/libxv/APKBUILD
index 0310484ba0d..0df460fa8c3 100644
--- a/main/libxv/APKBUILD
+++ b/main/libxv/APKBUILD
@@ -1,25 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxv
 pkgver=1.0.11
-pkgrel=2
+pkgrel=3
 pkgdesc="X11 Video extension library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
-depends=""
 makedepends="xorgproto libx11-dev libxext-dev util-macros"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/lib/libXv-$pkgver.tar.bz2
-	"
+source="https://www.x.org/releases/individual/lib/libXv-$pkgver.tar.bz2"
+builddir="$srcdir"/libXv-$pkgver
 
 prepare() {
 	default_prepare
 	update_config_sub
 }
 
-builddir="$srcdir"/libXv-$pkgver
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,12 +28,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/main/libxxf86vm/APKBUILD b/main/libxxf86vm/APKBUILD
index c73b4b5a029..e002cfe83f7 100644
--- a/main/libxxf86vm/APKBUILD
+++ b/main/libxxf86vm/APKBUILD
@@ -1,18 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxxf86vm
 pkgver=1.1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="X11 XFree86 video mode extension library"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
-depends=
 makedepends="xorgproto libx11-dev libxext-dev util-macros"
-source="https://www.x.org/releases/individual/lib/libXxf86vm-$pkgver.tar.bz2
-	"
-
+source="https://www.x.org/releases/individual/lib/libXxf86vm-$pkgver.tar.bz2"
 builddir="$srcdir"/libXxf86vm-$pkgver
 
 prepare() {
@@ -21,7 +18,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,8 +26,8 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
+
 sha512sums="c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0  libXxf86vm-1.1.4.tar.bz2"
diff --git a/main/linenoise/APKBUILD b/main/linenoise/APKBUILD
index 92443594f2e..bfd4d2f73bc 100644
--- a/main/linenoise/APKBUILD
+++ b/main/linenoise/APKBUILD
@@ -2,28 +2,23 @@
 # Maintainer:
 pkgname=linenoise
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Minimal replacement for readline"
 url="https://github.com/antirez/linenoise"
 arch="all"
 options="!check"  # No test suite.
 license="BSD-2-Clause-NetBSD"
-depends=""
-depends_dev=""
 makedepends="$depends_dev"
-install=""
 subpackages="$pkgname-dev"
 source="linenoise-$pkgver.tar.gz::https://github.com/antirez/linenoise/archive/$pkgver.tar.gz
 	build-shared-lib.patch
 	"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/ltrace/APKBUILD b/main/ltrace/APKBUILD
index a09bd3018bc..4dcbbb10574 100644
--- a/main/ltrace/APKBUILD
+++ b/main/ltrace/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ltrace
 pkgver=0.7.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Tracks runtime library calls in dynamically linked programs"
 url="https://www.ltrace.org/"
 arch="all !riscv64"
diff --git a/main/lua-asn1/APKBUILD b/main/lua-asn1/APKBUILD
index 58b32d0a096..c10a2adec6c 100644
--- a/main/lua-asn1/APKBUILD
+++ b/main/lua-asn1/APKBUILD
@@ -2,35 +2,15 @@
 # Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=lua-asn1
 pkgver=2.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ASN.1 framework for Lua"
 url=https://github.com/kunkku/lua-asn1
 arch=noarch
 license=MIT
 depends=lua-stringy
-makedepends=
-install=
-subpackages=
-source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz
-	"
-
-_builddir=$srcdir/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	:
-}
+source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
 
 package() {
-	cd "$_builddir"
 	make install "ROOT_DIR=$pkgdir"
 }
 
diff --git a/main/lua-cmsgpack/APKBUILD b/main/lua-cmsgpack/APKBUILD
index 8faa4f9b25c..b7ac1a7d9fc 100644
--- a/main/lua-cmsgpack/APKBUILD
+++ b/main/lua-cmsgpack/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=lua-cmsgpack
 pkgver=0.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="MessagePack C implementation for Lua"
 url="https://github.com/antirez/lua-cmsgpack"
 arch="all"
diff --git a/main/lua-evdev/APKBUILD b/main/lua-evdev/APKBUILD
index 21824b16f29..25defe7f9ab 100644
--- a/main/lua-evdev/APKBUILD
+++ b/main/lua-evdev/APKBUILD
@@ -3,14 +3,12 @@ _luaversions="5.1 5.2 5.3"
 pkgname=lua-evdev
 _rockname=evdev
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Lua module for reading input events"
 url="https://github.com/Tangent128/lua-evdev"
 arch="all"
 license="MIT"
-depends=""
 makedepends="linux-headers"
-subpackages=""
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_package"
@@ -20,10 +18,10 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/Tangent128/$pkgname/archive/
 builddir="$srcdir/$pkgname-evdev-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	local lver; for lver in $_luaversions; do
-		cp -r "$builddir" "$builddir-$lver" || return 1
+		cp -r "$builddir" "$builddir-$lver"
 	done
 }
 
@@ -32,7 +30,7 @@ build() {
 		msg "Building for Lua $lver..."
 
 		cd "$builddir-$lver"
-		make MYCFLAGS="$CFLAGS $(pkg-config --cflags lua$lver)" || return 1
+		make MYCFLAGS="$CFLAGS $(pkg-config --cflags lua$lver)"
 	done
 }
 
@@ -50,7 +48,7 @@ _package() {
 	cd "$builddir-$lver"
 
 	local f; for f in evdev.lua evdev/constants.lua; do
-		install -D $f "$subpkgdir"/usr/share/lua/$lver/$f || return 1
+		install -D $f "$subpkgdir"/usr/share/lua/$lver/$f
 	done
 	install -D evdev/core.so "$subpkgdir"/usr/lib/lua/$lver/evdev/core.so
 
diff --git a/main/lua-ldbus/APKBUILD b/main/lua-ldbus/APKBUILD
index 5c78342e531..8e4eecb9fdd 100644
--- a/main/lua-ldbus/APKBUILD
+++ b/main/lua-ldbus/APKBUILD
@@ -3,70 +3,49 @@ _luaversions="5.1 5.2 5.3"
 pkgname=lua-ldbus
 pkgver=20150430
 _commitid=9f6db626600eb7e04000368da947e0c5cd175fb5
-pkgrel=2
+pkgrel=3
 pkgdesc="Lua D-Bus bindings"
 url="https://github.com/daurnimator/ldbus"
 arch="all"
 license="MIT"
-depends=""
-subpackages=""
 makedepends="dbus-dev"
-install=""
 source="ldbus-$pkgver.tar.gz::https://github.com/daurnimator/ldbus/archive/$_commitid.tar.gz
 	0001-fix-lua_State-usage-for-callbacks.patch
 	fix-makefile.patch
 	"
 
 for _i in $_luaversions; do
-	makedepends="$makedepends lua${_i}-dev"
-	subpackages="$subpackages lua${_i}-ldbus:_split_${_i/./}"
+	makedepends="$makedepends lua$_i-dev"
+	subpackages="$subpackages lua$_i-ldbus:_package"
 done
 
-_builddir="$srcdir"/ldbus-$_commitid/src
-prepare() {
-	local i
-	cd "$srcdir"/ldbus-$_commitid
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/ldbus-$_commitid
 
 build() {
-	cd "$_builddir"
+	cd src
 	for _i in $_luaversions; do
 		msg "Build for Lua $_i"
-		make LUA_VERSION=$_i LUA_LIBDIR="$pkgdir"/usr/lib/lua/$_i all || return 1
+		make LUA_VERSION=$_i LUA_LIBDIR="$pkgdir"/usr/lib/lua/$_i all
 	done
 }
 
 package() {
-	cd "$_builddir"
+	cd src
 	for _i in $_luaversions; do
 		msg "Install for Lua $_i"
-		make LUA_VERSION=$_i LUA_LIBDIR="$pkgdir"/usr/lib/lua/$_i install || return 1
+		make LUA_VERSION=$_i LUA_LIBDIR="$pkgdir"/usr/lib/lua/$_i install
 	done
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-_split() {
-	local d= _ver=$1
-	pkgdesc="$pkgdesc - for Lua $_ver"
-	depends=
-	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
-	for d in usr/lib/lua usr/share/lua; do
-		if [ -d "$pkgdir"/$d/$_ver ]; then
-			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
-		fi
-	done
-}
-
-for _i in $_luaversions; do
-	eval "_split_${_i/./}() { _split $_i; }"
-done
+_package() {
+	local lver=${subpkgname:3:3}
+	pkgdesc="$pkgdesc - for Lua $lver"
+	depends="lua$lver"
+	install_if="lua$lver $pkgname=$pkgver-r$pkgrel"
 
+	amove usr/lib/lua/$lver usr/share/lua/$lver
+}
 
 sha512sums="cab609800b3d67bb6fd533b62179345430e822ad30c711bc8f35cb079353108339288eb7adc374a681bb4f42b66cfd025cff4591fd9cbef045acad41e72d3073  ldbus-20150430.tar.gz
 77d631acfa58ad28868a7ccd8a3ec3f5e44357f0243cdf373037955b5961bc84094790d137a05a47b3cd26665d5afcfc1491b361dd895797fe317fe7e947a252  0001-fix-lua_State-usage-for-callbacks.patch
diff --git a/main/lua-soap/APKBUILD b/main/lua-soap/APKBUILD
index dadb30fb42e..aca12ef1c4a 100644
--- a/main/lua-soap/APKBUILD
+++ b/main/lua-soap/APKBUILD
@@ -3,41 +3,25 @@
 pkgname=lua-soap
 pkgver=3.0
 _pkgver=${pkgver/./_}
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua library to ease the use of SOAP"
 url="http://tomasguisasola.github.io/luasoap/"
 arch="noarch"
 license="MIT"
 depends="lua-expat lua-socket"
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages=""
 source="https://github.com/tomasguisasola/luasoap/archive/v$_pkgver.tar.gz"
-
-_builddir="$srcdir"/luasoap-$_pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/luasoap-$_pkgver
 
 build() {
-	cd "$_builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make LUA_DIR="$pkgdir"/usr/share/lua/5.1 install || return 1
+	make LUA_DIR="$pkgdir"/usr/share/lua/5.1 install
 
 	# https://github.com/tomasguisasola/luasoap/issues/7
 	mv "$pkgdir"/usr/share/lua/5.1/soap/soap.lua \
-	   "$pkgdir"/usr/share/lua/5.1/soap.lua || return 1
+	   "$pkgdir"/usr/share/lua/5.1/soap.lua
 }
 
 sha512sums="de0fa591f5bc9bbf9740660edd4482289bca2139e60119cb5607304cd7afdf6b0d63aedf5c67386022d538a5f8d206323fada49e8ae268f297dec71eda2bc0ad  v3_0.tar.gz"
diff --git a/main/makedepend/APKBUILD b/main/makedepend/APKBUILD
index d3427dea9e2..8c67117a41e 100644
--- a/main/makedepend/APKBUILD
+++ b/main/makedepend/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=makedepend
 pkgver=1.0.6
-pkgrel=0
+pkgrel=1
 pkgdesc="utility for making makefile dependencies"
 url="http://www.freedesktop.org/"
 arch="all"
@@ -12,7 +12,6 @@ subpackages="$pkgname-doc"
 source="https://www.x.org/releases/individual/util/makedepend-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,12 +21,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/mlmmj/APKBUILD b/main/mlmmj/APKBUILD
index e57701e38b1..d89c8e64a7c 100644
--- a/main/mlmmj/APKBUILD
+++ b/main/mlmmj/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mlmmj
 pkgver=1.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Mailing list managing made joyful"
 url="http://mlmmj.org/"
 arch="all"
@@ -28,5 +28,7 @@ package() {
 	cp -r listtexts/* "$pkgdir"/usr/share/mlmmj/texts/
 	install -o mlmmj -g mlmmj -d "$pkgdir"/var/spool/mlmmj
 }
-sha512sums="ea40cae02a7ca5949af6ae01adcdc97536f63f9336f1e4081cf875312bb121a285405353a5863aa6d5f09834b2b6dd328650ed212a30f4940b5fbf82d20184cf  mlmmj-1.3.0.tar.gz
-8c929fc1e078ae1ffeaced0a7f188da75de390e93abfe7abd8b481f9f51efee52997dbca2e5904003ac2a95f61be9764da41082fabca01767320b86873f6734c  gcc-10.patch"
+sha512sums="
+ea40cae02a7ca5949af6ae01adcdc97536f63f9336f1e4081cf875312bb121a285405353a5863aa6d5f09834b2b6dd328650ed212a30f4940b5fbf82d20184cf  mlmmj-1.3.0.tar.gz
+8c929fc1e078ae1ffeaced0a7f188da75de390e93abfe7abd8b481f9f51efee52997dbca2e5904003ac2a95f61be9764da41082fabca01767320b86873f6734c  gcc-10.patch
+"
diff --git a/main/netcf/APKBUILD b/main/netcf/APKBUILD
index e9f7fbdeae0..49930d572a6 100644
--- a/main/netcf/APKBUILD
+++ b/main/netcf/APKBUILD
@@ -1,21 +1,17 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=netcf
 pkgver=0.2.8
-pkgrel=6
+pkgrel=7
 pkgdesc="Cross-platform network configuration library"
 arch="all"
 url="https://fedorahosted.org/released/netcf"
 license="LGPL-2.0"
-depends=
 makedepends="augeas-dev libgcrypt-dev libnl3-dev libxml2-dev libxslt-dev
 	linux-headers pkgconfig readline-dev"
-install=
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://releases.pagure.org/$pkgname/$pkgname-$pkgver.tar.gz"
 replaces="libnetcf"
 
-builddir="$srcdir/netcf-$pkgver"
-
 prepare() {
 	update_config_sub
 	update_config_guess
@@ -23,7 +19,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,20 +26,18 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-driver=debian \
-		|| return 1
-	make || return 1
+		--with-driver=debian
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 libs() {
 	pkgdesc="Libraries for $pkgname"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr/
+
+	amove usr/lib usr/share
 }
 
 sha512sums="d9a667a06469b60e8967423d6a738abc65512bf0ad0975164738c6cd5a168bf0300153067a772a61c4088ea969a88de234be0486c354edf73a7b984ddb003328  netcf-0.2.8.tar.gz"
diff --git a/main/nload/APKBUILD b/main/nload/APKBUILD
index abc947c6fa3..f39ca620d99 100644
--- a/main/nload/APKBUILD
+++ b/main/nload/APKBUILD
@@ -2,39 +2,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nload
 pkgver=0.7.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Console network traffic and bandwidth monitor"
 url="http://www.roland-riegel.de/nload"
 arch="all"
 license="GPL"
-depends=
 makedepends="ncurses-dev"
-install=
 subpackages="$pkgname-doc"
 source="http://www.roland-riegel.de/nload/nload-$pkgver.tar.gz"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/obex-data-server/APKBUILD b/main/obex-data-server/APKBUILD
index 28e06a4f0b6..205b3e21c35 100644
--- a/main/obex-data-server/APKBUILD
+++ b/main/obex-data-server/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=obex-data-server
 pkgver=0.4.6
-pkgrel=4
+pkgrel=5
 pkgdesc="D-Bus service for Obex access"
 url="http://wiki.muiline.com/obex-data-server"
 license="GPL-2.0-or-later"
diff --git a/main/openvpn-ad-check/APKBUILD b/main/openvpn-ad-check/APKBUILD
index 4f67033cbe5..f19fca5efbc 100644
--- a/main/openvpn-ad-check/APKBUILD
+++ b/main/openvpn-ad-check/APKBUILD
@@ -2,38 +2,21 @@
 # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
 pkgname=openvpn-ad-check
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Authenticate OpenVPN users against AD server and verify if they are member of a specific group."
 url="https://sourceforge.net/p/openvpnadcheck"
 arch="noarch"
 license="GPL"
 depends="openvpn lua-ldap"
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages=""
 source="https://sourceforge.net/projects/openvpnadcheck/files/$pkgname-$pkgver.tgz"
-
-_builddir="$srcdir/$pkgname"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-}
+builddir="$srcdir/openvpn-ad-check"
+options="!check" # no tests
 
 package() {
-        mkdir -p "$pkgdir"/etc/openvpn
-	cd "$_builddir"
-	install -c * "$pkgdir"/etc/openvpn
-	chmod 644 "$pkgdir"/etc/openvpn/openvpnadcheck.conf
+	install -Dm755 openvpnadcheck.lua -t "$pkgdir"/etc/openvpn
+	install -Dm644 openvpnadcheck.conf -t "$pkgdir"/etc/openvpn
 }
 
-sha512sums="0d2237acb3b227184b4f7c1ff34516d1dc0a04b09faba940afa9c8bb179cd608f43939f851109662dd0956ba9b8e24e2aad416e140554cc5b4006202fad2feab  openvpn-ad-check-1.1.tgz"
+sha512sums="
+0d2237acb3b227184b4f7c1ff34516d1dc0a04b09faba940afa9c8bb179cd608f43939f851109662dd0956ba9b8e24e2aad416e140554cc5b4006202fad2feab  openvpn-ad-check-1.1.tgz
+"
diff --git a/main/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD
index b4b0c8d07ba..c31d6b57ed7 100644
--- a/main/pcmciautils/APKBUILD
+++ b/main/pcmciautils/APKBUILD
@@ -1,33 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pcmciautils
 pkgver=018
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities for inserting and removing PCMCIA cards"
 url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 arch="all"
 license="GPL"
 subpackages="$pkgname-doc"
-depends=
 makedepends="sysfsutils-dev bison flex"
 options="!check"
-source="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
+source="https://sources.archlinux.org/other/pcmciautils/pcmciautils-$pkgver.tar.xz
 	unsigned.patch
 	disable_yywrap.patch
 	"
-builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$builddir"
-	default_prepare || return 1
-}
 
 build() {
-	cd "$builddir"
-	make -j1 LEX=flex || return 1
+	make -j1 LEX=flex
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir"/ install
 	ln -sf pccardctl "$pkgdir"/sbin/lspcmcia
 }
diff --git a/main/pingu/APKBUILD b/main/pingu/APKBUILD
index 5f8f21f3435..7e061bf5e78 100644
--- a/main/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
@@ -2,22 +2,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pingu
 pkgver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Small daemon that pings hosts and executes a script when status change"
 url="https://git.alpinelinux.org/cgit/pingu"
 arch="all"
 license="GPL"
 makedepends="libev-dev lua-dev asciidoc linux-headers"
-depends=
 subpackages="$pkgname-doc lua-pingu:_lua mtu"
 source="pingu-$pkgver.tar.gz::https://github.com/ncopa/pingu/archive/v$pkgver.tar.gz
 	pingu.initd
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
-	cd "$_builddir"
 	./configure \
 		--prefix=/usr \
 		--localstatedir=/var \
@@ -27,7 +23,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -m644 -D pingu.conf "$pkgdir"/etc/pingu/pingu.conf
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -35,14 +30,12 @@ package() {
 
 mtu() {
 	pkgdesc="Utility to detect MTU"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin
 }
 
 _lua() {
 	pkgdesc="lua module for pingu client"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr/
+	amove usr/lib usr/share
 }
 
 sha512sums="71e5fbe93f831f24d168957cdeaff2817a22f407575316d6515755bec760d10724821070549eaab562924237b96976a1a776ca903d5fe0cd9f9b69a38eadd8c9  pingu-1.5.tar.gz
diff --git a/main/policyd-spf-fs/APKBUILD b/main/policyd-spf-fs/APKBUILD
index ab95fbb761e..6d743f4eaa8 100644
--- a/main/policyd-spf-fs/APKBUILD
+++ b/main/policyd-spf-fs/APKBUILD
@@ -2,15 +2,12 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=policyd-spf-fs
 pkgver=23
-pkgrel=3
+pkgrel=4
 pkgdesc="Policy daemon for checking SPF records in postfix"
 url="http://www.freestone.net/software/policyd-spf-fs/"
 arch="all"
 license="GPL"
-depends=""
 makedepends="libspf2-dev"
-install=
-subpackages=""
 source="http://www.freestone.net/ftp/policyd-spf-fs/${pkgname}_$pkgver.tar.gz
 	policyd-spf-fs-localpolicy-fix.patch
 	fix-makefile.patch
@@ -19,12 +16,10 @@ source="http://www.freestone.net/ftp/policyd-spf-fs/${pkgname}_$pkgver.tar.gz
 builddir="$srcdir"/${pkgname}_$pkgver
 
 build() {
-	cd "$builddir"
-	make CFLAGS+=-DHAVE_NS_TYPE LIBS="-lspf2" || return 1
+	make CFLAGS+=-DHAVE_NS_TYPE LIBS="-lspf2"
 }
 
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir"/usr/bin
 	make PREFIX="$pkgdir"/usr install
 }
diff --git a/main/postfix-policyd-spf-perl/APKBUILD b/main/postfix-policyd-spf-perl/APKBUILD
index 2a4c2818803..752a7dcb43e 100644
--- a/main/postfix-policyd-spf-perl/APKBUILD
+++ b/main/postfix-policyd-spf-perl/APKBUILD
@@ -1,20 +1,16 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=postfix-policyd-spf-perl
 pkgver=2.011
-pkgrel=0
+pkgrel=1
 pkgdesc="A Sender Policy Framework implementation"
 url="http://www.openspf.org/Software"
 arch="all"
 license="GPL"
 depends="perl perl-mail-spf perl-netaddr-ip perl-sys-hostname-long"
-makedepends=""
-install=
-subpackages=""
 source="https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	install -m755 -D "$srcdir"/$pkgname-$pkgver/$pkgname "$pkgdir"/usr/bin/$pkgname
+	install -Dm755 -D postfix-policyd-spf-perl -t "$pkgdir"/usr/bin
 }
 
 sha512sums="22fc00bf74912056a67e937a460ac1fd878f1cb1a3bfa7b19bc5f1e6bc1c36d815dcf8c945e818d242ed5e72a6295bb0e1569446e06b09aefb2842993b8016ba  postfix-policyd-spf-perl-2.011.tar.gz"
diff --git a/main/pptpd/APKBUILD b/main/pptpd/APKBUILD
index 1c1ed0d0776..5d26ea8a840 100644
--- a/main/pptpd/APKBUILD
+++ b/main/pptpd/APKBUILD
@@ -2,14 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pptpd
 pkgver=1.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="PoPToP - PPTP Daemon, Linux as Microsoft VPN Server"
 url="http://www.poptop.org/"
 arch="all"
 license="GPL-2.0-or-later"
 depends="ppp-daemon"
 makedepends="ppp-dev"
-install=""
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://sourceforge.net/projects/poptop/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz/download
 	fix_MSG_TRYHARD.patch
@@ -20,26 +19,13 @@ source="$pkgname-$pkgver.tar.gz::https://sourceforge.net/projects/poptop/files/$
 	pptpd.conf
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
 build() {
-	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
-	make || return 1
+	./configure --prefix=/usr --sysconfdir=/etc
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 	install -Dm755 "$srcdir"/pptpd.initd "$pkgdir"/etc/init.d/pptpd
 	install -Dm644 "$srcdir"/pptpd.confd "$pkgdir"/etc/conf.d/pptpd
diff --git a/main/rarian/APKBUILD b/main/rarian/APKBUILD
index d41be593fc9..af13241be4d 100644
--- a/main/rarian/APKBUILD
+++ b/main/rarian/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rarian
 pkgver=0.8.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper."
 url="https://rarian.freedesktop.org/"
 arch="all"
@@ -14,13 +14,11 @@ source="https://download.gnome.org/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
 	user-segfault.patch"
 
 prepare() {
-	cd "$builddir"
 	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,7 +31,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/rrdcollect/APKBUILD b/main/rrdcollect/APKBUILD
index a549269b188..c845c4cf34d 100644
--- a/main/rrdcollect/APKBUILD
+++ b/main/rrdcollect/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=rrdcollect
 pkgver=0.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Read system statistical data and feed it to RRDtool"
 url="http://rrdcollect.sourceforge.net/"
 arch="all"
@@ -14,9 +14,7 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 		rrdcollect.conf.patch
 		rrdcollect.initd"
 
-builddir="$srcdir/$pkgname-$pkgver"
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +27,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/rrdcollect.initd \
 		"$pkgdir"/etc/init.d/rrdcollect
diff --git a/main/rtapd/APKBUILD b/main/rtapd/APKBUILD
index 73250a5e89f..655d3674b5e 100644
--- a/main/rtapd/APKBUILD
+++ b/main/rtapd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=rtapd
 pkgver=1.7
-pkgrel=6
+pkgrel=7
 pkgdesc="daemon for routing packets to rtnppd"
 url="https://sourceforge.net/projects/rtnppd/"
 arch="all"
diff --git a/main/rtnppd/APKBUILD b/main/rtnppd/APKBUILD
index 2568ffe6a17..a1bf715893e 100644
--- a/main/rtnppd/APKBUILD
+++ b/main/rtnppd/APKBUILD
@@ -2,12 +2,11 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=rtnppd
 pkgver=1.7b
-pkgrel=8
+pkgrel=9
 pkgdesc="A program route TNPP 3.8 (Telocator Network Paging Protocol) packets between serial and other links"
 url="https://sourceforge.net/projects/rtnppd/"
 arch="all"
 license="GPL"
-depends=""
 makedepends="libpq-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dbg"
@@ -16,14 +15,13 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	$pkgname.confd"
 pkgusers="rtnppd"
 pkggroups="rtnppd"
-builddir=$srcdir/"$pkgname"
+builddir="$srcdir/$pkgname"
 
 build() {
-	cd "$builddir"
-	make || return 1
+	make
 }
+
 package() {
-	cd "$builddir"
 	#make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
diff --git a/main/scstadmin/APKBUILD b/main/scstadmin/APKBUILD
index e706689ea19..3354e73c892 100644
--- a/main/scstadmin/APKBUILD
+++ b/main/scstadmin/APKBUILD
@@ -2,35 +2,31 @@
 # Maintainer:
 pkgname=scstadmin
 pkgver=2.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="SCST administration tool written in perl"
 url="http://scst.sourceforge.net"
 arch="noarch"
 license="GPL-2.0"
 depends="perl"
 makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/scst/$pkgname-$pkgver.tar.bz2
 	scstadmin.initd
 	"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-
 prepare() {
-        cd "$_builddir"/scstadmin.sysfs/scst-0.9.10
-        PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	cd "$_builddir"
+	cd scstadmin.sysfs/scst-0.9.10
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 package() {
-	cd "$_builddir"/scstadmin.sysfs/scst-0.9.10
-	make DESTDIR="$pkgdir" install || return 1
+	cd scstadmin.sysfs/scst-0.9.10
+	make DESTDIR="$pkgdir" install
 
-        cd "$_builddir"
+	cd "$builddir"
 	mkdir -p "$pkgdir"/var/lib/scst/pr
-	install -Dm755 scstadmin.sysfs/scstadmin "$pkgdir"/usr/sbin/scstadmin || return 1
-	install -Dm755 "$srcdir"/scstadmin.initd "$pkgdir"/etc/init.d/scstadmin || return 1
+	install -Dm755 scstadmin.sysfs/scstadmin "$pkgdir"/usr/sbin/scstadmin
+	install -Dm755 "$srcdir"/scstadmin.initd "$pkgdir"/etc/init.d/scstadmin
 }
 
 sha512sums="0c1ebf27203c63f3ec16a6c4ca159d4203da902ed8cc3fc6b8a415847c39a83294609c325e0c736e60a8e7cbb445ab2f3914dd9df980238363c6d8be98f0d08e  scstadmin-2.2.0.tar.bz2
diff --git a/main/sendpage/APKBUILD b/main/sendpage/APKBUILD
index 5ef152f5025..a9a8ca301d3 100644
--- a/main/sendpage/APKBUILD
+++ b/main/sendpage/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=sendpage
 pkgver=1.0.3
 _pkgver=1.000003
-pkgrel=5
+pkgrel=6
 pkgdesc="SNPP server, client, queueing engine, modem control and TAP system"
 url="http://www.sendpage.org"
 arch="noarch"
@@ -10,37 +10,26 @@ license="GPL"
 depends="perl-mailtools perl-net-snpp perl-device-serialport
 	perl-dbi perl-sys-hostname-long perl-test-mockobject"
 makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$_pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$_pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/sendpage-$_pkgver"
+options="!check"
 
 build() {
-	cd "$_builddir"
 	perl ./Makefile.PL \
 		PREFIX="/usr" \
-		INSTALLSITELIB="/usr/lib/perl5/vendor_perl" \
-		|| return 1
-	make || return 1
+		INSTALLSITELIB="/usr/lib/perl5/vendor_perl"
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	# Remove useless folder, since it has nothing of value in it
 	rm -r "$pkgdir"/usr/local
 	# Prevent perl file collisions
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="d2ebf5332529baca94ab6de91556600a881d99991355915cfd373f658a0e8ba5d8322518f4ec39351f21f3e561c2c32d784159bc856969c05a306f1754767235  sendpage-1.000003.tar.gz"
+sha512sums="
+d2ebf5332529baca94ab6de91556600a881d99991355915cfd373f658a0e8ba5d8322518f4ec39351f21f3e561c2c32d784159bc856969c05a306f1754767235  sendpage-1.000003.tar.gz
+"
diff --git a/main/ser2net/APKBUILD b/main/ser2net/APKBUILD
index 419ce853472..5cd2dc8d9cb 100644
--- a/main/ser2net/APKBUILD
+++ b/main/ser2net/APKBUILD
@@ -2,24 +2,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ser2net
 pkgver=3.5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports"
 url="https://sourceforge.net/projects/ser2net"
 arch="all"
 license="GPL"
-depends=""
-depends_dev=""
 makedepends="$depends_dev linux-headers"
-install=""
 subpackages="$pkgname-doc $pkgname-openrc"
 source="https://sourceforge.net/projects/ser2net/files/ser2net/$pkgname-$pkgver.tar.gz
 	$pkgname.confd
 	$pkgname.initd
 "
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +27,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
diff --git a/main/setup-box/APKBUILD b/main/setup-box/APKBUILD
index 678a14984fd..cb05560a65c 100644
--- a/main/setup-box/APKBUILD
+++ b/main/setup-box/APKBUILD
@@ -2,47 +2,27 @@
 # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
 pkgname=setup-box
 pkgver=1.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A tool to setup a variety of Alpine Linux Environments"
 url="https://git.alpinelinux.org/cgit/alacerda/setup-box/"
 arch="noarch"
 license="MIT"
 depends="jq"
-depends_dev=""
-makedepends="$depends_dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-doc () {
-	mkdir -p "$subpkgdir"/usr/share/man/man1 || return 1
-	mv "$_builddir"/usr/share/man/setup-box.1.gz "$subpkgdir"/usr/share/man/man1/ || return 1
-}
-
 build() {
-	cd "$_builddir"
+	sed -i \
+		-e 's:@CONFIG_DIR@:/etc/setup-box:g' \
+		-e 's:@JSON_DIR@:/etc/setup-box/json:g' \
+		-e 's:@VERSION@:v$pkgver:g' \
+		setup-box
 }
 
 package() {
-	cd "$_builddir"
-	mkdir -p "$pkgdir"/etc/setup-box/json
-	mkdir "$pkgdir"/sbin
-	install -m 755 setup-box "$pkgdir"/sbin/$pkgname
-	cp json/* "$pkgdir"/etc/setup-box/json
-	sed -e 's:@CONFIG_DIR@:/etc/setup-box:g' -i "$pkgdir"/sbin/$pkgname
-	sed -e 's:@JSON_DIR@:/etc/setup-box/json:g' -i "$pkgdir"/sbin/$pkgname
-	sed -e 's:@VERSION@:v$pkgver:g' -i "$pkgdir"/sbin/$pkgname
+	install -Dm755 setup-box -t "$pkgdir"/sbin
+	install -Dm644 json/* -t "$pkgdir"/etc/setup-box/json
+	install -Dm644 usr/share/man/setup-box.1.gz -t "$pkgdir"/usr/share/man/man1
 }
 
 sha512sums="22891037b4a0ed8a60103959e21b2d99e4bdf0a518419141623373b6a7a1c0160c8bd761ca81637bef069078849d06952817eaef83fd5c426ae9693329c29e48  setup-box-1.0.1.tar.bz2"
diff --git a/main/sfic/APKBUILD b/main/sfic/APKBUILD
index 6e3365ae8a8..cabd63ac4c6 100644
--- a/main/sfic/APKBUILD
+++ b/main/sfic/APKBUILD
@@ -1,27 +1,18 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=sfic
 pkgver=0.1.7
-pkgrel=6
+pkgrel=7
 pkgdesc="Small and Simple File Integrity Checker"
 url="http://sfic.sourceforge.net/"
 arch="all"
 license="GPL"
-depends=""
 makedepends="autoconf automake tdb-dev"
+subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	sfic-0.1.7-signal.patch
 	limits.patch
 	automake.patch"
 
-subpackages="$pkgname-doc"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-check() {
-	cd "$builddir"
-	make check
-}
-
 prepare() {
 	default_prepare
 	sed -i -e 's/^        /\t/' src/Makefile.am
@@ -31,7 +22,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -39,8 +29,11 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 }
 
diff --git a/main/spandsp/APKBUILD b/main/spandsp/APKBUILD
index 1c80f95ff86..d0adba33478 100644
--- a/main/spandsp/APKBUILD
+++ b/main/spandsp/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=spandsp
 pkgver=0.0.6
 _ver=${pkgver/_/}
-pkgrel=1
+pkgrel=2
 pkgdesc="SpanDSP is a library of DSP functions for telephony"
 url="https://www.soft-switch.org/installing-spandsp.html"
 arch="all"
@@ -14,13 +14,11 @@ source="https://deb.debian.org/debian/pool/main/s/spandsp/spandsp_$pkgver+dfsg.o
 builddir="$srcdir"/$pkgname-$pkgver+dfsg
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +30,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/ssh-getkey-ldap/APKBUILD b/main/ssh-getkey-ldap/APKBUILD
index d40e3abdd55..e885c934257 100644
--- a/main/ssh-getkey-ldap/APKBUILD
+++ b/main/ssh-getkey-ldap/APKBUILD
@@ -2,23 +2,16 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ssh-getkey-ldap
 pkgver=0.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A simple script to be used as AuthorizedKeysCommand in OpenSSH server to look up user's public keys in LDAP."
 url="https://github.com/jirutka/ssh-getkey-ldap"
 arch="noarch"
 license="MIT"
 depends="lua lua-ldap"
-makedepends=""
 install="$pkgname.post-install"
 source="$pkgname-$pkgver.tar.gz::https://github.com/jirutka/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	return 0
-}
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" PREFIX="/usr" ./install
 }
 
diff --git a/main/statserial/APKBUILD b/main/statserial/APKBUILD
index e89ca263815..baaa3f1e767 100644
--- a/main/statserial/APKBUILD
+++ b/main/statserial/APKBUILD
@@ -2,42 +2,30 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=statserial
 pkgver=1.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Display serial port modem status lines"
 url="http://sunsite.unc.edu/pub/Linux/system/Serial"
 arch="all"
 license="GPL"
-depends=""
 depends_dev="ncurses-dev"
 makedepends="$depends_dev"
-install=""
-subpackages=""
 source="http://ibiblio.org/pub/linux/system/serial/statserial-$pkgver.tar.gz
 	statserial-1.patch
 	statserial-c.patch
 	makefile.patch
 	"
-_builddir="$srcdir"/$pkgname-$pkgver
+
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
 	sed -i -e "s/\/local//" Makefile
 }
 
 build() {
-	cd "$_builddir"
-	make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="${CC:-gcc}" || return 1
+	make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="${CC:-gcc}"
 }
 
 package() {
-	cd "$_builddir"
-	mkdir -p $pkgdir/usr/bin
-	install -m755 $pkgname $pkgdir/usr/bin/$pkgname
+	install -Dm755 statserial -t "$pkgdir"/usr/bin
 }
 
 sha512sums="070ec4b6fb4a432fd406571319d9431d55c6dd43ee9298c1907011038a57dd3efd5def434aeb6884fb195cc90aa961d2ad2ff0567c9c69173e6f4adc0509a805  statserial-1.1.tar.gz
diff --git a/main/stfl/APKBUILD b/main/stfl/APKBUILD
index 6a77b8946d7..d9995fc6b67 100644
--- a/main/stfl/APKBUILD
+++ b/main/stfl/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=stfl
 pkgver=0.24
-pkgrel=2
+pkgrel=3
 pkgdesc="The Structured Terminal Forms Language/Library"
-url="http://www.clifford.at/stfl/"
+url="http://bygone.clairexen.net/stfl/"
 arch="all"
 license="LGPL-3.0-or-later"
 makedepends="ncurses-dev"
diff --git a/main/su-exec/APKBUILD b/main/su-exec/APKBUILD
index 43b6058cd47..4a6ab40c018 100644
--- a/main/su-exec/APKBUILD
+++ b/main/su-exec/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=su-exec
 pkgver=0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="switch user and group id, setgroups and exec"
 url="https://github.com/ncopa/su-exec"
 arch="all"
@@ -14,7 +14,7 @@ build() {
 }
 
 package() {
-	install -D su-exec "$pkgdir"/sbin/su-exec || return 1
+	install -D su-exec "$pkgdir"/sbin/su-exec
 }
 
 sha512sums="68155a06c716b362aee1214f22cd325b3e934c05b653d3b084a720458fb04207c0681d218b72adfd5ae8fab0262f7ab90e49eb2e218d1b0d7d7af7911715d4e1  su-exec-0.2.tar.gz"
diff --git a/main/ttf-dejavu/APKBUILD b/main/ttf-dejavu/APKBUILD
index 3e7c77edd57..83540374786 100644
--- a/main/ttf-dejavu/APKBUILD
+++ b/main/ttf-dejavu/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ttf-dejavu
 pkgver=2.37
-pkgrel=1
+pkgrel=2
 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
 url="https://dejavu-fonts.github.io/"
 arch="noarch"
@@ -17,10 +17,6 @@ source="https://downloads.sourceforge.net/project/dejavu/dejavu/$pkgver/dejavu-f
 	90-tt-dejavu.conf
 	"
 
-build() {
-	return 0
-}
-
 package() {
 	mkdir -p "$pkgdir"/usr/share/fonts/$pkgname \
 		"$pkgdir"/etc/fonts/conf.avail \
diff --git a/main/udns/APKBUILD b/main/udns/APKBUILD
index 29d30b20dd7..76e9728b962 100644
--- a/main/udns/APKBUILD
+++ b/main/udns/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=udns
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="DNS Resolver Library"
 options="!check" # No testsuite
 url="http://www.corpit.ru/mjt/udns.html"
@@ -17,17 +17,19 @@ build() {
 }
 
 package() {
-	install -D -m0755 dnsget "${pkgdir}/usr/bin/dnsget"
-	install -D -m0755 rblcheck "${pkgdir}/usr/bin/rblcheck"
-	install -D -m0755 ex-rdns "${pkgdir}/usr/bin/ex-rdns"
+	install -Dm755 dnsget rblcheck ex-rdns \
+		-t "$pkgdir"/usr/bin
 
-	install -D -m0644 udns.h "${pkgdir}/usr/include/udns.h"
-	install -D -m0755 libudns.so.0 "${pkgdir}/usr/lib/libudns.so.0"
-	ln -s libudns.so.0 "${pkgdir}/usr/lib/libudns.so"
+	install -Dm644 udns.h \
+		-t "$pkgdir"/usr/include
+	install -Dm755 libudns.so.0 \
+		-t "$pkgdir"/usr/lib
+	ln -s libudns.so.0 "$pkgdir"/usr/lib/libudns.so
 
-	install -D -m0644 dnsget.1 "${pkgdir}/usr/share/man/man1/dnsget.1"
-	install -D -m0644 rblcheck.1 "${pkgdir}/usr/share/man/man1/rblcheck.1"
-	install -D -m0644 udns.3 "${pkgdir}/usr/share/man/man3/udns.3"
+	install -Dm644 dnsget.1 rblcheck.1 \
+		-t "$pkgdir"/usr/share/man/man1
+	install -Dm644 udns.3 \
+		-t "$pkgdir"/usr/share/man/man3
 }
 
 sha512sums="2990d57b3b6bf176a12ee07fd4391921e13634fc8409e8ce4df8dbe7b3556a116ae59ab328a1b6a95ebc94298f6b56ec7197a06a649d8d642b371b8ecef3e40b  udns-0.4.tar.gz"
diff --git a/main/umix/APKBUILD b/main/umix/APKBUILD
index 9fc08b2ca59..333c0a16386 100644
--- a/main/umix/APKBUILD
+++ b/main/umix/APKBUILD
@@ -2,39 +2,32 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=umix
 pkgver=1.0.2
-pkgrel=7
+pkgrel=8
 pkgdesc="Program for adjusting soundcard volumes"
 url="http://umix.sf.net"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
 makedepends="linux-headers ncurses-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
-_builddir="$srcdir"/umix-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468  umix-1.0.2.tar.gz"
diff --git a/main/v86d/APKBUILD b/main/v86d/APKBUILD
index 4e01aa78517..8cb16e8d2d9 100644
--- a/main/v86d/APKBUILD
+++ b/main/v86d/APKBUILD
@@ -1,29 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=v86d
 pkgver=0.1.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace helper for uvesafb that runs x86 code in an emulated environment"
 url="https://github.com/mjanusz/v86d"
 arch="x86 x86_64"
 license="GPL-2.0"
-depends=""
 makedepends="bash linux-headers"
 source="v86d-$pkgver.tar.gz::https://github.com/mjanusz/v86d/archive/v86d-$pkgver.tar.gz
 		modprobe.uvesafb"
+builddir="$srcdir"/v86d-86d-$pkgver
 
-_builddir="$srcdir"/v86d-86d-$pkgver
 build () {
-	cd "$_builddir"
 	./configure \
-		--with-x86emu \
-		|| return 1
-	make || return 1
+		--with-x86emu
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 "$srcdir"/modprobe.uvesafb "$pkgdir"/etc/modprobe.d/uvesafb || return 1
+	make DESTDIR="$pkgdir" install
+	install -D -m644 "$srcdir"/modprobe.uvesafb "$pkgdir"/etc/modprobe.d/uvesafb
 }
 
 sha512sums="148b1676d932d1207da396defeae0fc39b664139eca5f29be98ceedc33e89566f7c35057df93249303c8e2c1bff0427430a077f88a85997e62ea96c29b5db9d1  v86d-0.1.10.tar.gz
diff --git a/main/vanessa_socket/APKBUILD b/main/vanessa_socket/APKBUILD
index 79eba18554d..2150334a035 100644
--- a/main/vanessa_socket/APKBUILD
+++ b/main/vanessa_socket/APKBUILD
@@ -1,18 +1,15 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=vanessa_socket
 pkgver=0.0.13
-pkgrel=0
+pkgrel=1
 pkgdesc="User space TCP/IP pipe"
 url="http://horms.net/projects/perdition/"
 arch="all"
 license="LGPL-2.0-or-later"
-depends=
 depends_dev="popt-dev vanessa_logger-dev"
 makedepends="$depends_dev"
-install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://horms.net/projects/vanessa/download/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
-builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	default_prepare
@@ -21,7 +18,6 @@ prepare() {
 
 build() {
 	export LDFLAGS="$LDFLAGS -lvanessa_logger"
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/wipe/APKBUILD b/main/wipe/APKBUILD
index c3c633ae207..24ee1057023 100644
--- a/main/wipe/APKBUILD
+++ b/main/wipe/APKBUILD
@@ -2,41 +2,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wipe
 pkgver=2.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Secure file wiping utility"
 url="http://wipe.sourceforge.net/"
 arch="all"
 license="GPL-2.0"
-depends=""
-depends_dev=""
-makedepends="$depends_dev linux-headers"
-install=""
+makedepends="linux-headers"
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+source="https://downloads.sourceforge.net/wipe/wipe-$pkgver.tar.bz2
 	stdint.patch
 	"
 
-builddir="$srcdir"/wipe-$pkgver
 prepare() {
 	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	CPPFLAGS= ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
+		--mandir=/usr/share/man
+	make
 }
 
 package() {
-	cd "$builddir"
 	install -d "$pkgdir"/usr/bin
-	make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install || return 1
+	make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install
 }
 
 sha512sums="63870e68fa5dbf90abb686052f8dcc216ccb93b0c4f5cc10d60ccf43f3606ba91b46dc1e3d8b34d201f7ea657f70b45a61d5d04facf5b2a3e47d2286c46e7110  wipe-2.3.1.tar.bz2
diff --git a/main/xmlto/APKBUILD b/main/xmlto/APKBUILD
index 548474cbcb5..5c349853721 100644
--- a/main/xmlto/APKBUILD
+++ b/main/xmlto/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xmlto
 pkgver=0.0.28
-pkgrel=2
+pkgrel=3
 pkgdesc="Convert xml to many other formats"
 url="https://pagure.io/xmlto/"
 arch="all"
@@ -12,7 +12,6 @@ subpackages="$pkgname-doc"
 source="https://releases.pagure.org/xmlto/xmlto-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,12 +21,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/xtrans/APKBUILD b/main/xtrans/APKBUILD
index 647db5c416a..74e117f6a91 100644
--- a/main/xtrans/APKBUILD
+++ b/main/xtrans/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xtrans
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X transport library"
 url="http://xorg.freedesktop.org/"
 arch="noarch"
@@ -10,7 +10,6 @@ makedepends="util-macros xmlto"
 source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -19,12 +18,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"/usr/lib
diff --git a/main/yasm/APKBUILD b/main/yasm/APKBUILD
index 0178d7cd218..19bf7b63e45 100644
--- a/main/yasm/APKBUILD
+++ b/main/yasm/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=yasm
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
 url="http://www.tortall.net/projects/yasm/"
 arch="all"
diff --git a/main/zd1211-firmware/APKBUILD b/main/zd1211-firmware/APKBUILD
index 919e22e79ae..25e1b1b1b31 100644
--- a/main/zd1211-firmware/APKBUILD
+++ b/main/zd1211-firmware/APKBUILD
@@ -2,28 +2,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zd1211-firmware
 pkgver=1.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
 url="https://sourceforge.net/projects/zd1211/"
 arch="noarch"
 license="GPL-2.0"
-depends=""
-depends_dev=""
-makedepends=""
-install=""
-subpackages=""
 source="https://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$pkgver/zd1211-firmware-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/zd1211-firmware
-build() {
-	return 0
-}
+builddir="$srcdir/zd1211-firmware"
 
 package() {
-	cd "$_builddir"
-	mkdir -p "$pkgdir"/lib/firmware/zd1211
-	cp zd1211_ub zd1211_ur zd1211_uphr zd1211b_ub zd1211b_ur zd1211b_uphr \
-		"$pkgdir"/lib/firmware/zd1211/
+	install -Dm644 zd1211_ub zd1211_ur zd1211_uphr \
+		zd1211b_ub zd1211b_ur zd1211b_uphr \
+		-t "$pkgdir"/lib/firmware/zd1211
 }
 
-sha512sums="6a8d39318a8c136b2a780ebeb485a94bbb05fa12ad7104b707314e0108e49939b4dcd0035b19f07dac0ec7bdd12668ea281b48724e512b45ac5df9dedf035897  zd1211-firmware-1.5.tar.bz2"
+sha512sums="
+6a8d39318a8c136b2a780ebeb485a94bbb05fa12ad7104b707314e0108e49939b4dcd0035b19f07dac0ec7bdd12668ea281b48724e512b45ac5df9dedf035897  zd1211-firmware-1.5.tar.bz2
+"