Resolve conflicts, remove old files, merge local changes

1 files changed, 255 insertions, 74 deletions

diff --git a/gnu/usr.bin/perl/installperl b/gnu/usr.bin/perl/installperl
index 0f87bde0942..bd2ca76b43c 100644
--- a/gnu/usr.bin/perl/installperl
+++ b/gnu/usr.bin/perl/installperl
@@ -1,5 +1,5 @@
 #!./perl
-#	$OpenBSD: installperl,v 1.12 2000/04/06 17:03:58 millert Exp $
+#	$OpenBSD: installperl,v 1.13 2001/05/24 18:34:50 millert Exp $
 #
 # This is hacked up, in order to support DESTDIR and INSTALL_STRIP.
 #
@@ -12,8 +12,9 @@ BEGIN {
 }
 
 use strict;
-my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $nonono, $dostrip,
-    $versiononly, $silent, $verbose, $otherperls);
+my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin,
+    $nonono, $dostrip, $versiononly, $silent, $verbose,
+    $otherperls, $archname,$Is_NetWare, $nwinstall, $nopods);
 use vars qw /$depth/;
 
 BEGIN {
@@ -21,6 +22,7 @@ BEGIN {
     $Is_W32 = $^O eq 'MSWin32';
     $Is_OS2 = $^O eq 'os2';
     $Is_Cygwin = $^O eq 'cygwin';
+    $Is_Darwin = $^O eq 'darwin';
     if ($Is_VMS) { eval 'use VMS::Filespec;' }
 }
 
@@ -34,6 +36,16 @@ use ExtUtils::Packlist;
 use Config;
 use subs qw(unlink link chmod cmd);
 
+if ($Config{d_umask}) {
+    umask(022); # umasks like 077 aren't that useful for installations
+}
+
+$Is_NetWare = $Config{osname} eq 'NetWare';
+if ($Is_NetWare) {
+	$Is_W32 = 0;
+	$scr_ext = '.pl';
+}
+
 # override the ones in the rest of the script
 sub mkpath {
     File::Path::mkpath(@_) unless $nonono;
@@ -58,32 +70,65 @@ while (@ARGV) {
     $nonono = 1 if $ARGV[0] eq '-n';
     $dostrip = 1 if $ARGV[0] eq '-s';
     $versiononly = 1 if $ARGV[0] eq '-v';
+    $versiononly = 0 if $ARGV[0] eq '+v';
     $silent = 1 if $ARGV[0] eq '-S';
     $otherperls = 0 if $ARGV[0] eq '-o';
     $verbose = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
+    $archname = 1 if $ARGV[0] eq '-A';
+	$nwinstall = 1 if $ARGV[0] eq '-netware';
+    $nopods = 1 if $ARGV[0] eq '-p';
+    if ($ARGV[0] eq '-?' or $ARGV[0] =~ /^-?-h/) {
+      print <<"EOT";
+Usage $0: [switches]
+  -n	    Don't actually run any commands; just print them.
+  -s        Run strip on installed binaries.
+  -v        Only install perl as a binary with the version number in the name.
+            (Override whatever config.sh says)
+  +v        Install perl as "perl" and as a binary with the version number in
+            the name.  (Override whatever config.sh says)
+  -S        Silent mode.
+  -o        Skip checking for other copies of perl in your PATH.
+  -V        Verbose mode.
+  -A        Also install perl with the architecture's name in the perl binary's
+            name.
+  -p        Don't install the pod files. [This will break use diagnostics;]
+  -netware  Install correctly on a Netware server.
+EOT
+      exit;
+    }
     shift;
 }
 
-$versiononly = 1 if $Config{versiononly};
-
-my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
-		utils/pl2pm utils/splain utils/perlcc utils/dprofpp
-		x2p/s2p x2p/find2perl 
-		pod/pod2man pod/pod2html pod/pod2latex pod/pod2text
-		pod/pod2usage pod/podchecker pod/podselect);
+$versiononly = 1 if $Config{versiononly} && !defined $versiononly;
+my (@scripts, @tolink);
+open SCRIPTS, "utils.lst" or die "Can't open utils.lst: $!";
+while (<SCRIPTS>) {
+    next if /^#/;
+    next if /#\s*pod\s*=/; # Binary programs need separate treatment
+    chomp;
+    if (/(\S*)\s*#\s*link\s*=\s*(\S*)/) {
+        push @scripts, $1;
+        push @tolink, [$1, $2];
+    } else {
+        push @scripts, $_;
+    }
+}
+close SCRIPTS;
 
 if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; }
 
