be saner wrt directory creation during pkg updates:

don't disturb existing objects if they're not directories,
create them better if they don't exist.

2 files changed, 14 insertions, 6 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm
index b6b027b8d1c..a5abadd108a 100644
--- a/usr.sbin/pkg_add/OpenBSD/Add.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Add.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Add.pm,v 1.14 2004/11/11 12:29:58 espie Exp $
+# $OpenBSD: Add.pm,v 1.15 2004/11/12 21:52:01 espie Exp $
 #
 # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
 #
@@ -245,15 +245,15 @@ sub install
 	my $destdir = $state->{destdir};
 
 	if ($state->{replacing}) {
-
 		return if $state->{not};
+		File::Path::mkpath(dirname($destdir.$fullname));
 		if (defined $self->{link}) {
 			link($destdir.$self->{link}, $destdir.$fullname);
 		} elsif (defined $self->{symlink}) {
 			symlink($self->{symlink}, $destdir.$fullname);
 		} else {
 			rename($self->{tempname}, $destdir.$fullname) or 
-			    Fatal "Can't move file to $fullname: $!";
+			    Fatal "Can't move ", $self->{tempname}, " to $fullname: $!";
 			print "moving ", $self->{tempname}, " -> $destdir$fullname\n" if $state->{very_verbose};
 			undef $self->{tempname};
 		}
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm
index 9e2092f62de..9d230fca960 100644
--- a/usr.sbin/pkg_add/OpenBSD/Update.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Update.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Update.pm,v 1.26 2004/11/11 22:40:38 espie Exp $
+# $OpenBSD: Update.pm,v 1.27 2004/11/12 21:52:01 espie Exp $
 #
 # Copyright (c) 2004 Marc Espie <espie@openbsd.org>
 #
@@ -74,11 +74,18 @@ sub extract
 		return;
 	}
 	
+	my $d = dirname($file->{destdir}.$file->{name});
+	while (!-d $d && -e _) {
+		$d = dirname($d);
+	}
+	if (!-e _) {
+		File::Path::mkpath($d);
+	}
 	if ($state->{not}) {
-		print "extracting tempfile under ", dirname($file->{destdir}.$file->{name}), "\n";
+		print "extracting tempfile under $d\n";
 	} else {
 		my ($fh, $tempname) = tempfile('pkg.XXXXXXXXXX', 
-		    DIR => dirname($file->{destdir}.$file->{name}));
+		    DIR => $d);
 
 		print "extracting $tempname\n" if $state->{very_verbose};
 		$file->{name} = $tempname;
@@ -94,6 +101,7 @@ sub extract
 	my $fullname = $self->fullname();
 	my $destdir = $state->{destdir};
 
+	return if -e $destdir.$fullname;
 	print "new directory ", $destdir, $fullname, "\n" if $state->{very_verbose};
 	return if $state->{not};
 	File::Path::mkpath($destdir.$fullname);