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

13 files changed, 13 insertions, 26 deletions

diff --git a/japanese/p5-Acme-Lou/Makefile b/japanese/p5-Acme-Lou/Makefile
index 9e30e5191c6d..84b6d6feddb8 100644
--- a/japanese/p5-Acme-Lou/Makefile
+++ b/japanese/p5-Acme-Lou/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Acme-Lou
 PORTVERSION=	0.03
 CATEGORIES=	japanese textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/T/TO/TOMITA
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	ja-p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/japanese/p5-Date-Japanese-Era/Makefile b/japanese/p5-Date-Japanese-Era/Makefile
index 7f5a2499edd0..9b1a7d9e377e 100644
--- a/japanese/p5-Date-Japanese-Era/Makefile
+++ b/japanese/p5-Date-Japanese-Era/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Date-Japanese-Era
 PORTVERSION=	0.06
 CATEGORIES=	japanese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Date
+MASTER_SITES=	CPAN
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Conversion between Japanese Era / Gregorian calendar
diff --git a/japanese/p5-Date-Japanese-Holiday/Makefile b/japanese/p5-Date-Japanese-Holiday/Makefile
index db39e8d17fa1..76bae71b1c50 100644
--- a/japanese/p5-Date-Japanese-Holiday/Makefile
+++ b/japanese/p5-Date-Japanese-Holiday/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Date-Japanese-Holiday
 PORTVERSION=	0.05
 CATEGORIES=	japanese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Date
+MASTER_SITES=	CPAN
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module for Calculate Japanese Holiday
diff --git a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
index faed3c203b00..d7bd3f707571 100644
--- a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
+++ b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Calendar-Japanese-Era
 PORTVERSION=	0.07
 CATEGORIES=	japanese devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/D/DM/DMAKI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	ja-p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/japanese/p5-Encode-EUCJPMS/Makefile b/japanese/p5-Encode-EUCJPMS/Makefile
index 61177e74d88f..333eb82b8d19 100644
--- a/japanese/p5-Encode-EUCJPMS/Makefile
+++ b/japanese/p5-Encode-EUCJPMS/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Encode-EUCJPMS
 PORTVERSION=	0.07
 PORTREVISION=	1
 CATEGORIES=	japanese converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/N/NA/NARUSE
+MASTER_SITES=	CPAN
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Perl5 module defining Microsoft compatible encodings for Japanese
diff --git a/japanese/p5-FormValidator-Simple-Plugin-Number-Phone-JP/Makefile b/japanese/p5-FormValidator-Simple-Plugin-Number-Phone-JP/Makefile
index 9b9f447261ac..460fce464cd2 100644
--- a/japanese/p5-FormValidator-Simple-Plugin-Number-Phone-JP/Makefile
+++ b/japanese/p5-FormValidator-Simple-Plugin-Number-Phone-JP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	FormValidator-Simple-Plugin-Number-Phone-JP
 PORTVERSION=	0.02
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/M/MI/MIZZY
+MASTER_SITES=	CPAN
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module for Japanese phone number validation
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index 37d467165ca0..1f199b14ee23 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Jcode
 PORTVERSION=	2.06
 CATEGORIES=	japanese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DANKOGAI
+MASTER_SITES=	CPAN
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension interface to convert Japanese text
diff --git a/japanese/p5-Lingua-JA-Numbers/Makefile b/japanese/p5-Lingua-JA-Numbers/Makefile
index 2b420ebe7897..ed2ab52b8e52 100644
--- a/japanese/p5-Lingua-JA-Numbers/Makefile
+++ b/japanese/p5-Lingua-JA-Numbers/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Lingua-JA-Numbers
 PORTVERSION=	0.04
 CATEGORIES=	japanese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Lingua
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org
diff --git a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
index d1e6c94acb1b..2d440ae0291d 100644
--- a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
+++ b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Lingua-JA-Summarize-Extract
 PORTVERSION=	0.01
 CATEGORIES=	japanese textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/Y/YA/YAPPO
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	ja-p5-
 
 MAINTAINER=	markun@onohara.to
diff --git a/japanese/p5-Number-Phone-JP/Makefile b/japanese/p5-Number-Phone-JP/Makefile
index d36209580002..f6203b6dcd79 100644
--- a/japanese/p5-Number-Phone-JP/Makefile
+++ b/japanese/p5-Number-Phone-JP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Number-Phone-JP
 PORTVERSION=	0.03
 CATEGORIES=	japanese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/T/TA/TANIGUCHI/
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	ja-p5-
 
 MAINTAINER=	nork@FreeBSD.org
diff --git a/japanese/p5-Text-MeCab/Makefile b/japanese/p5-Text-MeCab/Makefile
index e5b9aa3cc3e0..49a6d98d4815 100644
--- a/japanese/p5-Text-MeCab/Makefile
+++ b/japanese/p5-Text-MeCab/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		Text-MeCab
 PORTVERSION=		0.20007
 CATEGORIES=		japanese textproc perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITES=		CPAN
 
 MAINTAINER=		fmysh@iijmio-mail.jp
 COMMENT=		Alternate Interface To libmecab
diff --git a/japanese/p5-Unicode-Japanese/Makefile b/japanese/p5-Unicode-Japanese/Makefile
index 3f2068b6db76..23366aae8f4b 100644
--- a/japanese/p5-Unicode-Japanese/Makefile
+++ b/japanese/p5-Unicode-Japanese/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unicode-Japanese
 PORTVERSION=	0.37
 CATEGORIES=	japanese converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/H/HI/HIO
+MASTER_SITES=	CPAN
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Perl5 module to handle Japanese character encodings
diff --git a/japanese/p5-WWW-2ch/Makefile b/japanese/p5-WWW-2ch/Makefile
index 32f44c0f987f..4b9322b26595 100644
--- a/japanese/p5-WWW-2ch/Makefile
+++ b/japanese/p5-WWW-2ch/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWW-2ch
 PORTVERSION=	0.07
 CATEGORIES=	japanese www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	WWW
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kaoru@kaisei.org