diff --git a/main/perl-apache-session/APKBUILD b/main/perl-apache-session/APKBUILD
index 3e908247f8307b40e3b4367e3fd6a0fd28007ab4..f0a594eb8e6c482eb871a90ffdff40edc1ea281c 100644
--- a/main/perl-apache-session/APKBUILD
+++ b/main/perl-apache-session/APKBUILD
@@ -11,7 +11,7 @@ url="https://metacpan.org/release/Apache-Session/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-test-deep perl-test-exception perl-module-build"
+makedepends="perl-test-deep perl-test-exception perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CH/CHORNY/Apache-Session-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-astro-suntime/APKBUILD b/main/perl-astro-suntime/APKBUILD
index 9f1b7b58692bc063583677cc34dc0ab9ada6736d..68cf379eb122a6d95de8b9178a355ffeb45e4c99 100644
--- a/main/perl-astro-suntime/APKBUILD
+++ b/main/perl-astro-suntime/APKBUILD
@@ -10,7 +10,7 @@ url="https://metacpan.org/release/Astro-SunTime/"
 arch="noarch"
 license="GPL-3.0-only"
 depends="perl perl-time-parsedate"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 checkdepends="perl-time-parsedate"
 source="https://cpan.metacpan.org/authors/id/R/RO/ROBF/Astro-SunTime-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-async-mergepoint/APKBUILD b/main/perl-async-mergepoint/APKBUILD
index e6acb558bbd5fe166de0c91c3dcc4fa0ee175436..06ddfcdfa14eb6f5a2529e5200b543edccfcd650 100644
--- a/main/perl-async-mergepoint/APKBUILD
+++ b/main/perl-async-mergepoint/APKBUILD
@@ -10,7 +10,7 @@ url="https://metacpan.org/release/Async-MergePoint"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-module-build perl-test-fatal"
+makedepends="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"
diff --git a/main/perl-class-mix/APKBUILD b/main/perl-class-mix/APKBUILD
index ad3e1857b29d05a2c5eff6cca58d1ab629ce6b53..2302e01bd30dee7c46bfb67f0ed9b4e4f17d6b70 100644
--- a/main/perl-class-mix/APKBUILD
+++ b/main/perl-class-mix/APKBUILD
@@ -10,7 +10,7 @@ url="https://metacpan.org/release/Class-Mix/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-params-classify"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/$_pkgreal-$pkgver.tar.gz"
 
diff --git a/main/perl-convert-color/APKBUILD b/main/perl-convert-color/APKBUILD
index 2ffc443737697877763645648ce4e57f4eb0f5af..ee9b12e72da0f2fb3cd572f8a115bbf8602be7ce 100644
--- a/main/perl-convert-color/APKBUILD
+++ b/main/perl-convert-color/APKBUILD
@@ -8,11 +8,9 @@ pkgrel=2
 pkgdesc="color space conversions and named lookups"
 url="https://metacpan.org/release/Convert-Color/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-list-utilsby"
-cpanmakedepends="perl-test-number-delta"
-depends="$cpandepends perl-module-pluggable"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-list-utilsby perl-module-pluggable"
+makedepends="perl-test-number-delta perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
 
diff --git a/main/perl-file-remove/APKBUILD b/main/perl-file-remove/APKBUILD
index e7da793044bc8ae9c2a36bc326ddec362332f720..7abf6e2dcd548b9a47004e0340080a51fda9f5e0 100644
--- a/main/perl-file-remove/APKBUILD
+++ b/main/perl-file-remove/APKBUILD
@@ -10,7 +10,7 @@ url="https://metacpan.org/release/File-Remove/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/File-Remove-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-future/APKBUILD b/main/perl-future/APKBUILD
index f5e45fbeaa43fb5e20ea7849b200c955a1b49734..d34cfb4d93c429ba9a604f5c2a81df3f113e2e4e 100644
--- a/main/perl-future/APKBUILD
+++ b/main/perl-future/APKBUILD
@@ -9,7 +9,7 @@ url="https://metacpan.org/release/Future"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 checkdepends="perl-test-refcount perl-test-fatal perl-test-identity"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Future-$pkgver.tar.gz"
diff --git a/main/perl-html-formattext-withlinks/APKBUILD b/main/perl-html-formattext-withlinks/APKBUILD
index 382179b36f335f6339dc56cdba95ae60cf1a916f..87942f169a23cb467536188ea7c1e7f4c2fba0fb 100644
--- a/main/perl-html-formattext-withlinks/APKBUILD
+++ b/main/perl-html-formattext-withlinks/APKBUILD
@@ -10,7 +10,7 @@ url="https://metacpan.org/release/HTML-FormatText-WithLinks/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-html-tree perl-uri perl-html-formatter"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-html-tree/APKBUILD b/main/perl-html-tree/APKBUILD
index 0f139ceeaf0aedcf3cd702aaebe59dbb2d51cfb7..1870179ea7ea3504effed8b631e63d905423baf8 100644
--- a/main/perl-html-tree/APKBUILD
+++ b/main/perl-html-tree/APKBUILD
@@ -8,33 +8,25 @@ pkgrel=2
 pkgdesc="Work with HTML in a DOM-like tree structure"
 url="https://metacpan.org/release/HTML-Tree/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-html-tagset perl-html-parser"
-cpanmakedepends="perl-test-fatal"
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev perl-module-build $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-html-tagset perl-html-parser"
+makedepends="perl-module-build perl-test-fatal"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare || return 1
-
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	perl Build.PL installdirs=vendor || return 1
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	./Build && ./Build test
 }
 
 package() {
-	cd "$builddir"
 	./Build install destdir="$pkgdir" || return 1
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-io-async/APKBUILD b/main/perl-io-async/APKBUILD
index 0ebffc5362119e26c3c64a44474915b3ac45dca4..4b0d8ec637c11dbcd858b0e4ff7d44a46b39aaa7 100644
--- a/main/perl-io-async/APKBUILD
+++ b/main/perl-io-async/APKBUILD
@@ -8,8 +8,8 @@ pkgdesc="Asynchronous event-driven programming"
 url="https://metacpan.org/release/IO-Async"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-struct-dumb perl-future"
-makedepends="perl-dev perl-test-refcount perl-test-fatal perl-test-identity perl-module-build"
+depends="perl perl-struct-dumb perl-future"
+makedepends="perl-test-refcount perl-test-fatal perl-test-identity perl-module-build"
 checkdepends="perl-test-metrics-any"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
diff --git a/main/perl-io-socket-inet6/APKBUILD b/main/perl-io-socket-inet6/APKBUILD
index f562a605949dd733d4542cf528dd47b9daeb5a5b..49b112fb14afd4ba4748bdb441408651ec257c0d 100644
--- a/main/perl-io-socket-inet6/APKBUILD
+++ b/main/perl-io-socket-inet6/APKBUILD
@@ -9,8 +9,8 @@ pkgdesc="Object interface for AF_INET|AF_INET6 domain sockets"
 url="https://metacpan.org/pod/IO::Socket::INET6"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-socket6"
-makedepends="perl-dev perl-module-build"
+depends="perl perl-socket6"
+makedepends="perl-module-build"
 options="!check" # No ipv6 in buildozer
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$_pkgreal-$pkgver.tar.gz"
@@ -18,24 +18,20 @@ 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-list-utilsby/APKBUILD b/main/perl-list-utilsby/APKBUILD
index a93ba7d170f361f969a09d3e7967fdbf5aa05f1c..c96ad21153a2a6254e7f0bd9eab4267320723eac 100644
--- a/main/perl-list-utilsby/APKBUILD
+++ b/main/perl-list-utilsby/APKBUILD
@@ -8,8 +8,9 @@ pkgrel=2
 pkgdesc="higher-order list utility functions"
 url="https://metacpan.org/release/List-UtilsBy/"
 arch="noarch"
-license="GPL PerlArtistic"
-makedepends="perl-dev perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
 
@@ -17,22 +18,18 @@ 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/main/perl-mail-spf/APKBUILD b/main/perl-mail-spf/APKBUILD
index 88fb34413f1230a0c48553426a0e6bc967203814..4ceed13f4d4893fe4836d6461145cad62f8a354a 100644
--- a/main/perl-mail-spf/APKBUILD
+++ b/main/perl-mail-spf/APKBUILD
@@ -8,10 +8,9 @@ pkgrel=4
 pkgdesc="An object-oriented implementation of Sender Policy Framework"
 url="http://search.cpan.org/~jmehnle/Mail-SPF-v2.006/"
 arch="noarch"
-license="GPL PerlArtistic"
-depends="perl perl-error perl-net-dns perl-uri perl-netaddr-ip
-	perl-net-dns-resolver-programmable"
-makedepends="perl-dev perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-error perl-net-dns perl-uri perl-netaddr-ip perl-net-dns-resolver-programmable"
+makedepends="perl-module-build"
 install=
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/J/JM/JMEHNLE/mail-spf/$_realname-v$pkgver.tar.gz"
diff --git a/main/perl-module-runtime/APKBUILD b/main/perl-module-runtime/APKBUILD
index 2d833f2db528ef6ec53efcfd19149668ef150880..5b5dbd2cdf01b08193c4f9fb0c39f4fbf36c4a97 100644
--- a/main/perl-module-runtime/APKBUILD
+++ b/main/perl-module-runtime/APKBUILD
@@ -10,7 +10,7 @@ url="https://metacpan.org/release/Module-Runtime/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-test-pod perl-test-pod-coverage perl-module-build"
+makedepends="perl-test-pod perl-test-pod-coverage perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/$_pkgreal-$pkgver.tar.gz"
 
diff --git a/main/perl-module-util/APKBUILD b/main/perl-module-util/APKBUILD
index c36aae1d66824eeb9c839ff17b4486bfb3fa3628..2ccc54a86444e5e0500a0e2c6b2275661f3d3794 100644
--- a/main/perl-module-util/APKBUILD
+++ b/main/perl-module-util/APKBUILD
@@ -8,11 +8,9 @@ pkgrel=2
 pkgdesc="Module name tools and transformations"
 url="https://metacpan.org/release/Module-Util/"
 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"
+depends="perl"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MA/MATTLAW/$_pkgreal-$pkgver.tar.gz"
 
diff --git a/main/perl-net-async-http/APKBUILD b/main/perl-net-async-http/APKBUILD
index 9551ad03165de39ee626ec66b08423d2b5d960fc..60cd87966c3265161c07784b59979624008a5e35 100644
--- a/main/perl-net-async-http/APKBUILD
+++ b/main/perl-net-async-http/APKBUILD
@@ -11,7 +11,10 @@ url="https://metacpan.org/release/Net-Async-HTTP/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-io-async perl-future perl-uri perl-http-message perl-struct-dumb perl-metrics-any"
-makedepends="perl-dev perl-test-identity perl-http-cookies perl-test-refcount perl-module-build perl-io-async perl-test-metrics-any"
+makedepends="
+	perl-test-identity perl-http-cookies perl-test-refcount perl-module-build perl-io-async
+	perl-test-metrics-any
+	"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Net-Async-HTTP-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD
index c9f200a2a8e50fe55bdb9cae162094a6319199b9..5a2c185f5d3c7985563f7fc2ffa894acb347cb8c 100644
--- a/main/perl-net-dns/APKBUILD
+++ b/main/perl-net-dns/APKBUILD
@@ -11,7 +11,6 @@ url="https://metacpan.org/release/Net-DNS/"
 arch="noarch"
 license="MIT"
 depends="perl perl-digest-hmac"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-net-snmp/APKBUILD b/main/perl-net-snmp/APKBUILD
index fa3743abb5ec298e17d0cf4e8468ff54e12e220d..d39fa7581059db70bb4f65743c75c86106355ea7 100644
--- a/main/perl-net-snmp/APKBUILD
+++ b/main/perl-net-snmp/APKBUILD
@@ -9,8 +9,8 @@ pkgdesc="Object oriented interface to SNMP"
 url="https://metacpan.org/release/Net-SNMP/"
 arch="noarch"
 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"
+depends="perl perl-crypt-des perl-crypt-rijndael perl-digest-sha1"
+makedepends="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"
diff --git a/main/perl-path-class/APKBUILD b/main/perl-path-class/APKBUILD
index cc403ca77bcdc98e88644187effaf6d911b2e49e..948f7adf2abac2552c4d6b89c78191d70ceec63d 100644
--- a/main/perl-path-class/APKBUILD
+++ b/main/perl-path-class/APKBUILD
@@ -8,11 +8,9 @@ pkgrel=2
 pkgdesc="Cross-platform path specification manipulation"
 url="https://metacpan.org/release/Path-Class/"
 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"
+depends="perl"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/$_pkgreal-$pkgver.tar.gz"
 
diff --git a/main/perl-role-basic/APKBUILD b/main/perl-role-basic/APKBUILD
index 6c2b412a51cdafcc08c48756b8b0b4adbd2f6b4a..f19e819d7a6928b2ea8421a106bf2c94a1d5dcd6 100644
--- a/main/perl-role-basic/APKBUILD
+++ b/main/perl-role-basic/APKBUILD
@@ -8,11 +8,9 @@ pkgrel=2
 pkgdesc="Just roles. Nothing else."
 url="https://metacpan.org/release/Role-Basic/"
 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"
+depends="perl"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/O/OV/OVID/$_pkgreal-$pkgver.tar.gz"
 
diff --git a/main/perl-server-starter/APKBUILD b/main/perl-server-starter/APKBUILD
index 15f86a33ad51c9baa2e13a753b1a43d24cef465f..9eb705ca69fb63afc6f3b917fa0e03fc00526e1e 100644
--- a/main/perl-server-starter/APKBUILD
+++ b/main/perl-server-starter/APKBUILD
@@ -9,12 +9,9 @@ pkgdesc="a superdaemon for hot-deploying server programs"
 url="https://metacpan.org/release/Server-Starter/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends=""
-cpanmakedepends="perl-module-build>=0.4229"
-cpancheckdepends="perl-test-tcp>=2.22 perl-test-sharedfork>=0.35 perl-test-requires>=0.10"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+depends="perl"
+makedepends="perl-module-build>=0.4229"
+checkdepends="perl-test-tcp>=2.22 perl-test-sharedfork>=0.35 perl-test-requires>=0.10"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/K/KA/KAZUHO/Server-Starter-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-socket-getaddrinfo/APKBUILD b/main/perl-socket-getaddrinfo/APKBUILD
index 76103a2a4fb9d12c4523cb5080546a3f2cbdbcda..0ea2d9e5746e97566a7a2b17daa99b03ff69c247 100644
--- a/main/perl-socket-getaddrinfo/APKBUILD
+++ b/main/perl-socket-getaddrinfo/APKBUILD
@@ -8,8 +8,8 @@ pkgdesc="Perl interface for get{addr,name}info(3)"
 url="https://metacpan.org/release/Socket-GetAddrInfo/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-extutils-cchecker"
-makedepends="perl-dev perl-module-build"
+depends="perl perl-extutils-cchecker"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-struct-dumb/APKBUILD b/main/perl-struct-dumb/APKBUILD
index 01d1e1c5db49b53ac5a2c4274cbb7362d2550663..e2017f9fb50da56a738e5371957721b8c0f05197 100644
--- a/main/perl-struct-dumb/APKBUILD
+++ b/main/perl-struct-dumb/APKBUILD
@@ -9,7 +9,8 @@ pkgdesc="Make simple lightweight record-like structures"
 url="https://metacpan.org/release/Struct-Dumb/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-makedepends="perl-dev perl-module-build"
+depends="perl"
+makedepends="perl-module-build"
 checkdepends="perl-test-fatal"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
diff --git a/main/perl-test-fork/APKBUILD b/main/perl-test-fork/APKBUILD
index ddc13cdda6e86a8b3948746a529340e0dc033452..4ae1288a4647f597c05e1cc1a7b8e9ff10497576 100644
--- a/main/perl-test-fork/APKBUILD
+++ b/main/perl-test-fork/APKBUILD
@@ -11,7 +11,7 @@ url="https://metacpan.org/release/Test-Fork/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MS/MSCHWERN/Test-Fork-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-test-identity/APKBUILD b/main/perl-test-identity/APKBUILD
index db224286091d4ca05717c13eab9a26e76d2bdc3b..ddb29af0e462ef347ceccde5ffd59cc9290bce46 100644
--- a/main/perl-test-identity/APKBUILD
+++ b/main/perl-test-identity/APKBUILD
@@ -9,7 +9,8 @@ pkgdesc="assert the referential identity of a reference"
 url="https://metacpan.org/release/Test-Identity/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-makedepends="perl-dev perl-module-build"
+depends="perl"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-test-metrics-any/APKBUILD b/main/perl-test-metrics-any/APKBUILD
index 5240f86f3588ab5927df609a8d5315c74ad16ac3..df15c704c2e7b415bb27d131a09ef7c5bd18d7f8 100644
--- a/main/perl-test-metrics-any/APKBUILD
+++ b/main/perl-test-metrics-any/APKBUILD
@@ -11,7 +11,7 @@ url="https://metacpan.org/release/Test-Metrics-Any/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-metrics-any"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Test-Metrics-Any-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-test-refcount/APKBUILD b/main/perl-test-refcount/APKBUILD
index 8d36c255566886fee6750efa9ea54a9e12094c34..d32de5d2d2ebb55c3368526cde784f59ad4d78f1 100644
--- a/main/perl-test-refcount/APKBUILD
+++ b/main/perl-test-refcount/APKBUILD
@@ -9,7 +9,8 @@ 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"
-makedepends="perl-dev perl-module-build"
+depends="perl"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-text-wikiformat/APKBUILD b/main/perl-text-wikiformat/APKBUILD
index 89c77188d0ff1e1325a9010b0c0afad63a032858..71ec9a7e85acc2f6fc2bf7672b64d790d75f8648 100644
--- a/main/perl-text-wikiformat/APKBUILD
+++ b/main/perl-text-wikiformat/APKBUILD
@@ -8,11 +8,9 @@ pkgrel=2
 pkgdesc="module for translating Wiki formatted text into other formats"
 url="https://metacpan.org/release/Text-WikiFormat/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-uri"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-uri"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CY/CYCLES/$_pkgreal-$pkgver.tar.gz"