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

11 files changed, 11 insertions, 21 deletions

diff --git a/chinese/p5-Date-Chinese/Makefile b/chinese/p5-Date-Chinese/Makefile
index c1066f76042c..ed82b1098104 100644
--- a/chinese/p5-Date-Chinese/Makefile
+++ b/chinese/p5-Date-Chinese/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	Date-Chinese
 PORTVERSION=	1.10
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../by-authors/id/R/RB/RBOW
 PKGNAMEPREFIX=	p5-
 
diff --git a/chinese/p5-Encode-HanConvert/Makefile b/chinese/p5-Encode-HanConvert/Makefile
index ac09a49c61a4..b8e12d6a3ab5 100644
--- a/chinese/p5-Encode-HanConvert/Makefile
+++ b/chinese/p5-Encode-HanConvert/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Encode-HanConvert
 PORTVERSION=	0.34
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Encode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	rafan@FreeBSD.org
diff --git a/chinese/p5-Encode-HanExtra/Makefile b/chinese/p5-Encode-HanExtra/Makefile
index 81b98bf9a689..4b2279353c04 100644
--- a/chinese/p5-Encode-HanExtra/Makefile
+++ b/chinese/p5-Encode-HanExtra/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Encode-HanExtra
 PORTVERSION=	0.23
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Encode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	leeym@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
index 3525ec7e59b8..5b1e2f3fca60 100644
--- a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
+++ b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Lingua-ZH-BPMFConvert
 PORTVERSION=	0.01
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Lingua
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-HanDetect/Makefile b/chinese/p5-Lingua-ZH-HanDetect/Makefile
index 7ffa0178a7a3..9f88a50d9913 100644
--- a/chinese/p5-Lingua-ZH-HanDetect/Makefile
+++ b/chinese/p5-Lingua-ZH-HanDetect/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Lingua-ZH-HanDetect
 PORTVERSION=	0.04
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Lingua
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
diff --git a/chinese/p5-Lingua-ZH-Keywords/Makefile b/chinese/p5-Lingua-ZH-Keywords/Makefile
index 4bafb1705dd8..c9fb9024ed60 100644
--- a/chinese/p5-Lingua-ZH-Keywords/Makefile
+++ b/chinese/p5-Lingua-ZH-Keywords/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Lingua-ZH-Keywords
 PORTVERSION=	0.04
 PORTREVISION=	1
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Lingua
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-Numbers/Makefile b/chinese/p5-Lingua-ZH-Numbers/Makefile
index 4523793dbb7c..8887cff4601a 100644
--- a/chinese/p5-Lingua-ZH-Numbers/Makefile
+++ b/chinese/p5-Lingua-ZH-Numbers/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	Lingua-ZH-Numbers
 PORTVERSION=	0.04
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Lingua
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-Summarize/Makefile b/chinese/p5-Lingua-ZH-Summarize/Makefile
index 3c8191193237..f2c96684d172 100644
--- a/chinese/p5-Lingua-ZH-Summarize/Makefile
+++ b/chinese/p5-Lingua-ZH-Summarize/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Lingua-ZH-Summarize
 PORTVERSION=	0.01
 PORTREVISION=	1
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Lingua
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-TaBE/Makefile b/chinese/p5-Lingua-ZH-TaBE/Makefile
index 64d092407f34..357ee2609507 100644
--- a/chinese/p5-Lingua-ZH-TaBE/Makefile
+++ b/chinese/p5-Lingua-ZH-TaBE/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	Lingua-ZH-TaBE
 PORTVERSION=	0.07
 PORTREVISION=	2
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Lingua
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-Toke/Makefile b/chinese/p5-Lingua-ZH-Toke/Makefile
index 74d278d063fe..c71baf0ab916 100644
--- a/chinese/p5-Lingua-ZH-Toke/Makefile
+++ b/chinese/p5-Lingua-ZH-Toke/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	Lingua-ZH-Toke
 PORTVERSION=	0.02
 PORTREVISION=	1
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Lingua
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/chinese/p5-Lingua-ZH-Wrap/Makefile b/chinese/p5-Lingua-ZH-Wrap/Makefile
index e022e14b997e..e7fea8e75cd5 100644
--- a/chinese/p5-Lingua-ZH-Wrap/Makefile
+++ b/chinese/p5-Lingua-ZH-Wrap/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Lingua-ZH-Wrap
 PORTVERSION=	0.03
 CATEGORIES=	chinese perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Lingua
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org