diff --git a/community/nheko/APKBUILD b/community/nheko/APKBUILD
index 9a5a629eb636b8360d7807f33a27385aef0cfb4d..6a461821302e6483ff20296d81adbd93c3060f65 100644
--- a/community/nheko/APKBUILD
+++ b/community/nheko/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=nheko
 pkgver=0.8.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5-based client for Matrix protocol"
 url="https://github.com/Nheko-Reborn/nheko/releases"
 arch="all !armhf" # Limited by qt5-qtmultimedia
diff --git a/community/perl-crypt-openssl-bignum/APKBUILD b/community/perl-crypt-openssl-bignum/APKBUILD
index b4e63122e21827314bedddc3d7ef14ab46db1501..86bec79d707dac0be5df8f43ac1b992f6be76229 100644
--- a/community/perl-crypt-openssl-bignum/APKBUILD
+++ b/community/perl-crypt-openssl-bignum/APKBUILD
@@ -1,18 +1,15 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-crypt-openssl-bignum
 _pkgreal=Crypt-OpenSSL-Bignum
 pkgver=0.09
-pkgrel=5
+pkgrel=6
 pkgdesc="OpenSSL's multiprecision integer arithmetic"
 url="https://metacpan.org/release/Crypt-OpenSSL-Bignum/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev openssl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+makedepends="perl-dev openssl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/K/KM/KMX/$_pkgreal-$pkgver.tar.gz"
 
