33 files changed, 35 insertions, 64 deletions

diff --git a/sysutils/p5-BSD-Jail-Object/Makefile b/sysutils/p5-BSD-Jail-Object/Makefile
index 82d4597f91e4..4cdd56478cfa 100644
--- a/sysutils/p5-BSD-Jail-Object/Makefile
+++ b/sysutils/p5-BSD-Jail-Object/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	BSD-Jail-Object
 PORTVERSION=	0.02
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/M/MA/MAHLON
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mahlon@martini.nu
diff --git a/sysutils/p5-BSD-Sysctl/Makefile b/sysutils/p5-BSD-Sysctl/Makefile
index 599382c83005..34469c7169da 100644
--- a/sysutils/p5-BSD-Sysctl/Makefile
+++ b/sysutils/p5-BSD-Sysctl/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	BSD-Sysctl
 PORTVERSION=	0.08
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	BSD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	david@landgren.net
diff --git a/sysutils/p5-Dir-Purge/Makefile b/sysutils/p5-Dir-Purge/Makefile
index 2cb722ee0357..eefcc41a2a22 100644
--- a/sysutils/p5-Dir-Purge/Makefile
+++ b/sysutils/p5-Dir-Purge/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Dir-Purge
 PORTVERSION=	1.02
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Dir
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/sysutils/p5-File-Next/Makefile b/sysutils/p5-File-Next/Makefile
index ab6835c3b9b1..3af784ea69ea 100644
--- a/sysutils/p5-File-Next/Makefile
+++ b/sysutils/p5-File-Next/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	File-Next
 PORTVERSION=	1.02
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	File
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/sysutils/p5-File-Which/Makefile b/sysutils/p5-File-Which/Makefile
index 308153871427..6b8e85734188 100644
--- a/sysutils/p5-File-Which/Makefile
+++ b/sysutils/p5-File-Which/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	File-Which
 PORTVERSION=	0.05
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	File
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/sysutils/p5-Filesys-Df/Makefile b/sysutils/p5-Filesys-Df/Makefile
index 1d827021c5a4..98695d73298c 100644
--- a/sysutils/p5-Filesys-Df/Makefile
+++ b/sysutils/p5-Filesys-Df/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Filesys-Df
 PORTVERSION=	0.92
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Filesys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pirzyk@FreeBSD.org
diff --git a/sysutils/p5-Filesys-DiskFree/Makefile b/sysutils/p5-Filesys-DiskFree/Makefile
index 28bcfc83dc7e..a47b188e01f4 100644
--- a/sysutils/p5-Filesys-DiskFree/Makefile
+++ b/sysutils/p5-Filesys-DiskFree/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Filesys-DiskFree
 PORTVERSION=	0.06
 PORTREVISION=	1
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Filesys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	david@trucs.org
diff --git a/sysutils/p5-Filesys-DiskSpace/Makefile b/sysutils/p5-Filesys-DiskSpace/Makefile
index 55b654679e05..efdfa28cc31f 100644
--- a/sysutils/p5-Filesys-DiskSpace/Makefile
+++ b/sysutils/p5-Filesys-DiskSpace/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Filesys-DiskSpace
 PORTVERSION=	0.05
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Filesys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/sysutils/p5-Filesys-DiskUsage/Makefile b/sysutils/p5-Filesys-DiskUsage/Makefile
index f1ceaa0f078a..59c3b88df172 100644
--- a/sysutils/p5-Filesys-DiskUsage/Makefile
+++ b/sysutils/p5-Filesys-DiskUsage/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Filesys-DiskUsage
 PORTVERSION=	0.04
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Filesys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/p5-Filesys-Statvfs/Makefile b/sysutils/p5-Filesys-Statvfs/Makefile
index f64332fecf51..aa9ca825b732 100644
--- a/sysutils/p5-Filesys-Statvfs/Makefile
+++ b/sysutils/p5-Filesys-Statvfs/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Filesys-Statvfs
 PORTVERSION=	0.82
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Filesys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pirzyk@freebsd.org
diff --git a/sysutils/p5-Fuse-Simple/Makefile b/sysutils/p5-Fuse-Simple/Makefile
index ca14c425db21..82e045ab3655 100644
--- a/sysutils/p5-Fuse-Simple/Makefile
+++ b/sysutils/p5-Fuse-Simple/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	Fuse-Simple
 PORTVERSION=	1.00
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/N/NO/NOSEYNICK/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../authors/id/N/NO/NOSEYNICK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/sysutils/p5-Fuse/Makefile b/sysutils/p5-Fuse/Makefile
index d0d224169262..fd7c720db727 100644
--- a/sysutils/p5-Fuse/Makefile
+++ b/sysutils/p5-Fuse/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Fuse
 PORTVERSION=	0.09
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/D/DP/DPAVLIN
 PKGNAMEPREFIX=	p5-
 