-my @pods = (<pod/*.pod>);
+my @pods = $nopods ? () : (<pod/*.pod>);
 
 # Specify here any .pm files that are actually architecture-dependent.
 # (Those included with XS extensions under ext/ are automatically
 # added later.)
 # Now that the default privlib has the full perl version number included,
-# we no longer have to play the trick of sticking version-specific .pm 
+# we no longer have to play the trick of sticking version-specific .pm
 # files under the archlib directory.
 my %archpms = (
-    Config => 1, 
+    Config => 1,
+    lib => 1,
+    Cwd => 1,
 );
 
 if ($^O eq 'dos') {
@@ -165,15 +210,23 @@ my $so = $Config{so};
 my $dlext = $Config{dlext};
 my $dlsrc = $Config{dlsrc};
 if ($^O eq 'os390') {
+    my $pwd;
+    chomp($pwd=`pwd`);
+    my $archlibexp = $Config{archlibexp};
     my $usedl = $Config{usedl};
     if ($usedl eq 'define') {
-        my $pwd;
-        chomp($pwd=`pwd`);
-        my $archlibexp = $Config{archlibexp};
-        `./$^X -p -e 's{$pwd\/libperl.x}{$archlibexp/CORE/libperl.x}' lib/Config.pm`;
+        `./$^X -pibak -e 's{$pwd\/libperl.x}{$archlibexp/CORE/libperl.x}' lib/Config.pm`;
     }
 }
 
+if ($nwinstall) {
+	# This is required only if we are installing on a NetWare server
+	$installscript = $Config{installnwscripts};
+	$installprivlib = $Config{installnwlib};
+	$installarchlib = $Config{installnwlib};
+	$installsitelib = $Config{installnwlib};
+}
+
 my $d_dosuid = $Config{d_dosuid};
 my $binexp = $Config{binexp};
 
@@ -195,19 +248,23 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 -w $installbin		|| $nonono || die "$installbin is not writable by you\n"
 	unless $installbin =~ m#^/afs/# || $nonono;
 
+if (!$Is_NetWare) {
 -x 'perl' . $exe_ext	|| die "perl isn't executable!\n";
 -x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
 
 -f 't/rantests'		|| $Is_W32
-			|| warn "WARNING: You've never run 'make test'!!!",
-				"  (Installing anyway.)\n";
+                        || warn "WARNING: You've never run 'make test' or",
+                                " some tests failed! (Installing anyway.)\n";
+} #if (!$Is_NetWare)
 
-if ($Is_W32 or $Is_Cygwin) {
+if (($Is_W32 and ! $Is_NetWare)  or $Is_Cygwin) {
   my $perldll;
 
   if ($Is_Cygwin) {
     $perldll = $libperl;
-    $perldll =~ s/(\..*)?$/.$dlext/;
+    my $v_e_r_s = $ver; $v_e_r_s =~ tr/./_/;
+    $perldll =~ s/(\..*)?$/$v_e_r_s.$dlext/;
+    $perldll =~ s/^lib/cyg/;
     if ($Config{useshrplib} eq 'true') {
       # install ld2 and perlld as well
       foreach ('ld2', 'perlld') {
@@ -215,9 +272,21 @@ if ($Is_W32 or $Is_Cygwin) {
         copy("$_", "$installbin/$_");
         chmod(0755, "$installbin/$_");
       };
+      { 
+		open (LD2, ">$installbin/ld2");
+		print LD2 "#!/bin/sh\n#\n# ld wrapper, passes all args to perlld;\n#\n"
+		          . "for trythis in $installbin/perl\ndo\n  if [ -x \$trythis ]\n"
+		          . "  then\n    \$trythis $installbin/perlld \"\$\@\"\n"
+		          . "    exit \$?\n  fi\ndone\n# hard luck!\necho i see no perl"
+		          . " executable around there\necho perl is required to build "
+		          . "dynamic libraries\necho look if the path to perl in /bin/ld2"
+		          . " is correct\nexit 1\n";
+		close LD2;
+      };
+      chmod(0755, "$installbin/ld2");
     };
   } else {
-    $perldll = 'perl56.' . $dlext;
+    $perldll = 'perl58.' . $dlext;
   }
 
   if ($dlsrc ne "dl_none.xs") {
@@ -228,8 +297,8 @@ if ($Is_W32 or $Is_Cygwin) {
   safe_unlink("$installbin/$perldll");
   copy("$perldll", "$installbin/$perldll");
   chmod(0755, "$installbin/$perldll");
-   
-} # if ($Is_W32 or $Is_Cygwin)
+
+} # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin)
 
 # This will be used to store the packlist
 my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
@@ -264,11 +333,27 @@ elsif ($^O eq 'mpeix') {
     link($Config{perlpath}, "$installbin/perl$ver$exe_ext");
 }
 elsif ($^O ne 'dos') {
-    safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
-    #copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext");
-    cmd("$installcmd perl$exe_ext $installbin/$perl_verbase$ver$exe_ext");
-    strip("$installbin/$perl_verbase$ver$exe_ext");
-    chmod(0755, "$installbin/$perl_verbase$ver$exe_ext");
+	if (!$Is_NetWare) {
+		safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
+		#copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext");
+		cmd("$installcmd perl$exe_ext $installbin/$perl_verbase$ver$exe_ext");
+		strip("$installbin/$perl_verbase$ver$exe_ext");
+		chmod(0755, "$installbin/$perl_verbase$ver$exe_ext");
+	}
+	else {
+		# If installing onto a NetWare server
+		if ($nwinstall) {
+			# Copy perl.nlm, echo.nlm, type.nlm, a2p.nlm & cgi2perl.nlm
+			mkpath($Config{installnwsystem}, 1, 0777);
+			copy("netware\\".$ENV{'MAKE_TYPE'}."\\perl.nlm", $Config{installnwsystem});
+			copy("netware\\testnlm\\echo\\echo.nlm", $Config{installnwsystem});
+			copy("netware\\testnlm\\type\\type.nlm", $Config{installnwsystem});
+			copy("x2p\\a2p.nlm", $Config{installnwsystem});
+			chmod(0755, "$Config{installnwsystem}\\perl.nlm");
+			mkpath($Config{installnwlcgi}, 1, 0777);
+			copy("lib\\auto\\cgi2perl\\cgi2perl.nlm", $Config{installnwlcgi});
+		}
+	} #if (!$Is_NetWare)
 }
 else {
     safe_unlink("$installbin/$perl.exe");
@@ -285,7 +370,7 @@ if ($d_dosuid) {
 # Install library files.
 
 my ($do_installarchlib, $do_installprivlib) = (0, 0);
-    
+
 mkpath($installprivlib, $verbose, 0777);
 mkpath($installarchlib, $verbose, 0777);
 mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
@@ -334,38 +419,72 @@ foreach my $file (@corefiles) {
     # on dynamically-loadable libraries. So we do it for all.
     if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
 	if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
-	    chmod(0555, "$installarchlib/CORE/$file");
 	    strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/;
+           chmod(0555, "$installarchlib/CORE/$file");
 	} else {
 	    chmod(0444, "$installarchlib/CORE/$file");
 	}
     }
 }
 
+# Switch in the 5.005-threads versions of he threadsafe queue and semaphore
+# modules if so needed.
+if ($Config{use5005threads}) {
+    for my $m (qw(Queue Semaphore)) {
+        my $t = "$installprivlib/Thread/$m.pm";
+        unlink $t;
+        copy("ext/Thread/$m.pmx", $t);
+        chmod(0444, $t);
+    }
+}
+
 # Install main perl executables
 # Make links to ordinary names if installbin directory isn't current directory.
 
-if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
+if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS && ! $Is_NetWare) {
     safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext");
     if ($^O eq 'mpeix') {
 	# MPE doesn't support hard links, so use a symlink.
 	# We don't want another cloned copy.
         symlink($Config{perlpath}, "$installbin/perl$exe_ext");
+    } elsif ($^O eq 'vos') {
+	# VOS doesn't support hard links, so use a symlink.
+        symlink("$installbin/$perl_verbase$ver$exe_ext",
+                "$installbin/$perl$exe_ext");
     } else {
 	link("$installbin/$perl_verbase$ver$exe_ext",
 		"$installbin/$perl$exe_ext");
     }
     link("$installbin/s$perl_verbase$ver$exe_ext",
-	    "$installbin/suid$perl$exe_ext") 
+	    "$installbin/suid$perl$exe_ext")
       if $d_dosuid;
 }
 
+# For development purposes it can be very useful to have multiple perls
+# build for different "architectures" (eg threading or not) simultaneously.
+if ($archname && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
+    my $archperl = "$perl_verbase$ver-$Config{archname}$exe_ext";
+    safe_unlink("$installbin/$archperl");
+    if ($^O eq 'mpeix') {
+	# MPE doesn't support hard links, so use a symlink.
+	# We don't want another cloned copy.
+        symlink($Config{perlpath}, "$installbin/$archperl");
+    } elsif ($^O eq 'vos') {
+	# VOS doesn't support hard links, so use a symlink.
+	symlink("$installbin/$perl_verbase$ver$exe_ext",
+		"$installbin/$archperl");
+    } else {
+	link("$installbin/$perl_verbase$ver$exe_ext",
+		"$installbin/$archperl");
+    }
+}
+
 # Offer to install perl in a "standard" location
 
 my $mainperl_is_instperl = 0;
 
 if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
-    !$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR
+    !$versiononly && !$nonono && !$Is_W32 && !$Is_NetWare && !$Is_VMS && -t STDIN && -t STDERR
 	&& -w $mainperldir && ! samepath($mainperldir, $installbin)) {
     my($usrbinperl)	= "$mainperldir/$perl$exe_ext";
     my($instperl)	= "$installbin/$perl$exe_ext";
@@ -383,11 +502,7 @@ if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
 	      (-l $usrbinperl) &&
 	      ((readlink $usrbinperl) eq $expinstperl));
     }
-    if ((! $mainperl_is_instperl) &&
-	(yn("Many scripts expect perl to be installed as $usrbinperl.\n" . 
-	     "Do you wish to have $usrbinperl be the same as\n" .
-	     "$expinstperl? [y] ")))
-    {
+    if (! $mainperl_is_instperl) {
 	unlink($usrbinperl);
 	( $Config{'d_link'} eq 'define' &&
 	  eval { CORE::link $instperl, $usrbinperl } )	||
@@ -399,12 +514,14 @@ if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
 }
 
 # Make links to ordinary names if installbin directory isn't current directory.
-
-if (!$versiononly && ! samepath($installbin, 'x2p')) {
-    safe_unlink("$installbin/a2p$exe_ext");
-    #copy("x2p/a2p$exe_ext", "$installbin/a2p$exe_ext");
-    cmd("$installcmd x2p/a2p$exe_ext $installbin/a2p$exe_ext");
-    chmod(0755, "$installbin/a2p$exe_ext");
+if (!$Is_NetWare) {
+	if (!$versiononly && ! samepath($installbin, 'x2p')) {
+		safe_unlink("$installbin/a2p$exe_ext");
+		#copy("x2p/a2p$exe_ext", "$installbin/a2p$exe_ext");
+		cmd("$installcmd x2p/a2p$exe_ext $installbin/a2p$exe_ext");
+		strip("$installbin/a2p$exe_ext");
+		chmod(0755, "$installbin/a2p$exe_ext");
+	}
 }
 
 # cppstdin is just a script, but it is architecture-dependent, so
@@ -417,32 +534,57 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) {
     chmod(0755, "$installbin/cppstdin");
 }
 
-if (! $versiononly) {
-    # Install scripts.
+sub script_alias {
+    my ($installscript, $orig, $alias, $scr_ext) = @_;
 
-    mkpath($installscript, $verbose, 0777);
+    safe_unlink("$installscript/$alias$scr_ext");
+    if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
+	copy("$installscript/$orig$scr_ext",
+	     "$installscript/$alias$scr_ext");
+    } elsif ($^O eq 'vos') {
+	symlink("$installscript/$orig$scr_ext",
+	        "$installscript/$alias$scr_ext");
+    } else {
+	link("$installscript/$orig$scr_ext",
+	     "$installscript/$alias$scr_ext");
+    }
+}
+
+# Install scripts.
+mkpath($installscript, $verbose, 0777);
+if ($versiononly) {
+    for (@scripts) {
+	(my $base = $_) =~ s#.*/##;
+	$base .= $ver;
+	copy($_,    "$installscript/$base");
+	chmod(0755, "$installscript/$base");
+    }
 
