merge 5.8.5 into HEAD

remove now-unused files
crank libperl shared library major number
update Makefile.bsd-wrapper
tweak openbsd hints file for arm and m68k

2 files changed, 6 insertions, 76 deletions

diff --git a/gnu/usr.bin/perl/plan9/config.plan9 b/gnu/usr.bin/perl/plan9/config.plan9
index ef629ff49f4..d1a3de52da7 100644
--- a/gnu/usr.bin/perl/plan9/config.plan9
+++ b/gnu/usr.bin/perl/plan9/config.plan9
@@ -3357,8 +3357,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "/sys/lib/perl/5.8.3"		/**/
-#define PRIVLIB_EXP "/sys/lib/perl/5.8.3"		/**/
+#define PRIVLIB "/sys/lib/perl/5.8.5"		/**/
+#define PRIVLIB_EXP "/sys/lib/perl/5.8.5"		/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3485,9 +3485,9 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "/sys/lib/perl/5.8.3/site_perl"		/**/
-#define SITELIB_EXP "/sys/lib/perl/5.8.3/site_perl"		/**/
-#define SITELIB_STEM "/sys/lib/perl/5.8.3/site_perl"		/**/
+#define SITELIB "/sys/lib/perl/5.8.5/site_perl"		/**/
+#define SITELIB_EXP "/sys/lib/perl/5.8.5/site_perl"		/**/
+#define SITELIB_STEM "/sys/lib/perl/5.8.5/site_perl"		/**/
 
 /* Size_t_size:
  *	This symbol holds the size of a Size_t in bytes.
@@ -3729,41 +3729,6 @@
 #define M_VOID			/* Xenix strikes again */
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in /sys/lib/perl/5.8.0/site_perl/386 for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in /sys/lib/perl/5.8.0/site_perl for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.8.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_CRYPT:
  *	This symbol, if defined, indicates that the crypt routine is available
  *	to encrypt passwords and the like.
diff --git a/gnu/usr.bin/perl/plan9/config_h.sample b/gnu/usr.bin/perl/plan9/config_h.sample
index 8dbae0fae40..1cb53996b20 100644
--- a/gnu/usr.bin/perl/plan9/config_h.sample
+++ b/gnu/usr.bin/perl/plan9/config_h.sample
@@ -7,7 +7,7 @@
  * that running config_h.SH again will wipe out any changes you've made.
  * For a more permanent change edit config.sh and rerun config_h.SH.
  *
- * $Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $
+ * $Id: config_h.sample,v 1.2 2003/12/03 03:02:43 millert Exp $
  */
 
 /*
@@ -3674,41 +3674,6 @@
 #define M_VOID			/* Xenix strikes again */
 #endif
 
-/* PERL_XS_APIVERSION:
- *	This variable contains the version of the oldest perl binary
- *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in /sys/lib/perl/5.8.0/site_perl/386 for older
- *	directories across major versions back to xs_apiversion.
- *	This is only useful if you have a perl library directory tree
- *	structured like the default one.
- *	See INSTALL for how this works.
- *	The versioned site_perl directory was introduced in 5.005,
- *	so that is the lowest possible value.
- *	Since this can depend on compile time options
- *	it is set by Configure.  Other non-default sources
- *	of potential incompatibility, such as multiplicity, threads,
- *	debugging, 64bits, sfio, etc., are not checked for currently,
- *	though in principle we could go snooping around in old
- *	Config.pm files.
- */
-/* PERL_PM_APIVERSION:
- *	This variable contains the version of the oldest perl
- *	compatible with the present perl.  (That is, pure perl modules
- *	written for pm_apiversion will still work for the current
- *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in /sys/lib/perl/5.8.0/site_perl for older directories across major versions
- *	back to pm_apiversion.  This is only useful if you have a perl
- *	library directory tree structured like the default one.  The
- *	versioned site_perl library was introduced in 5.005, so that's
- *	the default setting for this variable.  It's hard to imagine
- *	it changing before Perl6.  It is included here for symmetry
- *	with xs_apiveprsion -- the searching algorithms will
- *	(presumably) be similar.
- *	See the INSTALL file for how this works.
- */
-#define PERL_XS_APIVERSION "5.8.0"
-#define PERL_PM_APIVERSION "5.005"
-
 /* HAS_CRYPT:
  *	This symbol, if defined, indicates that the crypt routine is available
  *	to encrypt passwords and the like.