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

80 files changed, 80 insertions, 160 deletions

diff --git a/math/p5-AI-DecisionTree/Makefile b/math/p5-AI-DecisionTree/Makefile
index 83fdaa958e78..eb5cd42f1ef7 100644
--- a/math/p5-AI-DecisionTree/Makefile
+++ b/math/p5-AI-DecisionTree/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	AI-DecisionTree
 PORTVERSION=	0.08
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	AI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/math/p5-AI-Genetic/Makefile b/math/p5-AI-Genetic/Makefile
index 0001822efa4f..0765d7d5cb04 100644
--- a/math/p5-AI-Genetic/Makefile
+++ b/math/p5-AI-Genetic/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	AI-Genetic
 PORTVERSION=	0.05
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	AI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-AI-NeuralNet-BackProp/Makefile b/math/p5-AI-NeuralNet-BackProp/Makefile
index b8b2f630707b..876f4d2cc413 100644
--- a/math/p5-AI-NeuralNet-BackProp/Makefile
+++ b/math/p5-AI-NeuralNet-BackProp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	AI-NeuralNet-BackProp
 PORTVERSION=	0.89
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	AI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-AI-Perceptron/Makefile b/math/p5-AI-Perceptron/Makefile
index 3ee00dd6c258..51aa958fb39c 100644
--- a/math/p5-AI-Perceptron/Makefile
+++ b/math/p5-AI-Perceptron/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	AI-Perceptron
 PORTVERSION=	1.0
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	AI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Algorithm-Combinatorics/Makefile b/math/p5-Algorithm-Combinatorics/Makefile
index c14035820b38..595486e93669 100644
--- a/math/p5-Algorithm-Combinatorics/Makefile
+++ b/math/p5-Algorithm-Combinatorics/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Algorithm-Combinatorics
 PORTVERSION=	0.25
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Algorithm
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Bit-ShiftReg/Makefile b/math/p5-Bit-ShiftReg/Makefile
index 9bc963e99b6b..1764508d7dbf 100644
--- a/math/p5-Bit-ShiftReg/Makefile
+++ b/math/p5-Bit-ShiftReg/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Bit-ShiftReg
 PORTVERSION=	2.0
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Bit
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Bit-Vector-Minimal/Makefile b/math/p5-Bit-Vector-Minimal/Makefile
index 9bf851f6c97a..9a4bb84dd678 100644
--- a/math/p5-Bit-Vector-Minimal/Makefile
+++ b/math/p5-Bit-Vector-Minimal/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Bit-Vector-Minimal
 PORTVERSION=	1.3
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Bit
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Bit-Vector/Makefile b/math/p5-Bit-Vector/Makefile
index d4ec36687d25..00c77403c7a7 100644
--- a/math/p5-Bit-Vector/Makefile
+++ b/math/p5-Bit-Vector/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Bit-Vector
 PORTVERSION=	6.4
 PORTREVISION=	1
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Bit
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-CAD-Calc/Makefile b/math/p5-CAD-Calc/Makefile
index 7f8ee0baeb76..945c8462993b 100644
--- a/math/p5-CAD-Calc/Makefile
+++ b/math/p5-CAD-Calc/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CAD-Calc
 PORTVERSION=	0.26
 CATEGORIES=	math graphics perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CAD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Date-Handler/Makefile b/math/p5-Date-Handler/Makefile