@@ -21,24 +18,20 @@ builddir="$srcdir/$_pkgreal-$pkgver"
 prepare() {
 	default_prepare
 
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/community/perl-data-ical/APKBUILD b/community/perl-data-ical/APKBUILD
index 4e7cfeeb8d7ac76a015ab76e3ccad43d768666b2..da1fd5f4c35bf626cf73043eb2d6c85114007b4b 100644
--- a/community/perl-data-ical/APKBUILD
+++ b/community/perl-data-ical/APKBUILD
@@ -1,31 +1,28 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-data-ical
 _pkgreal=Data-ICal
 pkgver=0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="Generates iCalendar (RFC 2445) calendar files"
 url="https://metacpan.org/release/Data-ICal"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-test-nowarnings perl-test-warn perl-text-vfile-asdata
+depends="perl-test-nowarnings perl-test-warn perl-text-vfile-asdata
 	perl-class-returnvalue perl-test-longstring perl-class-accessor perl-file-slurp"
-depends="$cpandepends"
 makedepends="perl-dev perl-module-install"
 checkdepends="perl-pod-coverage"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/B/BP/BPS/Data-ICal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	default_prepare
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
diff --git a/community/perl-math-random-mt-auto/APKBUILD b/community/perl-math-random-mt-auto/APKBUILD
index a67a9c59669395941fdb444bc91dcf0d94ac3f84..b4f5ef0eee12dc8f4918f108e0dbb50fd36a2f50 100644
--- a/community/perl-math-random-mt-auto/APKBUILD
+++ b/community/perl-math-random-mt-auto/APKBUILD
@@ -1,39 +1,34 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-math-random-mt-auto
 _pkgreal=Math-Random-MT-Auto
 pkgver=6.23
-pkgrel=4
+pkgrel=5
 pkgdesc="Auto-seeded Mersenne Twister PRNGs"
 url="https://metacpan.org/release/Math-Random-MT-Auto/"
 arch="all"
-license="unrestricted"
-cpandepends="perl-exception-class perl-object-insideout"
-depends="$cpandepends"
+license="BSD-3-Clause"
+depends="perl-exception-class perl-object-insideout"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/J/JD/JDHEDDEN/$_pkgreal-$pkgver.tar.gz"
-
-builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir"/$_pkgreal-$pkgver
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/community/perl-moo/APKBUILD b/community/perl-moo/APKBUILD
index 3bef38c2e95d90586cc4eeb6ce15f2fd90b2d855..64f2f470e17f6ac3ffe01ce1a644a6dcff8f1445 100644
--- a/community/perl-moo/APKBUILD
+++ b/community/perl-moo/APKBUILD
@@ -1,11 +1,11 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-moo
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Moo
 pkgver=2.005004
-pkgrel=0
+pkgrel=1
 pkgdesc="Minimalist Object Orientation (with Moose compatibility)"
 url="https://metacpan.org/release/Moo/"
 arch="noarch"
@@ -13,19 +13,16 @@ license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-class-method-modifiers perl-sub-quote perl-role-tiny"
 makedepends="perl-dev"
 checkdepends="perl-test-fatal"
-
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -34,6 +31,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-
-
 sha512sums="a1335d180cd19dc7189bc1663efd5a05650d579c5e5d049fc4059a382d1eeb882fdd9cd2b107fdd40499e22a5c6196fc47c1334145101def531e5f5fd3cd0edf  Moo-2.005004.tar.gz"
diff --git a/community/perl-object-insideout/APKBUILD b/community/perl-object-insideout/APKBUILD
index cea1907c7b2b3822f05c9d7ecff7abc829ba9c81..fe5e8e384be4a3f780eb19635b2dd2a9a48cdb38 100644
--- a/community/perl-object-insideout/APKBUILD
+++ b/community/perl-object-insideout/APKBUILD
@@ -1,43 +1,35 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-object-insideout
 _pkgreal=Object-InsideOut
 pkgver=4.05
-pkgrel=4
+pkgrel=5
 pkgdesc="Comprehensive inside-out object support module"
 url="https://metacpan.org/release/Object-InsideOut/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-exception-class perl-module-build"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-2.0-or-later OR Artistic-2.0"
+depends="perl-exception-class perl-module-build"
+makedepends="perl-dev"
 checkdepends="perl-want perl-test-pod-coverage"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/J/JD/JDHEDDEN/$_pkgreal-$pkgver.tar.gz"
-
-builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir"/$_pkgreal-$pkgver
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
 	perl Build.PL installdirs=vendor
 }
 
 build() {
-	cd "$builddir"
 	./Build
 }
 
 check() {
-        cd "$builddir"
         ./Build test
 }
 
 package() {
-	cd "$builddir"
 	./Build install destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/community/perl-strictures/APKBUILD b/community/perl-strictures/APKBUILD
index b061a96d5f3d956df67010e8e83cee117b195c21..f8bebb28e8aa0ae6634aa91e502a8e528d21a2f8 100644
--- a/community/perl-strictures/APKBUILD
+++ b/community/perl-strictures/APKBUILD
@@ -1,44 +1,32 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-strictures
 _pkgreal=strictures
 pkgver=2.000006
-pkgrel=1
+pkgrel=2
 pkgdesc="Turn on strict and make most warnings fatal"
 url="https://search.cpan.org/dist/strictures/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/$_pkgreal-$pkgver.tar.gz"
-
-builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir"/$_pkgreal-$pkgver
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	make
 }
 
 check() {
-        cd "$builddir"
         make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/community/pngcrush/APKBUILD b/community/pngcrush/APKBUILD
index 6f60357bebabbb3d17cad428fd9948f20a2d1831..a105af314e36ebbbbb981b03863e86518055916d 100644
--- a/community/pngcrush/APKBUILD
+++ b/community/pngcrush/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=pngcrush
 pkgver=1.8.13
-pkgrel=0
+pkgrel=1
 pkgdesc="PNG recompression utility"
 url="http://pmt.sourceforge.net/pngcrush/"
 arch="all"
diff --git a/community/python3-tkinter/APKBUILD b/community/python3-tkinter/APKBUILD
index 01c77f38e318d11cd7598e7a36355e74889c7b74..a403616b3406d8f9797966c60675139546675a17 100644
--- a/community/python3-tkinter/APKBUILD
+++ b/community/python3-tkinter/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer:
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 
 pkgname=python3-tkinter
 pkgver=3.9.5
 _basever="${pkgver%.*}"
-pkgrel=0
+pkgrel=1
 pkgdesc="A graphical user interface for the Python"
 url="https://wiki.python.org/moin/TkInter"
 arch="all"
-license="custom"
+license="PSF-2.0"
 replaces=python3
 subpackages="$pkgname-tests::noarch python3-idle:_idle:noarch"
 makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev xz-dev
diff --git a/main/ack/APKBUILD b/main/ack/APKBUILD
index cd3466f8b91125ac3b5084cfda916fa4c5244457..567f52036c4e586044d6a3909a58cbea3b54fd6b 100644
--- a/main/ack/APKBUILD
+++ b/main/ack/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ack
 pkgver=3.5.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A Perl-powered replacement for grep"
 url="https://beyondgrep.com/"
 arch="noarch"
diff --git a/main/apache-mod-fcgid/APKBUILD b/main/apache-mod-fcgid/APKBUILD
index a1eaf4eb3d4b64f0a9635a7ade644fa68ae7eb8d..a5b87e5eaef66e3c0340612f3aace6d17dee57c1 100644
--- a/main/apache-mod-fcgid/APKBUILD
+++ b/main/apache-mod-fcgid/APKBUILD
@@ -1,32 +1,29 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=apache-mod-fcgid
 _pkgreal=mod_fcgid
 pkgver=2.3.9
-pkgrel=2
+pkgrel=3
 pkgdesc="FastCGI module for Apache 2.x"
 url="http://httpd.apache.org/$_pkgreal/"
 arch="all"
 license="Apache-2.0"
 depends="apache2"
 makedepends="apache2-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://www.apache.org/dist/httpd/mod_fcgid/$_pkgreal-$pkgver.tar.gz
-        $_pkgreal.conf
-        "
+	$_pkgreal.conf
+	"
+builddir="$srcdir"/$_pkgreal-$pkgver
 
-_builddir="$srcdir"/$_pkgreal-$pkgver
 build() {
-	cd "$_builddir"
-	./configure.apxs || return 1
-	make || return 1
+	./configure.apxs
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -d "$pkgdir"/var/www/localhost/fcgi-bin || return 1
+	make DESTDIR="$pkgdir" install
+	install -d "$pkgdir"/var/www/localhost/fcgi-bin
 	install -Dm644 "$srcdir"/$_pkgreal.conf "$pkgdir"/etc/apache2/conf.d/$_pkgreal.conf
 	rm -fr "$pkgdir"/etc/apache2/original
 }
diff --git a/main/bash-completion/APKBUILD b/main/bash-completion/APKBUILD
index 5eebe7075739495a33b92cd0d9daeebe02d8f725..fc2dea20444b9319b9f48269f4ea9e2bb81e437c 100644
--- a/main/bash-completion/APKBUILD
+++ b/main/bash-completion/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
 pkgname=bash-completion
 pkgver=2.11
-pkgrel=3
+pkgrel=4
 pkgdesc="Command-line tab-completion for bash"
 options="!check" # 7 Tests fail
 url="https://github.com/scop/bash-completion"
diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD
index eaf1b9ba70dffadda97414f7eabdbdaf271d5138..7daf428e07f8da9f2701100c67441c5e3ccd756c 100644
--- a/main/bitlbee/APKBUILD
+++ b/main/bitlbee/APKBUILD
@@ -1,11 +1,12 @@
 # Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=bitlbee
 pkgver=3.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An IRC to other chat networks gateway"
 url="https://www.bitlbee.org/"
 arch="all"
+options="!check" # no test suite
 license="GPL-2.0-or-later"
 makedepends="python3 glib-dev gnutls-dev libotr-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-otr $pkgname-openrc"
@@ -15,7 +16,6 @@ source="http://get.bitlbee.org/src/bitlbee-$pkgver.tar.gz
 	"
 
 build() {
-	cd "$builddir"
 	PYTHON=python3 \
 	./configure \
 		--build=$CBUILD \
@@ -28,7 +28,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install install-etc install-dev
 
 	install -m755 -D "$srcdir"/$pkgname.initd \
diff --git a/main/libotr/APKBUILD b/main/libotr/APKBUILD
index 75930207f2ae22170c3fee9ce67199333aa984fc..507bb54e0f175b9dbb931a8d74f1ab3c9b078a08 100644
--- a/main/libotr/APKBUILD
+++ b/main/libotr/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=libotr
 pkgver=4.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Off The Record Messaging, an encryption library for secure IM conversations"
 options="!check"
 url="http://otr.cypherpunks.ca/"
diff --git a/main/libwebp/APKBUILD b/main/libwebp/APKBUILD
index 77e2484ba21495c131cedecf738ae3a5068d01b2..3d05e8839a52f32871739c8eb5fae18fa18e6f89 100644
--- a/main/libwebp/APKBUILD
+++ b/main/libwebp/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libwebp
 pkgver=1.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Libraries for working with WebP images"
 url="https://developers.google.com/speed/webp"
 arch="all"
diff --git a/main/lynx/APKBUILD b/main/lynx/APKBUILD
index 5f5a2c0b1685d5eee6f6e9783177a58fcf083f2d..e2ce1b33b360f6b93e2ec871be84d11ae4a3e8ea 100644
--- a/main/lynx/APKBUILD
+++ b/main/lynx/APKBUILD
@@ -1,11 +1,10 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=lynx
 pkgver=2.8.9_p1
 _relver=${pkgver/_p/rel.}
-_v=${_relver%rel.*}
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform text-based browser"
 url="https://lynx.invisible-island.net/"
 arch="all"
@@ -13,11 +12,10 @@ license="GPL-2.0-only"
 depends="gzip"
 makedepends="openssl-dev gettext zlib-dev glib-dev perl ncurses-dev"
 subpackages="$pkgname-doc"
-source="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2"
+source="http://invisible-mirror.net/archives/lynx/tarballs/lynx$_relver.tar.bz2"
+builddir="$srcdir"/$pkgname$_relver
 
-builddir="$srcdir"/${pkgname}${_relver}
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,12 +31,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	./lynx -version
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install install-help install-doc \
 		helpdir=/usr/share/doc/lynx/help \
 		docdir=/usr/share/doc/lynx
diff --git a/main/perl-async-mergepoint/APKBUILD b/main/perl-async-mergepoint/APKBUILD
index 838899136ca13fff47050d1823b6dafeb0f08a93..e6acb558bbd5fe166de0c91c3dcc4fa0ee175436 100644
--- a/main/perl-async-mergepoint/APKBUILD
+++ b/main/perl-async-mergepoint/APKBUILD
@@ -1,28 +1,26 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-async-mergepoint
 _pkgreal=Async-MergePoint
 pkgver=0.04
-pkgrel=2
+pkgrel=3
 pkgdesc="resynchronise diverged control flow"
 url="https://metacpan.org/release/Async-MergePoint"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpanmakedepends="perl-test-fatal"
 depends="perl"
-makedepends="perl-dev perl-module-build $cpanmakedepends"
+makedepends="perl-dev perl-module-build perl-test-fatal"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Async-MergePoint-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
+	default_prepare
 	perl Build.PL installdirs=vendor
 }
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	./Build
 }
 
