formatting cleanup and:

Subject: Re: perl-5.8.0 on HP porting center
From: "H.Merijn Brand" <h.m.brand@hccnet.nl>
Message-Id: <20020829122221.0CA3.H.M.BRAND@hccnet.nl>

p4raw-id: //depot/perl@17815

1 files changed, 179 insertions, 170 deletions

diff --git a/installperl b/installperl
index ddcb43bb7d..ebddeca4dd 100755
--- a/installperl
+++ b/installperl
@@ -9,8 +9,8 @@ BEGIN {
 
 use strict;
 my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin,
-    $nonono, $dostrip, $versiononly, $silent, $verbose,
-    $otherperls, $archname,$Is_NetWare, $nwinstall, $nopods);
+    $nonono, $dostrip, $versiononly, $silent, $verbose, $force,
+    $otherperls, $archname, $Is_NetWare, $nwinstall, $nopods);
 use vars qw /$depth/;
 
 BEGIN {
@@ -38,8 +38,8 @@ if ($Config{d_umask}) {
 
 $Is_NetWare = $Config{osname} eq 'NetWare';
 if ($Is_NetWare) {
-	$Is_W32 = 0;
-	$scr_ext = '.pl';
+    $Is_W32 = 0;
+    $scr_ext = '.pl';
 }
 
 # override the ones in the rest of the script
@@ -69,12 +69,13 @@ while (@ARGV) {
     $versiononly = 0 if $ARGV[0] eq '+v';
     $silent = 1 if $ARGV[0] eq '-S';
     $otherperls = 0 if $ARGV[0] eq '-o';
+    $force = 1 if $ARGV[0] eq '-f';
     $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';
+    $nwinstall = 1 if $ARGV[0] eq '-netware';
     $nopods = 1 if $ARGV[0] eq '-p';
     if ($ARGV[0] eq '-?' or $ARGV[0] =~ /^-?-h/) {
-      print <<"EOT";
+	print <<"EOT";
 Usage $0: [switches]
   -n	    Don't actually run any commands; just print them.
   -s        Run strip on installed binaries.
@@ -83,6 +84,7 @@ Usage $0: [switches]
   +v        Install perl as "perl" and as a binary with the version number in
             the name.  (Override whatever config.sh says)
   -S        Silent mode.
+  -f        Force installation (don't check if same version is there)
   -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
@@ -90,7 +92,7 @@ Usage $0: [switches]
   -p        Don't install the pod files. [This will break use diagnostics;]
   -netware  Install correctly on a Netware server.
 EOT
-      exit;
+	exit;
     }
     shift;
 }
@@ -103,10 +105,10 @@ while (<SCRIPTS>) {
     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];
+	push @scripts, $1;
+	push @tolink, [$1, $2];
     } else {
-        push @scripts, $_;
+	push @scripts, $_;
     }
 }
 close SCRIPTS;
@@ -132,31 +134,30 @@ if ($^O eq 'dos') {
     $archpms{config} = $archpms{filehand} = 1;
 }
 
-if ((-e "testcompile") && (defined($ENV{'COMPILE'})))
-{
-	push(@scripts, map("$_.exe", @scripts));
+if ((-e "testcompile") && (defined($ENV{'COMPILE'}))) {
+    push(@scripts, map("$_.exe", @scripts));
 }
 
 find(sub {
-	if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) {
-	    my($path, $modname) = ($1,$2);
+    if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) {
+	my($path, $modname) = ($1,$2);
 
-	    # strip trailing component first
-	    $path =~ s{/[^/]*$}{};
+	# strip trailing component first
+	$path =~ s{/[^/]*$}{};
 
-	    # strip optional "/lib";
-	    $path =~ s{/lib\b}{};
+	# strip optional "/lib";
+	$path =~ s{/lib\b}{};
 
-	    # strip any leading /
-	    $path =~ s{^/}{};
+	# strip any leading /
+	$path =~ s{^/}{};
 
-	    # reconstitute canonical module name
-	    $modname = "$path/$modname" if length $path;
+	# reconstitute canonical module name
+	$modname = "$path/$modname" if length $path;
 
-	    # remember it
-	    $archpms{$modname} = 1;
-	}
-    }, 'ext');
+	# remember it
+	$archpms{$modname} = 1;
+    }
+}, 'ext');
 
 # print "[$_]\n" for sort keys %archpms;
 
