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, 31 insertions, 28 deletions

diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index c172435c033..1cc6410d335 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,43 +1,41 @@
-# $NetBSD: Makefile,v 1.19 2001/05/29 15:45:28 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/06/07 04:25:33 jlam Exp $
 
-DISTNAME=		perl-${PERL_VERSION}
-PKGNAME=		libperl-${PERL_VERSION}nb3
-PERL_VERSION=		5.6.0
-CATEGORIES=		lang devel 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/
+.include "../../lang/perl5/Makefile.common"
 
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://language.perl.com/index.html
-COMMENT=		Perl DynaLoader as a shared object
+PKGNAME=	libperl-${PERL5_VERS}
+PERL5_PKG_VERS=	# empty
+CATEGORIES+=	lang devel
 
-USE_PERL5=		# defined
-PERL_REQD=		${PERL_VERSION}nb6
+MAINTAINER=	jlam@netbsd.org
+HOMEPAGE=	http://language.perl.com/index.html
+COMMENT=	Perl DynaLoader as a shared object
 
-#DISTINFO_FILE=		${.CURDIR}/../../lang/perl5-base/distinfo
+USE_PERL5=	# defined
+PERL_REQD=	${PERL5_DIST_VERS}
 
 EXTRACT_ELEMENTS=	${DISTNAME}/ext/DynaLoader
 WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 
 .include "../../mk/bsd.prefs.mk"
 
+MKPIC?=		yes
+
 .if ${OPSYS} == "NetBSD"
-.if exists(/usr/libexec/ld.elf_so) || exists(/usr/libexec/ld.so)
-MKPIC?=			yes
-.else
-MKPIC?=			no
+.if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
+MKPIC=		no
 .endif
 .endif
 
 .if ${MKPIC} == "no"
-IGNORE=			${PKGNAME} needs shared objects
+IGNORE=		${PKGNAME} needs shared objects
 .endif
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 do-build:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} DynaLoader.o
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV}				\
+		${MAKE_PROGRAM} -f ${MAKEFILE} DynaLoader.o
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/DynaLoader.o ${PERL5_ARCHLIB}/DynaLoader_pic.o
diff --git a/lang/libperl/distinfo b/lang/libperl/distinfo
index 5d1f4e60f11..07be3d215ff 100644
--- a/lang/libperl/distinfo
+++ b/lang/libperl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/06/06 23:01:09 wiz Exp $
+$NetBSD: distinfo,v 1.6 2001/06/07 04:25:33 jlam Exp $
 
-SHA1 (perl-5.6.0.tar.gz) = a2e9da9c82116a9094cc0f92c248c4339fda89fa
-Size (perl-5.6.0.tar.gz) = 5443601 bytes
+SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
+Size (perl-5.6.1.tar.gz) = 5983695 bytes
diff --git a/lang/libperl/pkg/DESCR b/lang/libperl/pkg/DESCR
index 96de57afbad..bd04f5c2d39 100644
--- a/lang/libperl/pkg/DESCR
+++ b/lang/libperl/pkg/DESCR
@@ -1,9 +1,14 @@
-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.
 
 This package is contains the Perl DynaLoader built as relocatable shared
 object.