- 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)

126 files changed, 129 insertions, 234 deletions

diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index 8099c9b79847..898b3af252b6 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	2.00
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/L/LO/LOOSIFER/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../authors/id/L/LO/LOOSIFER
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Interactive shell used to administer ldap directories
diff --git a/net/p5-AddressBook/Makefile b/net/p5-AddressBook/Makefile
index d28b721b7ae2..7b85fde85f9d 100644
--- a/net/p5-AddressBook/Makefile
+++ b/net/p5-AddressBook/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	AddressBook
 PORTVERSION=	0.16
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/D/DL/DLEIGH/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../authors/id/D/DL/DLEIGH
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-BBS-UserInfo-Maple3/Makefile b/net/p5-BBS-UserInfo-Maple3/Makefile
index 1d4c1126868e..6a962524916a 100644
--- a/net/p5-BBS-UserInfo-Maple3/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	BBS-UserInfo-Maple3
 PORTVERSION=	0.01
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/G/GS/GSLIN
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-BBS-UserInfo-Maple3itoc/Makefile b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
index 1a3765f217ca..94e239dc8e7f 100644
--- a/net/p5-BBS-UserInfo-Maple3itoc/Makefile
+++ b/net/p5-BBS-UserInfo-Maple3itoc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	BBS-UserInfo-Maple3itoc
 PORTVERSION=	0.01
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/G/GS/GSLIN
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-BBS-UserInfo-Ptt/Makefile b/net/p5-BBS-UserInfo-Ptt/Makefile
index 06c0ed649cb5..d877ca2649fd 100644
--- a/net/p5-BBS-UserInfo-Ptt/Makefile
+++ b/net/p5-BBS-UserInfo-Ptt/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	BBS-UserInfo-Ptt
 PORTVERSION=	0.06
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/G/GS/GSLIN
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-BBS-UserInfo-SOB/Makefile b/net/p5-BBS-UserInfo-SOB/Makefile
index 0699ff63d6a7..5a3531cd57c2 100644
--- a/net/p5-BBS-UserInfo-SOB/Makefile
+++ b/net/p5-BBS-UserInfo-SOB/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	BBS-UserInfo-SOB
 PORTVERSION=	0.01
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/G/GS/GSLIN
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-BBS-UserInfo-Wretch/Makefile b/net/p5-BBS-UserInfo-Wretch/Makefile
index 0d4f5dc2e6b5..9574a276aa9b 100644
--- a/net/p5-BBS-UserInfo-Wretch/Makefile
+++ b/net/p5-BBS-UserInfo-Wretch/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	BBS-UserInfo-Wretch
 PORTVERSION=	0.03
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/G/GS/GSLIN
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-BBS-UserInfo/Makefile b/net/p5-BBS-UserInfo/Makefile
index 7b87e275f2a0..dda0ac1b8b1e 100644
--- a/net/p5-BBS-UserInfo/Makefile
+++ b/net/p5-BBS-UserInfo/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	BBS-UserInfo
 PORTVERSION=	0.01
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/G/GS/GSLIN
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-Cisco-IPPhone/Makefile b/net/p5-Cisco-IPPhone/Makefile
index 279a31aa1e07..917d7ceb8392 100644
--- a/net/p5-Cisco-IPPhone/Makefile
+++ b/net/p5-Cisco-IPPhone/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Cisco-IPPhone
 PORTVERSION=	0.05
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Cisco
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	numisemis@yahoo.com
diff --git a/net/p5-EasyTCP/Makefile b/net/p5-EasyTCP/Makefile
index 17b7b9997150..7641daea246e 100644
--- a/net/p5-EasyTCP/Makefile
+++ b/net/p5-EasyTCP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	EasyTCP
 PORTVERSION=	0.26
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-File-Rsync/Makefile b/net/p5-File-Rsync/Makefile
index e706aebaa85a..de116a32c950 100644
--- a/net/p5-File-Rsync/Makefile
+++ b/net/p5-File-Rsync/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	File-Rsync
 PORTVERSION=	0.42
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	File
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Filesys-SmbClient/Makefile b/net/p5-Filesys-SmbClient/Makefile
index 3b2783423737..93cf00537b17 100644
--- a/net/p5-Filesys-SmbClient/Makefile
+++ b/net/p5-Filesys-SmbClient/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Filesys-SmbClient
 PORTVERSION=	1.5
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Filesys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/net/p5-Frontier-RPC/Makefile b/net/p5-Frontier-RPC/Makefile
index 57057a93ec88..0867544c6fc8 100644
--- a/net/p5-Frontier-RPC/Makefile
+++ b/net/p5-Frontier-RPC/Makefile
@@ -9,9 +9,8 @@
 PORTNAME=	Frontier-RPC
 PORTVERSION=	0.07.b4
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://bitsko.slc.ut.us/~ken/xml-rpc/
-MASTER_SITE_SUBDIR=	Frontier
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-0.07b4
 