diff --git a/main/perl-cache-cache/APKBUILD b/main/perl-cache-cache/APKBUILD
index ee12ffbe09bba3aee1e5af1541cbb48680c422bf..8ab94600dae68f4b8a56a9d4219dd73c43ee5f8e 100644
--- a/main/perl-cache-cache/APKBUILD
+++ b/main/perl-cache-cache/APKBUILD
@@ -1,38 +1,34 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-cache-cache
 _pkgreal=Cache-Cache
 pkgver=1.08
-pkgrel=2
+pkgrel=3
 pkgdesc="Perl modules for cache-handling for applications"
 url="https://metacpan.org/release/Cache-Cache/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-error perl-digest-sha1"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev perl-ipc-sharelite $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl-error perl-digest-sha1"
+makedepends="perl-dev perl-ipc-sharelite"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	default_prepare
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+	make
+}
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-cps/APKBUILD b/main/perl-cps/APKBUILD
index 052411c11cf07384bd994aff78e2077b41e546fc..5f3968ee60be08cff846e9bafc0fefe9c13a7c76 100644
--- a/main/perl-cps/APKBUILD
+++ b/main/perl-cps/APKBUILD
@@ -1,44 +1,34 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-cps
 _pkgreal=CPS
 pkgver=0.19
-pkgrel=2
+pkgrel=3
 pkgdesc="manage flow of control in Continuation-Passing Style"
 url="https://metacpan.org/release/CPS/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-future perl-sub-name"