@@ -187,16 +188,16 @@ if ($^O eq 'os390') {
     my $archlibexp = $Config{archlibexp};
     my $usedl = $Config{usedl};
     if ($usedl eq 'define') {
-        `./$^X -pibak -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};
+    # 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};
@@ -204,9 +205,9 @@ my $binexp = $Config{binexp};
 
 if ($Is_VMS) {  # Hang in there until File::Spec hits the big time
     foreach ( \$installbin,     \$installscript,  \$installprivlib,
-              \$installarchlib, \$installsitelib, \$installsitearch,
-              \$installman1dir ) {
-      $$_ = unixify($$_);  $$_ =~ s:/$::;
+	      \$installarchlib, \$installsitelib, \$installsitearch,
+	      \$installman1dir ) {
+	$$_ = unixify($$_);  $$_ =~ s:/$::;
     }
 }
 
@@ -225,51 +226,60 @@ if (!$Is_NetWare) {
 -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' or",
-                                " some tests failed! (Installing anyway.)\n";
+			|| warn "WARNING: You've never run 'make test' or",
+				" some tests failed! (Installing anyway.)\n";
 } #if (!$Is_NetWare)
 
-if (($Is_W32 and ! $Is_NetWare)  or $Is_Cygwin) {
-  my $perldll;
-
-  if ($Is_Cygwin) {
-    $perldll = $libperl;
-    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') {
-        safe_unlink("$installbin/$_");
-        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 = 'perl59.' . $dlext;
-  }
-
-  if ($dlsrc ne "dl_none.xs") {
-    -f $perldll || die "No perl DLL built\n";
-  }
-  # Install the DLL
+if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) {
+    my $perldll;
+
+    if ($Is_Cygwin) {
+	$perldll = $libperl;
+	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') {
+		safe_unlink("$installbin/$_");
+		copy("$_", "$installbin/$_");
+		chmod(0755, "$installbin/$_");
+	    };
+	    open (LD2, ">$installbin/ld2");
+	    print LD2 <<SHELL;
+#!/bin/sh
+#
+# ld wrapper, passes all args to perlld;
+#
+for trythis in $installbin/perl
+do
+  if [ -x \$trythis ]
+  then
+    \$trythis $installbin/perlld "\$\@"
+    exit \$?
+  fi
+done
+# hard luck!
+echo I see no perl executable around there
+echo perl is required to build dynamic libraries
+echo look if the path to perl in /bin/ld2 is correct
+exit 1
+SHELL
+	    close LD2;
+	    chmod(0755, "$installbin/ld2");
+	};
+    } else {
+	$perldll = 'perl59.' . $dlext;
+    }
 
-  safe_unlink("$installbin/$perldll");
-  copy("$perldll", "$installbin/$perldll");
-  chmod(0755, "$installbin/$perldll");
+    if ($dlsrc ne "dl_none.xs") {
+	-f $perldll || die "No perl DLL built\n";
+    }
 
+    # Install the DLL
+    safe_unlink("$installbin/$perldll");
+    copy("$perldll", "$installbin/$perldll");
+    chmod(0755, "$installbin/$perldll");
 } # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin)
 
 # This will be used to store the packlist
@@ -296,26 +306,26 @@ elsif ($^O eq 'mpeix') {
     link($Config{perlpath}, "$installbin/perl$ver$exe_ext");
 }
 elsif ($^O ne 'dos') {
-	if (!$Is_NetWare) {
-		safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
-		copy("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");
+	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});
 	}
-	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)
+    } #if (!$Is_NetWare)
 }
 else {
     safe_unlink("$installbin/$perl.exe");
@@ -366,9 +376,9 @@ else {
     # AIX needs perl.exp installed as well.
     push(@corefiles,'perl.exp') if $^O eq 'aix';
     if ($^O eq 'mpeix') {
-        # MPE needs mpeixish.h installed as well.
-        mkpath("$installarchlib/CORE/mpeix", $verbose, 0777);
-        push(@corefiles,'mpeix/mpeixish.h');
+	# MPE needs mpeixish.h installed as well.
+	mkpath("$installarchlib/CORE/mpeix", $verbose, 0777);
+	push(@corefiles,'mpeix/mpeixish.h');
     }
     # If they have built sperl.o...
     push(@corefiles,'sperl.o') if -f 'sperl.o';
@@ -379,7 +389,7 @@ foreach my $file (@corefiles) {
     if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
 	if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
 	    strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/;
-           chmod(0555, "$installarchlib/CORE/$file");
+	    chmod(0555, "$installarchlib/CORE/$file");
 	} else {
 	    chmod(0444, "$installarchlib/CORE/$file");
 	}
@@ -390,10 +400,10 @@ foreach my $file (@corefiles) {
 # 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);
+	my $t = "$installprivlib/Thread/$m.pm";
+	unlink $t;
+	copy("ext/Thread/$m.pmx", $t);
+	chmod(0444, $t);
     }
 }
 
@@ -405,11 +415,11 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
     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");
+	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");
+	symlink("$installbin/$perl_verbase$ver$exe_ext",
+		"$installbin/$perl$exe_ext");
     } else {
 	link("$installbin/$perl_verbase$ver$exe_ext",
 		"$installbin/$perl$exe_ext");
@@ -427,14 +437,13 @@ if ($archname && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
     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");
+	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");
+	link("$installbin/$perl_verbase$ver$exe_ext", "$installbin/$archperl");
     }
 }
 
@@ -503,7 +512,7 @@ sub script_alias {
 	     "$installscript/$alias$scr_ext");
     } elsif ($^O eq 'vos') {
 	symlink("$installscript/$orig$scr_ext",
-	        "$installscript/$alias$scr_ext");
+		"$installscript/$alias$scr_ext");
     } else {
 	link("$installscript/$orig$scr_ext",
 	     "$installscript/$alias$scr_ext");
@@ -521,10 +530,10 @@ if ($versiononly) {
     }
 
     for (@tolink) {
-        my ($from, $to) = map { "$_$ver" } @$_;
-        (my $frbase = $from) =~ s#.*/##;
-        (my $tobase = $to) =~ s#.*/##;
-        script_alias($installscript, $frbase, $tobase, $scr_ext);
+	my ($from, $to) = map { "$_$ver" } @$_;
+	(my $frbase = $from) =~ s#.*/##;
+	(my $tobase = $to) =~ s#.*/##;
+	script_alias($installscript, $frbase, $tobase, $scr_ext);
     }
 } else {
     for (@scripts) {
@@ -534,10 +543,10 @@ if ($versiononly) {
     }
 
     for (@tolink) {
-        my ($from, $to) = @$_;
-        (my $frbase = $from) =~ s#.*/##;
-        (my $tobase = $to) =~ s#.*/##;
-        script_alias($installscript, $frbase, $tobase, $scr_ext);
+	my ($from, $to) = @$_;
+	(my $frbase = $from) =~ s#.*/##;
+	(my $tobase = $to) =~ s#.*/##;
+	script_alias($installscript, $frbase, $tobase, $scr_ext);
     }
 }
 
@@ -565,7 +574,7 @@ if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
 
     for (@pods) {
 	# $_ is a name like  pod/perl.pod
-        (my $base = $_) =~ s#.*/##;
+	(my $base = $_) =~ s#.*/##;
 	copy_if_diff($_, "${installprivlib}/$pod/${base}");
     }
 
@@ -583,11 +592,11 @@ if (!$versiononly && $otherperls) {
     ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
     @path = split(/$dirsep/, $path);
     if ($Is_VMS) {
-        my $i = 0;
-        while (exists $ENV{'DCL$PATH' . $i}) {
-            my $dir = unixpath($ENV{'DCL$PATH' . $i});  $dir =~ s-/$--;
-            push(@path,$dir);
-        }
+	my $i = 0;
+	while (exists $ENV{'DCL$PATH' . $i}) {
+	    my $dir = unixpath($ENV{'DCL$PATH' . $i});  $dir =~ s-/$--;
+	    push(@path,$dir);
+	}
     }
     my @otherperls;
     my %otherperls;
@@ -597,7 +606,7 @@ if (!$versiononly && $otherperls) {
 	# to $mainperldir (like SunOS)
 	next if samepath($_, $binexp);
 	next if ($mainperl_is_instperl && samepath($_, $mainperldir));
-        my $otherperl = "$_/$perl$exe_ext";
+	my $otherperl = "$_/$perl$exe_ext";
 	next if $otherperls{$otherperl}++;
 	push(@otherperls, $otherperl)
 	    if (-x $otherperl && ! -d $otherperl);
@@ -689,18 +698,18 @@ sub link {
 	      ? die "AFS"  # okay inside eval {}
 	      : die "Couldn't link $from to $to: $!\n"
 	  unless $nonono;
-        $packlist->{$to} = { from => $from, type => 'link' };
+	$packlist->{$to} = { from => $from, type => 'link' };
     };
     if ($@) {
 	warn $@;
-        print $verbose ? "  cp $from $to\n" : "  $to\n" unless $silent;
+	print $verbose ? "  cp $from $to\n" : "  $to\n" unless $silent;
 	print "  creating new version of $to\n"
-                 if $Is_VMS and -e $to and !$silent;
+		 if $Is_VMS and -e $to and !$silent;
 	File::Copy::copy($from, $to)
 	    ? $success++
 	    : warn "Couldn't copy $from to $to: $!\n"
 	  unless $nonono;
-        $packlist->{$to} = { type => 'file' };
+	$packlist->{$to} = { type => 'file' };
     }
     $success;
 }
@@ -758,7 +767,7 @@ sub installlib {
     # ignore patch backups, RCS files, emacs backup & temp files and the
     # .exists files, .PL files, and .t files.
     return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.t$} ||
-              $dir  =~ m{/t(?:/|$)};
+	      $dir  =~ m{/t(?:/|$)};
     # ignore the test extensions
     return if $dir =~ m{ext/XS/(?:APItest|Typemap)/};
 
@@ -769,7 +778,7 @@ sub installlib {
 	  ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
 	  ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare))
        ) {
-        $installlib = $installarchlib;
+	$installlib = $installarchlib;
 	return unless $do_installarchlib;
     } else {
 	return unless $do_installprivlib;
@@ -784,34 +793,34 @@ sub installlib {
 	    #This might not work because $archname might have changed.
 	    unlink("$installarchlib/$name");
 	}
-        $packlist->{"$installlib/$name"} = { type => 'file' };
-	if (compare($_, "$installlib/$name") || $nonono) {
+	$packlist->{"$installlib/$name"} = { type => 'file' };
+	if ($force || compare($_, "$installlib/$name") || $nonono) {
 	    unlink("$installlib/$name");
 	    mkpath("$installlib/$dir", $verbose, 0777);
 	    # HP-UX (at least) needs to maintain execute permissions
 	    # on dynamically-loaded libraries.
-           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")
+	    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)
+				  "$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)
 	}
     }
 }
@@ -842,11 +851,11 @@ sub copy_if_diff {
     }
     -f $from || $perlpodbadsymlink || warn "$0: $from not found";
     $packlist->{$to} = { type => 'file' };
-    if (compare($from, $to) || $nonono) {
+    if ($force || compare($from, $to) || $nonono) {
 	safe_unlink($to);   # In case we don't have write permissions.
-        if ($nonono) {
-            $from = $depth . "/" . $from if $depth;
-        }
+	if ($nonono) {
+	    $from = $depth . "/" . $from if $depth;
+	}
 	if ($perlpodbadsymlink && $from =~ m!^pod/perl(.+)\.pod$!) {
 	    $from = "README.$1";
 	}
@@ -868,19 +877,19 @@ sub strip
 
     my @opts;
     while (@args && $args[0] =~ /^(-\w+)$/) {
-        push @opts, shift @args;
+	push @opts, shift @args;
     }
 
     foreach my $file (@args) {
-        if (-f $file) {
-           if ($verbose) {
-               print "  strip " . join(' ', @opts);
-               print " " if (@opts);
-               print "$file\n";
-           }
-            system("strip", @opts, $file);
-        } else {
-            print "# file '$file' skipped\n" if $verbose;
-        }
+	if (-f $file) {
+	    if ($verbose) {
+		print "  strip " . join(' ', @opts);
+		print " " if (@opts);
+		print "$file\n";
+	    }
+	    system("strip", @opts, $file);
+	} else {
+	    print "# file '$file' skipped\n" if $verbose;
+	}
     }
 }