diff --git a/net/p5-Geo-IPfree/Makefile b/net/p5-Geo-IPfree/Makefile
index bb0a0d2c2ad8..55d3611c8d81 100644
--- a/net/p5-Geo-IPfree/Makefile
+++ b/net/p5-Geo-IPfree/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Geo-IPfree
 PORTVERSION=	0.2
 CATEGORIES=	net perl5 geography
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Geo
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/net/p5-Gopher-Server/Makefile b/net/p5-Gopher-Server/Makefile
index 0b2cb1789c98..f2ed36c1f7fb 100644
--- a/net/p5-Gopher-Server/Makefile
+++ b/net/p5-Gopher-Server/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Gopher-Server
 PORTVERSION=	0.1.1
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/T/TM/TMURRAY
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-IO-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile
index ad75f7e9bcc7..408f2f665c49 100644
--- a/net/p5-IO-Socket-Multicast/Makefile
+++ b/net/p5-IO-Socket-Multicast/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	IO-Socket-Multicast
 PORTVERSION=	1.05
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	IO
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	janos.mohacsi@bsd.hu
diff --git a/net/p5-IO-Socket-Multicast6/Makefile b/net/p5-IO-Socket-Multicast6/Makefile
index 34e003f827ae..f0978fff7814 100644
--- a/net/p5-IO-Socket-Multicast6/Makefile
+++ b/net/p5-IO-Socket-Multicast6/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	IO-Socket-Multicast6
 PORTVERSION=	0.02
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	IO
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-IP-Country/Makefile b/net/p5-IP-Country/Makefile
index cd1e810029ed..bbde0959a30c 100644
--- a/net/p5-IP-Country/Makefile
+++ b/net/p5-IP-Country/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	IP-Country
 PORTVERSION=	2.23
 PORTREVISION=	1
 CATEGORIES=	net perl5 geography
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../by-authors/id/N/NW/NWETTERS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dikshie@lapi.itb.ac.id
diff --git a/net/p5-JavaScript-RPC/Makefile b/net/p5-JavaScript-RPC/Makefile
index 88b3e48c5ceb..589a76ad83d7 100644
--- a/net/p5-JavaScript-RPC/Makefile
+++ b/net/p5-JavaScript-RPC/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	JavaScript-RPC
 PORTVERSION=	0.3
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	JavaScript
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-ARP/Makefile b/net/p5-Net-ARP/Makefile
index 7a0e213e86dc..912abcb8d5ea 100644
--- a/net/p5-Net-ARP/Makefile
+++ b/net/p5-Net-ARP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-ARP
 PORTVERSION=	1.0.2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/p5-Net-Address-IPv4-Local/Makefile b/net/p5-Net-Address-IPv4-Local/Makefile
