Index: head/lang/perl5.14/Makefile
===================================================================
--- head/lang/perl5.14/Makefile
+++ head/lang/perl5.14/Makefile
@@ -5,13 +5,8 @@
 PORTVERSION=	${PERL_VERSION}
 PORTREVISION=	13
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	CPAN \
-		${MASTER_SITE_LOCAL:S/$/:local/} \
-		http://protey.ru/freebsd/distfiles/:local
-MASTER_SITE_SUBDIR=	../../src \
-			skv/:local
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-${BSDPAN_VERSION}${EXTRACT_SUFX}:local
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../src
 DIST_SUBDIR=	perl
 
 MAINTAINER=	perl@FreeBSD.org
@@ -72,8 +67,7 @@
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
-	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
-	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
+	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none
 LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
 		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
 		LC_TIME=""
@@ -201,18 +195,7 @@
 .endif
 SUB_LIST+=	LINK_USRBIN=${LINK_USRBIN}
 
-BSDPAN_DEST=	${PREFIX}/${_PRIV_LIB}/BSDPAN
-BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
-		ExtUtils/MM_Unix.pm \
-		ExtUtils/MakeMaker.pm \
-		ExtUtils/Packlist.pm
-BSDPAN_VERSION=	20111107
-BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${BSDPAN_VERSION}
-
 post-patch:
-	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|${PERL_VER}|g;' \
-		-e 's!%%BSDPAN_VERSION%%!${BSDPAN_VERSION}!g;' \
-		${BSDPAN_WRKSRC}/ExtUtils/*.pm
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
 .if ${PORT_OPTIONS:MPTHREAD}
@@ -252,11 +235,6 @@
 .if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
-.for files in ${BSDPAN_FILES}
-	${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H}
-	${INSTALL_DATA} \
-		${BSDPAN_WRKSRC}/${files} ${STAGEDIR}${BSDPAN_DEST}/${files}
-.endfor
 
 test: build
 	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
Index: head/lang/perl5.14/pkg-plist
===================================================================
--- head/lang/perl5.14/pkg-plist
+++ head/lang/perl5.14/pkg-plist
@@ -59,12 +59,6 @@
 %%PRIV_LIB%%/B/Deparse.pm
 %%PRIV_LIB%%/B/Lint.pm
 %%PRIV_LIB%%/B/Lint/Debug.pm
-%%PRIV_LIB%%/BSDPAN/BSDPAN.pm
-%%PRIV_LIB%%/BSDPAN/BSDPAN/Override.pm
-%%PRIV_LIB%%/BSDPAN/Config.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/MM_Unix.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/MakeMaker.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/Packlist.pm
 %%PRIV_LIB%%/Benchmark.pm
 %%PRIV_LIB%%/CGI.pm
 %%PRIV_LIB%%/CGI/Apache.pm
Index: head/lang/perl5.16/Makefile
===================================================================
--- head/lang/perl5.16/Makefile
+++ head/lang/perl5.16/Makefile
@@ -5,13 +5,8 @@
 PORTVERSION=	${PERL_VERSION}
 PORTREVISION=	17
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	CPAN \
-		${MASTER_SITE_LOCAL:S/$/:local/} \
-		http://protey.ru/freebsd/distfiles/:local
-MASTER_SITE_SUBDIR=	../../src \
-			skv/:local
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-${BSDPAN_VERSION}${EXTRACT_SUFX}:local
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../src
 DIST_SUBDIR=	perl
 
 MAINTAINER=	perl@FreeBSD.org
@@ -72,8 +67,7 @@
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
-	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
-	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
+	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none
 LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
 		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
 		LC_TIME=""
@@ -201,18 +195,7 @@
 .endif
 SUB_LIST+=	LINK_USRBIN=${LINK_USRBIN}
 
-BSDPAN_DEST=	${PREFIX}/${_PRIV_LIB}/BSDPAN
-BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
-		ExtUtils/MM_Unix.pm \
-		ExtUtils/MakeMaker.pm \
-		ExtUtils/Packlist.pm
-BSDPAN_VERSION=	20111107
-BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${BSDPAN_VERSION}
-
 post-patch:
-	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|${PERL_VER}|g;' \
-		-e 's!%%BSDPAN_VERSION%%!${BSDPAN_VERSION}!g;' \
-		${BSDPAN_WRKSRC}/ExtUtils/*.pm
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
 .if ${PORT_OPTIONS:MPTHREAD}
@@ -252,11 +235,6 @@
 .if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
-.for files in ${BSDPAN_FILES}
-	${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H}
-	${INSTALL_DATA} \
-		${BSDPAN_WRKSRC}/${files} ${STAGEDIR}${BSDPAN_DEST}/${files}
-.endfor
 
 test: build
 	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
Index: head/lang/perl5.16/pkg-plist
===================================================================
--- head/lang/perl5.16/pkg-plist
+++ head/lang/perl5.16/pkg-plist
@@ -59,12 +59,6 @@
 %%PRIV_LIB%%/B/Deparse.pm
 %%PRIV_LIB%%/B/Lint.pm
 %%PRIV_LIB%%/B/Lint/Debug.pm
-%%PRIV_LIB%%/BSDPAN/BSDPAN.pm
-%%PRIV_LIB%%/BSDPAN/BSDPAN/Override.pm
-%%PRIV_LIB%%/BSDPAN/Config.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/MM_Unix.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/MakeMaker.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/Packlist.pm
 %%PRIV_LIB%%/Benchmark.pm
 %%PRIV_LIB%%/CGI.pm
 %%PRIV_LIB%%/CGI/Apache.pm