-cpanmakedepends="perl-test-identity perl-test-refcount perl-test-fatal"
-depends="$cpandepends"
-makedepends="$cpanmakedepends perl-dev perl-module-build"
+depends="perl-future perl-sub-name"
+makedepends="perl-test-identity perl-test-refcount perl-test-fatal perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	perl Build.PL installdirs=vendor
 }
 
 build() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	./Build
 }
 
 check() {
-	cd "$builddir"
 	./Build test
 }
 
 package() {
-	cd "$_builddir"
 	./Build install destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-devel-stacktrace/APKBUILD b/main/perl-devel-stacktrace/APKBUILD
index 52d03000500f41d2f4498990245654b944fc1416..b92507e8c20611ee921d12ed4cae7d5a5094b188 100644
--- a/main/perl-devel-stacktrace/APKBUILD
+++ b/main/perl-devel-stacktrace/APKBUILD
@@ -1,10 +1,10 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-devel-stacktrace
 _pkgreal=Devel-StackTrace
 pkgver=2.04
-pkgrel=2
+pkgrel=3
 pkgdesc="An object representing a stack trace"
 url="https://metacpan.org/release/Devel-StackTrace/"
 arch="noarch"
@@ -12,30 +12,22 @@ license="Artistic-2.0"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-extutils-cchecker/APKBUILD b/main/perl-extutils-cchecker/APKBUILD
index ecc541a4b5845232ffb3f9d6fffd502a5d332775..6f9609f3bff95389ad42422c2c940680d8052b22 100644
--- a/main/perl-extutils-cchecker/APKBUILD
+++ b/main/perl-extutils-cchecker/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer:
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-extutils-cchecker
 _pkgreal=ExtUtils-CChecker
 pkgver=0.10
-pkgrel=3
+pkgrel=4
 pkgdesc="Perl module configuration-time utilities for using C headers, libraries, or OS features"
 url="https://metacpan.org/release/ExtUtils-CChecker/"
 arch="noarch"
@@ -13,22 +13,18 @@ makedepends="perl-dev"
 checkdepends="perl-test-fatal perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-file-next/APKBUILD b/main/perl-file-next/APKBUILD
index c894fc51ca8ea719b256f24d9d91d3685435fc03..6b83a0f2a9f618b1a686cfb879cbbef0a60b449b 100644
--- a/main/perl-file-next/APKBUILD
+++ b/main/perl-file-next/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-next
 _pkgreal=File-Next
 pkgver=1.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Perl module for taint-safe file-finding"
 url="https://metacpan.org/release/File-Next"
 arch="noarch"
@@ -12,22 +12,18 @@ depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/File-Next-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name perllocal.pod -delete
 }
