Nuke lang/perl5-base as it's been reabsorbed into lang/perl5.

11 files changed, 1 insertions, 352 deletions

diff --git a/lang/Makefile b/lang/Makefile
index baef2a148ab..50d984a6571 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2001/08/09 19:32:03 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2001/09/05 17:30:40 jlam Exp $
 #
 
 COMMENT=	Programming languages
@@ -60,7 +60,6 @@ SUBDIR+=	nhc98
 SUBDIR+=	ocaml
 SUBDIR+=	p2c
 SUBDIR+=	perl5
-SUBDIR+=	perl5-base
 SUBDIR+=	pforth
 SUBDIR+=	pgcc
 SUBDIR+=	py-extclass
diff --git a/lang/perl5-base/Makefile b/lang/perl5-base/Makefile
deleted file mode 100644
index 55dae57cfa1..00000000000
--- a/lang/perl5-base/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2001/07/14 11:31:08 jlam Exp $
-
-.include "../../lang/perl5/Makefile.common"
-
-PKGNAME=		perl-base-${PERL5_VERS}nb1
-PERL5_PKG_VERS=		# empty
-CATEGORIES+=		lang devel
-
-MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://language.perl.com/index.html
-COMMENT=		base installation of Perl
-
-CONFLICTS=		perl-5.00* p5-CGI-2.6* p5-CGI-2.7[0-5] \
-			p5-Data-Dumper-2.1[0-9][0-9] p5-Data-Dumper-[0-9][0-9] \
-			p5-Devel-DProf-[0-9]* p5-Devel-Peek-[0-9]* \
-			perl-mk-[0-9]*
-
-HAS_CONFIGURE=		# defined
-CONFIGURE_SCRIPT=	./Configure
-CONFIGURE_ARGS+=	-sde
-CONFIGURE_ARGS+=	-Dprefix="${PREFIX}"
-CONFIGURE_ARGS+=	-Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
-CONFIGURE_ARGS+=	-Doptimize="${CFLAGS}"
-CONFIGURE_ARGS+=	-Dcc="${CC}"
-CONFIGURE_ARGS+=	-Uusemymalloc
-CONFIGURE_ARGS+=	-Uinstallusrbinperl
-
-.include "../../mk/bsd.prefs.mk"
-
-MKPIC?=			yes
-
-# Nail down the needed libraries for each platform here to avoid hidden
-# dependencies.
-#
-LIBSWANTED.NetBSD=	m crypt
-
-.if defined(LIBSWANTED.${OPSYS})
-CONFIGURE_ARGS+=	-Dlibswanted="${LIBSWANTED.${OPSYS}}"
-.endif
-
-.if (${OPSYS} == "NetBSD")
-.if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
-MKPIC=			no
-.endif
-.if (${MACHINE_ARCH} == "sparc64")
-# The toolchain on sparc64 is not really production-quality right now, but
-# gcc-2.96 is supposed to fix most problems.  Passing -g to the configure
-# process triggers -DDEBUGGING, which plays the real trick and circumvents
-# code-generation bugs, so we add -g to CFLAGS to at least have a really
-# debuggable build.
-#
-CFLAGS+=		-g -msoft-quad-float -O2
-.endif
-.elif (${OPSYS} == "SunOS")
-CFLAGS=
-.endif
-
-.if (${MKPIC} == "yes")
-CONFIGURE_ARGS+=	-Duseshrplib
-.endif
-
-PERL5_ARCHLIB=		${PREFIX}/lib/perl5/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
-PERL5_SITEARCH=		${PREFIX}/lib/perl5/site_perl/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
-PERL5_PACKLIST=		${PERL5_ARCHLIB}/.packlist
-
-# Remove modules that are externally available in pkgsrc and that also install
-# manpages.
-#
-pre-configure:
-	cd ${WRKSRC}; ${RM} -rf eg/cgi lib/CGI lib/CGI.pm
-
-.if (${MKPIC} == "yes")
-STATIC_WRKDIR=		${WRKDIR}/static
-STATIC_MAKEFLAGS=	MKPIC=no
-STATIC_MAKEFLAGS+=	WRKDIR=${STATIC_WRKDIR}
-STATIC_MAKEFLAGS+=	ALL_TARGET=perl
-
-post-build:
-	cd ${.CURDIR} && ${MAKE} build ${STATIC_MAKEFLAGS}
-.endif
-
-post-install:
-.if (${MKPIC} == "yes")
-	${RM} ${PREFIX}/bin/perl
-	${INSTALL_PROGRAM} ${STATIC_WRKDIR}/${DISTNAME}/perl ${PREFIX}/bin/perl
-.endif
-	strip ${PREFIX}/bin/a2p
-	strip ${PREFIX}/bin/perl
-	${RMDIR} -p ${PERL5_SITEARCH} 2>/dev/null || ${TRUE}
-	${RM} -f ${WRKDIR}/bsd.perl.mk
-	eval `${PERL5} -V:installsitelib 2>/dev/null` && \
-		echo PERL5_SITELIB=$$installsitelib >>${WRKDIR}/bsd.perl.mk     
-	eval `${PERL5} -V:installsitearch 2>/dev/null` && \
-		echo PERL5_SITEARCH=$$installsitearch >>${WRKDIR}/bsd.perl.mk   
-	eval `${PERL5} -V:installarchlib 2>/dev/null` && \
-		echo PERL5_ARCHLIB=$$installarchlib >>${WRKDIR}/bsd.perl.mk     
-	${INSTALL_DATA} ${WRKDIR}/bsd.perl.mk ${PREFIX}/share/mk/bsd.perl.mk
-
-test:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl5-base/distinfo b/lang/perl5-base/distinfo
deleted file mode 100644
index 4a1f46d065d..00000000000
--- a/lang/perl5-base/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2001/07/09 17:10:27 tv Exp $
-
-SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
-Size (perl-5.6.1.tar.gz) = 5983695 bytes
-SHA1 (patch-aa) = e581ef24bfe84916339ab230a02e267e3100ec63
-SHA1 (patch-ab) = 6e8fa455273f1102c1932ed21db2fce4122993b8
-SHA1 (patch-ac) = 574af66da47465a2b06065651ae21fc87a992553
-SHA1 (patch-ad) = cb95cbf393ea484028bb9dd7f7d835f3f6f0e156
-SHA1 (patch-ae) = 763e087a277988851dde569b59408b030867d672
diff --git a/lang/perl5-base/patches/patch-aa b/lang/perl5-base/patches/patch-aa
deleted file mode 100644
index db13addbd49..00000000000
--- a/lang/perl5-base/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/06/07 04:25:34 jlam Exp $
-
---- MANIFEST.orig	Sun Apr  8 11:38:40 2001
-+++ MANIFEST	Wed Jun  6 20:07:20 2001
-@@ -88,27 +88,6 @@
- dump.c			Debugging output
- eg/ADB			An adb wrapper to put in your crash dir
- eg/README		Intro to example perl scripts
--eg/cgi/RunMeFirst		Setup script for CGI examples
--eg/cgi/caution.xbm		CGI example
--eg/cgi/clickable_image.cgi	CGI example
--eg/cgi/cookie.cgi		CGI example
--eg/cgi/crash.cgi		CGI example
--eg/cgi/customize.cgi		CGI example
--eg/cgi/diff_upload.cgi		CGI example
--eg/cgi/dna_small_gif.uu		Small image for CGI examples
--eg/cgi/file_upload.cgi		CGI example
--eg/cgi/frameset.cgi		CGI example
--eg/cgi/index.html		Index page for CGI examples
--eg/cgi/internal_links.cgi	CGI example
--eg/cgi/javascript.cgi		CGI example
--eg/cgi/monty.cgi		CGI example
--eg/cgi/multiple_forms.cgi	CGI example
--eg/cgi/nph-clock.cgi		CGI example
--eg/cgi/nph-multipart.cgi	CGI example
--eg/cgi/popup.cgi		CGI example
--eg/cgi/save_state.cgi		CGI example
--eg/cgi/tryit.cgi		CGI example
--eg/cgi/wilogo_gif.uu		Small image for CGI examples
- eg/changes		A program to list recently changed files
- eg/client		A sample client
- eg/down			A program to do things to subdirectories
-@@ -571,15 +550,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/CGI/Util.pm		Utility functions
- 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
diff --git a/lang/perl5-base/patches/patch-ab b/lang/perl5-base/patches/patch-ab
deleted file mode 100644
index 9d3acaa0a3d..00000000000
--- a/lang/perl5-base/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/07/09 17:10:28 tv Exp $
-
---- hints/netbsd.sh.orig	Thu Feb 22 21:57:55 2001
-+++ hints/netbsd.sh	Mon Jul  9 11:40:02 2001
-@@ -21,7 +21,11 @@
- 	if [ -f /usr/libexec/ld.elf_so ]; then
- 		d_dlopen=$define
- 		d_dlerror=$define
--		ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
-+		# Include the whole libgcc.a, required for Xerces-P, which
-+		# needs __eh_alloc, __pure_virtual, and others.
-+		# XXX This should be obsoleted by gcc-3.0.
-+		ccdlflags="-Wl,-whole-archive -lgcc -Wl,-no-whole-archive \
-+			-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
- 		cccdlflags="-DPIC -fPIC $cccdlflags"
- 		lddlflags="--whole-archive -shared $lddlflags"
- 	elif [ "`uname -m`" = "pmax" ]; then
-@@ -59,14 +63,18 @@
- d_setruid="$undef"
- 
- # there's no problem with vfork.
--case "$usevfork" in
--'') usevfork=true ;;
--esac
-+usevfork=true
-+
-+# Using perl's malloc leads to trouble on some toolchain versions.
-+usemymalloc="$undef"
- 
- # Pre-empt the /usr/bin/perl question of installperl.
--installusrbinperl='n'
-+installusrbinperl="$undef"
-+
-+# Don't install any manpages in man3; make user use perldoc
-+# (to prevent confusion with similarly named man2/man3 pages).
-+man3dir=none
- 
- # Recognize the NetBSD packages collection.
--# GDBM might be here.
- test -d /usr/pkg/lib     && loclibpth="$loclibpth /usr/pkg/lib"
- test -d /usr/pkg/include && locincpth="$locincpth /usr/pkg/include"
diff --git a/lang/perl5-base/patches/patch-ac b/lang/perl5-base/patches/patch-ac
deleted file mode 100644
index 97449e1189c..00000000000
--- a/lang/perl5-base/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/06/07 04:25:34 jlam Exp $
-
---- lib/ExtUtils/Install.pm.orig	Thu Feb 22 21:57:55 2001
-+++ lib/ExtUtils/Install.pm	Mon May 21 12:06:01 2001
-@@ -156,7 +156,14 @@
- 	    } else {
- 		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
- 	    }
--	    $packlist->{$origfile}++;
-+	    #
-+	    # jlam 2001-05-21 - Fix a bug in the packlists where only the
-+	    # filename and not the full pathname is recorded.  The broken
-+	    # line is:
-+	    #
-+	    #	$packlist->{$origfile}++;
-+	    #
-+	    $packlist->{$targetfile}++;
- 
- 	}, ".");
- 	chdir($cwd) or Carp::croak("Couldn't chdir to $cwd: $!");
diff --git a/lang/perl5-base/patches/patch-ad b/lang/perl5-base/patches/patch-ad
deleted file mode 100644
index 4d03f81ca18..00000000000
--- a/lang/perl5-base/patches/patch-ad
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/06/07 04:25:34 jlam Exp $
-
---- pp.c.orig	Sun Apr  8 02:09:16 2001
-+++ pp.c	Sun May 27 17:02:09 2001
-@@ -1900,6 +1900,28 @@
-     }
- }
- 
-+/*
-+ * There are strange code-generation bugs caused on sparc64 by gcc-2.95.2.
-+ * These need to be revisited when a newer toolchain becomes available.
-+ */
-+#if defined(__sparc64__) && defined(__GNUC__)
-+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-+#undef SPARC64_WORKAROUND
-+#define SPARC64_WORKAROUND 1
-+#endif
-+#endif
-+
-+#if defined(SPARC64_WORKAROUND)
-+double
-+sparc64_workaround_modf(double theVal, double *theIntRes)
-+{
-+    double res, ret;
-+    ret = modf(theVal, &res);
-+    *theIntRes = res;
-+    return ret;
-+}
-+#endif
-+
- PP(pp_int)
- {
-     dSP; dTARGET;
-@@ -1913,6 +1935,9 @@
-       }
-       else {
- 	  if (value >= 0.0) {
-+#if defined(SPARC64_WORKAROUND)
-+	      (void)sparc64_workaround_modf(value, &value);
-+#else
- #if defined(HAS_MODFL) || defined(LONG_DOUBLE_EQUALS_DOUBLE)
- 	      (void)Perl_modf(value, &value);
- #else
-@@ -1920,6 +1945,7 @@
- 	      (void)Perl_modf(tmp, &tmp);
- 	      value = (NV)tmp;
- #endif
-+#endif /* SPARC64_WORKAROUND */
- 	  }
- 	else {
- #if defined(HAS_MODFL) || defined(LONG_DOUBLE_EQUALS_DOUBLE)
diff --git a/lang/perl5-base/patches/patch-ae b/lang/perl5-base/patches/patch-ae
deleted file mode 100644
index fba896a01b6..00000000000
--- a/lang/perl5-base/patches/patch-ae
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2001/06/07 04:26:48 jlam Exp $
-
---- regcomp.c.orig	Thu Mar 22 00:05:02 2001
-+++ regcomp.c	Sun May 27 17:02:37 2001
-@@ -541,6 +541,17 @@
- 	cl->flags |= ANYOF_EOS;
- }
- 
-+/*
-+ * There are strange code-generation bugs caused on sparc64 by gcc-2.95.2.
-+ * These need to be revisited when a newer toolchain becomes available.
-+ */
-+#if defined(__sparc64__) && defined(__GNUC__)
-+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-+#undef SPARC64_WORKAROUND
-+#define SPARC64_WORKAROUND 1
-+#endif
-+#endif
-+
- /* REx optimizer.  Converts nodes into quickier variants "in place".
-    Finds fixed substrings.  */
- 
-@@ -1076,11 +1087,28 @@
- 		    int counted = mincount != 0;
- 
- 		    if (data->last_end > 0 && mincount != 0) { /* Ends with a string. */
-+#if defined(SPARC64_WORKAROUND)
-+			I32 b = 0;
-+			STRLEN l = 0;
-+			char *s = NULL;
-+			I32 old = 0;
-+
-+			if (pos_before >= data->last_start_min)
-+			    b = pos_before;
-+			else
-+			    b = data->last_start_min;
-+
-+			l = 0;
-+			s = SvPV(data->last_found, l);
-+			old = b - data->last_start_min;
-+
-+#else
- 			I32 b = pos_before >= data->last_start_min 
- 			    ? pos_before : data->last_start_min;
- 			STRLEN l;
- 			char *s = SvPV(data->last_found, l);
- 			I32 old = b - data->last_start_min;
-+#endif
- 
- 			if (UTF)
- 			    old = utf8_hop((U8*)s, old) - (U8*)s;
diff --git a/lang/perl5-base/pkg/DESCR b/lang/perl5-base/pkg/DESCR
deleted file mode 100644
index 2b488353c49..00000000000
--- a/lang/perl5-base/pkg/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-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 contains the base installation of Perl and the Perl Library.
diff --git a/lang/perl5-base/pkg/MESSAGE b/lang/perl5-base/pkg/MESSAGE
deleted file mode 100644
index 7e14e9d7211..00000000000
--- a/lang/perl5-base/pkg/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/07/09 17:10:28 tv Exp $
-
-Note: Perl no longer installs manual pages for Perl library functions,
-such as "open" or "Data::Dumper", into section 3 of the system manual
-("man3").
-
-Use the "perldoc" program instead to obtain documentation for Perl
-library functions.
-
-======================================================================
diff --git a/lang/perl5-base/pkg/PLIST b/lang/perl5-base/pkg/PLIST
deleted file mode 100644
index b9fd9f3f038..00000000000
--- a/lang/perl5-base/pkg/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2001/07/09 17:10:28 tv Exp $
-share/mk/bsd.perl.mk
-@unexec rm -f %D/${PERL5_ARCHLIB}/perllocal.pod