index 35d5532e1c3e..9dac9bc8bb91 100644
--- a/math/p5-Date-Handler/Makefile
+++ b/math/p5-Date-Handler/Makefile
@@ -10,8 +10,7 @@
 PORTNAME=	Date-Handler
 PORTVERSION=	1.2
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Date
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Geo-Distance/Makefile b/math/p5-Geo-Distance/Makefile
index da087022962e..eab8375cbfdd 100644
--- a/math/p5-Geo-Distance/Makefile
+++ b/math/p5-Geo-Distance/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Geo-Distance
 PORTVERSION=	0.11
 CATEGORIES=	math perl5 geography
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Geo
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Graph/Makefile b/math/p5-Graph/Makefile
index 7925d952b97e..a24a65dc38e2 100644
--- a/math/p5-Graph/Makefile
+++ b/math/p5-Graph/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Graph
 PORTVERSION=	0.84
 PORTEPOCH=	1
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Graph
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Math-Algebra-Symbols/Makefile b/math/p5-Math-Algebra-Symbols/Makefile
index 1c988b4b2f38..34d63811b0e2 100644
--- a/math/p5-Math-Algebra-Symbols/Makefile
+++ b/math/p5-Math-Algebra-Symbols/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Algebra-Symbols
 PORTVERSION=	1.21
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Base85/Makefile b/math/p5-Math-Base85/Makefile
index 3fe84b92698d..f5e70d255325 100644
--- a/math/p5-Math-Base85/Makefile
+++ b/math/p5-Math-Base85/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Base85
 PORTVERSION=	0.2
 CATEGORIES=	math perl5 converters net
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Math-BaseCalc/Makefile b/math/p5-Math-BaseCalc/Makefile
index 0d8e18a69020..2eecf94fae2a 100644
--- a/math/p5-Math-BaseCalc/Makefile
+++ b/math/p5-Math-BaseCalc/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-BaseCalc
 PORTVERSION=	1.011
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Math-Bezier-Convert/Makefile b/math/p5-Math-Bezier-Convert/Makefile
index b05951095742..42a267bc9cc3 100644
--- a/math/p5-Math-Bezier-Convert/Makefile
+++ b/math/p5-Math-Bezier-Convert/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Bezier-Convert
 PORTVERSION=	0.02
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/Y/YS/YSAS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/math/p5-Math-Bezier/Makefile b/math/p5-Math-Bezier/Makefile
index a8e345349bf0..84f4dbfdd2a0 100644
--- a/math/p5-Math-Bezier/Makefile
+++ b/math/p5-Math-Bezier/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Bezier
 PORTVERSION=	0.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Math-BigInt-GMP/Makefile b/math/p5-Math-BigInt-GMP/Makefile
index 8a0614f9d21f..77b50763b337 100644
--- a/math/p5-Math-BigInt-GMP/Makefile
+++ b/math/p5-Math-BigInt-GMP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-BigInt-GMP
 PORTVERSION=	1.24
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Math-BigInt/Makefile b/math/p5-Math-BigInt/Makefile
index 51189f1df84e..5adc63fc95be 100644
--- a/math/p5-Math-BigInt/Makefile
+++ b/math/p5-Math-BigInt/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-BigInt
 PORTVERSION=	1.87
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Math-BigRat/Makefile b/math/p5-Math-BigRat/Makefile
index 2051141a93be..de6be7ec1eff 100644
--- a/math/p5-Math-BigRat/Makefile
+++ b/math/p5-Math-BigRat/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-BigRat
 PORTVERSION=	0.22
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/math/p5-Math-Calc-Units/Makefile b/math/p5-Math-Calc-Units/Makefile
index be4a8fc58eac..8f0ee722c2ee 100644
--- a/math/p5-Math-Calc-Units/Makefile
+++ b/math/p5-Math-Calc-Units/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Calc-Units
 PORTVERSION=	1.06
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Math-Cephes/Makefile b/math/p5-Math-Cephes/Makefile
index 5b3268ecde7f..ace94b168c45 100644
--- a/math/p5-Math-Cephes/Makefile
+++ b/math/p5-Math-Cephes/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Cephes
 PORTVERSION=	0.45
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Combinatorics/Makefile b/math/p5-Math-Combinatorics/Makefile
index 5567fe019894..f2d113d2de55 100644
--- a/math/p5-Math-Combinatorics/Makefile
+++ b/math/p5-Math-Combinatorics/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Combinatorics
 PORTVERSION=	0.09
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-ConvexHull/Makefile b/math/p5-Math-ConvexHull/Makefile
index 871a56a3d6c6..8915a3beda03 100644
--- a/math/p5-Math-ConvexHull/Makefile
+++ b/math/p5-Math-ConvexHull/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-ConvexHull
 PORTVERSION=	1.02
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Math-Derivative/Makefile b/math/p5-Math-Derivative/Makefile
index 98eb7186501b..ce7623b9f490 100644
--- a/math/p5-Math-Derivative/Makefile
+++ b/math/p5-Math-Derivative/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	Math-Derivative
 PORTVERSION=	0.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