index c04f3b6b5f90..c7a45aef37b4 100644
--- a/net/p5-Net-Address-IPv4-Local/Makefile
+++ b/net/p5-Net-Address-IPv4-Local/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Address-IPv4-Local
 PORTVERSION=	0.12
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-Analysis/Makefile b/net/p5-Net-Analysis/Makefile
index 65b69748b255..31e83f2afea0 100644
--- a/net/p5-Net-Analysis/Makefile
+++ b/net/p5-Net-Analysis/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Analysis
 PORTVERSION=	0.40
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	araujo@FreeBSD.org
diff --git a/net/p5-Net-BGP/Makefile b/net/p5-Net-BGP/Makefile
index 23d28a829453..eaf5f21f1a4f 100644
--- a/net/p5-Net-BGP/Makefile
+++ b/net/p5-Net-BGP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-BGP
 PORTVERSION=	0.08
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-Net-Blogger/Makefile b/net/p5-Net-Blogger/Makefile
index c9c5b8bb8f85..b238ee6a75f5 100644
--- a/net/p5-Net-Blogger/Makefile
+++ b/net/p5-Net-Blogger/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	Net-Blogger
 PORTVERSION=	1.02
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-Net-CIDR-Lite/Makefile b/net/p5-Net-CIDR-Lite/Makefile
index f17e9719121e..1df9a140d3bc 100644
--- a/net/p5-Net-CIDR-Lite/Makefile
+++ b/net/p5-Net-CIDR-Lite/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-CIDR-Lite
 PORTVERSION=	0.20
 CATEGORIES=	net perl5 ipv6
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-DAV-Server/Makefile b/net/p5-Net-DAV-Server/Makefile
index d91797d0b04c..07c94da6e541 100644
--- a/net/p5-Net-DAV-Server/Makefile
+++ b/net/p5-Net-DAV-Server/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-DAV-Server
 PORTVERSION=	1.29
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/net/p5-Net-DHCP/Makefile b/net/p5-Net-DHCP/Makefile
index 07ec36a5cf17..1bd7cb8e0d18 100644
--- a/net/p5-Net-DHCP/Makefile
+++ b/net/p5-Net-DHCP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-DHCP
 PORTVERSION=	0.66
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-Net-DHCPClient/Makefile b/net/p5-Net-DHCPClient/Makefile
index 55f7bfb98a0f..909563d096ea 100644
--- a/net/p5-Net-DHCPClient/Makefile
+++ b/net/p5-Net-DHCPClient/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-DHCPClient
 PORTVERSION=	1.0
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sem@FreeBSD.org
diff --git a/net/p5-Net-DLookup/Makefile b/net/p5-Net-DLookup/Makefile
index 0d5b71ba075a..7ae5fb1b4da0 100644
--- a/net/p5-Net-DLookup/Makefile
+++ b/net/p5-Net-DLookup/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-DLookup
 PORTVERSION=	1.01
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index b3bfb3df4afb..c47213242bdd 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Daemon
 PORTVERSION=	0.43
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-Net-Dict/Makefile b/net/p5-Net-Dict/Makefile
index 91e8df8ab0a4..75bfa0f1331d 100644
--- a/net/p5-Net-Dict/Makefile
+++ b/net/p5-Net-Dict/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Dict
 PORTVERSION=	2.07
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Net-Divert/Makefile b/net/p5-Net-Divert/Makefile
index 1cf2f73776bb..5448280895f0 100644
--- a/net/p5-Net-Divert/Makefile
+++ b/net/p5-Net-Divert/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	Net-Divert
 PORTVERSION=	0.01
 PORTREVISION=	1
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
diff --git a/net/p5-Net-EPP-Client/Makefile b/net/p5-Net-EPP-Client/Makefile
index 4130182bb6ed..709e15b66082 100644
--- a/net/p5-Net-EPP-Client/Makefile
+++ b/net/p5-Net-EPP-Client/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-EPP-Client
 PORTVERSION=	0.06
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-EPP-Frame/Makefile b/net/p5-Net-EPP-Frame/Makefile
index 19d5f269b14c..426aa39b22a9 100644
--- a/net/p5-Net-EPP-Frame/Makefile
+++ b/net/p5-Net-EPP-Frame/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-EPP-Frame
 PORTVERSION=	0.07
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-EPP-Proxy/Makefile b/net/p5-Net-EPP-Proxy/Makefile
index 9c8a02733bc3..01b1f71d5047 100644
--- a/net/p5-Net-EPP-Proxy/Makefile
+++ b/net/p5-Net-EPP-Proxy/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-EPP-Proxy
 PORTVERSION=	0.03
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-EPP/Makefile b/net/p5-Net-EPP/Makefile
index 4130182bb6ed..709e15b66082 100644
--- a/net/p5-Net-EPP/Makefile
+++ b/net/p5-Net-EPP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-EPP-Client
 PORTVERSION=	0.06
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-FS-Flickr/Makefile b/net/p5-Net-FS-Flickr/Makefile
index e3954c16285e..da5ce19d4c16 100644
--- a/net/p5-Net-FS-Flickr/Makefile
+++ b/net/p5-Net-FS-Flickr/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Net-FS-Flickr
 PORTVERSION=	0.1
 PORTREVISION=	1
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/net/p5-Net-FS-Gmail/Makefile b/net/p5-Net-FS-Gmail/Makefile
index 971aa52841e8..f04db21084c2 100644
--- a/net/p5-Net-FS-Gmail/Makefile
+++ b/net/p5-Net-FS-Gmail/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-FS-Gmail
 PORTVERSION=	0.2
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/net/p5-Net-FTP-File/Makefile b/net/p5-Net-FTP-File/Makefile
index ffb080cdf705..0cd2e6d0f8bc 100644
--- a/net/p5-Net-FTP-File/Makefile
+++ b/net/p5-Net-FTP-File/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-FTP-File
 PORTVERSION=	0.05
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-Finger/Makefile b/net/p5-Net-Finger/Makefile
index 3eaf05cfb98d..a30c8a5b3db5 100644
--- a/net/p5-Net-Finger/Makefile
+++ b/net/p5-Net-Finger/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Finger
 PORTVERSION=	1.06
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Net-Frame/Makefile b/net/p5-Net-Frame/Makefile
index d3651c2df825..d661feb7dd07 100644
--- a/net/p5-Net-Frame/Makefile
+++ b/net/p5-Net-Frame/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Frame
 PORTVERSION=	1.04
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-Net-Google-Calendar/Makefile b/net/p5-Net-Google-Calendar/Makefile
index 4641c394b899..dc98c7ea04c5 100644
--- a/net/p5-Net-Google-Calendar/Makefile
+++ b/net/p5-Net-Google-Calendar/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Google-Calendar
 DISTVERSION=	0.5
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mhsin@mhsin.org
diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index 43c53ca8f570..688144247a28 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Google
 PORTVERSION=	1.0.1
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-Net-Gopher/Makefile b/net/p5-Net-Gopher/Makefile
index 4b3305b5deaa..ffe25be6d250 100644
--- a/net/p5-Net-Gopher/Makefile
+++ b/net/p5-Net-Gopher/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Gopher
 PORTVERSION=	1.15
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	toni.viemero@iki.fi
diff --git a/net/p5-Net-Growl/Makefile b/net/p5-Net-Growl/Makefile
index 11d26edc8274..471ab0708dba 100644
--- a/net/p5-Net-Growl/Makefile
+++ b/net/p5-Net-Growl/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Growl
 PORTVERSION=	0.99
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/N/NM/NMCFARL
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/net/p5-Net-IPTrie/Makefile b/net/p5-Net-IPTrie/Makefile
index 1ca290c044f0..052a2855b828 100644
--- a/net/p5-Net-IPTrie/Makefile
+++ b/net/p5-Net-IPTrie/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-IPTrie
 PORTVERSION=	0.3
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
diff --git a/net/p5-Net-Ident/Makefile b/net/p5-Net-Ident/Makefile
index da6174d0a6ab..96f1c04fca88 100644
--- a/net/p5-Net-Ident/Makefile
+++ b/net/p5-Net-Ident/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	Net-Ident
 PORTVERSION=	1.20
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kai@xs4all.nl
diff --git a/net/p5-Net-Interface/Makefile b/net/p5-Net-Interface/Makefile
index 8ccb2551c68c..8054ae6c5fff 100644
--- a/net/p5-Net-Interface/Makefile
+++ b/net/p5-Net-Interface/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Interface
 PORTVERSION=	0.08
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-Net-LDAP-LDAPhash/Makefile b/net/p5-Net-LDAP-LDAPhash/Makefile
index 9e38be6c3535..3f5305d2ec10 100644
--- a/net/p5-Net-LDAP-LDAPhash/Makefile
+++ b/net/p5-Net-LDAP-LDAPhash/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	Net-LDAP-LDAPhash
 PORTVERSION=	1.0.1
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../authors/id/V/VV/VVELOX
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvelox@vvelox.net
diff --git a/net/p5-Net-MAC-Vendor/Makefile b/net/p5-Net-MAC-Vendor/Makefile
index 5252badde30f..8becaaf98e5f 100644
--- a/net/p5-Net-MAC-Vendor/Makefile
+++ b/net/p5-Net-MAC-Vendor/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-MAC-Vendor
 PORTVERSION=	1.17
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-MovableType/Makefile b/net/p5-Net-MovableType/Makefile
index d173bf991c37..c301af31b213 100644
--- a/net/p5-Net-MovableType/Makefile
+++ b/net/p5-Net-MovableType/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-MovableType
 PORTVERSION=	1.74
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-Net-NBName/Makefile b/net/p5-Net-NBName/Makefile
index 739b0c90caa8..e7d6a4b77ae2 100644
--- a/net/p5-Net-NBName/Makefile
+++ b/net/p5-Net-NBName/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Net-NBName
 PORTVERSION=	0.26
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fenner@FreeBSD.Org
diff --git a/net/p5-Net-NBsocket/Makefile b/net/p5-Net-NBsocket/Makefile
index 7d8fba324c69..12d56cd4a3d2 100644
--- a/net/p5-Net-NBsocket/Makefile
+++ b/net/p5-Net-NBsocket/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-NBsocket
 PORTVERSION=	0.13
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-Net-NIS-Listgroup/Makefile b/net/p5-Net-NIS-Listgroup/Makefile
index 4e7b09fe5cb2..e2e28bc83519 100644
--- a/net/p5-Net-NIS-Listgroup/Makefile
+++ b/net/p5-Net-NIS-Listgroup/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-NIS-Listgroup
 PORTVERSION=	1.0.0
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/net/p5-Net-OpenDHT/Makefile b/net/p5-Net-OpenDHT/Makefile
index a6493968380d..b4671e549a53 100644
--- a/net/p5-Net-OpenDHT/Makefile
+++ b/net/p5-Net-OpenDHT/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-OpenDHT
 PORTVERSION=	0.33
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-ParseWhois/Makefile b/net/p5-Net-ParseWhois/Makefile
index 8b1a755f67e2..6ed6134bf4a5 100644
--- a/net/p5-Net-ParseWhois/Makefile
+++ b/net/p5-Net-ParseWhois/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-ParseWhois
 PORTVERSION=	0.62
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Net-Patricia/Makefile b/net/p5-Net-Patricia/Makefile
index 9bfe93f2deaa..c25c4614d846 100644
--- a/net/p5-Net-Patricia/Makefile
+++ b/net/p5-Net-Patricia/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	Net-Patricia
 PORTVERSION=	1.014
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://net.doit.wisc.edu/~plonka/Net-Patricia/
-MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-Net-PcapUtils/Makefile b/net/p5-Net-PcapUtils/Makefile
index ddbe667667bf..ec7b5ad1ca9d 100644
--- a/net/p5-Net-PcapUtils/Makefile
+++ b/net/p5-Net-PcapUtils/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-PcapUtils
 PORTVERSION=	0.01
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-Net-Ping-External/Makefile b/net/p5-Net-Ping-External/Makefile
index 8659ef4b1c84..aa6a781c53b4 100644
--- a/net/p5-Net-Ping-External/Makefile
+++ b/net/p5-Net-Ping-External/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Ping-External
 PORTVERSION=	0.12
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	douglas@douglasthrift.net
diff --git a/net/p5-Net-RTP/Makefile b/net/p5-Net-RTP/Makefile
index 7b7e4b39acfc..bffb6b91063a 100644
--- a/net/p5-Net-RTP/Makefile
+++ b/net/p5-Net-RTP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-RTP
 PORTVERSION=	0.09
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile
index 22bf0516fb82..4e844955f911 100644
--- a/net/p5-Net-Radius/Makefile
+++ b/net/p5-Net-Radius/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Radius
 PORTVERSION=	1.56
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-Random/Makefile b/net/p5-Net-Random/Makefile
index e8a8ecff5ee7..bd8f8fbe6374 100644
--- a/net/p5-Net-Random/Makefile
+++ b/net/p5-Net-Random/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Random
 PORTVERSION=	2.0
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-Net-RawIP/Makefile b/net/p5-Net-RawIP/Makefile
index 7e1b7d694676..5db2b5da0931 100644
--- a/net/p5-Net-RawIP/Makefile
+++ b/net/p5-Net-RawIP/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Net-RawIP
 PORTVERSION=	0.23
 PORTEPOCH=	1
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/net/p5-Net-Rendezvous/Makefile b/net/p5-Net-Rendezvous/Makefile
index ec3e30625e2c..6511002916d8 100644
--- a/net/p5-Net-Rendezvous/Makefile
+++ b/net/p5-Net-Rendezvous/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Rendezvous
 PORTVERSION=	0.90
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Net-Rsh/Makefile b/net/p5-Net-Rsh/Makefile
index a8b073e9eadd..13ca0736d605 100644
--- a/net/p5-Net-Rsh/Makefile
+++ b/net/p5-Net-Rsh/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Rsh
 PORTVERSION=	0.02
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nistor@snickers.org
diff --git a/net/p5-Net-SAP/Makefile b/net/p5-Net-SAP/Makefile
index 5992b67fbcbc..4f4a843c02c7 100644
--- a/net/p5-Net-SAP/Makefile
+++ b/net/p5-Net-SAP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SAP
 PORTVERSION=	0.10
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-SCP-Expect/Makefile b/net/p5-Net-SCP-Expect/Makefile
index 09d808322d70..faf71fb1627e 100644
--- a/net/p5-Net-SCP-Expect/Makefile
+++ b/net/p5-Net-SCP-Expect/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SCP-Expect
 PORTVERSION=	0.12
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	numisemis@yahoo.com
diff --git a/net/p5-Net-SDP/Makefile b/net/p5-Net-SDP/Makefile
index 31b34c3150c2..2f9a75aa8669 100644
--- a/net/p5-Net-SDP/Makefile
+++ b/net/p5-Net-SDP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SDP
 PORTVERSION=	0.07
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-Net-SFTP/Makefile b/net/p5-Net-SFTP/Makefile
index 828c4b643c4a..145f8f9a2b47 100644
--- a/net/p5-Net-SFTP/Makefile
+++ b/net/p5-Net-SFTP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SFTP
 PORTVERSION=	0.10
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tcornpropst@cox.net
diff --git a/net/p5-Net-SMPP/Makefile b/net/p5-Net-SMPP/Makefile
index 3486a68cde87..ee1962b59277 100644
--- a/net/p5-Net-SMPP/Makefile
+++ b/net/p5-Net-SMPP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SMPP
 PORTVERSION=	1.10
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jhay@FreeBSD.org
diff --git a/net/p5-Net-SMS-PChome/Makefile b/net/p5-Net-SMS-PChome/Makefile
index 66d463aaa036..f8f2102bd8bf 100644
--- a/net/p5-Net-SMS-PChome/Makefile
+++ b/net/p5-Net-SMS-PChome/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SMS-PChome
 PORTVERSION=	0.11
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/net/p5-Net-SNPP/Makefile b/net/p5-Net-SNPP/Makefile
index 026c291a5d08..0f8bb9868cb6 100644
--- a/net/p5-Net-SNPP/Makefile
+++ b/net/p5-Net-SNPP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SNPP
 PORTVERSION=	1.17
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/net/p5-Net-SSH-Expect/Makefile b/net/p5-Net-SSH-Expect/Makefile
index 51d420b12f6d..9b5b70f23631 100644
--- a/net/p5-Net-SSH-Expect/Makefile
+++ b/net/p5-Net-SSH-Expect/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SSH-Expect
 PORTVERSION=	1.04
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index 5c2ac285885c..dd583f1973c4 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Net-SSH-Perl
 PORTVERSION=	1.30
 PORTREVISION=	1
 CATEGORIES=		net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-SSH/Makefile b/net/p5-Net-SSH/Makefile
