1 files changed, 42 insertions, 97 deletions

diff --git a/contrib/perl5/lib/ExtUtils/Install.pm b/contrib/perl5/lib/ExtUtils/Install.pm
index c496aa0..aa6c764 100644
--- a/contrib/perl5/lib/ExtUtils/Install.pm
+++ b/contrib/perl5/lib/ExtUtils/Install.pm
@@ -1,9 +1,11 @@
+# $FreeBSD$
 package ExtUtils::Install;
 
 use 5.005_64;
 our(@ISA, @EXPORT, $VERSION);
 $VERSION = substr q$Revision: 1.28 $, 10;
 # $Date: 1998/01/25 07:08:24 $
+# $FreeBSD$
 
 use Exporter;
 use Carp ();
@@ -16,28 +18,6 @@ my $splitchar = $^O eq 'VMS' ? '|' : ($^O eq 'os2' || $^O eq 'dos') ? ';' : ':';
 my @PERL_ENV_LIB = split $splitchar, defined $ENV{'PERL5LIB'} ? $ENV{'PERL5LIB'} : $ENV{'PERLLIB'} || '';
 my $Inc_uninstall_warn_handler;
 
-# install relative to here
-
-my $INSTALL_ROOT = $ENV{PERL_INSTALL_ROOT};
-
-use File::Spec;
-
-sub install_rooted_file {
-    if (defined $INSTALL_ROOT) {
-	MY->catfile($INSTALL_ROOT, $_[0]);
-    } else {
-	$_[0];
-    }
-}
-
-sub install_rooted_dir {
-    if (defined $INSTALL_ROOT) {
-	MY->catdir($INSTALL_ROOT, $_[0]);
-    } else {
-	$_[0];
-    }
-}
-
 #our(@EXPORT, @ISA, $Is_VMS);
 #use strict;
 