+    for (@tolink) {
+        my ($from, $to) = map { "$_$ver" } @$_;
+        (my $frbase = $from) =~ s#.*/##;
+        (my $tobase = $to) =~ s#.*/##;
+        script_alias($installscript, $frbase, $tobase, $scr_ext);
+    }
+} else {
     for (@scripts) {
 	(my $base = $_) =~ s#.*/##;
 	copy($_, "$installscript/$base");
 	chmod(0755, "$installscript/$base");
     }
 
-    # pstruct should be a link to c2ph
-    safe_unlink("$installscript/pstruct$scr_ext");
-    if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
-	copy("$installscript/c2ph$scr_ext",
-	     "$installscript/pstruct$scr_ext"); 
-    } else {
-	link("$installscript/c2ph$scr_ext",
-	     "$installscript/pstruct$scr_ext");
+    for (@tolink) {
+        my ($from, $to) = @$_;
+        (my $frbase = $from) =~ s#.*/##;
+        (my $tobase = $to) =~ s#.*/##;
+        script_alias($installscript, $frbase, $tobase, $scr_ext);
     }
 }
 
 # Install pod pages.  Where? I guess in $installprivlib/pod
 # ($installprivlib/pods for cygwin).
 
-my $pod = $Is_Cygwin ? 'pods' : 'pod';
+my $pod = ($Is_Cygwin || $Is_Darwin) ? 'pods' : 'pod';
 if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
     mkpath("${installprivlib}/$pod", $verbose, 0777);
 
