19 files changed, 19 insertions, 37 deletions

diff --git a/net-mgmt/p5-Cisco-Reconfig/Makefile b/net-mgmt/p5-Cisco-Reconfig/Makefile
index e476157b50c9..85349b7eca7c 100644
--- a/net-mgmt/p5-Cisco-Reconfig/Makefile
+++ b/net-mgmt/p5-Cisco-Reconfig/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Cisco-Reconfig
 PORTVERSION=	0.9
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Cisco
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/net-mgmt/p5-Mon/Makefile b/net-mgmt/p5-Mon/Makefile
index af739c38ae44..0399f41bb5fa 100644
--- a/net-mgmt/p5-Mon/Makefile
+++ b/net-mgmt/p5-Mon/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Mon
 PORTVERSION=	0.11
 CATEGORIES=	net-mgmt sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mon
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Mon-${PORTVERSION}
 
diff --git a/net-mgmt/p5-NSNMP/Makefile b/net-mgmt/p5-NSNMP/Makefile
index 31441af4b42f..7e9a159f24de 100644
--- a/net-mgmt/p5-NSNMP/Makefile
+++ b/net-mgmt/p5-NSNMP/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	NSNMP
 PORTVERSION=	0.5
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/K/KR/KRAGEN
 PKGNAMEPREFIX=	p5-
 
diff --git a/net-mgmt/p5-Net-ACL/Makefile b/net-mgmt/p5-Net-ACL/Makefile
index cb6002040632..23b73712f41c 100644
--- a/net-mgmt/p5-Net-ACL/Makefile
+++ b/net-mgmt/p5-Net-ACL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-ACL
 PORTVERSION=	0.07
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/net-mgmt/p5-Net-CIDR/Makefile b/net-mgmt/p5-Net-CIDR/Makefile
index 83bcdd4e06cc..ea1de41bac52 100644
--- a/net-mgmt/p5-Net-CIDR/Makefile
+++ b/net-mgmt/p5-Net-CIDR/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-CIDR
 PORTVERSION=	0.11
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tabthorpe@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IP-Match-XS/Makefile b/net-mgmt/p5-Net-IP-Match-XS/Makefile
index 5c0dbffb682e..80db0a79675b 100644
--- a/net-mgmt/p5-Net-IP-Match-XS/Makefile
+++ b/net-mgmt/p5-Net-IP-Match-XS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-IP-Match-XS
 PORTVERSION=	0.03
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IP-Resolver/Makefile b/net-mgmt/p5-Net-IP-Resolver/Makefile
index cc8e4baf9bf4..c1951125bd6a 100644
--- a/net-mgmt/p5-Net-IP-Resolver/Makefile
+++ b/net-mgmt/p5-Net-IP-Resolver/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-IP-Resolver
 PORTVERSION=	0.02
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IP/Makefile b/net-mgmt/p5-Net-IP/Makefile
index 07857c045ff5..b44c96a23fc9 100644
--- a/net-mgmt/p5-Net-IP/Makefile
+++ b/net-mgmt/p5-Net-IP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-IP
 PORTVERSION=	1.25
 CATEGORIES=	net-mgmt perl5 ipv6
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IPv4Addr/Makefile b/net-mgmt/p5-Net-IPv4Addr/Makefile
index f97941663e69..077e579e9648 100644
--- a/net-mgmt/p5-Net-IPv4Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv4Addr/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-IPv4Addr
 PORTVERSION=	0.10
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-mgmt/p5-Net-IPv6Addr/Makefile b/net-mgmt/p5-Net-IPv6Addr/Makefile
index e05a159d2a10..e965761c7da6 100644
--- a/net-mgmt/p5-Net-IPv6Addr/Makefile
+++ b/net-mgmt/p5-Net-IPv6Addr/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-IPv6Addr
 PORTVERSION=	0.2
 CATEGORIES=	net-mgmt 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-mgmt/p5-Net-Netmask/Makefile b/net-mgmt/p5-Net-Netmask/Makefile
index c81f9ac40504..8cf0d8897c6d 100644
--- a/net-mgmt/p5-Net-Netmask/Makefile
+++ b/net-mgmt/p5-Net-Netmask/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Netmask
 PORTVERSION=	1.9015
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index f61771091a8f..397e3d256141 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-SNMP
 PORTVERSION=	5.2.0
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile b/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
index 74e5c255de70..c7f7eae946e6 100644
--- a/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
+++ b/net-mgmt/p5-Net-Telnet-Cisco-IOS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Net-Telnet-Cisco-IOS
 PORTVERSION=	0.6
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Net
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION}beta
 
diff --git a/net-mgmt/p5-NetAddr-IP-Lite/Makefile b/net-mgmt/p5-NetAddr-IP-Lite/Makefile
index 3e1ad6c026df..88861560b04f 100644
--- a/net-mgmt/p5-NetAddr-IP-Lite/Makefile
+++ b/net-mgmt/p5-NetAddr-IP-Lite/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	NetAddr-IP-Lite
 PORTVERSION=	1.01
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	NetAddr
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ychsiao@ychsiao.org
diff --git a/net-mgmt/p5-NetAddr-IP/Makefile b/net-mgmt/p5-NetAddr-IP/Makefile
index 92b66386882a..4b3550f4ac9b 100644
--- a/net-mgmt/p5-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-NetAddr-IP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	NetAddr-IP
 PORTVERSION=	4.00.7
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	NetAddr
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9])$/\1/}
 
diff --git a/net-mgmt/p5-POE-Component-SNMP/Makefile b/net-mgmt/p5-POE-Component-SNMP/Makefile
index 81f5f391d685..bcbeed859861 100644
--- a/net-mgmt/p5-POE-Component-SNMP/Makefile
+++ b/net-mgmt/p5-POE-Component-SNMP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	POE-Component-SNMP
 PORTVERSION=	1.07
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
index f193675faea9..35c401250dfe 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SNMP-MIB-Compiler
 PORTVERSION=	0.06
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SNMP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	marcus@FreeBSD.org
diff --git a/net-mgmt/p5-SNMP-Util/Makefile b/net-mgmt/p5-SNMP-Util/Makefile
index 5554d4a7715b..94761302fd58 100644
--- a/net-mgmt/p5-SNMP-Util/Makefile
+++ b/net-mgmt/p5-SNMP-Util/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	SNMP-Util
 PORTVERSION=	1.8
 PORTREVISION=	1
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SNMP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fenner@FreeBSD.org
diff --git a/net-mgmt/p5-Tie-NetAddr-IP/Makefile b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
index 95514212f9ac..51d592fe93f2 100644
--- a/net-mgmt/p5-Tie-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Tie-NetAddr-IP
 PORTVERSION=	1.51
 CATEGORIES=	net-mgmt perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tie
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org