diff --git a/main/perl-heap/APKBUILD b/main/perl-heap/APKBUILD
index 1d4fdc641bc8dd512def2432469f78c9ab02b618..d14c9bc97b2f195902145c5a840d77a9dd16fd09 100644
--- a/main/perl-heap/APKBUILD
+++ b/main/perl-heap/APKBUILD
@@ -1,41 +1,33 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-heap
 _pkgreal=Heap
 pkgver=0.80
-pkgrel=3
+pkgrel=4
 pkgdesc="Perl extensions for keeping data partially sorted"
 url="https://metacpan.org/release/Heap/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/J/JM/JMM/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-http-message/APKBUILD b/main/perl-http-message/APKBUILD
index 4a97899af59047b304c1c6c235246a47537b656c..c6db6228d1721e36178bb197a78c51e6d4acd330 100644
--- a/main/perl-http-message/APKBUILD
+++ b/main/perl-http-message/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-http-message
 _pkgreal=HTTP-Message
 pkgver=6.31
-pkgrel=0
+pkgrel=1
 pkgdesc="HTTP style message"
 url="https://metacpan.org/release/HTTP-Message"
 arch="noarch"
@@ -13,18 +13,14 @@ makedepends="perl-dev"
 checkdepends="perl-try-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Message-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
diff --git a/main/perl-io-async/APKBUILD b/main/perl-io-async/APKBUILD
index 166a3933b2ef991bbed8c972e389814f94e659b2..28a731c8a42c2271249caccf43b73d2b32116d2a 100644
--- a/main/perl-io-async/APKBUILD
+++ b/main/perl-io-async/APKBUILD
@@ -1,10 +1,10 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-io-async
 _pkgreal=IO-Async
 pkgver=0.78
-pkgrel=0
+pkgrel=1
 pkgdesc="Asynchronous event-driven programming"
 url="https://metacpan.org/release/IO-Async"
 arch="noarch"
@@ -15,7 +15,6 @@ checkdepends="perl-test-metrics-any"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
 options="net" # Required for tests
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
@@ -24,7 +23,6 @@ prepare() {
 }
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	./Build
 }
 
diff --git a/main/perl-ipc-system-simple/APKBUILD b/main/perl-ipc-system-simple/APKBUILD
index 5d0d960f3ed9cfdc2351a378e9defc49c5d4f75c..af9c28fca2677d4a13b9649fe0e059c1ea4a61e8 100644
--- a/main/perl-ipc-system-simple/APKBUILD
+++ b/main/perl-ipc-system-simple/APKBUILD
@@ -1,11 +1,11 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-ipc-system-simple
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=IPC-System-Simple
 pkgver=1.30
-pkgrel=1
+pkgrel=2
 pkgdesc="Run commands simply, with detailed diagnostics"
 url="https://metacpan.org/release/IPC-System-Simple/"
 arch="noarch"