diff --git a/math/p5-Math-Expr/Makefile b/math/p5-Math-Expr/Makefile
index 60ae7cdbd1f6..307126c22f3e 100644
--- a/math/p5-Math-Expr/Makefile
+++ b/math/p5-Math-Expr/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Expr
 PORTVERSION=	0.4
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Math-FFT/Makefile b/math/p5-Math-FFT/Makefile
index 1e77b7125c3d..2fe7c232b1b5 100644
--- a/math/p5-Math-FFT/Makefile
+++ b/math/p5-Math-FFT/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-FFT
 PORTVERSION=	1.28
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Math-GSL/Makefile b/math/p5-Math-GSL/Makefile
index 8f27eda320bb..301fb26c7666 100644
--- a/math/p5-Math-GSL/Makefile
+++ b/math/p5-Math-GSL/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Math-GSL
 PORTVERSION=	0.01
 PORTREVISION=	4
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Math-Geometry-Planar-GPC/Makefile b/math/p5-Math-Geometry-Planar-GPC/Makefile
index 6e13b11080c8..f850ab269d96 100644
--- a/math/p5-Math-Geometry-Planar-GPC/Makefile
+++ b/math/p5-Math-Geometry-Planar-GPC/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Geometry-Planar-GPC
 PORTVERSION=	1.04
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Geometry-Planar-Offset/Makefile b/math/p5-Math-Geometry-Planar-Offset/Makefile
index df0a330f0422..c7bcecab1dcf 100644
--- a/math/p5-Math-Geometry-Planar-Offset/Makefile
+++ b/math/p5-Math-Geometry-Planar-Offset/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Geometry-Planar-Offset
 PORTVERSION=	1.05
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Geometry-Planar/Makefile b/math/p5-Math-Geometry-Planar/Makefile
index ff0fabe556a3..91cad26f2bb5 100644
--- a/math/p5-Math-Geometry-Planar/Makefile
+++ b/math/p5-Math-Geometry-Planar/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Geometry-Planar
 PORTVERSION=	1.16
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Geometry/Makefile b/math/p5-Math-Geometry/Makefile
index af31df121e46..c1973aff8b16 100644
--- a/math/p5-Math-Geometry/Makefile
+++ b/math/p5-Math-Geometry/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Geometry
 PORTVERSION=	0.04
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/math/p5-Math-Interpolate/Makefile b/math/p5-Math-Interpolate/Makefile
index 0c50a4563c3f..746da85716c8 100644
--- a/math/p5-Math-Interpolate/Makefile
+++ b/math/p5-Math-Interpolate/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Interpolate
 PORTVERSION=	1.05
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Math-Intersection-StraightLine/Makefile b/math/p5-Math-Intersection-StraightLine/Makefile
index ea9155b2c22b..acbdb24270cb 100644
--- a/math/p5-Math-Intersection-StraightLine/Makefile
+++ b/math/p5-Math-Intersection-StraightLine/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Intersection-StraightLine
 PORTVERSION=	0.04
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-LinearCombination/Makefile b/math/p5-Math-LinearCombination/Makefile
index 7399fb5faf0e..380ee02d1ac6 100644
--- a/math/p5-Math-LinearCombination/Makefile
+++ b/math/p5-Math-LinearCombination/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-LinearCombination
 PORTVERSION=	0.03
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/math/p5-Math-Logic/Makefile b/math/p5-Math-Logic/Makefile
index b5a7eb03810e..63cdedd8db54 100644
--- a/math/p5-Math-Logic/Makefile
+++ b/math/p5-Math-Logic/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Logic
 PORTVERSION=	1.19
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Math-Matrix/Makefile b/math/p5-Math-Matrix/Makefile
index 95b06c601914..c5d7a1baaf51 100644
--- a/math/p5-Math-Matrix/Makefile
+++ b/math/p5-Math-Matrix/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Matrix
 PORTVERSION=	0.5
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/p5-Math-NumberCruncher/Makefile b/math/p5-Math-NumberCruncher/Makefile
index aa90d1ce09cf..6470eb0e43b8 100644
--- a/math/p5-Math-NumberCruncher/Makefile
+++ b/math/p5-Math-NumberCruncher/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-NumberCruncher
 PORTVERSION=	5.00
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index f76c5ee0caf2..9a0a5e16769e 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Pari
 PORTVERSION=	2.010709
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/math/p5-Math-Random-MT/Makefile b/math/p5-Math-Random-MT/Makefile
index 19267318ff73..cb4c085df9b1 100644
--- a/math/p5-Math-Random-MT/Makefile
+++ b/math/p5-Math-Random-MT/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Random-MT
 PORTVERSION=	1.07
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/math/p5-Math-Random-OO/Makefile b/math/p5-Math-Random-OO/Makefile
index 919330d886d5..d3d55f0f1164 100644
--- a/math/p5-Math-Random-OO/Makefile
+++ b/math/p5-Math-Random-OO/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Random-OO
 PORTVERSION=	0.19
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tjs@cdpa.nsysu.edu.tw
diff --git a/math/p5-Math-Random/Makefile b/math/p5-Math-Random/Makefile
index a3272e2bce29..3f20a9a8206d 100644
--- a/math/p5-Math-Random/Makefile
+++ b/math/p5-Math-Random/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Random
 PORTVERSION=	0.69
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/math/p5-Math-RandomOrg/Makefile b/math/p5-Math-RandomOrg/Makefile
index cf3f8db4aec5..eb1a04311634 100644
--- a/math/p5-Math-RandomOrg/Makefile
+++ b/math/p5-Math-RandomOrg/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-RandomOrg
 PORTVERSION=	0.04
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Round-Var/Makefile b/math/p5-Math-Round-Var/Makefile
index e7daca3b874f..34e6a2f7991c 100644
--- a/math/p5-Math-Round-Var/Makefile
+++ b/math/p5-Math-Round-Var/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Round-Var
 PORTVERSION=	0.03
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Round/Makefile b/math/p5-Math-Round/Makefile
index b8ea723b5b4b..201dc1f3d5c4 100644
--- a/math/p5-Math-Round/Makefile
+++ b/math/p5-Math-Round/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Round
 PORTVERSION=	0.06
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Math-Sequence/Makefile b/math/p5-Math-Sequence/Makefile
index c1becbf1ab57..b957039d25ff 100644
--- a/math/p5-Math-Sequence/Makefile
+++ b/math/p5-Math-Sequence/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Sequence
 PORTVERSION=	1.00
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Series/Makefile b/math/p5-Math-Series/Makefile
index 8c2c95089a77..8be39f51bb4c 100644
--- a/math/p5-Math-Series/Makefile
+++ b/math/p5-Math-Series/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Series
 PORTVERSION=	1.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-SimpleVariable/Makefile b/math/p5-Math-SimpleVariable/Makefile
