Update to perl-5.6.0nb2. This update removes one last module, CGI.pm,

from the base perl5 installation to prevent conflicts with a much more
up-to-date CGI.pm externally available through CPAN.

4 files changed, 24 insertions, 25 deletions

diff --git a/lang/perl5-current/Makefile b/lang/perl5-current/Makefile
index 51f58e2a4da..12d9ec9ae74 100644
--- a/lang/perl5-current/Makefile
+++ b/lang/perl5-current/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2000/08/27 20:55:56 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/28 23:01:46 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
 #
 
 DISTNAME=		perl-${PERL_VERSION}
-PKGNAME=		perl-${PERL_VERSION}nb1
+PKGNAME=		perl-${PERL_VERSION}nb2
 PERL_VERSION=		5.6.0
 CATEGORIES=		lang devel perl5
 MASTER_SITES=		ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
@@ -50,6 +50,7 @@ post-patch:
 #
 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:
diff --git a/lang/perl5-current/files/patch-sum b/lang/perl5-current/files/patch-sum
index 2cb0f48663f..0065e33f869 100644
--- a/lang/perl5-current/files/patch-sum
+++ b/lang/perl5-current/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.6 2000/08/27 20:55:57 jlam Exp $
+$NetBSD: patch-sum,v 1.7 2000/08/28 23:01:47 jlam Exp $
 
 MD5 (patch-aa) = 22d1a3a613210ca5f129c81449eab10b
-MD5 (patch-ab) = 204f7a4c605f5afb4ddc3a0163a5b3d3
+MD5 (patch-ab) = 032835dd7aaab9ee4531e7e6e83ffba5
 MD5 (patch-ac) = ddd3e3b08afdc062c78f26175e4fcc44
 MD5 (patch-ad) = 14da69742c8f0ec26b24771804aa1173
 MD5 (patch-ae) = 197b8ed09f99be86865c0d6d66927e96
diff --git a/lang/perl5-current/patches/patch-ab b/lang/perl5-current/patches/patch-ab
index 49b3484cc98..40d006f3b73 100644
--- a/lang/perl5-current/patches/patch-ab
+++ b/lang/perl5-current/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2000/08/27 20:55:57 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2000/08/28 23:01:47 jlam Exp $
 
 --- MANIFEST.orig	Wed Mar 22 14:33:23 2000
-+++ MANIFEST
++++ MANIFEST	Mon Aug 28 18:35:18 2000
 @@ -214,20 +214,6 @@
  ext/DB_File/hints/sco.pl	Hint for DB_File for named architecture
  ext/DB_File/typemap		Berkeley DB extension interface types
@@ -35,7 +35,22 @@ $NetBSD: patch-ab,v 1.3 2000/08/27 20:55:57 jlam Exp $
  ext/IO/ChangeLog		IO perl module change log
  ext/IO/IO.pm			Top-level interface to IO::* classes
  ext/IO/IO.xs			IO extension external subroutines
-@@ -1493,7 +1474,6 @@
+@@ -559,14 +540,6 @@
+ lib/AutoLoader.pm	Autoloader base class
+ lib/AutoSplit.pm	Split up autoload functions
+ lib/Benchmark.pm	Measure execution time
+-lib/CGI.pm		Web server interface ("Common Gateway Interface")
+-lib/CGI/Apache.pm	Support for Apache's Perl module
+-lib/CGI/Carp.pm		Log server errors with helpful context
+-lib/CGI/Cookie.pm	Interface to Netscape Cookies
+-lib/CGI/Fast.pm		Support for FastCGI (persistent server process)
+-lib/CGI/Pretty.pm	Output nicely formatted HTML
+-lib/CGI/Push.pm		Support for server push
+-lib/CGI/Switch.pm	Simple interface for multiple server types
+ lib/CPAN.pm		Interface to Comprehensive Perl Archive Network
+ lib/CPAN/FirstTime.pm	Utility for creating CPAN config files
+ lib/CPAN/Nox.pm		Runs CPAN while avoiding compiled extensions
+@@ -1493,7 +1466,6 @@
  util.h			Dummy header
  utils/Makefile		Extract the utility scripts
  utils/c2ph.PL		program to translate dbx stabs to perl
diff --git a/lang/perl5-current/pkg/PLIST b/lang/perl5-current/pkg/PLIST
index 734abe10646..377b7c35e9e 100644
--- a/lang/perl5-current/pkg/PLIST
+++ b/lang/perl5-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/08/27 20:56:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/08/28 23:01:47 jlam Exp $
 bin/a2p
 bin/c2ph
 bin/find2perl
@@ -285,14 +285,6 @@ lib/perl5/${PERL_VERSION}/B/cc_harness
 lib/perl5/${PERL_VERSION}/B/disassemble
 lib/perl5/${PERL_VERSION}/B/makeliblinks
 lib/perl5/${PERL_VERSION}/Benchmark.pm
-lib/perl5/${PERL_VERSION}/CGI.pm
-lib/perl5/${PERL_VERSION}/CGI/Apache.pm
-lib/perl5/${PERL_VERSION}/CGI/Carp.pm
-lib/perl5/${PERL_VERSION}/CGI/Cookie.pm
-lib/perl5/${PERL_VERSION}/CGI/Fast.pm
-lib/perl5/${PERL_VERSION}/CGI/Pretty.pm
-lib/perl5/${PERL_VERSION}/CGI/Push.pm
-lib/perl5/${PERL_VERSION}/CGI/Switch.pm
 lib/perl5/${PERL_VERSION}/CPAN.pm
 lib/perl5/${PERL_VERSION}/CPAN/FirstTime.pm
 lib/perl5/${PERL_VERSION}/CPAN/Nox.pm
@@ -873,14 +865,6 @@ man/man3/B::Terse.3
 man/man3/B::Xref.3
 man/man3/Benchmark.3
 man/man3/ByteLoader.3
-man/man3/CGI.3
-man/man3/CGI::Apache.3
-man/man3/CGI::Carp.3
-man/man3/CGI::Cookie.3
-man/man3/CGI::Fast.3
-man/man3/CGI::Pretty.3
-man/man3/CGI::Push.3
-man/man3/CGI::Switch.3
 man/man3/CPAN.3
 man/man3/CPAN::FirstTime.3
 man/man3/CPAN::Nox.3
@@ -1107,7 +1091,6 @@ man/man3/warnings::register.3
 @dirrm lib/perl5/${PERL_VERSION}/Class
 @dirrm lib/perl5/${PERL_VERSION}/Carp
 @dirrm lib/perl5/${PERL_VERSION}/CPAN
-@dirrm lib/perl5/${PERL_VERSION}/CGI
 @dirrm lib/perl5/${PERL_VERSION}/B
 @dirrm lib/perl5/${PERL_VERSION}
 @unexec rmdir -p %D/lib/perl5/site_perl/${PERL_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS} 2>/dev/null || true