@@ -77,9 +57,8 @@ sub install {
 	opendir DIR, $source_dir_or_file or next;
 	for (readdir DIR) {
 	    next if $_ eq "." || $_ eq ".." || $_ eq ".exists";
-		my $targetdir = install_rooted_dir($hash{$source_dir_or_file});
-	    if (-w $targetdir ||
-		mkpath($targetdir)) {
+	    if (-w $hash{$source_dir_or_file} ||
+		mkpath($hash{$source_dir_or_file})) {
 		last;
 	    } else {
 		warn "Warning: You do not have permissions to " .
@@ -89,8 +68,7 @@ sub install {
 	}
 	closedir DIR;
     }
-    my $tmpfile = install_rooted_file($pack{"read"});
-    $packlist->read($tmpfile) if (-f $tmpfile);
+    $packlist->read($pack{"read"}) if (-f $pack{"read"});
     my $cwd = cwd();
 
     my($source);
@@ -101,16 +79,17 @@ sub install {
 	#install locations. AFS users may call this a bug. We'll have
 	#to reconsider how to add the means to satisfy AFS users also.
 
+	# FreeBSD also doesn't like this (much). At install time, the
+	# ctime should change, even if the file does not.
+
 	#October 1997: we want to install .pm files into archlib if
 	#there are any files in arch. So we depend on having ./blib/arch
 	#hardcoded here.
-
-	my $targetroot = install_rooted_dir($hash{$source});
-
+	my $targetroot = $hash{$source};
 	if ($source eq "blib/lib" and
 	    exists $hash{"blib/arch"} and
 	    directory_not_empty("blib/arch")) {
-	    $targetroot = install_rooted_dir($hash{"blib/arch"});
+	    $targetroot = $hash{"blib/arch"};
             print "Files found in blib/arch: installing files in blib/lib into architecture dependent library tree\n";
 	}
 	chdir($source) or next;
@@ -119,9 +98,8 @@ sub install {
                          $atime,$mtime,$ctime,$blksize,$blocks) = stat;
 	    return unless -f _;
 	    return if $_ eq ".exists";
-	    my $targetdir  = MY->catdir($targetroot, $File::Find::dir);
-	    my $origfile   = $_;
-	    my $targetfile = MY->catfile($targetdir, $_);
+	    my $targetdir = MY->catdir($targetroot,$File::Find::dir);
+	    my $targetfile = MY->catfile($targetdir,$_);
 
 	    my $diff = 0;
 	    if ( -f $targetfile && -s _ == $size) {
@@ -131,6 +109,8 @@ sub install {
 		print "$_ differs\n" if $verbose>1;
 		$diff++;
 	    }
+	    my $diff = 1; # Nasty, lowdown, rotten, scumsucking
+	                  # hack to make FreeBSD _really_ install.
 
 	    if ($diff){
 		if (-f $targetfile){
@@ -156,16 +136,16 @@ sub install {
 	    } else {
 		inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
 	    }
-	    $packlist->{$origfile}++;
+	    $packlist->{$targetfile}++;
 
 	}, ".");
 	chdir($cwd) or Carp::croak("Couldn't chdir to $cwd: $!");
     }
     if ($pack{'write'}) {
-	$dir = install_rooted_dir(dirname($pack{'write'}));
+	$dir = dirname($pack{'write'});
 	mkpath($dir,0,0755);
 	print "Writing $pack{'write'}\n";
-	$packlist->write(install_rooted_file($pack{'write'}));
+	$packlist->write($pack{'write'});
     }
 }
 
@@ -262,22 +242,8 @@ sub inc_uninstall {
     }
 }
 
-sub run_filter {
-    my ($cmd, $src, $dest) = @_;
-    local *SRC, *CMD;
-    open(CMD, "|$cmd >$dest") || die "Cannot fork: $!";
-    open(SRC, $src)           || die "Cannot open $src: $!";
-    my $buf;
-    my $sz = 1024;
-    while (my $len = sysread(SRC, $buf, $sz)) {
-	syswrite(CMD, $buf, $len);
-    }
-    close SRC;
-    close CMD or die "Filter command '$cmd' failed for $src";
-}
-
 sub pm_to_blib {
-    my($fromto,$autodir,$pm_filter) = @_;
+    my($fromto,$autodir) = @_;
 
     use File::Basename qw(dirname);
     use File::Copy qw(copy);
@@ -300,37 +266,23 @@ sub pm_to_blib {
 
     mkpath($autodir,0,0755);
     foreach (keys %$fromto) {
-	my $dest = $fromto->{$_};
-	next if -f $dest && -M $dest < -M $_;
-
-	# When a pm_filter is defined, we need to pre-process the source first
-	# to determine whether it has changed or not.  Therefore, only perform
-	# the comparison check when there's no filter to be ran.
-	#    -- RAM, 03/01/2001
-
-	my $need_filtering = defined $pm_filter && length $pm_filter && /\.pm$/;
-
-	if (!$need_filtering && 0 == compare($_,$dest)) {
-	    print "Skip $dest (unchanged)\n";
+	next if -f $fromto->{$_} && -M $fromto->{$_} < -M $_;
+	unless (compare($_,$fromto->{$_})){
+	    print "Skip $fromto->{$_} (unchanged)\n";
 	    next;
 	}
-	if (-f $dest){
-	    forceunlink($dest);
+	if (-f $fromto->{$_}){
+	    forceunlink($fromto->{$_});
 	} else {
-	    mkpath(dirname($dest),0,0755);
-	}
-	if ($need_filtering) {
-	    run_filter($pm_filter, $_, $dest);
-	    print "$pm_filter <$_ >$dest\n";
-	} else {
-	    copy($_,$dest);
-	    print "cp $_ $dest\n";
+	    mkpath(dirname($fromto->{$_}),0,0755);
 	}
+	copy($_,$fromto->{$_});
 	my($mode,$atime,$mtime) = (stat)[2,8,9];
-	utime($atime,$mtime+$Is_VMS,$dest);
-	chmod(0444 | ( $mode & 0111 ? 0111 : 0 ),$dest);
-	next unless /\.pm$/;
-	autosplit($dest,$autodir);
+	utime($atime,$mtime+$Is_VMS,$fromto->{$_});
+	chmod(0444 | ( $mode & 0111 ? 0111 : 0 ),$fromto->{$_});
+	print "cp $_ $fromto->{$_}\n";
+	next unless /\.pm\z/;
+	autosplit($fromto->{$_},$autodir);
     }
 }
 
@@ -344,20 +296,18 @@ sub add {
 }
 
 sub DESTROY {
-	unless(defined $INSTALL_ROOT) {
-		my $self = shift;
-		my($file,$i,$plural);
-		foreach $file (sort keys %$self) {
-		$plural = @{$self->{$file}} > 1 ? "s" : "";
-		print "## Differing version$plural of $file found. You might like to\n";
-		for (0..$#{$self->{$file}}) {
-			print "rm ", $self->{$file}[$_], "\n";
-			$i++;
-		}
-		}
-		$plural = $i>1 ? "all those files" : "this file";
-		print "## Running 'make install UNINST=1' will unlink $plural for you.\n";
+    my $self = shift;
+    my($file,$i,$plural);
+    foreach $file (sort keys %$self) {
+	$plural = @{$self->{$file}} > 1 ? "s" : "";
+	print "## Differing version$plural of $file found. You might like to\n";
+	for (0..$#{$self->{$file}}) {
+	    print "rm ", $self->{$file}[$_], "\n";
+	    $i++;
 	}
+    }
+    $plural = $i>1 ? "all those files" : "this file";
+    print "## Running 'make install UNINST=1' will unlink $plural for you.\n";
 }
 
 1;
@@ -420,11 +370,6 @@ no-don't-really-do-it-now switch.
 pm_to_blib() takes a hashref as the first argument and copies all keys
 of the hash to the corresponding values efficiently. Filenames with
 the extension pm are autosplit. Second argument is the autosplit
-directory.  If third argument is not empty, it is taken as a filter command
-to be ran on each .pm file, the output of the command being what is finally
-copied, and the source for auto-splitting.
-
-You can have an environment variable PERL_INSTALL_ROOT set which will
-be prepended as a directory to each installed file (and directory).
+directory.
 
 =cut