@@ -17,13 +17,11 @@ source="https://cpan.metacpan.org/authors/id/J/JK/JKEENAN/IPC-System-Simple-$pkg
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
diff --git a/main/perl-json/APKBUILD b/main/perl-json/APKBUILD
index 973c93e063d57221ce196570b670f776a05d5439..75a6317d5ee7a53471aaa1ee2f553a97ada4860b 100644
--- a/main/perl-json/APKBUILD
+++ b/main/perl-json/APKBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-json
 _pkgreal=JSON
 pkgver=4.03
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl module implementing a JSON encoder/decoder"
 url="https://metacpan.org/release/JSON"
 arch="noarch"
diff --git a/main/perl-lwp-protocol-https/APKBUILD b/main/perl-lwp-protocol-https/APKBUILD
index 975f963cc08493376abe69a8702967f88fe21f5c..23a6ad90b9c1909ad66c745c71a0517f76fa3666 100644
--- a/main/perl-lwp-protocol-https/APKBUILD
+++ b/main/perl-lwp-protocol-https/APKBUILD
@@ -1,10 +1,10 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-lwp-protocol-https
 _pkgreal=LWP-Protocol-https
 pkgver=6.10
-pkgrel=0
+pkgrel=1
 pkgdesc="Provide https support for LWP::UserAgent"
 url="https://metacpan.org/release/LWP-Protocol-https/"
 arch="noarch"
@@ -18,12 +18,10 @@ builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
diff --git a/main/perl-mozilla-ca/APKBUILD b/main/perl-mozilla-ca/APKBUILD
index e132083848471a2d090e9ea7e7bf2f5d745ee672..f44a812ca2985eb9f7272a45ebeb6ee3f942fe74 100644
--- a/main/perl-mozilla-ca/APKBUILD
+++ b/main/perl-mozilla-ca/APKBUILD
@@ -1,14 +1,14 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-mozilla-ca
 _pkgreal=Mozilla-CA
 pkgver=20200520
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla's CA cert bundle in PEM format"
 url="https://metacpan.org/release/Mozilla-CA"
 arch="noarch"
-license="GPL PerlArtistic"
+license="MPL-2.0"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://search.cpan.org/CPAN/authors/id/A/AB/ABH/$_pkgreal-$pkgver.tar.gz"
diff --git a/main/perl-net-async-http/APKBUILD b/main/perl-net-async-http/APKBUILD
index 346b8835a19423be3221be907a0d7fa3057fc24a..9551ad03165de39ee626ec66b08423d2b5d960fc 100644
--- a/main/perl-net-async-http/APKBUILD
+++ b/main/perl-net-async-http/APKBUILD
@@ -1,11 +1,11 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-net-async-http
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Net-Async-HTTP
 pkgver=0.48
-pkgrel=0
+pkgrel=1
 pkgdesc="use HTTP with C<IO::Async>"
 url="https://metacpan.org/release/Net-Async-HTTP/"
 arch="noarch"
@@ -17,7 +17,6 @@ source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Net-Async-HTTP-$pkgver.
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	perl Build.PL --installdirs=vendor
 	./Build
 }
diff --git a/main/perl-net-snmp/APKBUILD b/main/perl-net-snmp/APKBUILD
index cce84786288a1d721eabd129390fdb72d1f9a0eb..fa3743abb5ec298e17d0cf4e8468ff54e12e220d 100644
--- a/main/perl-net-snmp/APKBUILD
+++ b/main/perl-net-snmp/APKBUILD
@@ -1,38 +1,35 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-net-snmp
 _pkgreal=Net-SNMP
 pkgver=6.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Object oriented interface to SNMP"
 url="https://metacpan.org/release/Net-SNMP/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends perl-crypt-des perl-crypt-rijndael perl-digest-sha1"
-makedepends="perl-dev perl-module-build $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl-crypt-des perl-crypt-rijndael perl-digest-sha1"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DT/DTOWN/$_pkgreal-v$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-v$pkgver"
+builddir="$srcdir/$_pkgreal-v$pkgver"
 
 prepare() {
-	cd "$_builddir"
-	perl Build.PL installdirs=vendor || return 1
+	default_prepare
+	perl Build.PL installdirs=vendor
 }
 
 build() {
-	cd "$_builddir"
-		export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	# test fails for some reason
-	./Build #&& ./Build test
+	./Build
+}
+
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-role-tiny/APKBUILD b/main/perl-role-tiny/APKBUILD
index 30d3dc5e06648c85b0242582f0751e0fefbc5bd0..77720271f992eab7cd0604ba85dd22c213d245b0 100644
--- a/main/perl-role-tiny/APKBUILD
+++ b/main/perl-role-tiny/APKBUILD
@@ -1,11 +1,11 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-role-tiny
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Role-Tiny
 pkgver=2.002004