index 04e98699b7bb..d101987ec1ff 100644
--- a/net/p5-Net-SSH/Makefile
+++ b/net/p5-Net-SSH/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SSH
 PORTVERSION=	0.08
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Net-SSH2/Makefile b/net/p5-Net-SSH2/Makefile
index f4866ff8175c..4787d78638f9 100644
--- a/net/p5-Net-SSH2/Makefile
+++ b/net/p5-Net-SSH2/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SSH2
 PORTVERSION=	0.18
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-Server/Makefile b/net/p5-Net-Server/Makefile
index 5d7f362d8f21..a4890fe07e45 100644
--- a/net/p5-Net-Server/Makefile
+++ b/net/p5-Net-Server/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Net-Server
 PORTVERSION=	0.97
 CATEGORIES=	net perl5
 MASTER_SITES=	http://seamons.com/projects/perl/net_server/ \
-		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+		CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-Net-Services/Makefile b/net/p5-Net-Services/Makefile
index 352d721ebfb5..ef8b6f937f86 100644
--- a/net/p5-Net-Services/Makefile
+++ b/net/p5-Net-Services/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Net-Services
 PORTVERSION=	1.3
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-Net-TCLink/Makefile b/net/p5-Net-TCLink/Makefile
index a6ecaa8d5984..2e6652428d3e 100644
--- a/net/p5-Net-TCLink/Makefile
+++ b/net/p5-Net-TCLink/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-TCLink
 PORTVERSION=	3.4
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Net_TCLink.pm-${PORTVERSION}
 
