1. Speed up the fetch stage by using groups of MASTER_SITES.

2. Remove the dependency on perl (rather important for this port).
3. Make the script this port installs use the version of perl from ports.

Reported-by:	(item 2) Juriy Goloveshkin <j@gu.ru>, Mark Huizer <xaa@timewasters.nl>

14 files changed, 77 insertions, 70 deletions

diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index 4f6e1b718cfc..68ac0d1fef73 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
-# If you don't use MASTER_SITE_OVERRIDE set to one of the
-# ftp.FreeBSD.org mirrors, fetching will be *very* slow.
-MASTER_SITES=	${MASTER_SITE_LOCAL} ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../src tobez
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} BSDPAN-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	../../src \
+			tobez/:local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		BSDPAN-${PORTVERSION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 
@@ -119,12 +120,12 @@ BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${PORTVERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/use.perl ${WRKDIR}
-	${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g;' \
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
-		${WRKDIR}/use.perl
+		${FILESDIR}/use.perl \
+		> ${WRKDIR}/use.perl
 
 post-install:
 	@strip ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
diff --git a/lang/perl5.10/files/use.perl b/lang/perl5.10/files/use.perl
index 4bd8fdef66d1..08cef70c7ab3 100644
--- a/lang/perl5.10/files/use.perl
+++ b/lang/perl5.10/files/use.perl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl5 -w
+#! %%PREFIX%%/bin/perl -w
 # $FreeBSD$
 use strict;
 
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index 4f6e1b718cfc..68ac0d1fef73 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
-# If you don't use MASTER_SITE_OVERRIDE set to one of the
-# ftp.FreeBSD.org mirrors, fetching will be *very* slow.
-MASTER_SITES=	${MASTER_SITE_LOCAL} ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../src tobez
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} BSDPAN-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	../../src \
+			tobez/:local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		BSDPAN-${PORTVERSION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 
@@ -119,12 +120,12 @@ BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${PORTVERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/use.perl ${WRKDIR}
-	${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g;' \
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
-		${WRKDIR}/use.perl
+		${FILESDIR}/use.perl \
+		> ${WRKDIR}/use.perl
 
 post-install:
 	@strip ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
diff --git a/lang/perl5.12/files/use.perl b/lang/perl5.12/files/use.perl
index 4bd8fdef66d1..08cef70c7ab3 100644
--- a/lang/perl5.12/files/use.perl
+++ b/lang/perl5.12/files/use.perl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl5 -w
+#! %%PREFIX%%/bin/perl -w
 # $FreeBSD$
 use strict;
 
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 4f6e1b718cfc..68ac0d1fef73 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
-# If you don't use MASTER_SITE_OVERRIDE set to one of the
-# ftp.FreeBSD.org mirrors, fetching will be *very* slow.
-MASTER_SITES=	${MASTER_SITE_LOCAL} ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../src tobez
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} BSDPAN-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	../../src \
+			tobez/:local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		BSDPAN-${PORTVERSION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 
@@ -119,12 +120,12 @@ BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${PORTVERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/use.perl ${WRKDIR}
-	${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g;' \
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
-		${WRKDIR}/use.perl
+		${FILESDIR}/use.perl \
+		> ${WRKDIR}/use.perl
 
 post-install:
 	@strip ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
diff --git a/lang/perl5.14/files/use.perl b/lang/perl5.14/files/use.perl
index 4bd8fdef66d1..08cef70c7ab3 100644
--- a/lang/perl5.14/files/use.perl
+++ b/lang/perl5.14/files/use.perl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl5 -w
+#! %%PREFIX%%/bin/perl -w
 # $FreeBSD$
 use strict;
 
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 4f6e1b718cfc..68ac0d1fef73 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
-# If you don't use MASTER_SITE_OVERRIDE set to one of the
-# ftp.FreeBSD.org mirrors, fetching will be *very* slow.
-MASTER_SITES=	${MASTER_SITE_LOCAL} ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../src tobez
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} BSDPAN-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	../../src \
+			tobez/:local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		BSDPAN-${PORTVERSION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 
@@ -119,12 +120,12 @@ BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${PORTVERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/use.perl ${WRKDIR}
-	${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g;' \
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
-		${WRKDIR}/use.perl
+		${FILESDIR}/use.perl \
+		> ${WRKDIR}/use.perl
 
 post-install:
 	@strip ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
diff --git a/lang/perl5.16/files/use.perl b/lang/perl5.16/files/use.perl
index 4bd8fdef66d1..08cef70c7ab3 100644
--- a/lang/perl5.16/files/use.perl
+++ b/lang/perl5.16/files/use.perl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl5 -w
+#! %%PREFIX%%/bin/perl -w
 # $FreeBSD$
 use strict;
 
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 4f6e1b718cfc..68ac0d1fef73 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
-# If you don't use MASTER_SITE_OVERRIDE set to one of the
-# ftp.FreeBSD.org mirrors, fetching will be *very* slow.
-MASTER_SITES=	${MASTER_SITE_LOCAL} ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../src tobez
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} BSDPAN-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	../../src \
+			tobez/:local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		BSDPAN-${PORTVERSION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 
@@ -119,12 +120,12 @@ BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${PORTVERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/use.perl ${WRKDIR}
-	${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g;' \
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
-		${WRKDIR}/use.perl
+		${FILESDIR}/use.perl \
+		> ${WRKDIR}/use.perl
 
 post-install:
 	@strip ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
diff --git a/lang/perl5.6/files/use.perl b/lang/perl5.6/files/use.perl
index 4bd8fdef66d1..08cef70c7ab3 100644
--- a/lang/perl5.6/files/use.perl
+++ b/lang/perl5.6/files/use.perl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl5 -w
+#! %%PREFIX%%/bin/perl -w
 # $FreeBSD$
 use strict;
 
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index 4f6e1b718cfc..68ac0d1fef73 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
-# If you don't use MASTER_SITE_OVERRIDE set to one of the
-# ftp.FreeBSD.org mirrors, fetching will be *very* slow.
-MASTER_SITES=	${MASTER_SITE_LOCAL} ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../src tobez
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} BSDPAN-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	../../src \
+			tobez/:local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		BSDPAN-${PORTVERSION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 
@@ -119,12 +120,12 @@ BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${PORTVERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/use.perl ${WRKDIR}
-	${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g;' \
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
-		${WRKDIR}/use.perl
+		${FILESDIR}/use.perl \
+		> ${WRKDIR}/use.perl
 
 post-install:
 	@strip ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
diff --git a/lang/perl5.8/files/use.perl b/lang/perl5.8/files/use.perl
index 4bd8fdef66d1..08cef70c7ab3 100644
--- a/lang/perl5.8/files/use.perl
+++ b/lang/perl5.8/files/use.perl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl5 -w
+#! %%PREFIX%%/bin/perl -w
 # $FreeBSD$
 use strict;
 
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 4f6e1b718cfc..68ac0d1fef73 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel perl5
-# If you don't use MASTER_SITE_OVERRIDE set to one of the
-# ftp.FreeBSD.org mirrors, fetching will be *very* slow.
-MASTER_SITES=	${MASTER_SITE_LOCAL} ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../src tobez
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} BSDPAN-${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	../../src \
+			tobez/:local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		BSDPAN-${PORTVERSION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	tobez@FreeBSD.org
 
@@ -119,12 +120,12 @@ BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 BSDPAN_WRKSRC=	${WRKDIR}/BSDPAN-${PORTVERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/use.perl ${WRKDIR}
-	${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g;' \
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
-		${WRKDIR}/use.perl
+		${FILESDIR}/use.perl \
+		> ${WRKDIR}/use.perl
 
 post-install:
 	@strip ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl
diff --git a/lang/perl5/files/use.perl b/lang/perl5/files/use.perl
index 4bd8fdef66d1..08cef70c7ab3 100644
--- a/lang/perl5/files/use.perl
+++ b/lang/perl5/files/use.perl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl5 -w
+#! %%PREFIX%%/bin/perl -w
 # $FreeBSD$
 use strict;