diff --git a/srcpkgs/perl-Crypt-Blowfish/template b/srcpkgs/perl-Crypt-Blowfish/template
index 7e3f3297f36..1f2e3b17a4a 100644
--- a/srcpkgs/perl-Crypt-Blowfish/template
+++ b/srcpkgs/perl-Crypt-Blowfish/template
@@ -2,8 +2,10 @@
 pkgname=perl-Crypt-Blowfish
 version=2.12
 wrksrc="Crypt-Blowfish-${version}"
-revision=1
+revision=2
 build_style=perl-module
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="Crypt::Blowfish - Blowfish cryptography algorithm interface"
 maintainer="Juan RP <xtraeme@gmail.com"
 homepage="http://search.cpan.org/dist/Crypt-Blowfish"
@@ -16,11 +18,9 @@ long_desc="
  to take full advantage of Crypt::CBC when desired.  Blowfish keys may be
  up to 448 bits (56 bytes) long."
 
-hostmakedepends="perl"
-
 perl-Crypt-Blowfish_package() {
-	depends="perl"
+	depends="${makedepends}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-Crypt-DH/template b/srcpkgs/perl-Crypt-DH/template
index 0cda2ca3012..f21b2a21c3d 100644
--- a/srcpkgs/perl-Crypt-DH/template
+++ b/srcpkgs/perl-Crypt-DH/template
@@ -2,8 +2,10 @@
 pkgname=perl-Crypt-DH
 version=0.07
 wrksrc="Crypt-DH-${version}"
-revision=1
+revision=2
 build_style=perl-module
+hostmakedepends="perl>=5.18"
+makedepends="perl>=5.18 perl-Math-BigInt-GMP"
 short_desc="Crypt::DH - Diffie-Hellman key exchange system"
 maintainer="Juan RP <xtraeme@gmail.com"
 homepage="http://search.cpan.org/dist/Crypt-DH"
@@ -17,12 +19,10 @@ long_desc="
  an insecure network without the two parties ever passing the actual
  shared secret, or their private keys, between them."
 
-makedepends="perl-Math-BigInt-GMP"
-
 perl-Crypt-DH_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 0ec1401b374..14d1fa3c913 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -2,8 +2,10 @@
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.04
 wrksrc="Crypt-OpenSSL-Bignum-${version}"
-revision=1
+revision=2
 build_style=perl-module
+hostmakedepends="perl>=5.18"
+makedepends="perl>=5.18 openssl-devel"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum"
@@ -18,11 +20,9 @@ long_desc="
  used to provide access to bignum values produced by other OpenSSL
  modules, such as key parameters from Crypt::OpenSSL::RSA."
 
-makedepends="perl openssl-devel"
-
 perl-Crypt-OpenSSL-Bignum_package() {
-	depends="perl"
+	depends="${hostmakedepends}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-DBD-SQLite/template b/srcpkgs/perl-DBD-SQLite/template
index b9d1de50091..12d7fee7bf2 100644
--- a/srcpkgs/perl-DBD-SQLite/template
+++ b/srcpkgs/perl-DBD-SQLite/template
@@ -1,11 +1,11 @@
 # Template build file for 'perl-DBD-SQLite'.
 pkgname=perl-DBD-SQLite
 version=1.40
-revision=1
+revision=2
 wrksrc="DBD-SQLite-${version}"
 build_style=perl-module
-hostmakedepends="perl"
-makedepends="perl-DBI"
+hostmakedepends="perl>=5.8"
+makedepends="perl>=5.8 perl-DBI"
 short_desc="DBD::SQLite - Self-contained RDBMS in a DBI driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/DBD-SQLite"
@@ -14,7 +14,7 @@ distfiles="${CPAN_SITE}/DBD/DBD-SQLite-$version.tar.gz"
 checksum=21fb65e740b6265512c82232b4ad8f75c19ac84c216830112656274eb8e375fb
 
 perl-DBD-SQLite_package() {
-	depends="perl-DBI"
+	depends="${makedepends}"
 	pkg_install() {
 		vmove all
 	}
diff --git a/srcpkgs/perl-DBI/template b/srcpkgs/perl-DBI/template
index 26219bae580..8f98cd08804 100644
--- a/srcpkgs/perl-DBI/template
+++ b/srcpkgs/perl-DBI/template
@@ -1,7 +1,7 @@
 # Template build file for 'perl-DBI'.
 pkgname=perl-DBI
 version=1.628
-revision=2
+revision=3
 wrksrc="DBI-${version}"
 build_style=perl-module
 hostmakedepends="perl>=5.18"
@@ -14,7 +14,7 @@ distfiles="${CPAN_SITE}/DBI/DBI-$version.tar.gz"
 checksum=46c834f4ba1b28c8d8a2db8095835a67fc69a9585761523aea3a74437a969b52
 
 perl-DBI_package() {
-	depends="perl>=5.12"
+	depends="${makedepends}"
 	pkg_install() {
 		vmove all
 	}
diff --git a/srcpkgs/perl-Encode-Locale/template b/srcpkgs/perl-Encode-Locale/template
index 019ef9e2f9b..aa45965c9cc 100644
--- a/srcpkgs/perl-Encode-Locale/template
+++ b/srcpkgs/perl-Encode-Locale/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-Encode-Locale'.
 pkgname=perl-Encode-Locale
 version=1.02
-revision=1
+revision=2
 wrksrc="Encode-Locale-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="Encode::Locale - Determine the locale encoding"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/Encode-Locale-1.02/lib/Encode/Locale.pm"
@@ -25,11 +26,10 @@ long_desc="
  can be converted to Unicode strings by calling Encode::encode(locale =>
  $bytes) and converted back again with Encode::decode(locale => $string)."
 
-
 perl-Encode-Locale_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-ExtUtils-Depends/template b/srcpkgs/perl-ExtUtils-Depends/template
index 021885c7d40..7f9aa6a1a30 100644
--- a/srcpkgs/perl-ExtUtils-Depends/template
+++ b/srcpkgs/perl-ExtUtils-Depends/template
@@ -4,7 +4,8 @@ version=0.301
 revision=3
 wrksrc="ExtUtils-Depends-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="Easily build XS extensions that depend on XS extensions"
 homepage="http://gtk2-perl.sourceforge.net/"
 license="GPL-2"
@@ -21,6 +22,6 @@ perl-ExtUtils-Depends_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-ExtUtils-PkgConfig/template b/srcpkgs/perl-ExtUtils-PkgConfig/template
index 08c18a95dcb..a1316932fef 100644
--- a/srcpkgs/perl-ExtUtils-PkgConfig/template
+++ b/srcpkgs/perl-ExtUtils-PkgConfig/template
@@ -4,7 +4,8 @@ version=1.12
 revision=3
 wrksrc="ExtUtils-PkgConfig-$version"
 build_style=perl-module
-makedepends="perl pkg-config"
+hostmakedepends="perl>=5.18 pkg-config"
+makedepends="${hostmakedepends}"
 short_desc="Simplistic perl interface to pkg-config"
 homepage="http://search.cpan.org/~xaoc/"
 license="LGPL-2.1"
@@ -24,6 +25,6 @@ perl-ExtUtils-PkgConfig_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-File-Listing/template b/srcpkgs/perl-File-Listing/template
index 1b177fe3a05..6e5de814bd2 100644
--- a/srcpkgs/perl-File-Listing/template
+++ b/srcpkgs/perl-File-Listing/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-File-Listing'.
 pkgname=perl-File-Listing
 version=6.02
-revision=1
+revision=2
 wrksrc="File-Listing-$version"
 build_style=perl-module
-makedepends="perl-HTTP-Date perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends} perl-HTTP-Date"
 short_desc="File::Listing - parse directory listing"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/File-Listing-6.02/lib/File/Listing.pm"
@@ -19,6 +20,6 @@ perl-File-Listing_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-Fuse/template b/srcpkgs/perl-Fuse/template
index 68b0060b437..b7a805d0626 100644
--- a/srcpkgs/perl-Fuse/template
+++ b/srcpkgs/perl-Fuse/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-Fuse'.
 pkgname=perl-Fuse
 version=0.16
-revision=1
+revision=2
 wrksrc="Fuse-$version"
 build_style=perl-module
-makedepends="pkg-config fuse-devel perl>=5.16"
+hostmakedepends="pkg-config perl>=5.18"
+makedepends="fuse-devel perl>=5.18"
 short_desc="Write filesystems in Perl using FUSE"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/~dpavlin/Fuse-0.13/Fuse.pm"
@@ -16,7 +17,7 @@ long_desc="
  (Filesystem in USErspace) kernel/lib interface."
 
 perl-Fuse_package() {
-	depends="perl>=5.16"
+	depends="perl>=5.18"
 	pkg_install() {
 		vmove all
 	}
diff --git a/srcpkgs/perl-Glib/template b/srcpkgs/perl-Glib/template
index 830e13ece16..a26fc27fc41 100644
--- a/srcpkgs/perl-Glib/template
+++ b/srcpkgs/perl-Glib/template
@@ -1,9 +1,10 @@
 # Template build file for 'perl-Glib'.
 pkgname=perl-Glib
 version=1.242
-revision=1
+revision=2
 wrksrc="Glib-$version"
 build_style=perl-module
+hostmakedepends="perl>=5.18"
 makedepends="perl-ExtUtils-Depends>=0.300 perl-ExtUtils-PkgConfig>=1.00 glib-devel"
 short_desc="Perl bindings for Glib 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -20,8 +21,8 @@ long_desc="
  projects."
 
 perl-Glib_package() {
-	depends="perl>=5.16"
+	depends="${hostmakedepends}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-HTML-Form/template b/srcpkgs/perl-HTML-Form/template
index e81b25f26f0..a1a4b2686a0 100644
--- a/srcpkgs/perl-HTML-Form/template
+++ b/srcpkgs/perl-HTML-Form/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-HTML-Form'.
 pkgname=perl-HTML-Form
 version=6.00
-revision=1
+revision=2
 wrksrc="HTML-Form-$version"
 build_style=perl-module
-makedepends="perl-HTML-Parser perl-URI perl-HTTP-Message perl"
+hostmakedepends="perl>=5.18"
+makedepends="perl-HTML-Parser perl-URI perl-HTTP-Message"
 short_desc="HTML::Form - Class that represents an HTML form element"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTML-Form-6.00/lib/HTML/Form.pm"
@@ -22,6 +23,6 @@ perl-HTML-Form_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-HTML-Parser/template b/srcpkgs/perl-HTML-Parser/template
index dc68fccf8f3..b6b33b5ea53 100644
--- a/srcpkgs/perl-HTML-Parser/template
+++ b/srcpkgs/perl-HTML-Parser/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-Parser'.
 pkgname=perl-HTML-Parser
 version=3.70
-revision=1
+revision=2
 wrksrc="HTML-Parser-$version"
 build_style=perl-module
-makedepends="perl>=5.16 perl-HTML-Tagset"
+hostmakedepends="perl>=5.18"
+makedepends="perl-HTML-Tagset"
 short_desc="HTML::Parser - HTML parser class"
 homepage="http://search.cpan.org/~gaas/HTML-Parser-3.68/Parser.pm"
 license="GPL-1+/Artistic"
@@ -18,6 +19,6 @@ long_desc="
 perl-HTML-Parser_package() {
 	depends="${makedepends}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-HTML-Tagset/template b/srcpkgs/perl-HTML-Tagset/template
index c639cb5b40c..dfcb71830aa 100644
--- a/srcpkgs/perl-HTML-Tagset/template
+++ b/srcpkgs/perl-HTML-Tagset/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-Tagset'.
 pkgname=perl-HTML-Tagset
 version=3.20
-revision=2
+revision=3
 wrksrc="HTML-Tagset-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="HTML::Tagset - data tables useful in parsing HTML"
 homepage="http://search.cpan.org/~petdance/HTML-Tagset-3.20/Tagset.pm"
 license="GPL-1+/Artistic"
@@ -19,6 +20,6 @@ perl-HTML-Tagset_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-HTTP-Cookies/template b/srcpkgs/perl-HTTP-Cookies/template
index 2edbe87b1ad..74499d84cab 100644
--- a/srcpkgs/perl-HTTP-Cookies/template
+++ b/srcpkgs/perl-HTTP-Cookies/template
@@ -1,9 +1,10 @@
 # Template build file for 'perl-HTTP-Cookies'.
 pkgname=perl-HTTP-Cookies
 version=6.00
-revision=1
+revision=2
 wrksrc="HTTP-Cookies-$version"
 build_style=perl-module
+hostmakedepends="perl>=5.18"
 makedepends="perl-HTTP-Message"
 short_desc="HTTP::Cookies - HTTP cookie jars"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -31,6 +32,6 @@ perl-HTTP-Cookies_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-HTTP-Daemon/template b/srcpkgs/perl-HTTP-Daemon/template
index 8044a91f68e..db7ce4075d5 100644
--- a/srcpkgs/perl-HTTP-Daemon/template
+++ b/srcpkgs/perl-HTTP-Daemon/template
@@ -1,9 +1,10 @@
 # Template build file for 'perl-HTTP-Daemon'.
 pkgname=perl-HTTP-Daemon
 version=6.00
-revision=1
+revision=2
 wrksrc="HTTP-Daemon-$version"
 build_style=perl-module
+hostmakedepends="perl>=5.18"
 makedepends="perl-HTTP-Message perl-LWP-MediaTypes"
 short_desc="HTTP::Daemon - a simple http server class"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -20,6 +21,6 @@ perl-HTTP-Daemon_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-HTTP-Date/template b/srcpkgs/perl-HTTP-Date/template
index 65d6908bb14..93add7097df 100644
--- a/srcpkgs/perl-HTTP-Date/template
+++ b/srcpkgs/perl-HTTP-Date/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-HTTP-Date'.
 pkgname=perl-HTTP-Date
 version=6.00
-revision=1
+revision=2
 wrksrc="HTTP-Date-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="HTTP::Date - date conversion routines"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/HTTP-Date-6.00/lib/HTTP/Date.pm"
@@ -20,6 +21,6 @@ perl-HTTP-Date_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-HTTP-Message/template b/srcpkgs/perl-HTTP-Message/template
index 61a73a897c2..85b9074ed90 100644
--- a/srcpkgs/perl-HTTP-Message/template
+++ b/srcpkgs/perl-HTTP-Message/template
@@ -1,9 +1,10 @@
 # Template build file for 'perl-HTTP-Message'.
 pkgname=perl-HTTP-Message
 version=6.02
-revision=2
+revision=3
 wrksrc="HTTP-Message-$version"
 build_style=perl-module
+hostmakedepends="perl>=5.18"
 makedepends="perl-LWP-MediaTypes perl-Encode-Locale perl-URI perl-HTTP-Date perl-HTML-Parser"
 short_desc="HTTP::Message - HTTP style message (base class)"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -23,6 +24,6 @@ perl-HTTP-Message_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-HTTP-Negotiate/template b/srcpkgs/perl-HTTP-Negotiate/template
index d8e24543e59..678326e8eef 100644
--- a/srcpkgs/perl-HTTP-Negotiate/template
+++ b/srcpkgs/perl-HTTP-Negotiate/template
@@ -1,9 +1,10 @@
 # Template build file for 'perl-HTTP-Negotiate'.
 pkgname=perl-HTTP-Negotiate
 version=6.00
-revision=1
+revision=2
 wrksrc="HTTP-Negotiate-$version"
 build_style=perl-module
+hostmakedepends="perl>=5.18"
 makedepends="perl-HTTP-Message"
 short_desc="HTTP::Negotiate - choose a variant to serve"
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -22,6 +23,6 @@ perl-HTTP-Negotiate_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-IO-Tty/template b/srcpkgs/perl-IO-Tty/template
index 7799d7e09f0..f618c6c037e 100644
--- a/srcpkgs/perl-IO-Tty/template
+++ b/srcpkgs/perl-IO-Tty/template
@@ -1,22 +1,21 @@
 # Template build file for 'perl-IO-Tty'.
 pkgname=perl-IO-Tty
 version=1.10
-revision=1
+revision=2
 wrksrc="IO-Tty-$version"
 build_style=perl-module
-makedepends="perl>=5.16"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="IO::Tty - Perl interface to Low-level allocate a pseudo-Tty"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/dist/IO-Tty/"
 license="GPL-2"
 distfiles="${CPAN_SITE}/IO/IO-Tty-$version.tar.gz"
 checksum=31a6e21ad187ec5ea93c2b898d6b3519647c5fce9f394b6d3c05a1f7c3f6f8b1
-long_desc="
- IO::Tty and IO::Pty provide an interface to pseudo tty's."
 
 perl-IO-Tty_package() {
 	depends="${makedepends}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-IPC-Run/template b/srcpkgs/perl-IPC-Run/template
index 3708afc3d96..b9981eedbf1 100644
--- a/srcpkgs/perl-IPC-Run/template
+++ b/srcpkgs/perl-IPC-Run/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-IPC-Run'.
 pkgname=perl-IPC-Run
 version=0.90
-revision=1
+revision=2
 wrksrc="IPC-Run-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="system() and background procs w/ piping, redirs, ptys"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/IPC-Run/lib/IPC/Run.pm"
@@ -21,6 +22,6 @@ perl-IPC-Run_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-LWP-MediaTypes/template b/srcpkgs/perl-LWP-MediaTypes/template
index a1e800a1b08..f9a31bf5c01 100644
--- a/srcpkgs/perl-LWP-MediaTypes/template
+++ b/srcpkgs/perl-LWP-MediaTypes/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-LWP-MediaTypes'.
 pkgname=perl-LWP-MediaTypes
 version=6.01
-revision=1
+revision=2
 wrksrc="LWP-MediaTypes-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="LWP::MediaTypes - guess media type for a file or a URL"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/LWP-MediaTypes-6.01/lib/LWP/MediaTypes.pm"
@@ -21,6 +22,6 @@ perl-LWP-MediaTypes_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-Lchown/template b/srcpkgs/perl-Lchown/template
index d72e417bd6c..df776b2feb0 100644
--- a/srcpkgs/perl-Lchown/template
+++ b/srcpkgs/perl-Lchown/template
@@ -2,9 +2,10 @@
 pkgname=perl-Lchown
 version=1.01
 wrksrc="Lchown-${version}"
-revision=1
+revision=2
 build_style=perl-ModuleBuild
-hostmakedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${makedepends}"
 short_desc="Perl module interface to the lchown() system call"
 maintainer="Juan RP <xtraeme@gmail.com"
 homepage="http://search.cpan.org/dist/Lchown"
@@ -13,8 +14,8 @@ distfiles="http://search.cpan.org/CPAN/authors/id/N/NC/NCLEATON/Lchown-${version
 checksum=9c0a13e279ad92208fb8fac73001635b0689251dd41b597522e1b3501ba0f76f
 
 perl-Lchown_package() {
-	depends="perl"
+	depends="${makedepends}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-Locale-gettext/template b/srcpkgs/perl-Locale-gettext/template
index fb0aaee2063..c2bbd38a388 100644
--- a/srcpkgs/perl-Locale-gettext/template
+++ b/srcpkgs/perl-Locale-gettext/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-Locale-gettext'.
 pkgname=perl-Locale-gettext
 version=1.05
-revision=1
+revision=2
 wrksrc="gettext-$version"
 build_style=perl-module
-hostmakedepends="perl>=5.16"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="Permits access from Perl to the gettext() family of functions"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/dist/gettext"
@@ -13,8 +14,8 @@ distfiles="http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-${version
 checksum=27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694
 
 perl-Locale-gettext_package() {
-	depends="${hostmakedepends}"
+	depends="${makedepends}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-Math-BigInt-GMP/template b/srcpkgs/perl-Math-BigInt-GMP/template
index 0bd367435c5..c4cdbfede3e 100644
--- a/srcpkgs/perl-Math-BigInt-GMP/template
+++ b/srcpkgs/perl-Math-BigInt-GMP/template
@@ -1,23 +1,21 @@
 # Template build file for 'perl-Math-BigInt-GMP'.
 pkgname=perl-Math-BigInt-GMP
 version=1.36
-revision=1
+revision=2
 wrksrc="Math-BigInt-GMP-${version}"
 build_style=perl-module
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends} gmp-devel"
 short_desc="Math::BigInt::GMP - Use the GMP library for Math::BigInt routines"
 maintainer="Juan RP <xtraeme@gmail.com"
 homepage="http://search.cpan.org/dist/Math-BigInt-GMP"
 license="GPL-2"
 distfiles="${CPAN_SITE}/Math/Math-BigInt-GMP-${version}.tar.gz"
 checksum=278115a882d0cb50fbbef36706d8fff44122de58f8e7d5f6dcebf00e2df1b449
-long_desc="
- Provides support for big integer calculations by means of the GMP c-library."
-
-makedepends="perl gmp-devel"
 
 perl-Math-BigInt-GMP_package() {
-	depends="perl"
+	depends="${hostmakedepends}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-Net-HTTP/template b/srcpkgs/perl-Net-HTTP/template
index a17bda7e591..a56359ea722 100644
--- a/srcpkgs/perl-Net-HTTP/template
+++ b/srcpkgs/perl-Net-HTTP/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-Net-HTTP'.
 pkgname=perl-Net-HTTP
 version=6.01
-revision=1
+revision=2
 wrksrc="Net-HTTP-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="Net::HTTP - Low-level HTTP connection (client)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/Net-HTTP-6.01/lib/Net/HTTP.pm"
@@ -20,6 +21,6 @@ perl-Net-HTTP_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 19c934054b7..a80e49f6b71 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,10 +1,10 @@
 # Template build file for 'perl-URI'.
 pkgname=perl-URI
 version=1.58
-revision=4
+revision=5
 wrksrc="URI-$version"
 build_style=perl-module
-hostmakedepends="perl"
+hostmakedepends="perl>=5.8"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 homepage="http://search.cpan.org/~gaas/URI-1.58/URI.pm"
 license="GPL-1+/Artisti"
@@ -29,6 +29,6 @@ perl-URI_package() {
 	depends="${hostmakedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-WWW-Curl/template b/srcpkgs/perl-WWW-Curl/template
index 004a23fe873..4e60b3a93c3 100644
--- a/srcpkgs/perl-WWW-Curl/template
+++ b/srcpkgs/perl-WWW-Curl/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-WWW-Curl'.
 pkgname=perl-WWW-Curl
 version=4.15
-revision=1
+revision=2
 wrksrc="WWW-Curl-${version}"
 build_style=perl-module
-hostmakedepends="perl libcurl-devel"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends} libcurl-devel"
 short_desc="WWW::Curl - Perl extension interface for libcurl"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/WWW-Curl/"
@@ -13,7 +14,7 @@ distfiles="${CPAN_SITE}/WWW/WWW-Curl-$version.tar.gz"
 checksum=3ef40494537a1ce7f848f3b524f5690cf47db458c0bb662e15c4642dc13c5fa1
 
 perl-WWW-Curl_package() {
-	depends="perl"
+	depends="${hostmakedepends}"
 	pkg_install() {
 		vmove all
 	}
diff --git a/srcpkgs/perl-WWW-RobotRules/template b/srcpkgs/perl-WWW-RobotRules/template
index d6cefded601..8fbb45d1d8b 100644
--- a/srcpkgs/perl-WWW-RobotRules/template
+++ b/srcpkgs/perl-WWW-RobotRules/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-WWW-RobotRules'.
 pkgname=perl-WWW-RobotRules
 version=6.01
-revision=1
+revision=2
 wrksrc="WWW-RobotRules-$version"
 build_style=perl-module
-makedepends="perl-URI"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends} perl-URI"
 short_desc="WWW::RobotRules - database of robots.txt-derived permissions"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://search.cpan.org/~gaas/WWW-RobotRules-6.01/lib/WWW/RobotRules.pm"
@@ -26,6 +27,6 @@ perl-WWW-RobotRules_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-XML-NamespaceSupport/template b/srcpkgs/perl-XML-NamespaceSupport/template
index 7f5ac46a016..5b0df9bb70a 100644
--- a/srcpkgs/perl-XML-NamespaceSupport/template
+++ b/srcpkgs/perl-XML-NamespaceSupport/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-XML-NamespaceSupport'.
 pkgname=perl-XML-NamespaceSupport
 version=1.11
-revision=1
+revision=2
 wrksrc="XML-NamespaceSupport-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="Perl module to the SAX2 NamespaceSupport class"
 homepage="http://search.cpan.org/~perigrin/XML-NamespaceSupport-1.11/"
 license="GPL+ or Artistic"
@@ -21,6 +22,6 @@ perl-XML-NamespaceSupport_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template
index b072245f180..dcf34e1199a 100644
--- a/srcpkgs/perl-XML-Parser/template
+++ b/srcpkgs/perl-XML-Parser/template
@@ -1,12 +1,13 @@
 # Template build file for 'perl-XML-Parser'.
 pkgname=perl-XML-Parser
 version=2.41
-revision=1
+revision=2
 wrksrc="XML-Parser-$version"
 homepage="http://search.cpan.org/dist/XML-Parser/"
 distfiles="${CPAN_SITE}/XML/XML-Parser-$version.tar.gz"
 build_style=perl-module
-makedepends="expat-devel perl>=5.16"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends} expat-devel"
 short_desc="Perl extension interface to James Clark's XML parser, expat"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -17,8 +18,8 @@ long_desc="
  expat library."
 
 perl-XML-Parser_package() {
-	depends="perl>=5.16"
+	depends="${hostmakedepends}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-XML-SAX-Base/template b/srcpkgs/perl-XML-SAX-Base/template
index 6c0efcebf94..e475bc828db 100644
--- a/srcpkgs/perl-XML-SAX-Base/template
+++ b/srcpkgs/perl-XML-SAX-Base/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-XML-SAX'.
 pkgname=perl-XML-SAX-Base
 version=1.08
-revision=1
+revision=2
 wrksrc="${pkgname#perl-}-$version"
 build_style=perl-module
-makedepends="perl"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends}"
 short_desc="Perl Base class SAX Drivers and Filters"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/XML-SAX-Base"
@@ -21,6 +22,6 @@ perl-XML-SAX-Base_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-XML-SAX/template b/srcpkgs/perl-XML-SAX/template
index f91ac1fef10..a3e136707a0 100644
--- a/srcpkgs/perl-XML-SAX/template
+++ b/srcpkgs/perl-XML-SAX/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-XML-SAX'.
 pkgname=perl-XML-SAX
 version=0.99
-revision=1
+revision=2
 wrksrc="XML-SAX-$version"
 build_style=perl-module
-makedepends="perl perl-XML-NamespaceSupport perl-XML-SAX-Base"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends} perl-XML-NamespaceSupport perl-XML-SAX-Base"
 short_desc="Perl interface to the SAX2 XML Parser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/XML-SAX"
@@ -20,6 +21,6 @@ perl-XML-SAX_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/perl-XML-Simple/template b/srcpkgs/perl-XML-Simple/template
index 8e399ece8c9..0e5fc8ebb64 100644
--- a/srcpkgs/perl-XML-Simple/template
+++ b/srcpkgs/perl-XML-Simple/template
@@ -1,10 +1,11 @@
 # Template build file for 'perl-XML-Simple'.
 pkgname=perl-XML-Simple
 version=2.20
-revision=1
+revision=2
 wrksrc="XML-Simple-$version"
 build_style=perl-module
-makedepends="perl>=5.16 expat perl-XML-Parser perl-XML-SAX"
+hostmakedepends="perl>=5.18"
+makedepends="${hostmakedepends} expat perl-XML-Parser perl-XML-SAX"
 short_desc="Easy Perl API to read/write XML"
 homepage="http://search.cpan.org/dist/XML-Simple/"
 license="GPL-1+/Artistic"
@@ -19,6 +20,6 @@ perl-XML-Simple_package() {
 	depends="${makedepends}"
 	noarch="yes"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }