a few more details so that infodirs become useful.

2 files changed, 22 insertions, 4 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 683cbe64bcd..89687a787d0 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackingElement.pm,v 1.116 2007/05/29 12:36:53 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.117 2007/05/29 13:00:17 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -1260,7 +1260,12 @@ sub add
 sub fullname
 {
 	my $self = shift;
-	return $self->infodir.'/'.$self->category;
+	my $d = $self->infodir;
+	if (defined $d) {
+		return $d.$self->category;
+	} else {
+		return undef;
+	}
 }
 
 package OpenBSD::PackingElement::FCONTENTS;
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm
index 032a5a2aa53..996895759d1 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackingList.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackingList.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackingList.pm,v 1.67 2007/05/29 12:36:53 espie Exp $
+# $OpenBSD: PackingList.pm,v 1.68 2007/05/29 13:00:17 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -61,10 +61,17 @@ sub new
 
 sub set_infodir
 {
-	my ($self, $dir) = shift;
+	my ($self, $dir) = @_;
+	$dir .= '/' unless $dir =~ m/\/$/;
 	${$self->{infodir}} = $dir;
 }
 
+sub infodir
+{
+	my $self = shift;
+	return ${$self->{infodir}}
+}
+
 sub read
 {
 	my ($a, $u, $code) = @_;
@@ -276,6 +283,12 @@ sub tofile
 	return 1;
 }
 
+sub save
+{
+	my $self = shift;
+	$self->tofile($self->infodir.CONTENTS);
+}
+
 sub add2list
 {
 	my ($plist, $object) = @_;