diff --git a/sysutils/p5-Proc-PidUtil/Makefile b/sysutils/p5-Proc-PidUtil/Makefile
index 6f10b66c6000..c12eaa9d705c 100644
--- a/sysutils/p5-Proc-PidUtil/Makefile
+++ b/sysutils/p5-Proc-PidUtil/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Proc-PidUtil
 PORTVERSION=	0.08
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Proc
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/sysutils/p5-Quota/Makefile b/sysutils/p5-Quota/Makefile
index 19f3ae608d7b..260eafd8db2e 100644
--- a/sysutils/p5-Quota/Makefile
+++ b/sysutils/p5-Quota/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Quota
 PORTVERSION=	1.6.2
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Quota
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/sysutils/p5-Schedule-At/Makefile b/sysutils/p5-Schedule-At/Makefile
index c2fbe97d049f..60606b503851 100644
--- a/sysutils/p5-Schedule-At/Makefile
+++ b/sysutils/p5-Schedule-At/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Schedule-At
 PORTVERSION=	1.06
 PORTREVISION=	1
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Schedule
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/sysutils/p5-Schedule-Cron/Makefile b/sysutils/p5-Schedule-Cron/Makefile
index f87bd74606c9..a2a90d4e1dec 100644
--- a/sysutils/p5-Schedule-Cron/Makefile
+++ b/sysutils/p5-Schedule-Cron/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Schedule-Cron
 PORTVERSION=	0.97
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Schedule
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/sysutils/p5-Schedule-Load/Makefile b/sysutils/p5-Schedule-Load/Makefile
index 10ad54f38a4a..7cbd14de0b78 100644
--- a/sysutils/p5-Schedule-Load/Makefile
+++ b/sysutils/p5-Schedule-Load/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Schedule-Load
 PORTVERSION=	3.051
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Schedule
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/sysutils/p5-Schedule-Match/Makefile b/sysutils/p5-Schedule-Match/Makefile
index cd8837f20e6d..02868932b75c 100644
--- a/sysutils/p5-Schedule-Match/Makefile
+++ b/sysutils/p5-Schedule-Match/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Schedule-Match
 PORTVERSION=	0.07
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Schedule
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/sysutils/p5-Stat-lsMode/Makefile b/sysutils/p5-Stat-lsMode/Makefile
index d2140c79dd6c..0819ce192380 100644
--- a/sysutils/p5-Stat-lsMode/Makefile
+++ b/sysutils/p5-Stat-lsMode/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Stat-lsMode
 PORTVERSION=	0.50
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Stat
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/sysutils/p5-Sys-CpuLoad/Makefile b/sysutils/p5-Sys-CpuLoad/Makefile
index 827945b500a1..7a01c57da551 100644
--- a/sysutils/p5-Sys-CpuLoad/Makefile
+++ b/sysutils/p5-Sys-CpuLoad/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Sys-CpuLoad
 PORTVERSION=	0.03
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Sys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/sysutils/p5-Sys-Gamin/Makefile b/sysutils/p5-Sys-Gamin/Makefile
index 4571e261c58c..de517846ba42 100644
--- a/sysutils/p5-Sys-Gamin/Makefile
+++ b/sysutils/p5-Sys-Gamin/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Sys-Gamin
 PORTVERSION=	0.1
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Sys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	n_hibma@freebsd.org
diff --git a/sysutils/p5-Sys-Hostname-FQDN/Makefile b/sysutils/p5-Sys-Hostname-FQDN/Makefile
index ed8713d3a941..07785d27c02d 100644
--- a/sysutils/p5-Sys-Hostname-FQDN/Makefile
+++ b/sysutils/p5-Sys-Hostname-FQDN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Sys-Hostname-FQDN
 PORTVERSION=	0.07
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Sys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
diff --git a/sysutils/p5-Sys-Hostname-Long/Makefile b/sysutils/p5-Sys-Hostname-Long/Makefile
index 74d3fe80edb3..eeadeb16c5fd 100644
--- a/sysutils/p5-Sys-Hostname-Long/Makefile
+++ b/sysutils/p5-Sys-Hostname-Long/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Sys-Hostname-Long
 PORTVERSION=	1.4
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Sys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tdb@FreeBSD.org
diff --git a/sysutils/p5-Sys-Utmp/Makefile b/sysutils/p5-Sys-Utmp/Makefile
index 51239f345d27..11ff5b9c70a4 100644
--- a/sysutils/p5-Sys-Utmp/Makefile
+++ b/sysutils/p5-Sys-Utmp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Sys-Utmp
 PORTVERSION=	1.6
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Sys
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	zaa@ulstu.ru
diff --git a/sysutils/p5-Sysadm-Install/Makefile b/sysutils/p5-Sysadm-Install/Makefile
index b647587553a1..32a5d6b7371d 100644
--- a/sysutils/p5-Sysadm-Install/Makefile
+++ b/sysutils/p5-Sysadm-Install/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Sysadm-Install
 PORTVERSION=	0.25
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MS/MSCHILLI
 PKGNAMEPREFIX=	p5-
 
