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

35 files changed, 35 insertions, 69 deletions

diff --git a/converters/p5-Boulder/Makefile b/converters/p5-Boulder/Makefile
index 548acd0d72d7..5f281b61f783 100644
--- a/converters/p5-Boulder/Makefile
+++ b/converters/p5-Boulder/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Boulder
 PORTVERSION=	1.30
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Boulder
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/converters/p5-Convert-ASCII-Armour/Makefile b/converters/p5-Convert-ASCII-Armour/Makefile
index 12385e974c68..21898a4a3c27 100644
--- a/converters/p5-Convert-ASCII-Armour/Makefile
+++ b/converters/p5-Convert-ASCII-Armour/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-ASCII-Armour
 PORTVERSION=	1.4
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/converters/p5-Convert-ASN1/Makefile b/converters/p5-Convert-ASN1/Makefile
index 1896ec1e96ff..dc1b21ec6c0a 100644
--- a/converters/p5-Convert-ASN1/Makefile
+++ b/converters/p5-Convert-ASN1/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-ASN1
 PORTVERSION=	0.21
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	scrappy@FreeBSD.org
diff --git a/converters/p5-Convert-BER/Makefile b/converters/p5-Convert-BER/Makefile
index 5cd306ce600f..e69158419dad 100644
--- a/converters/p5-Convert-BER/Makefile
+++ b/converters/p5-Convert-BER/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-BER
 PORTVERSION=	1.31.01
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
diff --git a/converters/p5-Convert-Bencode/Makefile b/converters/p5-Convert-Bencode/Makefile
index 6715041a4a32..0b947fc003c6 100644
--- a/converters/p5-Convert-Bencode/Makefile
+++ b/converters/p5-Convert-Bencode/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Convert-Bencode
 PORTVERSION=	1.03
 PORTREVISION=	1
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mor@WhiteLuna.com
diff --git a/converters/p5-Convert-Bencode_XS/Makefile b/converters/p5-Convert-Bencode_XS/Makefile
index a2997ca2cc48..354a04a8fa67 100644
--- a/converters/p5-Convert-Bencode_XS/Makefile
+++ b/converters/p5-Convert-Bencode_XS/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-Bencode_XS
 PORTVERSION=	0.06
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/converters/p5-Convert-BinHex/Makefile b/converters/p5-Convert-BinHex/Makefile
index 16f55dd9f406..ed9cf36dddc7 100644
--- a/converters/p5-Convert-BinHex/Makefile
+++ b/converters/p5-Convert-BinHex/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-BinHex
 PORTVERSION=	1.119
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	j.koopmann@seceidos.de
diff --git a/converters/p5-Convert-Binary-C/Makefile b/converters/p5-Convert-Binary-C/Makefile
index dc0f4057b9f9..8c0831b771f4 100644
--- a/converters/p5-Convert-Binary-C/Makefile
+++ b/converters/p5-Convert-Binary-C/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-Binary-C
 PORTVERSION=	0.70
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/converters/p5-Convert-Morse/Makefile b/converters/p5-Convert-Morse/Makefile
index 01fdc465e948..5ae9df7b32d0 100644
--- a/converters/p5-Convert-Morse/Makefile
+++ b/converters/p5-Convert-Morse/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-Morse
 PORTVERSION=	0.06
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/converters/p5-Convert-PEM/Makefile b/converters/p5-Convert-PEM/Makefile
index 1105c82c5389..4a452cf3f363 100644
--- a/converters/p5-Convert-PEM/Makefile
+++ b/converters/p5-Convert-PEM/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	Convert-PEM
 PORTVERSION=	0.07
 PORTREVISION=	1
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/converters/p5-Convert-Recode/Makefile b/converters/p5-Convert-Recode/Makefile
index e0c775cc769a..5b693f85e929 100644
--- a/converters/p5-Convert-Recode/Makefile
+++ b/converters/p5-Convert-Recode/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-Recode
 PORTVERSION=	1.04
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index 3be95edcfc84..a8fdfa820e5f 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-TNEF
 PORTVERSION=	0.17
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tabthorpe@FreeBSD.org
diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index bbf07d343b54..ce2691becf4f 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Convert-UU
 PORTVERSION=	0.52
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/converters/p5-Convert-UUlib/Makefile b/converters/p5-Convert-UUlib/Makefile
index 019fadd99e69..c687785e72ad 100644
--- a/converters/p5-Convert-UUlib/Makefile
+++ b/converters/p5-Convert-UUlib/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Convert-UUlib
 PORTVERSION=	1.09
 PORTEPOCH=	1
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Convert
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
 