index b5fd3bcf2e71..4d6115d1fb61 100644
--- a/math/p5-Math-SimpleVariable/Makefile
+++ b/math/p5-Math-SimpleVariable/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-SimpleVariable
 PORTVERSION=	0.03
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/math/p5-Math-Spline/Makefile b/math/p5-Math-Spline/Makefile
index e55d8f9461fc..dbf97273f553 100644
--- a/math/p5-Math-Spline/Makefile
+++ b/math/p5-Math-Spline/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	Math-Spline
 PORTVERSION=	0.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fernan@iib.unsam.edu.ar
diff --git a/math/p5-Math-Symbolic-Custom-Contains/Makefile b/math/p5-Math-Symbolic-Custom-Contains/Makefile
index 9dada5db6d9c..2b81fa396a1f 100644
--- a/math/p5-Math-Symbolic-Custom-Contains/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Contains/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Math-Symbolic-Custom-Contains
 PORTVERSION=	1.00
 PORTREVISION=	1
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
index 7161c1f7df9e..b14484a73c8c 100644
--- a/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
+++ b/math/p5-Math-Symbolic-Custom-ErrorPropagation/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Symbolic-Custom-ErrorPropagation
 PORTVERSION=	0.10
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Symbolic-Custom-Simplification/Makefile b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
index a0764f03161c..7fccd07f0c19 100644
--- a/math/p5-Math-Symbolic-Custom-Simplification/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Simplification/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Symbolic-Custom-Simplification
 PORTVERSION=	1.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Symbolic-Custom-Transformation/Makefile b/math/p5-Math-Symbolic-Custom-Transformation/Makefile