-pkgrel=0
+pkgrel=1
 pkgdesc="Roles: a nouvelle cuisine portion size slice of Moose"
 url="https://metacpan.org/release/Role-Tiny/"
 arch="noarch"
@@ -17,13 +17,11 @@ source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-$pkgver.tar.gz
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
diff --git a/main/perl-socket-getaddrinfo/APKBUILD b/main/perl-socket-getaddrinfo/APKBUILD
index f955e0f7b8f9e509dab1ac9ae783aa867a058304..76103a2a4fb9d12c4523cb5080546a3f2cbdbcda 100644
--- a/main/perl-socket-getaddrinfo/APKBUILD
+++ b/main/perl-socket-getaddrinfo/APKBUILD
@@ -1,33 +1,29 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-socket-getaddrinfo
 _pkgreal=Socket-GetAddrInfo
 pkgver=0.22
-pkgrel=2
+pkgrel=3
 pkgdesc="Perl interface for get{addr,name}info(3)"
 url="https://metacpan.org/release/Socket-GetAddrInfo/"
 arch="noarch"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl-extutils-cchecker"
 makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name .packlist -name perllocal.pod -delete
 }
diff --git a/main/perl-socket6/APKBUILD b/main/perl-socket6/APKBUILD
index 93593b9362c45904a689525ba21cfd3067dd738d..362051ac3dfeea7683a69eae304afdbae39e8672 100644
--- a/main/perl-socket6/APKBUILD
+++ b/main/perl-socket6/APKBUILD
@@ -1,10 +1,10 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-socket6
 _pkgreal=Socket6
 pkgver=0.29
-pkgrel=3
+pkgrel=4
 pkgdesc="perl module for IPV6 operations"
 url="https://metacpan.org/release/Socket6/"
 arch="all"
@@ -12,26 +12,22 @@ license="BSD-3-Clause"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/U/UM/UMEMOTO/$_pkgreal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-test-fatal/APKBUILD b/main/perl-test-fatal/APKBUILD
index 65a911ef5cf87845978bda583f8f71d5486a5f29..5c387f9d71600d3fc9b7d51a6126582115a26983 100644
--- a/main/perl-test-fatal/APKBUILD
+++ b/main/perl-test-fatal/APKBUILD
@@ -1,19 +1,18 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-test-fatal
 _pkgreal=Test-Fatal
 pkgver=0.016
-pkgrel=1
+pkgrel=2
 pkgdesc="incredibly simple helpers for testing code with exceptions"
 url="https://metacpan.org/release/Test-Fatal/"
 arch="noarch"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl-try-tiny"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
diff --git a/main/perl-test-identity/APKBUILD b/main/perl-test-identity/APKBUILD
index 2e1a3da339703f99573f15fc6109d1d30217ff51..db224286091d4ca05717c13eab9a26e76d2bdc3b 100644
--- a/main/perl-test-identity/APKBUILD
+++ b/main/perl-test-identity/APKBUILD
@@ -1,37 +1,33 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-test-identity
 _pkgreal=Test-Identity
 pkgver=0.01
-pkgrel=2
+pkgrel=3
 pkgdesc="assert the referential identity of a reference"
 url="https://metacpan.org/release/Test-Identity/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
-	perl Build.PL installdirs=vendor || return 1
+	default_prepare
+	perl Build.PL installdirs=vendor
 }
 
 build() {
-	cd "$_builddir"
-		export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+	./Build
+}
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-test-refcount/APKBUILD b/main/perl-test-refcount/APKBUILD
index 9b7ce323ce247089c39a8f4eb85fa7ab32029cb6..8d36c255566886fee6750efa9ea54a9e12094c34 100644
--- a/main/perl-test-refcount/APKBUILD
+++ b/main/perl-test-refcount/APKBUILD
@@ -1,29 +1,25 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-test-refcount
 _pkgreal=Test-Refcount
 pkgver=0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="assert reference counts on objects"
 url="https://metacpan.org/release/Test-Refcount"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	perl Build.PL installdirs=vendor
 }
 
 build() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	./Build
 }
 
@@ -32,7 +28,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	./Build install destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-try-tiny/APKBUILD b/main/perl-try-tiny/APKBUILD
index af6fb29e0d3da4bf4fdc65825995f362e3f1aab6..765510ef4eb244f58fac9f1986cec5170d6ddb5e 100644
--- a/main/perl-try-tiny/APKBUILD
+++ b/main/perl-try-tiny/APKBUILD
@@ -1,43 +1,35 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-try-tiny
 _pkgreal=Try-Tiny
 pkgver=0.30
