Update perl to 5.6.1. Changes from perl-5.6.0 include many bug fixes,

the plugging of several memory leaks, fixes to the regular expression
engine, the addition of a Unicode character classes, better support for
64-bit platorms, and updates of many modules in the base Perl Library.
See perldelta.pod for more details.

Also update p5-Data-Dumper, p5-Devel-DProf, and p5-Devel-Peek to the
latest versions distributed with the perl-5.6.1 sources, and libperl to
5.6.1 to match the perl package.

3 files changed, 36 insertions, 16 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 58102d761a5..f7b47011cf6 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.36 2001/05/20 05:16:07 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2001/06/07 04:25:33 jlam Exp $
 
-DISTNAME=		perl-5.6.0nb6
-CATEGORIES=		lang devel perl5
-MASTER_SITES=		# empty
+.include "../../lang/perl5/Makefile.common"
+
+PKGNAME=		perl-${PERL5_VERS}
+PERL5_PKG_VERS=		# empty
+CATEGORIES+=		lang devel
 DISTFILES=		# empty
 
-MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
 COMMENT=		Practical Extraction and Report Language
 
-DEPENDS+=		perl-base>=5.6.0nb2:../../lang/perl5-base
-DEPENDS+=		p5-Data-Dumper>=2.101:../../devel/p5-Data-Dumper
-DEPENDS+=		p5-Devel-DProf>=19990108:../../devel/p5-Devel-DProf
-DEPENDS+=		p5-Devel-Peek>=1.0001:../../devel/p5-Devel-Peek
-DEPENDS+=		p5-CGI>=2.56:../../www/p5-CGI
+DEPENDS+=		perl-base>=${PERL5_DIST_VERS}:../../lang/perl5-base
+DEPENDS+=		p5-CGI>=2.75.2:../../www/p5-CGI
 DEPENDS+=		perl-mk-1.1:../../pkgtools/perl-mk
 
 EXTRACT_ONLY=		# empty
diff --git a/lang/perl5/Makefile.common b/lang/perl5/Makefile.common
new file mode 100644
index 00000000000..349cd609cb3
--- /dev/null
+++ b/lang/perl5/Makefile.common
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile.common,v 1.1 2001/06/07 04:25:34 jlam Exp $
+
+DISTNAME=	perl-${PERL5_DIST_VERS}
+CATEGORIES+=	perl5
+MASTER_SITES+=	ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/maint/ \
+		ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/maint/
+
+# Version numbering scheme:
+#
+# PERL5_DIST_VERS	version number on the distfile
+# PERL5_BASE_VERS	pkgsrc-mangled version number (convert pl -> .)
+# PERL5_PKG_VERS	pkgsrc revisions (nbX, etc.)
+# PERL5_VERS		pkgsrc version number of package
+#
+PERL5_DIST_VERS=	5.6.1
+PERL5_PKG_VERS?=	# empty
+PERL5_VERS=		${PERL5_DIST_VERS}${PERL5_PKG_VERS}
diff --git a/lang/perl5/pkg/DESCR b/lang/perl5/pkg/DESCR
index 84a1b8889ce..ace5f12f3c1 100644
--- a/lang/perl5/pkg/DESCR
+++ b/lang/perl5/pkg/DESCR
@@ -1,6 +1,11 @@
-From the distribution README:
-
-Perl is a language that combines some of the features of C, sed, awk
-and shell.  See the manual page for more hype.  There are also two Nutshell
-Handbooks published by O'Reilly & Assoc.  See pod/perlbook.pod
-for more information.
+Perl is a high-level programming language with an eclectic heritage
+written by Larry Wall and a cast of thousands.  It derives from the
+ubiquitous C programming language and to a lesser extent from sed, awk,
+the Unix shell, and at least a dozen other tools and languages.  Perl's
+process, file, and text manipulation facilities make it particularly
+well-suited for tasks involving quick prototyping, system utilities,
+software tools, system management tasks, database access, graphical
+programming, networking, and world wide web programming.  These strengths
+make it especially popular with system administrators and CGI script
+authors, but mathematicians, geneticists, journalists, and even managers
+also use Perl.  Maybe you should, too.