diff --git a/sysutils/p5-SyslogScan/Makefile b/sysutils/p5-SyslogScan/Makefile
index 97768e5f66a1..671867d465a6 100644
--- a/sysutils/p5-SyslogScan/Makefile
+++ b/sysutils/p5-SyslogScan/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SyslogScan
 PORTVERSION=	0.32
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	SyslogScan
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/sysutils/p5-Tie-Syslog/Makefile b/sysutils/p5-Tie-Syslog/Makefile
index 1b27ee77cfc2..79228d759ea4 100644
--- a/sysutils/p5-Tie-Syslog/Makefile
+++ b/sysutils/p5-Tie-Syslog/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Tie-Syslog
 PORTVERSION=	1.07
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Tie
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/p5-Unix-ConfigFile/Makefile b/sysutils/p5-Unix-ConfigFile/Makefile
index e4856d5b7dd7..9a75a6a28a84 100644
--- a/sysutils/p5-Unix-ConfigFile/Makefile
+++ b/sysutils/p5-Unix-ConfigFile/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unix-ConfigFile
 PORTVERSION=	0.06
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unix
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/p5-Unix-Mknod/Makefile b/sysutils/p5-Unix-Mknod/Makefile
index f06988988cb3..d865bd63abd5 100644
--- a/sysutils/p5-Unix-Mknod/Makefile
+++ b/sysutils/p5-Unix-Mknod/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unix-Mknod
 PORTVERSION=	0.04
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unix
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pirzyk@FreeBSD.org
diff --git a/sysutils/p5-Unix-Processors/Makefile b/sysutils/p5-Unix-Processors/Makefile
index 41e9c7a9b3a6..97755306fb2b 100644
--- a/sysutils/p5-Unix-Processors/Makefile
+++ b/sysutils/p5-Unix-Processors/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unix-Processors
 PORTVERSION=	2.034
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unix
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/sysutils/p5-Unix-Syslog/Makefile b/sysutils/p5-Unix-Syslog/Makefile
index ec53cbb8f0bd..fc952ecaa859 100644
--- a/sysutils/p5-Unix-Syslog/Makefile
+++ b/sysutils/p5-Unix-Syslog/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unix-Syslog
 PORTVERSION=	1.0
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unix/MHARNISCH
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/sysutils/p5-User/Makefile b/sysutils/p5-User/Makefile
index 955bc85958ed..71e8d594092e 100644
--- a/sysutils/p5-User/Makefile
+++ b/sysutils/p5-User/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	User
 PORTVERSION=	1.8
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	User
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@FreeBSD.org
diff --git a/sysutils/savelogs/Makefile b/sysutils/savelogs/Makefile
index bb33ddd92a30..ddeffe036637 100644
--- a/sysutils/savelogs/Makefile
+++ b/sysutils/savelogs/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	savelogs
 PORTVERSION=	1.81
 CATEGORIES=	sysutils perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/S/SC/SCOTTW/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../authors/id/S/SC/SCOTTW
 
 MAINTAINER=	ports@c0decafe.net
 COMMENT=	Save log files in a nice way