Modifications for better Solaris support, to search for a fuller list of

libraries during configuration, and enabling dynamic support.

1 files changed, 22 insertions, 14 deletions

diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index 577d8defea5..068887a1e94 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
+$NetBSD: patch-aa,v 1.13 1999/08/31 18:51:36 agc Exp $
 
 --- Configure.orig	Fri Oct  3 13:57:39 1997
 +++ Configure	Wed Dec  2 14:30:27 1998
@@ -52,19 +52,27 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  
  : Private path used by Configure to find libraries.  Its value
  : is prepended to libpth. This variable takes care of special
-@@ -753,9 +753,8 @@
+@@ -753,9 +753,16 @@
  defvoidused=15
  
  : List of libraries we want.
 -libswanted='sfio net socket inet nsl nm ndbm gdbm dbm db malloc dl'
 -libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt"
 -libswanted="$libswanted ucb bsd BSD PW x"
-+# libswanted='sfio net socket inet nsl nm ndbm gdbm dbm db malloc dl'
-+libswanted='m crypt'
++case `uname -s` in
++SunOS)
++	libswanted='sfio net socket inet nsl nm ndbm dbm db malloc dl'
++	libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt"
++	libswanted="$libswanted ucb bsd BSD PW x"
++	;;
++NetBSD)
++	libswanted='m crypt'
++	;;
++esac
  : We probably want to search /usr/shlib before most other libraries.
  : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
  glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
-@@ -2365,7 +2364,7 @@
+@@ -2365,7 +2372,7 @@
  : determine root of directory hierarchy where package will be installed.
  case "$prefix" in
  '')
@@ -73,7 +81,7 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  	;;
  *)
  	dflt="$prefix"
-@@ -2375,10 +2374,10 @@
+@@ -2375,10 +2382,10 @@
  
  By default, $package will be installed in $dflt/bin, manual
  pages under $dflt/man, etc..., i.e. with $dflt as prefix for
@@ -86,7 +94,7 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  for each of the installation directories, the prefix being only used
  to set the defaults.
  
-@@ -2426,7 +2425,7 @@
+@@ -2426,7 +2433,7 @@
  esac'
  
  : determine where private library files go
@@ -95,7 +103,7 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  : /opt/perl/lib, since /opt/perl/lib/perl5 would be redundant.
  case "$prefix" in
  *perl*) set dflt privlib lib ;;
-@@ -2501,7 +2500,7 @@
+@@ -2501,7 +2508,7 @@
  case "$archlib" in
  '')
      case "$privlib" in
@@ -104,7 +112,7 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  	set dflt
  	eval $prefixup
  	;;
-@@ -2986,8 +2985,8 @@
+@@ -2986,8 +2993,8 @@
  	syspath='/usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1'
  	syspath="$syspath /usr/man/u_man/man1 /usr/share/man/man1"
  	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
@@ -115,7 +123,7 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  	sysman=`./loc . /usr/man/man1 $syspath`
  	;;
  esac
-@@ -3268,7 +3267,7 @@
+@@ -3268,7 +3275,7 @@
  : Set private lib path
  case "$plibpth" in
  '') if ./mips; then
@@ -124,7 +132,7 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  	fi;;
  esac
  case "$libpth" in
-@@ -4742,15 +4741,15 @@
+@@ -4742,15 +4749,15 @@
  shrpdir=$archlibexp/CORE
  xxx=''
  tmp_shrpenv=''
@@ -143,7 +151,7 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  		xxx="-Wl,-R$shrpdir"
  		;;
  	linux|irix*|dec_osf)
-@@ -4965,8 +4964,8 @@
+@@ -4965,8 +4972,8 @@
  esac
  
  echo "If you don't want the manual sources installed, answer 'none'."
@@ -154,7 +162,7 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  : thus man less will show the perl module less.pm, but not the system
  : less command.  We might also conflict with TCL man pages.
  : However, something like /opt/perl/man/man3 is fine.
-@@ -5413,7 +5412,7 @@
+@@ -5413,7 +5420,7 @@
  	: guess some guesses
  	$test -d /usr/share/scripts && dflt=/usr/share/scripts
  	$test -d /usr/share/bin && dflt=/usr/share/bin
@@ -163,7 +171,7 @@ $NetBSD: patch-aa,v 1.12 1999/06/15 12:27:23 bad Exp $
  	$test -d $prefixexp/script && dflt=$prefixexp/script
  	set dflt
  	eval $prefixup
-@@ -8726,7 +8725,7 @@
+@@ -8726,7 +8733,7 @@
  	case "$ranlib" in
  	:) ranlib='';;
  	'')