@@ -477,7 +619,7 @@ if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
 
 if (!$versiononly && $otherperls) {
     my ($path, @path);
-    my $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ;
+    my $dirsep = ($Is_OS2 || $Is_W32 || $Is_NetWare) ? ';' : ':' ;
     ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
     @path = split(/$dirsep/, $path);
     if ($Is_VMS) {
@@ -522,7 +664,7 @@ sub yn {
     my($prompt) = @_;
     my($answer);
     my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
-    warn $prompt;
+    print STDERR $prompt;
     chop($answer = <STDIN>);
     $answer = $default if $answer =~ m/^\s*$/;
     ($answer =~ m/^[yY]/);
@@ -536,9 +678,9 @@ sub unlink {
 
     foreach my $name (@names) {
 	next unless -e $name;
-	chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin);
+	chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin || $Is_NetWare);
 	print "  unlink $name\n" if $verbose;
-	( CORE::unlink($name) and ++$cnt 
+	( CORE::unlink($name) and ++$cnt
 	  or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
     }
     return $cnt;
@@ -549,7 +691,7 @@ sub safe_unlink {
     my @names = @_;
     foreach my $name (@names) {
 	next unless -e $name;
-	chmod 0777, $name if ($Is_OS2 || $Is_W32);
+	chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_NetWare);
 	print "  unlink $name\n" if $verbose;
 	next if CORE::unlink($name);
 	warn "Couldn't unlink $name: $!\n";
@@ -568,7 +710,7 @@ sub safe_rename {
 	for ($i = 1; $i < 50; $i++) {
 	    last if rename($to, "$to.$i");
 	}
-	warn("Cannot rename to `$to.$i': $!"), return 0 
+	warn("Cannot rename to `$to.$i': $!"), return 0
 	   if $i >= 50;	# Give up!
     }
     link($from,$to) || return 0;
@@ -636,7 +778,7 @@ sub copy {
 sub samepath {
     my($p1, $p2) = @_;
 
-    return (lc($p1) eq lc($p2)) if $Is_W32;
+    return (lc($p1) eq lc($p2)) if ($Is_W32 || $Is_NetWare);
 
     if ($p1 ne $p2) {
 	my($dev1, $ino1, $dev2, $ino2);
@@ -661,17 +803,20 @@ sub installlib {
 	$File::Find::prune = 1;
 	return;
     }
-    
+
     # ignore patch backups, RCS files, emacs backup & temp files and the
-    # .exists files.
-    return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists};
+    # .exists files, .PL files, and .t files.
+    return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.t$} ||
+              $dir  =~ m{/t(?:/|$)};
+    # ignore the test extensions
+    return if $dir =~ m{ext/XS/(?:APItest|Typemap)/};
 
     $name = "$dir/$name" if $dir ne '';
 
     my $installlib = $installprivlib;
     if ($dir =~ /^auto/ ||
 	  ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
-	  ($name =~ /^(.*)\.(?:h|lib)$/i && $Is_W32)
+	  ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare))
        ) {
         $installlib = $installarchlib;
 	return unless $do_installarchlib;
@@ -694,9 +839,28 @@ sub installlib {
 	    mkpath("$installlib/$dir", $verbose, 0777);
 	    # HP-UX (at least) needs to maintain execute permissions
 	    # on dynamically-loaded libraries.
-	    copy_if_diff($_, "$installlib/$name")
-		and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444,
-			   "$installlib/$name");
+           if ($Is_NetWare && !$nwinstall) {
+               # Don't copy .nlp,.nlm files, doesn't make sense on Windows and also
+               # if copied will give problems when building new extensions.
+               # Has to be copied if we are installing on a NetWare server and hence
+               # the check !$nwinstall
+               if (!(/\.(?:nlp|nlm|bs)$/)) {
+                   copy_if_diff($_, "$installlib/$name")
+			and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444,
+                                 "$installlib/$name");
+               }
+           } else {
+               if (copy_if_diff($_, "$installlib/$name")) {
+                   if ($name =~ /\.(so|$dlext)$/o) {
+                       strip("-S", "$installlib/$name") if $^O =~ /^(rhapsody|darwin)$/;
+                       chmod(0555, "$installlib/$name");
+                   } else {
+                       strip("-S", "$installlib/$name")
+                           if ($name =~ /\.a$/o and $^O =~ /^(rhapsody|darwin)$/);
+                       chmod(0444, "$installlib/$name");
+                   }
+               }
+           } #if ($Is_NetWare)
 	}
     }
 }
@@ -714,13 +878,27 @@ sub installlib {
 sub copy_if_diff {
     my($from,$to)=@_;
     return 1 if (($^O eq 'VMS') && (-d $from));
-    -f $from || warn "$0: $from not found";
+    my $perlpodbadsymlink;
+    if ($from =~ m!^pod/perl[\w-]+\.pod$! &&
+	-l $from &&
+	! -e $from) {
+	# Some Linux implementations have problems traversing over
+	# multiple symlinks (when going over NFS?) and fail to read
+	# the symlink target.  Combine this with the fact that some
+	# of the pod files (the perl$OS.pod) are symlinks (to ../README.$OS),
+	# and you end up with those pods not getting installed.
+	$perlpodbadsymlink = 1;
+    }
+    -f $from || $perlpodbadsymlink || warn "$0: $from not found";
     $packlist->{$to} = { type => 'file' };
     if (compare($from, $to) || $nonono) {
 	safe_unlink($to);   # In case we don't have write permissions.
         if ($nonono) {
             $from = $depth . "/" . $from if $depth;
         }
+	if ($perlpodbadsymlink && $from =~ m!^pod/perl(.+)\.pod$!) {
+	    $from = "README.$1";
+	}
 	copy($from, $to);
 	# Restore timestamps if it's a .a library or for OS/2.
 	if (!$nonono && ($Is_OS2 || $to =~ /\.a$/)) {
@@ -744,11 +922,14 @@ sub strip
 
     foreach my $file (@args) {
         if (-f $file) {
-            print "  strip $file\n" if $verbose;
+           if ($verbose) {
+               print "  strip " . join(' ', @opts);
+               print " " if (@opts);
+               print "$file\n";
+           }
             system("strip", @opts, $file);
         } else {
             print "# file '$file' skipped\n" if $verbose;
         }
     }
 }
-