diff --git a/net/p5-Net-Telnet-Netscreen/Makefile b/net/p5-Net-Telnet-Netscreen/Makefile
index 838a68be6ae0..4f9e63e42aa7 100644
--- a/net/p5-Net-Telnet-Netscreen/Makefile
+++ b/net/p5-Net-Telnet-Netscreen/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Telnet-Netscreen
 PORTVERSION=	1.1
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Netscreen-${PORTVERSION}
 
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index 3682df84807b..664b2b07bbf4 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Telnet
 PORTVERSION=	3.03
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/net/p5-Net-TiVo/Makefile b/net/p5-Net-TiVo/Makefile
index ee78ed0e5401..aaa1140b4dd3 100644
--- a/net/p5-Net-TiVo/Makefile
+++ b/net/p5-Net-TiVo/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-TiVo
 PORTVERSION=	0.10
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	boumenot@gmail.com
diff --git a/net/p5-Net-Traceroute/Makefile b/net/p5-Net-Traceroute/Makefile
index 33eda5c2d251..52562a5bb1fa 100644
--- a/net/p5-Net-Traceroute/Makefile
+++ b/net/p5-Net-Traceroute/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Traceroute
 PORTVERSION=	1.10
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/net/p5-Net-Traceroute6/Makefile b/net/p5-Net-Traceroute6/Makefile
index f4c165b632af..af96580f81f1 100644
--- a/net/p5-Net-Traceroute6/Makefile
+++ b/net/p5-Net-Traceroute6/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Traceroute6
 PORTVERSION=	0.03
 CATEGORIES=	net perl5 ipv6
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Net-Wake/Makefile b/net/p5-Net-Wake/Makefile
index f6b6298fcabc..4204b4687540 100644
--- a/net/p5-Net-Wake/Makefile
+++ b/net/p5-Net-Wake/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Wake
 PORTVERSION=	0.02
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mistral@imasy.or.jp
diff --git a/net/p5-Net-Whois-ARIN/Makefile b/net/p5-Net-Whois-ARIN/Makefile
index 710b24c80bd4..2f50ce38311d 100644
--- a/net/p5-Net-Whois-ARIN/Makefile
+++ b/net/p5-Net-Whois-ARIN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Whois-ARIN
 PORTVERSION=	0.11
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-Whois-IP/Makefile b/net/p5-Net-Whois-IP/Makefile
index 45e9c2eba348..ab84f2357125 100644
--- a/net/p5-Net-Whois-IP/Makefile
+++ b/net/p5-Net-Whois-IP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Whois-IP
 PORTVERSION=	1.04
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-Net-Whois-RIPE/Makefile b/net/p5-Net-Whois-RIPE/Makefile
index 8f6c9c1fcd02..b6e9d72f5f1f 100644
--- a/net/p5-Net-Whois-RIPE/Makefile
+++ b/net/p5-Net-Whois-RIPE/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	Net-Whois-RIPE
 PORTVERSION=	1.23
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/P/PA/PAULG
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index 4c7f7f0567ae..2cee72446579 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Whois
 PORTVERSION=	1.9
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/net/p5-Net-XWhois/Makefile b/net/p5-Net-XWhois/Makefile
index 9504a2cd313f..3e9fb6aa0616 100644
--- a/net/p5-Net-XWhois/Makefile
+++ b/net/p5-Net-XWhois/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Net-XWhois
 PORTVERSION=	0.90
 PORTREVISION=	4
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-Net-Z3950-ZOOM/Makefile b/net/p5-Net-Z3950-ZOOM/Makefile
index 1770172b0216..a71b94df29f2 100644
--- a/net/p5-Net-Z3950-ZOOM/Makefile
+++ b/net/p5-Net-Z3950-ZOOM/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Net-Z3950-ZOOM
 PORTVERSION=	1.21
 PORTREVISION=	1
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/net/p5-Net-ext/Makefile b/net/p5-Net-ext/Makefile
index e588aaf44044..fceb99459360 100644
--- a/net/p5-Net-ext/Makefile
+++ b/net/p5-Net-ext/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-ext
 PORTVERSION=	1.011
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-NetAddr-IP-Count/Makefile b/net/p5-NetAddr-IP-Count/Makefile
index 174a40c9905b..73ccb7fc05a9 100644
--- a/net/p5-NetAddr-IP-Count/Makefile
+++ b/net/p5-NetAddr-IP-Count/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	NetAddr-IP-Count
 PORTVERSION=	2.01
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	NetAddr
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/net/p5-NetPacket/Makefile b/net/p5-NetPacket/Makefile
index 5ef3bcad5b57..d61a0890827b 100644
--- a/net/p5-NetPacket/Makefile
+++ b/net/p5-NetPacket/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	NetPacket
 PORTVERSION=	0.04
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	NetPacket
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tolid@plab.ku.dk
diff --git a/net/p5-OurNet-BBS/Makefile b/net/p5-OurNet-BBS/Makefile
index 28db1891bd29..6a3ed5564419 100644
--- a/net/p5-OurNet-BBS/Makefile
+++ b/net/p5-OurNet-BBS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	OurNet-BBS
 PORTVERSION=	1.66
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	OurNet
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-OurNet-BBSAgent/Makefile b/net/p5-OurNet-BBSAgent/Makefile
index 308b5a8dbbb0..62b48b51eb1b 100644
--- a/net/p5-OurNet-BBSAgent/Makefile
+++ b/net/p5-OurNet-BBSAgent/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	OurNet-BBSAgent
 PORTVERSION=	1.61
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	OurNet
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/net/p5-POE-Component-Client-Keepalive/Makefile b/net/p5-POE-Component-Client-Keepalive/Makefile
index 87653630fe7a..f058970ba135 100644
--- a/net/p5-POE-Component-Client-Keepalive/Makefile
+++ b/net/p5-POE-Component-Client-Keepalive/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Client-Keepalive
 PORTVERSION=	0.1000
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-POE-Component-Client-Ping/Makefile b/net/p5-POE-Component-Client-Ping/Makefile
index e90e6c4051a7..8b268e4c6da1 100644
--- a/net/p5-POE-Component-Client-Ping/Makefile
+++ b/net/p5-POE-Component-Client-Ping/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Client-Ping
 PORTVERSION=	1.13
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-POE-Component-Client-Telnet/Makefile b/net/p5-POE-Component-Client-Telnet/Makefile
index 359433d506be..4e5e5b4dc3df 100644
--- a/net/p5-POE-Component-Client-Telnet/Makefile
+++ b/net/p5-POE-Component-Client-Telnet/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	POE-Component-Client-Telnet
 PORTVERSION=	0.06
 PORTREVISION=	2
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-POE-Component-Client-Traceroute/Makefile b/net/p5-POE-Component-Client-Traceroute/Makefile
index a66b8697dc6d..edde64a79d86 100644
--- a/net/p5-POE-Component-Client-Traceroute/Makefile
+++ b/net/p5-POE-Component-Client-Traceroute/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Client-Traceroute
 PORTVERSION=	0.21
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-POE-Component-ControlPort/Makefile b/net/p5-POE-Component-ControlPort/Makefile
index 7fb9bdb84fb4..4358a526b723 100644
--- a/net/p5-POE-Component-ControlPort/Makefile
+++ b/net/p5-POE-Component-ControlPort/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-ControlPort
 PORTVERSION=	0.01
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hideo@lastamericanempire.com
diff --git a/net/p5-POE-Component-Pcap/Makefile b/net/p5-POE-Component-Pcap/Makefile
index 4f608c81b838..dbb159579095 100644
--- a/net/p5-POE-Component-Pcap/Makefile
+++ b/net/p5-POE-Component-Pcap/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Pcap
 PORTVERSION=	0.04
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-POE-Component-Spread/Makefile b/net/p5-POE-Component-Spread/Makefile
index 12aa87038b57..68956b8ba2e1 100644
--- a/net/p5-POE-Component-Spread/Makefile
+++ b/net/p5-POE-Component-Spread/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-Spread
 PORTVERSION=	0.02
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-Parallel-MPI/Makefile b/net/p5-Parallel-MPI/Makefile
index b480ef72733e..d1251962a580 100644
--- a/net/p5-Parallel-MPI/Makefile
+++ b/net/p5-Parallel-MPI/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Parallel-MPI
 PORTVERSION=	0.03
 PORTREVISION=	2
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Parallel
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-Parallel-Pvm/Makefile b/net/p5-Parallel-Pvm/Makefile
index dff84f5da07a..21fc72890fe6 100644
--- a/net/p5-Parallel-Pvm/Makefile
+++ b/net/p5-Parallel-Pvm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Parallel-Pvm
 PORTVERSION=	1.4.0
 PORTREVISION=	1
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Parallel
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index e6a5db2e4053..24584cf5f4e5 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	PlRPC
 PORTVERSION=	0.2020
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	RPC
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/p5-REST-Application/Makefile b/net/p5-REST-Application/Makefile
index e00ac283a69b..4764de656350 100644
--- a/net/p5-REST-Application/Makefile
+++ b/net/p5-REST-Application/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	REST-Application
 PORTVERSION=	0.992
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/M/MO/MOCONNOR/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../authors/id/M/MO/MOCONNOR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-RPC-Simple/Makefile b/net/p5-RPC-Simple/Makefile
index 2ebfd1cbff4a..c223ad928c44 100644
--- a/net/p5-RPC-Simple/Makefile
+++ b/net/p5-RPC-Simple/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	RPC-Simple
 PORTVERSION=	1.002
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	RPC
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile
index f4e2c8acb954..c4afea59364f 100644
--- a/net/p5-RPC-XML/Makefile
+++ b/net/p5-RPC-XML/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	RPC-XML
 PORTVERSION=	0.59
 CATEGORIES=	net www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	RPC
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
index ade5849823a7..f9cb7cc1fc1c 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ResourcePool-Resource-Net-LDAP
 PORTVERSION=	1.0002
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MW/MWS
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
index ea6c3f18473f..bb8f6b8612c3 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ResourcePool-Resource-SOAP-Lite
 PORTVERSION=	1.0101
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+MASTER_SITES=	CPAN \
 		http://www.fatalmind.com/projects/ResourcePool/
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MW/MWS
 PKGNAMEPREFIX=	p5-
