Update perl5 to 5.6.0nb3. This is now a meta-pkg which pulls in perl-base,

as well as other modules from a standard installation of perl-5.6.0.

4 files changed, 23 insertions, 58 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 978bb344967..dee63d6c5df 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,56 +1,25 @@
-# $NetBSD: Makefile,v 1.30 2000/08/30 19:46:47 jlam Exp $
-# FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
-#
+# $NetBSD: Makefile,v 1.31 2000/09/05 09:20:44 jlam Exp $
 
-DISTNAME=		perl-${PERL_VERSION}
-PKGNAME=		perl-${PERL_VERSION}nb2
-PERL_VERSION=		5.6.0
+DISTNAME=		perl-5.6.0nb3
 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/
+MASTER_SITES=		# empty
+DISTFILES=		# empty
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
 
-HAS_CONFIGURE=		# defined
-CONFIGURE_ENV+=		PREFIX=${PREFIX}
-CONFIGURE_SCRIPT=	./Configure
-CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX} -Doptimize="${CFLAGS}" \
-			-Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} \
-			-Dcc=gcc -Dusemymalloc=false
-MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}
+DEPENDS+=		perl-base>=5.6.0:../../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
 
-.if exists(/usr/libexec/ld.so) || exists(/usr/libexec/ld.elf_so)
-CONFIGURE_ARGS+=	-Duseshrplib=true
-.else
-CONFIGURE_ARGS+=	-Duseshrplib=false
-.endif
+EXTRACT_ONLY=		# empty
+NO_CHECKSUM=		# defined
+NO_PATCH=		# defined
+NO_CONFIGURE=		# defined
+NO_BUILD=		# defined
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=		CFLAGS=
-.endif
-
-PERL5_PACKLIST=		${PREFIX}/lib/perl5/${PERL_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/.packlist
-
-test:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} test
-
-post-patch:
-	cd ${WRKSRC}/ext/DynaLoader/hints && ${CP} -f openbsd.pl netbsd.pl
-
-# Remove several modules which are externally available and don't need to be
-# part of the base perl distribution.
-#
-pre-configure:
-	cd ${WRKSRC}/ext; ${RM} -rf Data Devel GDBM_File
-	cd ${WRKSRC}/lib; ${RM} -rf CGI CGI.pm
-	cd ${WRKSRC}/utils; ${RM} -f dprofpp.PL
-
-post-install:
-	@strip ${PREFIX}/bin/a2p
-	@strip ${PREFIX}/bin/perl
-	${RMDIR} -p ${PREFIX}/lib/perl5/site_perl/${PERL_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS} 2>/dev/null || ${TRUE}
+do-install:		# empty
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl5/files/md5 b/lang/perl5/files/md5
deleted file mode 100644
index b0d27bc2a0b..00000000000
--- a/lang/perl5/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.6 2000/08/30 18:42:24 jlam Exp $
-
-MD5 (perl-5.6.0.tar.gz) = b2940e2cc6312bcfa52355b684e70b9d
diff --git a/lang/perl5/files/patch-sum b/lang/perl5/files/patch-sum
index d464b7f1dba..70c9ad33ce8 100644
--- a/lang/perl5/files/patch-sum
+++ b/lang/perl5/files/patch-sum
@@ -1,8 +1,6 @@
-$NetBSD: patch-sum,v 1.7 2000/08/30 19:46:47 jlam Exp $
+$NetBSD: patch-sum,v 1.8 2000/09/05 09:20:44 jlam Exp $
 
-MD5 (patch-aa) = 22d1a3a613210ca5f129c81449eab10b
-MD5 (patch-ab) = 032835dd7aaab9ee4531e7e6e83ffba5
-MD5 (patch-ac) = ddd3e3b08afdc062c78f26175e4fcc44
-MD5 (patch-ad) = 76f075f7badc7dcc5a315b3c2a82657c
-MD5 (patch-ae) = 197b8ed09f99be86865c0d6d66927e96
-MD5 (patch-af) = 16d95e0667ef104d0dba4a61531d5b11
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/lang/perl5/pkg/PLIST b/lang/perl5/pkg/PLIST
index 401920286db..2ab0546ba31 100644
--- a/lang/perl5/pkg/PLIST
+++ b/lang/perl5/pkg/PLIST
@@ -1 +1,2 @@
-@comment $NetBSD: PLIST,v 1.9 2000/08/30 19:46:47 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2000/09/05 09:20:44 jlam Exp $
+@comment this plist intentionally left empty