index 962e42489a5b..54d803b69766 100644
--- a/math/p5-Math-Symbolic-Custom-Transformation/Makefile
+++ b/math/p5-Math-Symbolic-Custom-Transformation/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Symbolic-Custom-Transformation
 PORTVERSION=	2.00
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Symbolic/Makefile b/math/p5-Math-Symbolic/Makefile
index 2e01adb53bad..de5a7d7a3c47 100644
--- a/math/p5-Math-Symbolic/Makefile
+++ b/math/p5-Math-Symbolic/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Symbolic
 PORTVERSION=	0.510
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-BigNum/Makefile b/math/p5-Math-SymbolicX-BigNum/Makefile
index fc6707dcf32c..9808efd694a5 100644
--- a/math/p5-Math-SymbolicX-BigNum/Makefile
+++ b/math/p5-Math-SymbolicX-BigNum/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-SymbolicX-BigNum
 PORTVERSION=	0.02
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-Complex/Makefile b/math/p5-Math-SymbolicX-Complex/Makefile
index ae37f2a27aa4..7db42ba20afe 100644
--- a/math/p5-Math-SymbolicX-Complex/Makefile
+++ b/math/p5-Math-SymbolicX-Complex/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-SymbolicX-Complex
 PORTVERSION=	1.00
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-Error/Makefile b/math/p5-Math-SymbolicX-Error/Makefile
index c593d146ba40..cd0b4fefc99c 100644
--- a/math/p5-Math-SymbolicX-Error/Makefile
+++ b/math/p5-Math-SymbolicX-Error/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-SymbolicX-Error
 PORTVERSION=	0.02
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-Inline/Makefile b/math/p5-Math-SymbolicX-Inline/Makefile
index 4e3b86533500..ca9d89603060 100644
--- a/math/p5-Math-SymbolicX-Inline/Makefile
+++ b/math/p5-Math-SymbolicX-Inline/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-SymbolicX-Inline
 PORTVERSION=	1.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-NoSimplification/Makefile b/math/p5-Math-SymbolicX-NoSimplification/Makefile
index b1dae024a5c1..37dfc158fa1c 100644
--- a/math/p5-Math-SymbolicX-NoSimplification/Makefile
+++ b/math/p5-Math-SymbolicX-NoSimplification/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-SymbolicX-NoSimplification
 PORTVERSION=	1.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