Index: head/lang/perl5.18/Makefile
===================================================================
--- head/lang/perl5.18/Makefile
+++ head/lang/perl5.18/Makefile
@@ -5,13 +5,8 @@
 PORTVERSION=	${PERL_VERSION}
 PORTREVISION=	10
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	CPAN \
-		${MASTER_SITE_LOCAL:S/$/:local/} \
-		http://protey.ru/freebsd/distfiles/:local
-MASTER_SITE_SUBDIR=	../../src \
-			skv/:local
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-${BSDPAN_VERSION}${EXTRACT_SUFX}:local
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../src
 DIST_SUBDIR=	perl
 
 MAINTAINER=	perl@FreeBSD.org
@@ -89,8 +84,7 @@
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
-	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
-	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
+	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none
 LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
 		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
 		LC_TIME=""
@@ -179,18 +173,7 @@
 .endif
 SUB_LIST+=	LINK_USRBIN=${LINK_USRBIN}
 
-BSDPAN_DEST=	${PREFIX}/${_PRIV_LIB}/BSDPAN
-BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
-		ExtUtils/MM_Unix.pm \
-		ExtUtils/MakeMaker.pm \
-		ExtUtils/Packlist.pm
-BSDPAN_VERSION=	20111107
-BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${BSDPAN_VERSION}
-
 post-patch:
-	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|${PERL_VER}|g;' \
-		-e 's!%%BSDPAN_VERSION%%!${BSDPAN_VERSION}!g;' \
-		${BSDPAN_WRKSRC}/ExtUtils/*.pm
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
 .if ${PORT_OPTIONS:MPTHREAD}
@@ -230,11 +213,6 @@
 .if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
-.for files in ${BSDPAN_FILES}
-	${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H}
-	${INSTALL_DATA} \
-		${BSDPAN_WRKSRC}/${files} ${STAGEDIR}${BSDPAN_DEST}/${files}
-.endfor
 
 test: build
 	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
Index: head/lang/perl5.18/pkg-plist
===================================================================
--- head/lang/perl5.18/pkg-plist
+++ head/lang/perl5.18/pkg-plist
@@ -59,12 +59,6 @@
 %%PRIV_LIB%%/B/Deparse.pm
 %%PRIV_LIB%%/B/Lint.pm
 %%PRIV_LIB%%/B/Lint/Debug.pm
-%%PRIV_LIB%%/BSDPAN/BSDPAN.pm
-%%PRIV_LIB%%/BSDPAN/BSDPAN/Override.pm
-%%PRIV_LIB%%/BSDPAN/Config.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/MM_Unix.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/MakeMaker.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/Packlist.pm
 %%PRIV_LIB%%/Benchmark.pm
 %%PRIV_LIB%%/CGI.pm
 %%PRIV_LIB%%/CGI/Apache.pm
Index: head/lang/perl5.20/Makefile
===================================================================
--- head/lang/perl5.20/Makefile
+++ head/lang/perl5.20/Makefile
@@ -5,13 +5,8 @@
 PORTVERSION=	${PERL_VERSION}
 PORTREVISION=	9
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	CPAN \
-		${MASTER_SITE_LOCAL:S/$/:local/} \
-		http://protey.ru/freebsd/distfiles/:local
-MASTER_SITE_SUBDIR=	../../src \
-			skv/:local
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-${BSDPAN_VERSION}${EXTRACT_SUFX}:local
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	../../src
 DIST_SUBDIR=	perl
 
 MAINTAINER=	perl@FreeBSD.org
@@ -89,8 +84,7 @@
 	-Dsiteman3dir=${SITE_MAN3} \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
-	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
-	-Dccflags=-DAPPLLIB_EXP=\"${BSDPAN_DEST}\"
+	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none
 # When upgrading to 5.22+ remove this.
 CONFIGURE_ARGS+= \
 	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
@@ -176,18 +170,7 @@
 WITH_PTHREAD=		yes
 .endif
 
-BSDPAN_DEST=	${PREFIX}/${_PRIV_LIB}/BSDPAN
-BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
-		ExtUtils/MM_Unix.pm \
-		ExtUtils/MakeMaker.pm \
-		ExtUtils/Packlist.pm
-BSDPAN_VERSION=	20111107
-BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${BSDPAN_VERSION}
-
 post-patch:
-	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|${PERL_VER}|g;' \
-		-e 's!%%BSDPAN_VERSION%%!${BSDPAN_VERSION}!g;' \
-		${BSDPAN_WRKSRC}/ExtUtils/*.pm
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
 .if ${PORT_OPTIONS:MPTHREAD}
@@ -226,11 +209,6 @@
 .if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
-.for files in ${BSDPAN_FILES}
-	${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H}
-	${INSTALL_DATA} \
-		${BSDPAN_WRKSRC}/${files} ${STAGEDIR}${BSDPAN_DEST}/${files}
-.endfor
 
 test: build
 	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
Index: head/lang/perl5.20/pkg-plist
===================================================================
--- head/lang/perl5.20/pkg-plist
+++ head/lang/perl5.20/pkg-plist
@@ -52,12 +52,6 @@
 %%PRIV_LIB%%/AutoSplit.pm
 %%PRIV_LIB%%/B/Debug.pm
 %%PRIV_LIB%%/B/Deparse.pm
-%%PRIV_LIB%%/BSDPAN/BSDPAN.pm
-%%PRIV_LIB%%/BSDPAN/BSDPAN/Override.pm
-%%PRIV_LIB%%/BSDPAN/Config.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/MM_Unix.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/MakeMaker.pm
-%%PRIV_LIB%%/BSDPAN/ExtUtils/Packlist.pm
 %%PRIV_LIB%%/Benchmark.pm
 %%PRIV_LIB%%/CGI.pm
 %%PRIV_LIB%%/CGI/Apache.pm