-pkgrel=2
-pkgdesc="minimal try/catch with proper preservation of $@"
+pkgrel=3
+pkgdesc="minimal try/catch with proper preservation of \$@"
 url="https://search.cpan.org/dist/Try-Tiny/"
 arch="noarch"
 license="MIT"
-cpandepends="perl-capture-tiny perl-pod-coverage"
-cpanmakedepends="grep perl-sub-name"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl-capture-tiny perl-pod-coverage"
+makedepends="perl-dev grep perl-sub-name"
 subpackages="$pkgname-doc"
 source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	default_prepare
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-xml-xpath/APKBUILD b/main/perl-xml-xpath/APKBUILD
index 959a6d1ec1e095fc36ba02cb794806b43c146707..44c124d9f449599cfb6a230e7564aa20a30cce11 100644
--- a/main/perl-xml-xpath/APKBUILD
+++ b/main/perl-xml-xpath/APKBUILD
@@ -1,30 +1,26 @@
 # Automatically generated by apkbuild-cpan, template 2
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-xml-xpath
 _pkgreal=XML-XPath
 pkgver=1.44
-pkgrel=1
+pkgrel=2
 pkgdesc="Parse and evaluate XPath statements."
 url="https://metacpan.org/release/XML-XPath/"
 arch="noarch"
 license="Artistic-2.0"
-cpandepends="perl-xml-parser"
-cpanmakedepends="perl-path-tiny"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl-xml-parser"
+makedepends="perl-dev perl-path-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MA/MANWAR/XML-XPath-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
diff --git a/main/protobuf/APKBUILD b/main/protobuf/APKBUILD
index 87500af32d38090a868c31030453e0dcc84e0fb5..59646818c4d4e07a80052b724c77256285ef5f50 100644
--- a/main/protobuf/APKBUILD
+++ b/main/protobuf/APKBUILD
@@ -1,10 +1,10 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=protobuf
 _gemname=google-protobuf
 pkgver=3.15.7
 _tstver=5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for extensible, efficient structure packing"
 url="https://github.com/google/protobuf"
 # Test protobuf-test fails on 32 bit arches.
diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD
index 545b2d842b1d5fd9115364d1d472de046de0dbeb..2cc9a24159415a1c9cd539583e9117e16e2acf3b 100644
--- a/main/python3/APKBUILD
+++ b/main/python3/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 
 pkgname=python3
 # the python3-tkinter's pkgver needs to be synchronized with this.
 pkgver=3.9.5
 _bluez_ver=5.55
 _basever="${pkgver%.*}"
-pkgrel=0
+pkgrel=1
 pkgdesc="A high-level scripting language"
 url="https://www.python.org/"
 arch="all"
diff --git a/main/socat/APKBUILD b/main/socat/APKBUILD
index 8c5faf0c8ce938fcdb9cf92e5174b3f3eed71dd7..28b691365b636c0f32f18079b1f34a573abfb7c4 100644
--- a/main/socat/APKBUILD
+++ b/main/socat/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=socat
 pkgver=1.7.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Multipurpose relay for binary protocols"
 # test  58 CHILDDEFAULT: child process default properties... FAILED:
 # ./socat -t 0.1  -u exec:./procan -
diff --git a/testing/tf/APKBUILD b/testing/tf/APKBUILD
index 3f19f2e38ff44bc47a083424bf5f61208780b2e1..aa82b6045e54685dff352fde8ebfeba4ce87729f 100644
--- a/testing/tf/APKBUILD
+++ b/testing/tf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=tf
 pkgver=5.0b8
 _pkgver=50b8
@@ -7,9 +7,7 @@ pkgrel=3
 pkgdesc="Powerful curses-based MUD client"
 url="http://tinyfugue.sourceforge.net/"
 arch="all"
-license="GPL-2.0+"
-depends=""
-depends_dev=""
+license="GPL-2.0-or-later"
 makedepends="openssl-dev ncurses-dev pcre-dev $depends_dev"
 install=""
 source="https://sourceforge.net/projects/tinyfugue/files/tinyfugue/5.0%20beta%208/tf-$_pkgver.tar.gz
@@ -25,8 +23,7 @@ builddir="$srcdir/tf-$_pkgver"
 options="!check"
 
 build() {
-	cd "$builddir"
-	./configure \
+	CFLAGS="-fcommon" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -37,7 +34,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }