diff --git a/srcpkgs/ClusterSSH/template b/srcpkgs/ClusterSSH/template
index fa4a4ce6abe..8180eaeed0d 100644
--- a/srcpkgs/ClusterSSH/template
+++ b/srcpkgs/ClusterSSH/template
@@ -1,15 +1,20 @@
 # Template build file for 'ClusterSSH'.
 pkgname=ClusterSSH
-version=4.03:06
+_distver=4.03_06
+version=${_distver/_/.}
 revision=1
-wrksrc="App-${pkgname}-${version/:/_}"
+noarch=yes
+wrksrc="App-${pkgname}-${_distver}"
 build_style=perl-ModuleBuild
-makedepends="perl perl-Module-Build xterm perl-Try-Tiny perl-Tk perl-Exception-Class perl-X11-Protocol"
-depends="perl perl-Tk xterm openssh perl-Exception-Class perl-Try-Tiny perl-X11-Protocol"
-short_desc='A tool for making the same change on multiple servers at the same time.'
+hostmakedepends="xterm openssh
+ perl-CPAN-Changes perl-Module-Build perl-Try-Tiny perl-Tk
+ perl-Exception-Class perl-X11-Protocol perl-File-Slurp perl-File-Which
+ perl-Readonly perl-Test-Differences perl-Test-DistManifest
+ perl-Test-Pod perl-Test-Pod-Coverage perl-Test-Trap"
+depends="xterm openssh perl-Try-Tiny perl-Tk perl-X11-Protocol perl-Exception-Class"
+short_desc='A tool for making the same change on multiple servers at the same time'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="http://clusterssh.sourceforge.net"
-license="GPL-2, Artistic"
-distfiles="http://downloads.sourceforge.net/clusterssh/App-${pkgname}-${version/:/_}.tar.gz"
+license="GPL-1, Artistic"
+distfiles="${SOURCEFORGE_SITE}/clusterssh/App-${pkgname}-${_distver}.tar.gz"
 checksum=f3c5c89669deb7a579be65a0dba1e197b6d8b9f1d5b3e48b8a0646193d0bf6f0
-noarch=yes
diff --git a/srcpkgs/perl-Algorithm-Diff/template b/srcpkgs/perl-Algorithm-Diff/template
index 10ac75e7386..395ac140f3b 100644
--- a/srcpkgs/perl-Algorithm-Diff/template
+++ b/srcpkgs/perl-Algorithm-Diff/template
@@ -4,12 +4,12 @@ version=1.1903
 revision=1
 wrksrc="${pkgname#*-}-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
 short_desc='Algorithm::Diff - Compute differences between two files / lists'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Algorithm::Diff"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="${CPAN_SITE}/Algorithm/${pkgname#*-}-${version}.tar.gz"
 checksum=30e84ac4b31d40b66293f7b1221331c5a50561a39d580d85004d9c1fff991751
 noarch=yes
diff --git a/srcpkgs/perl-CPAN-Changes/template b/srcpkgs/perl-CPAN-Changes/template
index 77adc8d0ff8..0bfbda7e9c8 100644
--- a/srcpkgs/perl-CPAN-Changes/template
+++ b/srcpkgs/perl-CPAN-Changes/template
@@ -4,12 +4,12 @@ version=0.30
 revision=1
 wrksrc="CPAN-Changes-${version}"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
+noarch=yes
 short_desc='CPAN::Changes - Read and write Changes files'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="http://search.cpan.org/dist/CPAN-Changes/"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/CPAN/CPAN-Changes-${version}.tar.gz"
 checksum=e4ac13555163f22a7f99a9494f9db28c68b02447e08bce230515fc36a5cfa1ab
-noarch=yes
diff --git a/srcpkgs/perl-Class-Data-Inheritable/template b/srcpkgs/perl-Class-Data-Inheritable/template
index 69bf96a029b..748f1dd55c6 100644
--- a/srcpkgs/perl-Class-Data-Inheritable/template
+++ b/srcpkgs/perl-Class-Data-Inheritable/template
@@ -4,12 +4,12 @@ version=0.08
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
+noarch=yes
 short_desc='Class::Data::Inheritable - Inheritable, overridable class data'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Class::Data::Inheritable"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Class/Class-Data-Inheritable-${version}.tar.gz"
 checksum=9967feceea15227e442ec818723163eb6d73b8947e31f16ab806f6e2391af14a
-noarch=yes
diff --git a/srcpkgs/perl-Devel-StackTrace/template b/srcpkgs/perl-Devel-StackTrace/template
index 8bd0cbefd1a..627865bf595 100644
--- a/srcpkgs/perl-Devel-StackTrace/template
+++ b/srcpkgs/perl-Devel-StackTrace/template
@@ -4,12 +4,12 @@ version=2.00
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
+noarch=yes
 short_desc='Devel::StackTrace - An object representing a stack trace'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Devel::StackTrace"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Devel/Devel-StackTrace-${version}.tar.gz"
 checksum=1debe7273099a60e1386e0da5edbed7334db3cf3ed8e3b4106b087100b8ec5e4
-noarch=yes
diff --git a/srcpkgs/perl-Devel-Symdump/template b/srcpkgs/perl-Devel-Symdump/template
index 8b8cbc2d6d8..49c629b9909 100644
--- a/srcpkgs/perl-Devel-Symdump/template
+++ b/srcpkgs/perl-Devel-Symdump/template
@@ -2,14 +2,14 @@
 pkgname=perl-Devel-Symdump
 version=2.15
 revision=1
-wrksrc="Devel-Symdump-${version}"
+wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
 short_desc='Devel::Symdump - Dump symbol names or the symbol table'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Devel::Symdump"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Devel/Devel-Symdump-${version}.tar.gz"
 checksum=76c2a90d31318204ecf1977f0217ce57b142e6681fe2b99fb8789efc5dd86f41
 noarch=yes
diff --git a/srcpkgs/perl-Exception-Class/template b/srcpkgs/perl-Exception-Class/template
index 25f989e4680..b64b9c398f0 100644
--- a/srcpkgs/perl-Exception-Class/template
+++ b/srcpkgs/perl-Exception-Class/template
@@ -4,12 +4,12 @@ version=1.39
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Class-Data-Inheritable perl-Devel-StackTrace"
+hostmakedepends="perl-Class-Data-Inheritable perl-Devel-StackTrace"
+depends="${hostmakedepends}"
+noarch=yes
 short_desc='Exception::Class - allows you to declare real exception classes'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Exception::Class"
 license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Exception/Exception-Class-${version}.tar.gz"
 checksum=819c756a69a6d1e31f396eca6a508b07b0a522a035b904cd1d432353cc362083
-noarch=yes
diff --git a/srcpkgs/perl-IPC-Run3/template b/srcpkgs/perl-IPC-Run3/template
index 8ed541e0ef4..8b0d2e45f0e 100644
--- a/srcpkgs/perl-IPC-Run3/template
+++ b/srcpkgs/perl-IPC-Run3/template
@@ -2,9 +2,9 @@
 pkgname=perl-IPC-Run3
 version=0.048
 revision=1
-wrksrc="IPC-Run3-${version}"
+wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
 short_desc='IPC::Run3 -  run a subprocess and redirect stdin, stdout, and/or stderr'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
diff --git a/srcpkgs/perl-Module-Manifest/template b/srcpkgs/perl-Module-Manifest/template
index 30bfd4b7aaa..3156a0fe881 100644
--- a/srcpkgs/perl-Module-Manifest/template
+++ b/srcpkgs/perl-Module-Manifest/template
@@ -4,8 +4,8 @@ version=1.08
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Params-Util perl-Test-Warn perl-Test-Exception"
+hostmakedepends="perl perl-Params-Util perl-Test-Warn perl-Test-Exception"
+depends="${hostmakedepends}"
 short_desc='Module::Manifest: Parse and examine a distribution MANIFEST file'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Module::Manifest"
diff --git a/srcpkgs/perl-Pod-Coverage/template b/srcpkgs/perl-Pod-Coverage/template
index ec8614413fa..2c345f31529 100644
--- a/srcpkgs/perl-Pod-Coverage/template
+++ b/srcpkgs/perl-Pod-Coverage/template
@@ -2,14 +2,14 @@
 pkgname=perl-Pod-Coverage
 version=0.23
 revision=1
-wrksrc="Pod-Coverage-${version}"
+wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Devel-Symdump"
+hostmakedepends="perl perl-Devel-Symdump"
+depends="${hostmakedepends}"
 short_desc='Pod::Coverage - Check if module documentation is comprehensive'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Pod::Coverage"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Pod/Pod-Coverage-${version}.tar.gz"
 checksum=30b7a0b0c942f44a7552c0d34e9b1f2e0ba0b67955c61e3b1589ec369074b107
 noarch=yes
diff --git a/srcpkgs/perl-Probe-Perl/template b/srcpkgs/perl-Probe-Perl/template
index 17d6573438f..a579a5e8935 100644
--- a/srcpkgs/perl-Probe-Perl/template
+++ b/srcpkgs/perl-Probe-Perl/template
@@ -2,14 +2,14 @@
 pkgname=perl-Probe-Perl
 version=0.03
 revision=1
-wrksrc="Probe-Perl-${version}"
+wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
 short_desc='Probe::Perl - Obtain information about running perl interpreter'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Probe::Perl"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Probe-Perl-${version}.tar.gz"
 checksum=d9e4d21e2e77638559045fa09046b1b6fff6c403b949929db213e30abe8a3c31
 noarch=yes
diff --git a/srcpkgs/perl-Test-Differences/template b/srcpkgs/perl-Test-Differences/template
index 712bfa3aad2..25c4e250614 100644
--- a/srcpkgs/perl-Test-Differences/template
+++ b/srcpkgs/perl-Test-Differences/template
@@ -4,8 +4,8 @@ version=0.63
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Text-Diff"
+hostmakedepends="perl perl-Text-Diff"
+depends="${hostmakedepends}"
 short_desc='Test::Differences - Test strings / data and show differences if not ok'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Test::Differences"
diff --git a/srcpkgs/perl-Test-DistManifest/template b/srcpkgs/perl-Test-DistManifest/template
index 13ce32fcf06..f11a27207e8 100644
--- a/srcpkgs/perl-Test-DistManifest/template
+++ b/srcpkgs/perl-Test-DistManifest/template
@@ -4,8 +4,8 @@ version=1.014
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Test-NoWarnings perl-Module-Manifest"
+hostmakedepends="perl perl-Test-NoWarnings perl-Module-Manifest"
+depends="${hostmakedepends}"
 short_desc='Test::DistManifest - Author test that validates a package MANIFEST'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Test::DistManifest"
diff --git a/srcpkgs/perl-Test-Exception/template b/srcpkgs/perl-Test-Exception/template
index c20f5baeed9..5d872c8c407 100644
--- a/srcpkgs/perl-Test-Exception/template
+++ b/srcpkgs/perl-Test-Exception/template
@@ -4,12 +4,12 @@ version=0.40
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Sub-Uplevel"
+hostmakedepends="perl perl-Sub-Uplevel"
+depends="${hostmakedepends}"
+noarch=yes
 short_desc='Test::Exception - Provides modules for testing exception based code.'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="http://search.cpan.org/dist/Test-Exception/"
 license="Artistic, GPL-1"
 distfiles="$CPAN_SITE/Test/Test-Exception-${version}.tar.gz"
 checksum=d92ccb566d93140abc93b07ec4c13e9b14c8f8f7d7858a2ab575d83b3bb51b26
-noarch=yes
diff --git a/srcpkgs/perl-Test-NoWarnings/template b/srcpkgs/perl-Test-NoWarnings/template
index eaeba1e2221..b042fdba524 100644
--- a/srcpkgs/perl-Test-NoWarnings/template
+++ b/srcpkgs/perl-Test-NoWarnings/template
@@ -4,12 +4,12 @@ version=1.04
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Test-Tester"
+hostmakedepends="perl perl-Test-Tester"
+depends="${hostmakedepends}"
+noarch=yes
 short_desc='Test::NoWarnings - Make sure you did not emit warnings while testing.'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Test::NoWarnings"
 license="LGPL-2.1"
 distfiles="$CPAN_SITE/Test/Test-NoWarnings-${version}.tar.gz"
 checksum=638a57658cb119af1fe5b15e73d47c2544dcfef84af0c6b1b2e97f08202b686c
-noarch=yes
diff --git a/srcpkgs/perl-Test-Pod-Coverage/template b/srcpkgs/perl-Test-Pod-Coverage/template
index be988ec237d..bbd76982fb4 100644
--- a/srcpkgs/perl-Test-Pod-Coverage/template
+++ b/srcpkgs/perl-Test-Pod-Coverage/template
@@ -2,14 +2,14 @@
 pkgname=perl-Test-Pod-Coverage
 version=1.10
 revision=1
-wrksrc="Test-Pod-Coverage-${version}"
+wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Pod-Coverage"
+hostmakedepends="perl perl-Pod-Coverage"
+depends="${hostmakedepends}"
+noarch=yes
 short_desc='Test::Pod::Coverage - Check for pod coverage in your distribution'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Test::Pod::Coverage"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Test/Test-Pod-Coverage-${version}.tar.gz"
 checksum=48c9cca9f7d99eee741176445b431adf09c029e1aa57c4703c9f46f7601d40d4
-noarch=yes
diff --git a/srcpkgs/perl-Test-Pod/template b/srcpkgs/perl-Test-Pod/template
index f81a9714bf0..7d4d0bf4939 100644
--- a/srcpkgs/perl-Test-Pod/template
+++ b/srcpkgs/perl-Test-Pod/template
@@ -2,14 +2,14 @@
 pkgname=perl-Test-Pod
 version=1.51
 revision=1
-wrksrc="Test-Pod-${version}"
+wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
+noarch=yes
 short_desc='Test::Pod - checks for POD errors in files'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="http://search.cpan.org/dist/Test-Pod/"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Test/Test-Pod-${version}.tar.gz"
 checksum=c1a1d3cedf4a579e3aad89c36f9878a8542b6656dbe71f1581420f49582d7efb
-noarch=yes
diff --git a/srcpkgs/perl-Test-Script/template b/srcpkgs/perl-Test-Script/template
index 022e287ebd4..c7a12aadad3 100644
--- a/srcpkgs/perl-Test-Script/template
+++ b/srcpkgs/perl-Test-Script/template
@@ -2,14 +2,14 @@
 pkgname=perl-Test-Script
 version=1.10
 revision=1
-wrksrc="Test-Script-${version}"
+wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Probe-Perl perl-IPC-Run3"
+hostmakedepends="perl perl-Probe-Perl perl-IPC-Run3"
+depends="${hostmakedepends}"
+noarch=yes
 short_desc='Test::Script - Provides a series of basic tests'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Test::Script"
 license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Test/Test-Script-${version}.tar.gz"
 checksum=d61db6a6b98aba023da5f8c7aac6bb30ce43ca76a7a03d73b1e3d85a8b8aab73
-noarch=yes
diff --git a/srcpkgs/perl-Test-Tester/template b/srcpkgs/perl-Test-Tester/template
index bf187eb7fe8..46ba4382f25 100644
--- a/srcpkgs/perl-Test-Tester/template
+++ b/srcpkgs/perl-Test-Tester/template
@@ -4,12 +4,12 @@ version=0.109
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
+noarch=yes
 short_desc='Test::Tester - Ease testing test modules built with Test::Builder'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Test::Tester"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Test/Test-Tester-${version}.tar.gz"
 checksum=d3c7c85e2fcbd5bb9c9c4d2e76ddaa9b1694ed0ab2795b722904cf043e123655
-noarch=yes
diff --git a/srcpkgs/perl-Test-Trap/template b/srcpkgs/perl-Test-Trap/template
index a889a2d017b..ece3964b55c 100644
--- a/srcpkgs/perl-Test-Trap/template
+++ b/srcpkgs/perl-Test-Trap/template
@@ -2,14 +2,14 @@
 pkgname=perl-Test-Trap
 version=v0.3.2
 revision=1
-wrksrc="Test-Trap-v0.3.2"
+wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Test-Tester perl-Data-Dump"
+hostmakedepends="perl perl-Test-Tester perl-Data-Dump"
+depends="${hostmakedepends}"
+noarch=yes
 short_desc='Test::Trap - Trap exit codes, exceptions, output, etc.'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Test::Trap"
-license="Artistic"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Test/Test-Trap-${version}.tar.gz"
 checksum=399b9309c669d161dcd9ee2e1377aa4027e7428ff4f5ffd07cc16852e725054b
-noarch=yes
diff --git a/srcpkgs/perl-Text-Diff/template b/srcpkgs/perl-Text-Diff/template
index af742337511..d2ceb6648bd 100644
--- a/srcpkgs/perl-Text-Diff/template
+++ b/srcpkgs/perl-Text-Diff/template
@@ -4,12 +4,12 @@ version=1.43
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
-depends="perl perl-Algorithm-Diff"
+hostmakedepends="perl perl-Algorithm-Diff"
+depends="${hostmakedepends}"
+noarch=yes
 short_desc='Text::Diff - Perform diffs on files and record sets'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Text::Diff"
-license="Artistic, GPL-2"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Text/Text-Diff-${version}.tar.gz"
 checksum=4c2d837c355c3f212044331f6712b5191a6cebc21c47c1157b4bb13283acb7aa
-noarch=yes
diff --git a/srcpkgs/perl-Tk/template b/srcpkgs/perl-Tk/template
index ac12eacc0bf..5bb0b4f5a69 100644
--- a/srcpkgs/perl-Tk/template
+++ b/srcpkgs/perl-Tk/template
@@ -1,14 +1,14 @@
-# Template build file for 'perl-Tk'.
+# Template file for 'perl-Tk'
 pkgname=perl-Tk
 version=804.033
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl libX11-devel libpng-devel libjpeg-turbo-devel"
-depends="perl"
+hostmakedepends="perl libX11-devel libpng-devel libjpeg-turbo-devel"
+makedepends="${hostmakedepends}"
 short_desc='Tk graphical interface for Perl'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/Tk"
-license="Artistic, Others"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/Tk/Tk-${version}.tar.gz"
 checksum=84756e9b07a2555c8eecf88e63d5cbbba9b1aa97b1e71a3d4aa524a7995a88ad
diff --git a/srcpkgs/perl-X11-Protocol/template b/srcpkgs/perl-X11-Protocol/template
index 9544b1c526c..c4d04012058 100644
--- a/srcpkgs/perl-X11-Protocol/template
+++ b/srcpkgs/perl-X11-Protocol/template
@@ -2,14 +2,14 @@
 pkgname=perl-X11-Protocol
 version=0.56
 revision=1
-wrksrc="X11-Protocol-${version}"
+wrksrc="${pkgname#*-}-${version}"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl"
 depends="perl"
+noarch=yes
 short_desc='X11::Protocol - Rough equivalent of Xlib'
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 homepage="https://metacpan.org/pod/X11::Protocol"
-license="Unknown"
+license="GPL-1, Artistic"
 distfiles="$CPAN_SITE/X11/X11-Protocol-${version}.tar.gz"
 checksum=de96dd6c7c1f25f3287aa7af64902bf84acaaa8e0c3bb76aa1676367e04a08b7
-noarch=yes