diff --git a/net/p5-SOAP-Data-Builder/Makefile b/net/p5-SOAP-Data-Builder/Makefile
index 798b474ea14c..0d37d0b68351 100644
--- a/net/p5-SOAP-Data-Builder/Makefile
+++ b/net/p5-SOAP-Data-Builder/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SOAP-Data-Builder
 PORTVERSION=	0.9
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SOAP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/net/p5-SOAP-Lite-060/Makefile b/net/p5-SOAP-Lite-060/Makefile
index 80a995abd8ee..4e1669a4a6d6 100644
--- a/net/p5-SOAP-Lite-060/Makefile
+++ b/net/p5-SOAP-Lite-060/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SOAP-Lite
 PORTVERSION=	0.60a
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SOAP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lbr@FreeBSD.org
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index 5a699e7792b2..5a3bd0b901af 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SOAP-Lite
 PORTVERSION=	0.69
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SOAP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kappa@freebsd.org.ua
diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile
index 56b9948ddbf2..c09ac117e329 100644
--- a/net/p5-SOAP/Makefile
+++ b/net/p5-SOAP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SOAP
 PORTVERSION=	0.28
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SOAP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Socket-Multicast6/Makefile b/net/p5-Socket-Multicast6/Makefile
index 4524638ad917..a2e58b0d89f2 100644
--- a/net/p5-Socket-Multicast6/Makefile
+++ b/net/p5-Socket-Multicast6/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Socket-Multicast6
 PORTVERSION=	0.02
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/N/NJ/NJH
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tjs@cdpa.nsysu.edu.tw
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index 439c5a6c4624..e0b384981bb8 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Socket6
 PORTVERSION=	0.20
 CATEGORIES=	net perl5 ipv6
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Socket6
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ume@FreeBSD.org
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 76e15dae5682..502c4fd0b4b8 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SOCKS
 PORTVERSION=	0.03
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/p5-Spread-Message/Makefile b/net/p5-Spread-Message/Makefile
index ec1721aad2a9..f5a9eb53dd7b 100644
--- a/net/p5-Spread-Message/Makefile
+++ b/net/p5-Spread-Message/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Spread-Message
 PORTVERSION=	0.21
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/M/MA/MARKPF
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-Spread-Session/Makefile b/net/p5-Spread-Session/Makefile
index 184d9111d163..079b7b7498a0 100644
--- a/net/p5-Spread-Session/Makefile
+++ b/net/p5-Spread-Session/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Spread-Session
 PORTVERSION=	0.4
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/J/JM/JMAY
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-URI-OpenURL/Makefile b/net/p5-URI-OpenURL/Makefile
index b2514c2ecb3a..2cd9b7b5f74d 100644
--- a/net/p5-URI-OpenURL/Makefile
+++ b/net/p5-URI-OpenURL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	URI-OpenURL
 PORTVERSION=	0.4.6
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	URI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index a6fa41b36dbe..e511185258dd 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	URI
 PORTVERSION=	1.36
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	URI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/net/p5-Validate-Net/Makefile b/net/p5-Validate-Net/Makefile
index c7aa3c6ad5b6..df1a525bccaa 100644
--- a/net/p5-Validate-Net/Makefile
+++ b/net/p5-Validate-Net/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Validate-Net
 PORTVERSION=	0.5
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/A/AD/ADAMK
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-What/Makefile b/net/p5-What/Makefile
index d76582e3fa8a..252dcdf8ed46 100644
--- a/net/p5-What/Makefile
+++ b/net/p5-What/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	What
 PORTVERSION=	1.01
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/T/TP/TPG
 PKGNAMEPREFIX=	p5-
 
diff --git a/net/p5-X500-DN/Makefile b/net/p5-X500-DN/Makefile
index 4c67fff43bb7..7ee741928b5c 100644
--- a/net/p5-X500-DN/Makefile
+++ b/net/p5-X500-DN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	X500-DN
 PORTVERSION=	0.29
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	X500
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net/p5-XPC/Makefile b/net/p5-XPC/Makefile
index 8350bc69b5a5..5782d4eef9eb 100644
--- a/net/p5-XPC/Makefile
+++ b/net/p5-XPC/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	XPC
 PORTVERSION=	0.2
 CATEGORIES=	net perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/G/GR/GREGOR
 PKGNAMEPREFIX=	p5-