aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorMarcelo Araujo <araujo@FreeBSD.org>2008-04-17 14:30:31 +0000
committerMarcelo Araujo <araujo@FreeBSD.org>2008-04-17 14:30:31 +0000
commit4aaab89f578233fc117be25797258ca7e2ed882d (patch)
tree0e38664987475f8c5017d144d57d775931da51c7 /security
parent6a99e7a1383fbd4f6eafdfdda68243ae93057e20 (diff)
downloadports-4aaab89f578233fc117be25797258ca7e2ed882d.tar.gz
ports-4aaab89f578233fc117be25797258ca7e2ed882d.zip
- Take advantage of CPAN macro from bsd.sites.mk, change ${MASTER_SITE_PERL_CPAN} to CPAN.
PR: ports/122674 Submitted by: Philip M. Gollucci <pgollucci@p6m7g8.com> Reworked by: araujo (myself) Approved by: portmgr (pav)
Notes
Notes: svn path=/head/; revision=211450
Diffstat (limited to 'security')
-rw-r--r--security/p5-Authen-Bitcard/Makefile3
-rw-r--r--security/p5-Authen-Captcha/Makefile3
-rw-r--r--security/p5-Authen-CyrusSASL/Makefile3
-rw-r--r--security/p5-Authen-Htpasswd/Makefile3
-rw-r--r--security/p5-Authen-Krb5/Makefile3
-rw-r--r--security/p5-Authen-Libwrap/Makefile3
-rw-r--r--security/p5-Authen-NTLM/Makefile3
-rw-r--r--security/p5-Authen-PAAS/Makefile3
-rw-r--r--security/p5-Authen-PAM/Makefile3
-rw-r--r--security/p5-Authen-PluggableCaptcha/Makefile3
-rw-r--r--security/p5-Authen-Radius/Makefile3
-rw-r--r--security/p5-Authen-SASL-Cyrus/Makefile3
-rw-r--r--security/p5-Authen-SASL/Makefile3
-rw-r--r--security/p5-Authen-Simple-DBI/Makefile3
-rw-r--r--security/p5-Authen-Simple-DBM/Makefile3
-rw-r--r--security/p5-Authen-Simple-HTTP/Makefile3
-rw-r--r--security/p5-Authen-Simple-LDAP/Makefile3
-rw-r--r--security/p5-Authen-Simple-Net/Makefile3
-rw-r--r--security/p5-Authen-Simple-PAM/Makefile3
-rw-r--r--security/p5-Authen-Simple-Passwd/Makefile3
-rw-r--r--security/p5-Authen-Simple-RADIUS/Makefile3
-rw-r--r--security/p5-Authen-Simple-SMB/Makefile3
-rw-r--r--security/p5-Authen-Simple-SSH/Makefile3
-rw-r--r--security/p5-Authen-Simple/Makefile3
-rw-r--r--security/p5-Authen-Smb/Makefile3
-rw-r--r--security/p5-Authen-TacacsPlus/Makefile3
-rw-r--r--security/p5-Authen-Ticket/Makefile3
-rw-r--r--security/p5-Authen-TypeKey/Makefile3
-rw-r--r--security/p5-Crypt-Anubis/Makefile3
-rw-r--r--security/p5-Crypt-AppleTwoFish/Makefile3
-rw-r--r--security/p5-Crypt-Blowfish/Makefile3
-rw-r--r--security/p5-Crypt-Blowfish_PP/Makefile3
-rw-r--r--security/p5-Crypt-CAST5_PP/Makefile3
-rw-r--r--security/p5-Crypt-CFB/Makefile3
-rw-r--r--security/p5-Crypt-Caesar/Makefile3
-rw-r--r--security/p5-Crypt-Camellia_PP/Makefile3
-rw-r--r--security/p5-Crypt-Chimera/Makefile3
-rw-r--r--security/p5-Crypt-CipherSaber/Makefile3
-rw-r--r--security/p5-Crypt-Cracklib/Makefile3
-rw-r--r--security/p5-Crypt-Ctr/Makefile3
-rw-r--r--security/p5-Crypt-DES/Makefile3
-rw-r--r--security/p5-Crypt-DES_EDE3/Makefile3
-rw-r--r--security/p5-Crypt-DES_PP/Makefile3
-rw-r--r--security/p5-Crypt-DH/Makefile3
-rw-r--r--security/p5-Crypt-DSA/Makefile3
-rw-r--r--security/p5-Crypt-Dining/Makefile3
-rw-r--r--security/p5-Crypt-ECB/Makefile3
-rw-r--r--security/p5-Crypt-Enigma/Makefile3
-rw-r--r--security/p5-Crypt-GOST/Makefile3
-rw-r--r--security/p5-Crypt-GOST_PP/Makefile3
-rw-r--r--security/p5-Crypt-GPG/Makefile3
-rw-r--r--security/p5-Crypt-GeneratePassword/Makefile3
-rw-r--r--security/p5-Crypt-HCE_MD5/Makefile3
-rw-r--r--security/p5-Crypt-HCE_SHA/Makefile3
-rw-r--r--security/p5-Crypt-Imail/Makefile3
-rw-r--r--security/p5-Crypt-Khazad/Makefile3
-rw-r--r--security/p5-Crypt-License/Makefile3
-rw-r--r--security/p5-Crypt-Lite/Makefile3
-rw-r--r--security/p5-Crypt-Loki97/Makefile3
-rw-r--r--security/p5-Crypt-MySQL/Makefile3
-rw-r--r--security/p5-Crypt-NULL/Makefile3
-rw-r--r--security/p5-Crypt-OFB/Makefile3
-rw-r--r--security/p5-Crypt-OICQ/Makefile3
-rw-r--r--security/p5-Crypt-OTP/Makefile3
-rw-r--r--security/p5-Crypt-OpenPGP/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-Bignum/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-DSA/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-RSA/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-Random/Makefile3
-rw-r--r--security/p5-Crypt-OpenSSL-X509/Makefile3
-rw-r--r--security/p5-Crypt-PGPSimple/Makefile3
-rw-r--r--security/p5-Crypt-PassGen/Makefile3
-rw-r--r--security/p5-Crypt-PasswdMD5/Makefile3
-rw-r--r--security/p5-Crypt-Primes/Makefile3
-rw-r--r--security/p5-Crypt-RC4/Makefile3
-rw-r--r--security/p5-Crypt-RC5/Makefile3
-rw-r--r--security/p5-Crypt-RC6/Makefile3
-rw-r--r--security/p5-Crypt-RIPEMD160/Makefile3
-rw-r--r--security/p5-Crypt-RSA/Makefile3
-rw-r--r--security/p5-Crypt-Rabbit/Makefile3
-rw-r--r--security/p5-Crypt-RandPasswd/Makefile3
-rw-r--r--security/p5-Crypt-Random/Makefile3
-rw-r--r--security/p5-Crypt-Rijndael_PP/Makefile3
-rw-r--r--security/p5-Crypt-SKey/Makefile3
-rw-r--r--security/p5-Crypt-SSLeay/Makefile3
-rw-r--r--security/p5-Crypt-Salt/Makefile3
-rw-r--r--security/p5-Crypt-SaltedHash/Makefile3
-rw-r--r--security/p5-Crypt-Serpent/Makefile3
-rw-r--r--security/p5-Crypt-Shark/Makefile3
-rw-r--r--security/p5-Crypt-SmbHash/Makefile3
-rw-r--r--security/p5-Crypt-Solitaire/Makefile3
-rw-r--r--security/p5-Crypt-TEA/Makefile3
-rw-r--r--security/p5-Crypt-TripleDES/Makefile3
-rw-r--r--security/p5-Crypt-Twofish/Makefile3
-rw-r--r--security/p5-Crypt-Twofish2/Makefile3
-rw-r--r--security/p5-Crypt-UnixCrypt/Makefile3
-rw-r--r--security/p5-Crypt-X509/Makefile3
-rw-r--r--security/p5-Data-Entropy/Makefile3
-rw-r--r--security/p5-Data-Password/Makefile3
-rw-r--r--security/p5-Digest-Adler32/Makefile3
-rw-r--r--security/p5-Digest-BubbleBabble/Makefile3
-rw-r--r--security/p5-Digest-CRC/Makefile3
-rw-r--r--security/p5-Digest-Crc32/Makefile3
-rw-r--r--security/p5-Digest-DJB/Makefile3
-rw-r--r--security/p5-Digest-DMAC/Makefile3
-rw-r--r--security/p5-Digest-EMAC/Makefile3
-rw-r--r--security/p5-Digest-Elf/Makefile3
-rw-r--r--security/p5-Digest-FNV/Makefile3
-rw-r--r--security/p5-Digest-HMAC/Makefile3
-rw-r--r--security/p5-Digest-Hashcash/Makefile2
-rw-r--r--security/p5-Digest-Haval256/Makefile3
-rw-r--r--security/p5-Digest-JHash/Makefile3
-rw-r--r--security/p5-Digest-MD2/Makefile3
-rw-r--r--security/p5-Digest-MD5-File/Makefile3
-rw-r--r--security/p5-Digest-MD5-M4p/Makefile3
-rw-r--r--security/p5-Digest-MD5/Makefile3
-rw-r--r--security/p5-Digest-ManberHash/Makefile3
-rw-r--r--security/p5-Digest-Nilsimsa/Makefile3
-rw-r--r--security/p5-Digest-Pearson-PurePerl/Makefile3
-rw-r--r--security/p5-Digest-Pearson/Makefile3
-rw-r--r--security/p5-Digest-Perl-MD4/Makefile3
-rw-r--r--security/p5-Digest-Perl-MD5/Makefile3
-rw-r--r--security/p5-Digest-SHA-PurePerl/Makefile3
-rw-r--r--security/p5-Digest-SHA1/Makefile3
-rw-r--r--security/p5-Digest-SHA256/Makefile3
-rw-r--r--security/p5-Digest-SV1/Makefile3
-rw-r--r--security/p5-Digest-Tiger/Makefile3
-rw-r--r--security/p5-Digest-Whirlpool/Makefile3
-rw-r--r--security/p5-Digest/Makefile3
-rw-r--r--security/p5-Email-Obfuscate/Makefile3
-rw-r--r--security/p5-File-Scan-ClamAV/Makefile3
-rw-r--r--security/p5-File-Scan/Makefile3
-rw-r--r--security/p5-Filter-CBC/Makefile3
-rw-r--r--security/p5-Filter-Crypto/Makefile3
-rw-r--r--security/p5-GD-SecurityImage/Makefile3
-rw-r--r--security/p5-GSSAPI/Makefile2
-rw-r--r--security/p5-HTML-Email-Obfuscate/Makefile3
-rw-r--r--security/p5-Module-Signature/Makefile3
-rw-r--r--security/p5-Net-Daemon-SSL/Makefile3
-rw-r--r--security/p5-Net-OpenID-JanRain/Makefile3
-rw-r--r--security/p5-Net-SSLeay/Makefile3
-rw-r--r--security/p5-Nmap-Scanner/Makefile3
-rw-r--r--security/p5-OpenCA-CRL/Makefile3
-rw-r--r--security/p5-OpenCA-CRR/Makefile3
-rw-r--r--security/p5-OpenCA-PKCS7/Makefile3
-rw-r--r--security/p5-OpenCA-REQ/Makefile3
-rw-r--r--security/p5-PGP-Sign/Makefile3
-rw-r--r--security/p5-PGP/Makefile3
-rw-r--r--security/p5-POE-Component-SSLify/Makefile3
-rw-r--r--security/p5-PerlCryptLib/Makefile2
-rw-r--r--security/p5-SHA/Makefile4
-rw-r--r--security/p5-Safe-Hole/Makefile3
-rw-r--r--security/p5-Snort-Rule/Makefile4
-rw-r--r--security/p5-Text-Password-Pronounceable/Makefile3
-rw-r--r--security/p5-Tie-EncryptedHash/Makefile3
-rw-r--r--security/p5-Tree-Authz/Makefile3
156 files changed, 158 insertions, 309 deletions
diff --git a/security/p5-Authen-Bitcard/Makefile b/security/p5-Authen-Bitcard/Makefile
index 6938fbacdf9e..853894a7c694 100644
--- a/security/p5-Authen-Bitcard/Makefile
+++ b/security/p5-Authen-Bitcard/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Bitcard
PORTVERSION= 0.86
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/security/p5-Authen-Captcha/Makefile b/security/p5-Authen-Captcha/Makefile
index c36826ea7a2c..237037536c2c 100644
--- a/security/p5-Authen-Captcha/Makefile
+++ b/security/p5-Authen-Captcha/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Authen-Captcha
PORTVERSION= 1.023
PORTREVISION= 2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Authen-CyrusSASL/Makefile b/security/p5-Authen-CyrusSASL/Makefile
index 7dc9fbce8d35..5ffce6747fb2 100644
--- a/security/p5-Authen-CyrusSASL/Makefile
+++ b/security/p5-Authen-CyrusSASL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-CyrusSASL
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= bra@fsn.hu
diff --git a/security/p5-Authen-Htpasswd/Makefile b/security/p5-Authen-Htpasswd/Makefile
index 1439d3078b95..4000b637ea25 100644
--- a/security/p5-Authen-Htpasswd/Makefile
+++ b/security/p5-Authen-Htpasswd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Htpasswd
PORTVERSION= 0.16
CATEGORIES= security perl5 www
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/security/p5-Authen-Krb5/Makefile b/security/p5-Authen-Krb5/Makefile
index 8dc1be880902..70c6ac9218d1 100644
--- a/security/p5-Authen-Krb5/Makefile
+++ b/security/p5-Authen-Krb5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Krb5
PORTVERSION= 1.6
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Krb5-${PORTVERSION}
diff --git a/security/p5-Authen-Libwrap/Makefile b/security/p5-Authen-Libwrap/Makefile
index cea1130ccab2..3102e4e9ed99 100644
--- a/security/p5-Authen-Libwrap/Makefile
+++ b/security/p5-Authen-Libwrap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Authen-Libwrap
PORTVERSION= 0.20
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= hideo@lastamericanempire.com
diff --git a/security/p5-Authen-NTLM/Makefile b/security/p5-Authen-NTLM/Makefile
index 2457d1bced30..526a66d22fa4 100644
--- a/security/p5-Authen-NTLM/Makefile
+++ b/security/p5-Authen-NTLM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= NTLM
PORTVERSION= 1.03
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= james@divide.org
diff --git a/security/p5-Authen-PAAS/Makefile b/security/p5-Authen-PAAS/Makefile
index 4e84f42c1fee..5a321bd5ac78 100644
--- a/security/p5-Authen-PAAS/Makefile
+++ b/security/p5-Authen-PAAS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-PAAS
PORTVERSION= 1.1.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-PAM/Makefile b/security/p5-Authen-PAM/Makefile
index a80413cb3746..c22d41a4ad41 100644
--- a/security/p5-Authen-PAM/Makefile
+++ b/security/p5-Authen-PAM/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Authen-PAM
PORTVERSION= 0.16
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= des@FreeBSD.org
diff --git a/security/p5-Authen-PluggableCaptcha/Makefile b/security/p5-Authen-PluggableCaptcha/Makefile
index 9876460442d6..2f227fe5ca64 100644
--- a/security/p5-Authen-PluggableCaptcha/Makefile
+++ b/security/p5-Authen-PluggableCaptcha/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-PluggableCaptcha
PORTVERSION= 0.05
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index 627425e9e20a..16af5dc5060d 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Radius
PORTVERSION= 0.13
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= RadiusPerl-${PORTVERSION}
diff --git a/security/p5-Authen-SASL-Cyrus/Makefile b/security/p5-Authen-SASL-Cyrus/Makefile
index 2d06420f31e3..bedf963ecf58 100644
--- a/security/p5-Authen-SASL-Cyrus/Makefile
+++ b/security/p5-Authen-SASL-Cyrus/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-SASL-Cyrus
PORTVERSION= 0.12
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile
index 95255a4256d0..9cb6509d8c14 100644
--- a/security/p5-Authen-SASL/Makefile
+++ b/security/p5-Authen-SASL/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Authen-SASL
PORTVERSION= 2.10
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Authen-Simple-DBI/Makefile b/security/p5-Authen-Simple-DBI/Makefile
index 34f1684eceb6..319e2bcf4ebd 100644
--- a/security/p5-Authen-Simple-DBI/Makefile
+++ b/security/p5-Authen-Simple-DBI/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-DBI
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-DBM/Makefile b/security/p5-Authen-Simple-DBM/Makefile
index 8c4e0d670562..0235ce987683 100644
--- a/security/p5-Authen-Simple-DBM/Makefile
+++ b/security/p5-Authen-Simple-DBM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-DBM
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-HTTP/Makefile b/security/p5-Authen-Simple-HTTP/Makefile
index d16a8070f6b1..e1c1d0ee1bb5 100644
--- a/security/p5-Authen-Simple-HTTP/Makefile
+++ b/security/p5-Authen-Simple-HTTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-HTTP
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-LDAP/Makefile b/security/p5-Authen-Simple-LDAP/Makefile
index 45adb856d299..6aefe769c633 100644
--- a/security/p5-Authen-Simple-LDAP/Makefile
+++ b/security/p5-Authen-Simple-LDAP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-LDAP
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-Net/Makefile b/security/p5-Authen-Simple-Net/Makefile
index 7bc742e67e15..360ad5264dd2 100644
--- a/security/p5-Authen-Simple-Net/Makefile
+++ b/security/p5-Authen-Simple-Net/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-Net
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-PAM/Makefile b/security/p5-Authen-Simple-PAM/Makefile
index 6c1ada04cee6..71ea21e84985 100644
--- a/security/p5-Authen-Simple-PAM/Makefile
+++ b/security/p5-Authen-Simple-PAM/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-PAM
PORTVERSION= 0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-Passwd/Makefile b/security/p5-Authen-Simple-Passwd/Makefile
index 11a3161d8409..019479424b5e 100644
--- a/security/p5-Authen-Simple-Passwd/Makefile
+++ b/security/p5-Authen-Simple-Passwd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-Passwd
PORTVERSION= 0.6
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-RADIUS/Makefile b/security/p5-Authen-Simple-RADIUS/Makefile
index e089f401ed13..d04eb8f2a588 100644
--- a/security/p5-Authen-Simple-RADIUS/Makefile
+++ b/security/p5-Authen-Simple-RADIUS/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-RADIUS
PORTVERSION= 0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-SMB/Makefile b/security/p5-Authen-Simple-SMB/Makefile
index c6324a204e2c..423c7f4e5122 100644
--- a/security/p5-Authen-Simple-SMB/Makefile
+++ b/security/p5-Authen-Simple-SMB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-SMB
PORTVERSION= 0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple-SSH/Makefile b/security/p5-Authen-Simple-SSH/Makefile
index 1b62705235c5..09674dda3acc 100644
--- a/security/p5-Authen-Simple-SSH/Makefile
+++ b/security/p5-Authen-Simple-SSH/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple-SSH
PORTVERSION= 0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Simple/Makefile b/security/p5-Authen-Simple/Makefile
index ff69971ddc0d..5b99da0742a6 100644
--- a/security/p5-Authen-Simple/Makefile
+++ b/security/p5-Authen-Simple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Simple
PORTVERSION= 0.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Authen-Smb/Makefile b/security/p5-Authen-Smb/Makefile
index 6f654e9d7047..7d35076ffd16 100644
--- a/security/p5-Authen-Smb/Makefile
+++ b/security/p5-Authen-Smb/Makefile
@@ -9,8 +9,7 @@
PORTNAME= Authen-Smb
PORTVERSION= 0.91
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ma499@doc.ic.ac.uk
diff --git a/security/p5-Authen-TacacsPlus/Makefile b/security/p5-Authen-TacacsPlus/Makefile
index b3585c7bca30..42f2a8641feb 100644
--- a/security/p5-Authen-TacacsPlus/Makefile
+++ b/security/p5-Authen-TacacsPlus/Makefile
@@ -8,8 +8,7 @@
PORTNAME= TacacsPlus
PORTVERSION= 0.16
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Authen-Ticket/Makefile b/security/p5-Authen-Ticket/Makefile
index 8e6641c61e8a..922405d34ec8 100644
--- a/security/p5-Authen-Ticket/Makefile
+++ b/security/p5-Authen-Ticket/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-Ticket
PORTVERSION= 0.02
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Authen-TypeKey/Makefile b/security/p5-Authen-TypeKey/Makefile
index 4433cc6dba36..819b051b41d8 100644
--- a/security/p5-Authen-TypeKey/Makefile
+++ b/security/p5-Authen-TypeKey/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Authen-TypeKey
PORTVERSION= 0.05
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Authen
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/security/p5-Crypt-Anubis/Makefile b/security/p5-Crypt-Anubis/Makefile
index e8ae60d5ccb3..40089146c05a 100644
--- a/security/p5-Crypt-Anubis/Makefile
+++ b/security/p5-Crypt-Anubis/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Anubis
PORTVERSION= 1.0.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-AppleTwoFish/Makefile b/security/p5-Crypt-AppleTwoFish/Makefile
index 62eed1a3f275..717f3be6cb9f 100644
--- a/security/p5-Crypt-AppleTwoFish/Makefile
+++ b/security/p5-Crypt-AppleTwoFish/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-AppleTwoFish
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Blowfish/Makefile b/security/p5-Crypt-Blowfish/Makefile
index cd98ec5e2a82..b4a8f43740c3 100644
--- a/security/p5-Crypt-Blowfish/Makefile
+++ b/security/p5-Crypt-Blowfish/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Blowfish
PORTVERSION= 2.10
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Blowfish_PP/Makefile b/security/p5-Crypt-Blowfish_PP/Makefile
index c301e7458070..39238f26c016 100644
--- a/security/p5-Crypt-Blowfish_PP/Makefile
+++ b/security/p5-Crypt-Blowfish_PP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Blowfish_PP
PORTVERSION= 1.12
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Crypt-CAST5_PP/Makefile b/security/p5-Crypt-CAST5_PP/Makefile
index b9592e362755..86ad4dea4a74 100644
--- a/security/p5-Crypt-CAST5_PP/Makefile
+++ b/security/p5-Crypt-CAST5_PP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-CAST5_PP
PORTVERSION= 1.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-CFB/Makefile b/security/p5-Crypt-CFB/Makefile
index 3fa668462d03..43289c10d8de 100644
--- a/security/p5-Crypt-CFB/Makefile
+++ b/security/p5-Crypt-CFB/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-CFB
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Caesar/Makefile b/security/p5-Crypt-Caesar/Makefile
index 8d6071d48bab..634961f37fe4 100644
--- a/security/p5-Crypt-Caesar/Makefile
+++ b/security/p5-Crypt-Caesar/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Caesar
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Camellia_PP/Makefile b/security/p5-Crypt-Camellia_PP/Makefile
index d2012352b5e0..50c254996687 100644
--- a/security/p5-Crypt-Camellia_PP/Makefile
+++ b/security/p5-Crypt-Camellia_PP/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Camellia_PP
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= yanagisawa@csg.is.titech.ac.jp
diff --git a/security/p5-Crypt-Chimera/Makefile b/security/p5-Crypt-Chimera/Makefile
index 753c329b2ec9..eeeb90d1b013 100644
--- a/security/p5-Crypt-Chimera/Makefile
+++ b/security/p5-Crypt-Chimera/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Chimera
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-CipherSaber/Makefile b/security/p5-Crypt-CipherSaber/Makefile
index 29595443451a..879a7eb7d312 100644
--- a/security/p5-Crypt-CipherSaber/Makefile
+++ b/security/p5-Crypt-CipherSaber/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-CipherSaber
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Crypt-Cracklib/Makefile b/security/p5-Crypt-Cracklib/Makefile
index 3c098518608a..3d0ea5fab3ed 100644
--- a/security/p5-Crypt-Cracklib/Makefile
+++ b/security/p5-Crypt-Cracklib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Cracklib
PORTVERSION= 1.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Ctr/Makefile b/security/p5-Crypt-Ctr/Makefile
index c1e85209ea14..100226b385af 100644
--- a/security/p5-Crypt-Ctr/Makefile
+++ b/security/p5-Crypt-Ctr/Makefile
@@ -7,8 +7,7 @@ PORTNAME= Crypt-Ctr
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index 2a2803b73f64..b0933f83a917 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-DES
PORTVERSION= 2.05
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-DES_EDE3/Makefile b/security/p5-Crypt-DES_EDE3/Makefile
index a8d1bcb3bdcd..8e045f581bf2 100644
--- a/security/p5-Crypt-DES_EDE3/Makefile
+++ b/security/p5-Crypt-DES_EDE3/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Crypt-DES_EDE3
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-DES_PP/Makefile b/security/p5-Crypt-DES_PP/Makefile
index afcee0347e37..f76ad861ed04 100644
--- a/security/p5-Crypt-DES_PP/Makefile
+++ b/security/p5-Crypt-DES_PP/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-DES_PP
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-DH/Makefile b/security/p5-Crypt-DH/Makefile
index 3f068ebab72d..f598dbfb02c0 100644
--- a/security/p5-Crypt-DH/Makefile
+++ b/security/p5-Crypt-DH/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-DH
PORTVERSION= 0.06
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-DSA/Makefile b/security/p5-Crypt-DSA/Makefile
index a0cf5355f739..ff0427ac98f6 100644
--- a/security/p5-Crypt-DSA/Makefile
+++ b/security/p5-Crypt-DSA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-DSA
PORTVERSION= 0.14
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Dining/Makefile b/security/p5-Crypt-Dining/Makefile
index e03fb138cc06..e60d6d0a74d5 100644
--- a/security/p5-Crypt-Dining/Makefile
+++ b/security/p5-Crypt-Dining/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Dining
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-Crypt-ECB/Makefile b/security/p5-Crypt-ECB/Makefile
index fee79b050aaa..9393f16438e1 100644
--- a/security/p5-Crypt-ECB/Makefile
+++ b/security/p5-Crypt-ECB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-ECB
PORTVERSION= 1.40
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/security/p5-Crypt-Enigma/Makefile b/security/p5-Crypt-Enigma/Makefile
index 4900e26ee359..57c2ccde41e1 100644
--- a/security/p5-Crypt-Enigma/Makefile
+++ b/security/p5-Crypt-Enigma/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Enigma
PORTVERSION= 1.3
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-GOST/Makefile b/security/p5-Crypt-GOST/Makefile
index dabd8cc46542..02c4a6db0262 100644
--- a/security/p5-Crypt-GOST/Makefile
+++ b/security/p5-Crypt-GOST/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-GOST
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-GOST_PP/Makefile b/security/p5-Crypt-GOST_PP/Makefile
index ac2534cd8f52..8977f3983bb7 100644
--- a/security/p5-Crypt-GOST_PP/Makefile
+++ b/security/p5-Crypt-GOST_PP/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-GOST_PP
PORTVERSION= 1.10
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-GPG/Makefile b/security/p5-Crypt-GPG/Makefile
index c86b22d355fe..8d67cd91320d 100644
--- a/security/p5-Crypt-GPG/Makefile
+++ b/security/p5-Crypt-GPG/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-GPG
PORTVERSION= 1.63
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-GeneratePassword/Makefile b/security/p5-Crypt-GeneratePassword/Makefile
index e943a8632eb2..98be475f1161 100644
--- a/security/p5-Crypt-GeneratePassword/Makefile
+++ b/security/p5-Crypt-GeneratePassword/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-GeneratePassword
PORTVERSION= 0.03
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= andrew@scoop.co.nz
diff --git a/security/p5-Crypt-HCE_MD5/Makefile b/security/p5-Crypt-HCE_MD5/Makefile
index a9a2d72abcd0..3abdfc921cbf 100644
--- a/security/p5-Crypt-HCE_MD5/Makefile
+++ b/security/p5-Crypt-HCE_MD5/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-HCE_MD5
PORTVERSION= 0.70
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-HCE_SHA/Makefile b/security/p5-Crypt-HCE_SHA/Makefile
index 25df4b5eb21c..53138886a8b4 100644
--- a/security/p5-Crypt-HCE_SHA/Makefile
+++ b/security/p5-Crypt-HCE_SHA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-HCE_SHA
PORTVERSION= 0.70
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-Imail/Makefile b/security/p5-Crypt-Imail/Makefile
index f18aa0893e70..b44955322875 100644
--- a/security/p5-Crypt-Imail/Makefile
+++ b/security/p5-Crypt-Imail/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Imail
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Khazad/Makefile b/security/p5-Crypt-Khazad/Makefile
index 5bc41cc114e6..7590286df7b1 100644
--- a/security/p5-Crypt-Khazad/Makefile
+++ b/security/p5-Crypt-Khazad/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Khazad
PORTVERSION= 1.0.3
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-License/Makefile b/security/p5-Crypt-License/Makefile
index 908fac12eb99..1fcf43fbe0a5 100644
--- a/security/p5-Crypt-License/Makefile
+++ b/security/p5-Crypt-License/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-License
PORTVERSION= 2.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Lite/Makefile b/security/p5-Crypt-Lite/Makefile
index 2a30b9910afa..05fcdd613bb4 100644
--- a/security/p5-Crypt-Lite/Makefile
+++ b/security/p5-Crypt-Lite/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Lite
PORTVERSION= 0.82.11
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Loki97/Makefile b/security/p5-Crypt-Loki97/Makefile
index bda145288a6e..364d64e4b1f6 100644
--- a/security/p5-Crypt-Loki97/Makefile
+++ b/security/p5-Crypt-Loki97/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Loki97
PORTVERSION= 1.0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-MySQL/Makefile b/security/p5-Crypt-MySQL/Makefile
index 42bbe49b2461..c57be350cb4a 100644
--- a/security/p5-Crypt-MySQL/Makefile
+++ b/security/p5-Crypt-MySQL/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-MySQL
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-NULL/Makefile b/security/p5-Crypt-NULL/Makefile
index c8b3d8e223b5..b2a8bf9c672e 100644
--- a/security/p5-Crypt-NULL/Makefile
+++ b/security/p5-Crypt-NULL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-NULL
PORTVERSION= 1.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kaoru@kaisei.org
diff --git a/security/p5-Crypt-OFB/Makefile b/security/p5-Crypt-OFB/Makefile
index f408568d6e3e..c82c83f4fa56 100644
--- a/security/p5-Crypt-OFB/Makefile
+++ b/security/p5-Crypt-OFB/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OFB
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-OICQ/Makefile b/security/p5-Crypt-OICQ/Makefile
index 605112e49c1c..10dcc2e1d7cd 100644
--- a/security/p5-Crypt-OICQ/Makefile
+++ b/security/p5-Crypt-OICQ/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OICQ
PORTVERSION= 1.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/security/p5-Crypt-OTP/Makefile b/security/p5-Crypt-OTP/Makefile
index d053372d0689..b9c5ad431915 100644
--- a/security/p5-Crypt-OTP/Makefile
+++ b/security/p5-Crypt-OTP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OTP
PORTVERSION= 2.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 18a0f0caeff2..3a4911c57331 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Crypt-OpenPGP
PORTVERSION= 1.03
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-Bignum/Makefile b/security/p5-Crypt-OpenSSL-Bignum/Makefile
index 05602f33b2e6..c3b14d102ebe 100644
--- a/security/p5-Crypt-OpenSSL-Bignum/Makefile
+++ b/security/p5-Crypt-OpenSSL-Bignum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-Bignum
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-DSA/Makefile b/security/p5-Crypt-OpenSSL-DSA/Makefile
index 0a14745cc9b6..95e868b3a946 100644
--- a/security/p5-Crypt-OpenSSL-DSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-DSA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-DSA
PORTVERSION= 0.13
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-RSA/Makefile b/security/p5-Crypt-OpenSSL-RSA/Makefile
index b8fe185bc46d..2f885e96b7a6 100644
--- a/security/p5-Crypt-OpenSSL-RSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-RSA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-RSA
PORTVERSION= 0.25
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-Random/Makefile b/security/p5-Crypt-OpenSSL-Random/Makefile
index 919d068f79b5..742d186f74ff 100644
--- a/security/p5-Crypt-OpenSSL-Random/Makefile
+++ b/security/p5-Crypt-OpenSSL-Random/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-Random
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-OpenSSL-X509/Makefile b/security/p5-Crypt-OpenSSL-X509/Makefile
index 822f60af4330..1a73db8a16b7 100644
--- a/security/p5-Crypt-OpenSSL-X509/Makefile
+++ b/security/p5-Crypt-OpenSSL-X509/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-OpenSSL-X509
PORTVERSION= 0.5
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= kftseng@iyard.org
diff --git a/security/p5-Crypt-PGPSimple/Makefile b/security/p5-Crypt-PGPSimple/Makefile
index 2258146098ab..73eb3505973d 100644
--- a/security/p5-Crypt-PGPSimple/Makefile
+++ b/security/p5-Crypt-PGPSimple/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-PGPSimple
PORTVERSION= 0.13
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= rachek@si.FreeBSD.org
diff --git a/security/p5-Crypt-PassGen/Makefile b/security/p5-Crypt-PassGen/Makefile
index fb399aae90e1..176fa0f1ba38 100644
--- a/security/p5-Crypt-PassGen/Makefile
+++ b/security/p5-Crypt-PassGen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-PassGen
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/security/p5-Crypt-PasswdMD5/Makefile b/security/p5-Crypt-PasswdMD5/Makefile
index c3ac7a2c48d1..757e465f4ebf 100644
--- a/security/p5-Crypt-PasswdMD5/Makefile
+++ b/security/p5-Crypt-PasswdMD5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-PasswdMD5
PORTVERSION= 1.3
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index d5b36c943b41..4d5a69fa9faf 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Primes
PORTVERSION= 0.50
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-RC4/Makefile b/security/p5-Crypt-RC4/Makefile
index cd198eee95f8..2a5fcd552c13 100644
--- a/security/p5-Crypt-RC4/Makefile
+++ b/security/p5-Crypt-RC4/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RC4
PORTVERSION= 2.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-RC5/Makefile b/security/p5-Crypt-RC5/Makefile
index 1b3ff7298181..2f0f65853ce6 100644
--- a/security/p5-Crypt-RC5/Makefile
+++ b/security/p5-Crypt-RC5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RC5
PORTVERSION= 2.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-RC6/Makefile b/security/p5-Crypt-RC6/Makefile
index 29c47fa47f32..869bd79cf9e5 100644
--- a/security/p5-Crypt-RC6/Makefile
+++ b/security/p5-Crypt-RC6/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RC6
PORTVERSION= 1.0
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-RIPEMD160/Makefile b/security/p5-Crypt-RIPEMD160/Makefile
index 68998df70ecd..1deef3a971f6 100644
--- a/security/p5-Crypt-RIPEMD160/Makefile
+++ b/security/p5-Crypt-RIPEMD160/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RIPEMD160
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile
index 11e7ceb52ff6..2df6d9231d7c 100644
--- a/security/p5-Crypt-RSA/Makefile
+++ b/security/p5-Crypt-RSA/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RSA
PORTVERSION= 1.58
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Rabbit/Makefile b/security/p5-Crypt-Rabbit/Makefile
index 4cdc3c8986e0..180a445411c7 100644
--- a/security/p5-Crypt-Rabbit/Makefile
+++ b/security/p5-Crypt-Rabbit/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Rabbit
PORTVERSION= 1.0.0
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-RandPasswd/Makefile b/security/p5-Crypt-RandPasswd/Makefile
index 9136ba2d9b4c..d2c7bdddf1d0 100644
--- a/security/p5-Crypt-RandPasswd/Makefile
+++ b/security/p5-Crypt-RandPasswd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-RandPasswd
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile
index 900a8df19c3f..0d76d01486e7 100644
--- a/security/p5-Crypt-Random/Makefile
+++ b/security/p5-Crypt-Random/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Crypt-Random
PORTVERSION= 1.25
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Rijndael_PP/Makefile b/security/p5-Crypt-Rijndael_PP/Makefile
index 47bf9901b455..c6f2eaef649b 100644
--- a/security/p5-Crypt-Rijndael_PP/Makefile
+++ b/security/p5-Crypt-Rijndael_PP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Rijndael_PP
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gslin@gslin.org
diff --git a/security/p5-Crypt-SKey/Makefile b/security/p5-Crypt-SKey/Makefile
index 64c5caddab89..e6c3ac80e029 100644
--- a/security/p5-Crypt-SKey/Makefile
+++ b/security/p5-Crypt-SKey/Makefile
@@ -7,8 +7,7 @@ PORTNAME= Crypt-SKey
PORTVERSION= 0.07
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile
index 59bdee408b43..92bc44cfba9e 100644
--- a/security/p5-Crypt-SSLeay/Makefile
+++ b/security/p5-Crypt-SSLeay/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-SSLeay
PORTVERSION= 0.57
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Crypt-Salt/Makefile b/security/p5-Crypt-Salt/Makefile
index b37f63df94a8..f0a9f7ecf377 100644
--- a/security/p5-Crypt-Salt/Makefile
+++ b/security/p5-Crypt-Salt/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Salt
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-SaltedHash/Makefile b/security/p5-Crypt-SaltedHash/Makefile
index 69fdb1ccc927..54a353f9155a 100644
--- a/security/p5-Crypt-SaltedHash/Makefile
+++ b/security/p5-Crypt-SaltedHash/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-SaltedHash
PORTVERSION= 0.05
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-Serpent/Makefile b/security/p5-Crypt-Serpent/Makefile
index 2991db1342c5..ddea85c4b4d9 100644
--- a/security/p5-Crypt-Serpent/Makefile
+++ b/security/p5-Crypt-Serpent/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Serpent
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Shark/Makefile b/security/p5-Crypt-Shark/Makefile
index cde776c3cf33..00f3c20a1b2d 100644
--- a/security/p5-Crypt-Shark/Makefile
+++ b/security/p5-Crypt-Shark/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-Shark
PORTVERSION= 1.0.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-SmbHash/Makefile b/security/p5-Crypt-SmbHash/Makefile
index 1d030ad8e1fb..b9c20e31e6e9 100644
--- a/security/p5-Crypt-SmbHash/Makefile
+++ b/security/p5-Crypt-SmbHash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-SmbHash
PORTVERSION= 0.12
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= flz@FreeBSD.org
diff --git a/security/p5-Crypt-Solitaire/Makefile b/security/p5-Crypt-Solitaire/Makefile
index 90ad69f7da53..5d2cf4cf530e 100644
--- a/security/p5-Crypt-Solitaire/Makefile
+++ b/security/p5-Crypt-Solitaire/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Solitaire
PORTVERSION= 2.0
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-TEA/Makefile b/security/p5-Crypt-TEA/Makefile
index 34d9f47eea12..ea7ddf0f7f3c 100644
--- a/security/p5-Crypt-TEA/Makefile
+++ b/security/p5-Crypt-TEA/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-TEA
PORTVERSION= 1.25
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Crypt-TripleDES/Makefile b/security/p5-Crypt-TripleDES/Makefile
index 8be6516c963c..bb98ebf110f7 100644
--- a/security/p5-Crypt-TripleDES/Makefile
+++ b/security/p5-Crypt-TripleDES/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-TripleDES
PORTVERSION= 0.24
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-Twofish/Makefile b/security/p5-Crypt-Twofish/Makefile
index 14c612f1fea1..71004e910a64 100644
--- a/security/p5-Crypt-Twofish/Makefile
+++ b/security/p5-Crypt-Twofish/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Crypt-Twofish
PORTVERSION= 2.12
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Crypt-Twofish2/Makefile b/security/p5-Crypt-Twofish2/Makefile
index bd55453533e5..0f149465d0d8 100644
--- a/security/p5-Crypt-Twofish2/Makefile
+++ b/security/p5-Crypt-Twofish2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-Twofish2
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-UnixCrypt/Makefile b/security/p5-Crypt-UnixCrypt/Makefile
index c2eb7bc651fd..71336710790a 100644
--- a/security/p5-Crypt-UnixCrypt/Makefile
+++ b/security/p5-Crypt-UnixCrypt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Crypt-UnixCrypt
PORTVERSION= 1.0
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@exit2shell.com
diff --git a/security/p5-Crypt-X509/Makefile b/security/p5-Crypt-X509/Makefile
index ef75da8113be..3cffbaac0540 100644
--- a/security/p5-Crypt-X509/Makefile
+++ b/security/p5-Crypt-X509/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Crypt-X509
PORTVERSION= 0.32
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Data-Entropy/Makefile b/security/p5-Data-Entropy/Makefile
index 7b6546df7eb9..3845002ceaa4 100644
--- a/security/p5-Data-Entropy/Makefile
+++ b/security/p5-Data-Entropy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Entropy
PORTVERSION= 0.004
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Data-Password/Makefile b/security/p5-Data-Password/Makefile
index 80d73719d6da..71642f182b61 100644
--- a/security/p5-Data-Password/Makefile
+++ b/security/p5-Data-Password/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Data-Password
PORTVERSION= 1.07
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@c0decafe.net
diff --git a/security/p5-Digest-Adler32/Makefile b/security/p5-Digest-Adler32/Makefile
index 30a4604494db..abcbb90b2752 100644
--- a/security/p5-Digest-Adler32/Makefile
+++ b/security/p5-Digest-Adler32/Makefile
@@ -7,8 +7,7 @@ PORTNAME= Digest-Adler32
PORTVERSION= 0.03
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-BubbleBabble/Makefile b/security/p5-Digest-BubbleBabble/Makefile
index 8975cdd20be9..85f8bec30c16 100644
--- a/security/p5-Digest-BubbleBabble/Makefile
+++ b/security/p5-Digest-BubbleBabble/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Digest-BubbleBabble
PORTVERSION= 0.01
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Digest-CRC/Makefile b/security/p5-Digest-CRC/Makefile
index 67470ddb64e3..9c7e25671431 100644
--- a/security/p5-Digest-CRC/Makefile
+++ b/security/p5-Digest-CRC/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-CRC
PORTVERSION= 0.14
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Crc32/Makefile b/security/p5-Digest-Crc32/Makefile
index 2ef0d978a259..3237a9e9ef49 100644
--- a/security/p5-Digest-Crc32/Makefile
+++ b/security/p5-Digest-Crc32/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Crc32
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-DJB/Makefile b/security/p5-Digest-DJB/Makefile
index 5861f9749779..77911e356311 100644
--- a/security/p5-Digest-DJB/Makefile
+++ b/security/p5-Digest-DJB/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-DJB
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-DMAC/Makefile b/security/p5-Digest-DMAC/Makefile
index c38bc9c683a7..0b5d57175307 100644
--- a/security/p5-Digest-DMAC/Makefile
+++ b/security/p5-Digest-DMAC/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-DMAC
PORTVERSION= 1.1.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-EMAC/Makefile b/security/p5-Digest-EMAC/Makefile
index 74c47831442f..b08cfb4b7de0 100644
--- a/security/p5-Digest-EMAC/Makefile
+++ b/security/p5-Digest-EMAC/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-EMAC
PORTVERSION= 1.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Elf/Makefile b/security/p5-Digest-Elf/Makefile
index a778d932fb90..df68f2ae12b4 100644
--- a/security/p5-Digest-Elf/Makefile
+++ b/security/p5-Digest-Elf/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Elf
PORTVERSION= 1.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-FNV/Makefile b/security/p5-Digest-FNV/Makefile
index fe0039b19906..3df4b8d344bf 100644
--- a/security/p5-Digest-FNV/Makefile
+++ b/security/p5-Digest-FNV/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-FNV
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile
index 7c86146fa878..bba749235cce 100644
--- a/security/p5-Digest-HMAC/Makefile
+++ b/security/p5-Digest-HMAC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-HMAC
PORTVERSION= 1.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Digest-Hashcash/Makefile b/security/p5-Digest-Hashcash/Makefile
index e18649252bc4..019272731b77 100644
--- a/security/p5-Digest-Hashcash/Makefile
+++ b/security/p5-Digest-Hashcash/Makefile
@@ -6,7 +6,7 @@
PORTNAME= Digest-Hashcash
PORTVERSION= 0.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../by-authors/id/A/AD/ADAMBACK
PKGNAMEPREFIX= p5-
EXTRACT_SUFX= .tgz
diff --git a/security/p5-Digest-Haval256/Makefile b/security/p5-Digest-Haval256/Makefile
index d3b9d1791e5d..73394d9bfab9 100644
--- a/security/p5-Digest-Haval256/Makefile
+++ b/security/p5-Digest-Haval256/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Haval256
PORTVERSION= 1.0.5
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-JHash/Makefile b/security/p5-Digest-JHash/Makefile
index 67edf7065126..8b95a6ff8b21 100644
--- a/security/p5-Digest-JHash/Makefile
+++ b/security/p5-Digest-JHash/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-JHash
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-MD2/Makefile b/security/p5-Digest-MD2/Makefile
index d6f10b916c97..0b92b1ec3a65 100644
--- a/security/p5-Digest-MD2/Makefile
+++ b/security/p5-Digest-MD2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-MD2
PORTVERSION= 2.03
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Digest-MD5-File/Makefile b/security/p5-Digest-MD5-File/Makefile
index 7a6a7ea880b2..51c99670eb87 100644
--- a/security/p5-Digest-MD5-File/Makefile
+++ b/security/p5-Digest-MD5-File/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-MD5-File
PORTVERSION= 0.06
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-MD5-M4p/Makefile b/security/p5-Digest-MD5-M4p/Makefile
index cd5bca733b0a..4998d3a57e67 100644
--- a/security/p5-Digest-MD5-M4p/Makefile
+++ b/security/p5-Digest-MD5-M4p/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-MD5-M4p
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index 9c0c30c8b390..3e9a1c7968ec 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-MD5
PORTVERSION= 2.36
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= tabthorpe@FreeBSD.org
diff --git a/security/p5-Digest-ManberHash/Makefile b/security/p5-Digest-ManberHash/Makefile
index 951665039d9d..1b919bd78937 100644
--- a/security/p5-Digest-ManberHash/Makefile
+++ b/security/p5-Digest-ManberHash/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-ManberHash
PORTVERSION= 0.7
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Nilsimsa/Makefile b/security/p5-Digest-Nilsimsa/Makefile
index 96f2c794fc3c..c28e5ad07c78 100644
--- a/security/p5-Digest-Nilsimsa/Makefile
+++ b/security/p5-Digest-Nilsimsa/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-Nilsimsa
PORTVERSION= 0.06
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
diff --git a/security/p5-Digest-Pearson-PurePerl/Makefile b/security/p5-Digest-Pearson-PurePerl/Makefile
index 8b37a6bdf6c5..8797d2f555cc 100644
--- a/security/p5-Digest-Pearson-PurePerl/Makefile
+++ b/security/p5-Digest-Pearson-PurePerl/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Pearson-PurePerl
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Pearson/Makefile b/security/p5-Digest-Pearson/Makefile
index 9395eacad276..94573d3f3aff 100644
--- a/security/p5-Digest-Pearson/Makefile
+++ b/security/p5-Digest-Pearson/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Pearson
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Perl-MD4/Makefile b/security/p5-Digest-Perl-MD4/Makefile
index c0c34bda7d1a..a93e976d27c2 100644
--- a/security/p5-Digest-Perl-MD4/Makefile
+++ b/security/p5-Digest-Perl-MD4/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Perl-MD4
PORTVERSION= 1.4
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Perl-MD5/Makefile b/security/p5-Digest-Perl-MD5/Makefile
index d87b00d53a52..cd2ca2c24c6f 100644
--- a/security/p5-Digest-Perl-MD5/Makefile
+++ b/security/p5-Digest-Perl-MD5/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Perl-MD5
PORTVERSION= 1.8
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-SHA-PurePerl/Makefile b/security/p5-Digest-SHA-PurePerl/Makefile
index f49cf805c7cd..681e748e2e9e 100644
--- a/security/p5-Digest-SHA-PurePerl/Makefile
+++ b/security/p5-Digest-SHA-PurePerl/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-SHA-PurePerl
PORTVERSION= 5.45
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-SHA1/Makefile b/security/p5-Digest-SHA1/Makefile
index c2fca60ef4be..d7401c94cb25 100644
--- a/security/p5-Digest-SHA1/Makefile
+++ b/security/p5-Digest-SHA1/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest-SHA1
PORTVERSION= 2.11
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
diff --git a/security/p5-Digest-SHA256/Makefile b/security/p5-Digest-SHA256/Makefile
index c3dcebda55c6..54945469650b 100644
--- a/security/p5-Digest-SHA256/Makefile
+++ b/security/p5-Digest-SHA256/Makefile
@@ -12,8 +12,7 @@ PORTNAME= Digest-SHA256
PORTVERSION= 0.01b
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= SHA256-${PORTVERSION}
diff --git a/security/p5-Digest-SV1/Makefile b/security/p5-Digest-SV1/Makefile
index 99a1482fb2a4..d749124f917a 100644
--- a/security/p5-Digest-SV1/Makefile
+++ b/security/p5-Digest-SV1/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-SV1
PORTVERSION= 0.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Tiger/Makefile b/security/p5-Digest-Tiger/Makefile
index 46b595a4df92..8c24c402e52e 100644
--- a/security/p5-Digest-Tiger/Makefile
+++ b/security/p5-Digest-Tiger/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Tiger
PORTVERSION= 0.02
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest-Whirlpool/Makefile b/security/p5-Digest-Whirlpool/Makefile
index 4cc40ef89c74..ca1992700786 100644
--- a/security/p5-Digest-Whirlpool/Makefile
+++ b/security/p5-Digest-Whirlpool/Makefile
@@ -6,8 +6,7 @@
PORTNAME= Digest-Whirlpool
PORTVERSION= 1.0.6
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= gabor@FreeBSD.org
diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile
index 544a1f9366c7..03f721e935ef 100644
--- a/security/p5-Digest/Makefile
+++ b/security/p5-Digest/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Digest
PORTVERSION= 1.15
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Digest
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Email-Obfuscate/Makefile b/security/p5-Email-Obfuscate/Makefile
index 1add8200b4bd..df2146a4af3c 100644
--- a/security/p5-Email-Obfuscate/Makefile
+++ b/security/p5-Email-Obfuscate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Email-Obfuscate
PORTVERSION= 1.13
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Email
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index 8373aec7f430..0fb04e76d7d1 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -9,8 +9,7 @@ PORTNAME= File-Scan-ClamAV
PORTVERSION= 1.8
PORTREVISION= 3
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= j.koopmann@seceidos.de
diff --git a/security/p5-File-Scan/Makefile b/security/p5-File-Scan/Makefile
index 46419f424f30..63904b0968ef 100644
--- a/security/p5-File-Scan/Makefile
+++ b/security/p5-File-Scan/Makefile
@@ -8,8 +8,7 @@
PORTNAME= File-Scan
PORTVERSION= 1.43
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File/HDIAS
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= jims@bluenotch.com
diff --git a/security/p5-Filter-CBC/Makefile b/security/p5-Filter-CBC/Makefile
index af2399f5fc47..72adba3bbc2f 100644
--- a/security/p5-Filter-CBC/Makefile
+++ b/security/p5-Filter-CBC/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filter-CBC
PORTVERSION= 0.09
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-Filter-Crypto/Makefile b/security/p5-Filter-Crypto/Makefile
index f4debc4fa416..3bded10d1a8a 100644
--- a/security/p5-Filter-Crypto/Makefile
+++ b/security/p5-Filter-Crypto/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Filter-Crypto
PORTVERSION= 1.18
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Filter
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile
index 3ce6cb82d0b4..00c7d2d6191d 100644
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -9,8 +9,7 @@ PORTNAME= GD-SecurityImage
PORTVERSION= 1.65
PORTEPOCH= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= GD
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-GSSAPI/Makefile b/security/p5-GSSAPI/Makefile
index bd81111e98bb..1d80c4951ca9 100644
--- a/security/p5-GSSAPI/Makefile
+++ b/security/p5-GSSAPI/Makefile
@@ -8,7 +8,7 @@
PORTNAME= GSSAPI
PORTVERSION= 0.26
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= LWP/AGROLMS
PKGNAMEPREFIX= p5-
diff --git a/security/p5-HTML-Email-Obfuscate/Makefile b/security/p5-HTML-Email-Obfuscate/Makefile
index d462f0e62f07..6d3bbd319040 100644
--- a/security/p5-HTML-Email-Obfuscate/Makefile
+++ b/security/p5-HTML-Email-Obfuscate/Makefile
@@ -8,8 +8,7 @@
PORTNAME= HTML-Email-Obfuscate
PORTVERSION= 1.00
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= LWP/ADAMK
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= chinsan@FreeBSD.org
diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile
index 140767a17cc7..502d8b7e04de 100644
--- a/security/p5-Module-Signature/Makefile
+++ b/security/p5-Module-Signature/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Module-Signature
PORTVERSION= 0.55
PORTREVISION= 2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Module
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/security/p5-Net-Daemon-SSL/Makefile b/security/p5-Net-Daemon-SSL/Makefile
index dc7691b6c5a6..6240ae18d921 100644
--- a/security/p5-Net-Daemon-SSL/Makefile
+++ b/security/p5-Net-Daemon-SSL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-Daemon-SSL
PORTVERSION= 1.0
CATEGORIES= security net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= simond@irrelevant.org
diff --git a/security/p5-Net-OpenID-JanRain/Makefile b/security/p5-Net-OpenID-JanRain/Makefile
index fce96b293e61..ed42d00f2f90 100644
--- a/security/p5-Net-OpenID-JanRain/Makefile
+++ b/security/p5-Net-OpenID-JanRain/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Net-OpenID-JanRain
PORTVERSION= 1.1.1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index 29a08fd00ad6..4a48c8ea20a2 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -9,8 +9,7 @@ PORTNAME= Net-SSLeay
PORTVERSION= 1.30
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
DISTNAME= Net_SSLeay.pm-${PORTVERSION}
diff --git a/security/p5-Nmap-Scanner/Makefile b/security/p5-Nmap-Scanner/Makefile
index 7a1a9797115c..3ce5b4c39829 100644
--- a/security/p5-Nmap-Scanner/Makefile
+++ b/security/p5-Nmap-Scanner/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Nmap-Scanner
PORTVERSION= 0.9
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/M/MA/MAXSCHUBE
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-OpenCA-CRL/Makefile b/security/p5-OpenCA-CRL/Makefile
index aa5f1c6f5df7..84ddc2c521ff 100644
--- a/security/p5-OpenCA-CRL/Makefile
+++ b/security/p5-OpenCA-CRL/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OpenCA-CRL
PORTVERSION= 0.9.17
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OpenCA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-OpenCA-CRR/Makefile b/security/p5-OpenCA-CRR/Makefile
index 1c494359de0a..15283f99c3ec 100644
--- a/security/p5-OpenCA-CRR/Makefile
+++ b/security/p5-OpenCA-CRR/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OpenCA-CRR
PORTVERSION= 0.0.2
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OpenCA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-OpenCA-PKCS7/Makefile b/security/p5-OpenCA-PKCS7/Makefile
index de6084b30087..7f0124676100 100644
--- a/security/p5-OpenCA-PKCS7/Makefile
+++ b/security/p5-OpenCA-PKCS7/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OpenCA-PKCS7
PORTVERSION= 0.9.13
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OpenCA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-OpenCA-REQ/Makefile b/security/p5-OpenCA-REQ/Makefile
index 81b43bcfc2ff..625d33a91820 100644
--- a/security/p5-OpenCA-REQ/Makefile
+++ b/security/p5-OpenCA-REQ/Makefile
@@ -8,8 +8,7 @@
PORTNAME= OpenCA-REQ
PORTVERSION= 0.9.52
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= OpenCA
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index 2328d2410165..c95239079167 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PGP-Sign
PORTVERSION= 0.20
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PGP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index 42a8a5e273c2..24fc8166132a 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PGP
PORTVERSION= 0.3a
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PGP
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-POE-Component-SSLify/Makefile b/security/p5-POE-Component-SSLify/Makefile
index a9eca80f0c96..ad4bafdf51b4 100644
--- a/security/p5-POE-Component-SSLify/Makefile
+++ b/security/p5-POE-Component-SSLify/Makefile
@@ -8,8 +8,7 @@
PORTNAME= POE-Component-SSLify
PORTVERSION= 0.10
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/A/AP/APOCAL
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
diff --git a/security/p5-PerlCryptLib/Makefile b/security/p5-PerlCryptLib/Makefile
index 2e2cf16a4ac4..7a9e6a1f1d32 100644
--- a/security/p5-PerlCryptLib/Makefile
+++ b/security/p5-PerlCryptLib/Makefile
@@ -8,7 +8,7 @@
PORTNAME= PerlCryptLib
PORTVERSION= 1.04
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
+MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/A/AL/ALVAROL
PKGNAMEPREFIX= p5-
diff --git a/security/p5-SHA/Makefile b/security/p5-SHA/Makefile
index 4cf6038382d0..ee366c5da927 100644
--- a/security/p5-SHA/Makefile
+++ b/security/p5-SHA/Makefile
@@ -8,8 +8,8 @@
PORTNAME= SHA
PORTVERSION= 2.01
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/G/GA/GAAS/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../../authors/id/G/GA/GAAS
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
diff --git a/security/p5-Safe-Hole/Makefile b/security/p5-Safe-Hole/Makefile
index 09f81e5ff75a..1c1e999eb8e8 100644
--- a/security/p5-Safe-Hole/Makefile
+++ b/security/p5-Safe-Hole/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Safe-Hole
PORTVERSION= 0.10
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Safe
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= sethk@meowfishies.com
diff --git a/security/p5-Snort-Rule/Makefile b/security/p5-Snort-Rule/Makefile
index e81617f5ad5b..30ec3e09620c 100644
--- a/security/p5-Snort-Rule/Makefile
+++ b/security/p5-Snort-Rule/Makefile
@@ -8,8 +8,8 @@
PORTNAME= Snort-Rule
PORTVERSION= 1.06
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../by-authors/id/S/SA/SAXJAZMAN/Snort/
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= ../by-authors/id/S/SA/SAXJAZMAN/Snort
PKGNAMEPREFIX= p5-
MAINTAINER= pauls@utdallas.edu
diff --git a/security/p5-Text-Password-Pronounceable/Makefile b/security/p5-Text-Password-Pronounceable/Makefile
index e159bf8c08fb..27f15fc67a18 100644
--- a/security/p5-Text-Password-Pronounceable/Makefile
+++ b/security/p5-Text-Password-Pronounceable/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Text-Password-Pronounceable
PORTVERSION= 0.28
CATEGORIES= security textproc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/C/CL/CLKAO
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index f215e3492b4d..4f67b1dfafa1 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tie-EncryptedHash
PORTVERSION= 1.21
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tie
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Tree-Authz/Makefile b/security/p5-Tree-Authz/Makefile
index a0197f41d0a5..4814ba4db547 100644
--- a/security/p5-Tree-Authz/Makefile
+++ b/security/p5-Tree-Authz/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Tree-Authz
PORTVERSION= 0.03
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tree
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= aaron@FreeBSD.org