diff --git a/converters/p5-Cstools/Makefile b/converters/p5-Cstools/Makefile
index 0850a35e98cc..a0a29d179ada 100644
--- a/converters/p5-Cstools/Makefile
+++ b/converters/p5-Cstools/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	Cstools
 PORTVERSION=	3.42
 CATEGORIES=	converters perl5
 MASTER_SITES=	http://www.fi.muni.cz/~adelton/perl/ \
-		${MASTER_SITE_PERL_CPAN}
+		CPAN
 MASTER_SITE_SUBDIR=	Cz
 PKGNAMEPREFIX=	p5-
 
diff --git a/converters/p5-Encode-JIS2K/Makefile b/converters/p5-Encode-JIS2K/Makefile
index c05108f11e71..a211814620ec 100644
--- a/converters/p5-Encode-JIS2K/Makefile
+++ b/converters/p5-Encode-JIS2K/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Encode-JIS2K
 PORTVERSION=	0.02
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Encode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	rafan@FreeBSD.org
diff --git a/converters/p5-Encode-compat/Makefile b/converters/p5-Encode-compat/Makefile
index 2a3dd6218cb5..553e8a50b5c7 100644
--- a/converters/p5-Encode-compat/Makefile
+++ b/converters/p5-Encode-compat/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Encode-compat
 PORTVERSION=	0.07
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Encode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/converters/p5-Encode/Makefile b/converters/p5-Encode/Makefile
index cc5027c82d91..1ac4143eaeeb 100644
--- a/converters/p5-Encode/Makefile
+++ b/converters/p5-Encode/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Encode
 PORTVERSION=	2.24
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Encode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	rafan@FreeBSD.org
diff --git a/converters/p5-JSON-DWIW/Makefile b/converters/p5-JSON-DWIW/Makefile
index 7f463535b09e..c43ffd23168d 100644
--- a/converters/p5-JSON-DWIW/Makefile
+++ b/converters/p5-JSON-DWIW/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	JSON-DWIW
 PORTVERSION=	0.23
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache/DOWENS
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/converters/p5-MIME-Base32/Makefile b/converters/p5-MIME-Base32/Makefile
index 0224b4e687ca..29f2c1a108e5 100644
--- a/converters/p5-MIME-Base32/Makefile
+++ b/converters/p5-MIME-Base32/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	MIME-Base32
 PORTVERSION=	1.01
 PORTREVISION=	1
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MIME
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nork@FreeBSD.org
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index 02a173c3e4c8..5156b7bb6cfd 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MIME-Base64
 PORTVERSION=	3.07
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MIME
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/converters/p5-Number-Nary/Makefile b/converters/p5-Number-Nary/Makefile
index f03432d7a2b4..3a9f5d42aadf 100644
--- a/converters/p5-Number-Nary/Makefile
+++ b/converters/p5-Number-Nary/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Number-Nary
 PORTVERSION=	0.102
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Number
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/converters/p5-Number-RecordLocator/Makefile b/converters/p5-Number-RecordLocator/Makefile
index 82c2e3f8a076..16b24c4493d8 100644
--- a/converters/p5-Number-RecordLocator/Makefile
+++ b/converters/p5-Number-RecordLocator/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Number-RecordLocator
 PORTVERSION=	0.003
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Number
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/converters/p5-String-Multibyte/Makefile b/converters/p5-String-Multibyte/Makefile
index ac9181401ae4..5202050f9781 100644
--- a/converters/p5-String-Multibyte/Makefile
+++ b/converters/p5-String-Multibyte/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	String-Multibyte
 PORTVERSION=	1.05
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	String
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile
index 166f209fc188..63f452341e7f 100644
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Text-Iconv
 PORTVERSION=	1.7
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
diff --git a/converters/p5-Text-Unidecode/Makefile b/converters/p5-Text-Unidecode/Makefile
index fa605a14cd89..359417e70244 100644
--- a/converters/p5-Text-Unidecode/Makefile
+++ b/converters/p5-Text-Unidecode/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Text-Unidecode
 PORTVERSION=	0.04
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
diff --git a/converters/p5-Unicode-IMAPUtf7/Makefile b/converters/p5-Unicode-IMAPUtf7/Makefile
index 04aa632dd5ae..5fb85718f00d 100644
--- a/converters/p5-Unicode-IMAPUtf7/Makefile
+++ b/converters/p5-Unicode-IMAPUtf7/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unicode-IMAPUtf7
 PORTVERSION=	2.01
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unicode/FABPOT
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/converters/p5-Unicode-Lite/Makefile b/converters/p5-Unicode-Lite/Makefile
index 2a0a80408adb..525418eccff8 100644
--- a/converters/p5-Unicode-Lite/Makefile
+++ b/converters/p5-Unicode-Lite/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unicode-Lite
 PORTVERSION=	0.12
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unicode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/converters/p5-Unicode-Map/Makefile b/converters/p5-Unicode-Map/Makefile
index 9034757d1159..01b8d042713c 100644
--- a/converters/p5-Unicode-Map/Makefile
+++ b/converters/p5-Unicode-Map/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Unicode-Map
 PORTVERSION=	0.112
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unicode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index c7b4734f7e14..cd30208baf8f 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Unicode-Map8
 PORTVERSION=	0.12
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unicode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile
index a3200dd6abf7..4931287abee3 100644
--- a/converters/p5-Unicode-MapUTF8/Makefile
+++ b/converters/p5-Unicode-MapUTF8/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Unicode-MapUTF8
 PORTVERSION=	1.11
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unicode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/converters/p5-Unicode-RecursiveDowngrade/Makefile b/converters/p5-Unicode-RecursiveDowngrade/Makefile
index c34e01c1d468..57ace0d2b566 100644
--- a/converters/p5-Unicode-RecursiveDowngrade/Makefile
+++ b/converters/p5-Unicode-RecursiveDowngrade/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unicode-RecursiveDowngrade
 PORTVERSION=	0.03
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/T/TA/TANIGUCHI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/converters/p5-Unicode-String/Makefile b/converters/p5-Unicode-String/Makefile
index e2f61372747e..4393faea4a7e 100644
--- a/converters/p5-Unicode-String/Makefile
+++ b/converters/p5-Unicode-String/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Unicode-String
 PORTVERSION=	2.09
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unicode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/converters/p5-Unicode-UTF8simple/Makefile b/converters/p5-Unicode-UTF8simple/Makefile
index 60156f78e7f7..655d6e53ec2b 100644
--- a/converters/p5-Unicode-UTF8simple/Makefile
+++ b/converters/p5-Unicode-UTF8simple/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Unicode-UTF8simple
 PORTVERSION=	1.06
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Unicode
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/converters/p5-XML-WBXML/Makefile b/converters/p5-XML-WBXML/Makefile
index 83f535aae907..e435c42f4dc7 100644
--- a/converters/p5-XML-WBXML/Makefile
+++ b/converters/p5-XML-WBXML/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	XML-WBXML
 PORTVERSION=	0.03
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	XML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	aaron@FreeBSD.org