index 56a1e14f1447..a6a791dd0922 100644
--- a/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
+++ b/math/p5-Math-SymbolicX-ParserExtensionFactory/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-SymbolicX-ParserExtensionFactory
 PORTVERSION=	2.00
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
index 266dfc313029..0c2678f65ba1 100644
--- a/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
+++ b/math/p5-Math-SymbolicX-Statistics-Distributions/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-SymbolicX-Statistics-Distributions
 PORTVERSION=	1.02
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-TrulyRandom/Makefile b/math/p5-Math-TrulyRandom/Makefile
index 874f4d54d7cc..3718efd15660 100644
--- a/math/p5-Math-TrulyRandom/Makefile
+++ b/math/p5-Math-TrulyRandom/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-TrulyRandom
 PORTVERSION=	1.0
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	anders@FreeBSD.org
diff --git a/math/p5-Math-Units/Makefile b/math/p5-Math-Units/Makefile
index 37817c0cdb55..e9116bd20bf0 100644
--- a/math/p5-Math-Units/Makefile
+++ b/math/p5-Math-Units/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Units
 PORTVERSION=	1.2
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Math-Vec/Makefile b/math/p5-Math-Vec/Makefile
index eedec4eb7e3f..74d517c50a21 100644
--- a/math/p5-Math-Vec/Makefile
+++ b/math/p5-Math-Vec/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Math-Vec
 PORTVERSION=	1.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/E/EW/EWILHELM
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/math/p5-Math-VecStat/Makefile b/math/p5-Math-VecStat/Makefile
index 61a0166e0e26..3a51200aebf6 100644
--- a/math/p5-Math-VecStat/Makefile
+++ b/math/p5-Math-VecStat/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	Math-VecStat
 PORTVERSION=	0.08
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Math
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/math/p5-Number-Compare/Makefile b/math/p5-Number-Compare/Makefile
index 9cb5cef8a0cd..ac2dd0b4b3b9 100644
--- a/math/p5-Number-Compare/Makefile
+++ b/math/p5-Number-Compare/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Number-Compare
 PORTVERSION=	0.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Number
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/math/p5-Number-WithError-LaTeX/Makefile b/math/p5-Number-WithError-LaTeX/Makefile
index 85fd4e418d81..0ff8ff2dbc38 100644
--- a/math/p5-Number-WithError-LaTeX/Makefile
+++ b/math/p5-Number-WithError-LaTeX/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Number-WithError-LaTeX
 PORTVERSION=	0.06
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Number
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Number-WithError/Makefile b/math/p5-Number-WithError/Makefile
index e0ba9b9fe33b..cb1f1ef8b617 100644
--- a/math/p5-Number-WithError/Makefile
+++ b/math/p5-Number-WithError/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Number-WithError
 PORTVERSION=	0.08
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Number
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Set-IntSpan-Fast/Makefile b/math/p5-Set-IntSpan-Fast/Makefile
index db6b4efa275c..ce811092d7ee 100644
--- a/math/p5-Set-IntSpan-Fast/Makefile
+++ b/math/p5-Set-IntSpan-Fast/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Set-IntSpan-Fast
 PORTVERSION=	1.11
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Set
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Set-IntSpan/Makefile b/math/p5-Set-IntSpan/Makefile
index d401458d4dd5..4d45aba5eb64 100644
--- a/math/p5-Set-IntSpan/Makefile
+++ b/math/p5-Set-IntSpan/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Set-IntSpan
 PORTVERSION=	1.13
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Set
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/p5-Set-Partition/Makefile b/math/p5-Set-Partition/Makefile
index 20103cdb3db5..d56c77ae9ba4 100644
--- a/math/p5-Set-Partition/Makefile
+++ b/math/p5-Set-Partition/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Set-Partition
 PORTVERSION=	0.03
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Set
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Set-Window/Makefile b/math/p5-Set-Window/Makefile
index d39b1837995b..da2b6cd66d48 100644
--- a/math/p5-Set-Window/Makefile
+++ b/math/p5-Set-Window/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Set-Window
 PORTVERSION=	1.01
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Set
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Statistics-ChiSquare/Makefile b/math/p5-Statistics-ChiSquare/Makefile
index 1e5ac28de60b..b89641a92c71 100644
--- a/math/p5-Statistics-ChiSquare/Makefile
+++ b/math/p5-Statistics-ChiSquare/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Statistics-ChiSquare
 PORTVERSION=	0.5
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Statistics
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Contingency/Makefile b/math/p5-Statistics-Contingency/Makefile
index 826b3c901e73..719194dc0c4f 100644
--- a/math/p5-Statistics-Contingency/Makefile
+++ b/math/p5-Statistics-Contingency/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Statistics-Contingency
 PORTVERSION=	0.06
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Statistics
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/math/p5-Statistics-Descriptive-Discrete/Makefile b/math/p5-Statistics-Descriptive-Discrete/Makefile
index 8ef2d0101e39..4ea643e635ed 100644
--- a/math/p5-Statistics-Descriptive-Discrete/Makefile
+++ b/math/p5-Statistics-Descriptive-Discrete/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Statistics-Descriptive-Discrete
 PORTVERSION=	0.07
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Statistics
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/math/p5-Statistics-Descriptive/Makefile b/math/p5-Statistics-Descriptive/Makefile
index e325a3e729cd..d8672419c483 100644
--- a/math/p5-Statistics-Descriptive/Makefile
+++ b/math/p5-Statistics-Descriptive/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Statistics-Descriptive
 PORTVERSION=	2.6
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Statistics
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Distributions/Makefile b/math/p5-Statistics-Distributions/Makefile
index 1a4cca0a8c4b..113337573d5d 100644
--- a/math/p5-Statistics-Distributions/Makefile
+++ b/math/p5-Statistics-Distributions/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Statistics-Distributions
 PORTVERSION=	1.02
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Statistics
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Statistics-LTU/Makefile b/math/p5-Statistics-LTU/Makefile
index 58e5f13d6ecb..39429a70555a 100644
--- a/math/p5-Statistics-LTU/Makefile
+++ b/math/p5-Statistics-LTU/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Statistics-LTU
 PORTVERSION=	2.8
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Statistics
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Statistics-OLS/Makefile b/math/p5-Statistics-OLS/Makefile
index a6479b9c52d2..288c6ad4145c 100644
--- a/math/p5-Statistics-OLS/Makefile
+++ b/math/p5-Statistics-OLS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Statistics-OLS
 PORTVERSION=	0.07
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Statistics
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/math/p5-Statistics-Regression/Makefile b/math/p5-Statistics-Regression/Makefile
index 567fa6da696b..cc2b51b7b1b0 100644
--- a/math/p5-Statistics-Regression/Makefile
+++ b/math/p5-Statistics-Regression/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Statistics-Regression
 PORTVERSION=	0.53
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Statistics
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org