add most things concerning @ignore, since we now have ways nicer to do

things.

We still recognize @ignore in packing-lists for now, but we don't handle
it. Not that register-plist has smart enough comparison functions that
it doesn't care about @ignore at all...

3 files changed, 7 insertions, 16 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index f200725cb73..91541c8edbf 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.89 2007/04/29 11:28:59 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.90 2007/04/30 08:43:19 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -250,7 +250,6 @@ sub write
 {
 	my ($self, $fh) = @_;
 	return if defined $self->{zap};
-	print $fh "\@ignore\n" if defined $self->{ignore};
 	print $fh "\@comment no checksum\n" if defined $self->{nochecksum};
 	$self->SUPER::write($fh);
 	if (defined $self->{md5}) {
@@ -280,10 +279,6 @@ sub destate
 		$self->{nochecksum} = 1;
 		undef $state->{nochecksum};
 	}
-	if (defined $state->{ignore}) {
-		$self->{ignore} = 1;
-		undef $state->{ignore};
-	}
 }
 
 sub add_md5
@@ -453,9 +448,6 @@ __PACKAGE__->setKeyword('ignore');
 
 sub add
 {
-	my ($class, $plist, @args) = @_;
-	$plist->{state}->{ignore} = 1;
-	return;
 }
 
 # Comment is very special
diff --git a/usr.sbin/pkg_add/pkg_create b/usr.sbin/pkg_add/pkg_create
index c0356e0f3f7..5f27895b43c 100644
--- a/usr.sbin/pkg_add/pkg_create
+++ b/usr.sbin/pkg_add/pkg_create
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_create,v 1.64 2007/04/29 12:46:18 espie Exp $
+# $OpenBSD: pkg_create,v 1.65 2007/04/30 08:43:19 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -442,9 +442,8 @@ if (defined $opt_q) {
 	for my $special (info_names()) {
 	    next unless -f $dir.$special;
 	    my $f = OpenBSD::PackingElement::File->add($plist, $special);
-	    $f->{ignore} = 1;
-	    $f->{md5} = OpenBSD::md5::fromfile($dir.$special);
-	    $f->{size} = (stat $dir.$special)[7];
+	    $f->add_md5(OpenBSD::md5::fromfile($dir.$special));
+	    $f->add_size((stat $dir.$special)[7]);
 	}
 	OpenBSD::PackingElement::File->add($plist, CONTENTS);
 }
diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1
index 1c5d306e7f2..e7b26d47bea 100644
--- a/usr.sbin/pkg_add/pkg_create.1
+++ b/usr.sbin/pkg_add/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.34 2007/04/23 14:47:37 jmc Exp $
+.\"	$OpenBSD: pkg_create.1,v 1.35 2007/04/30 08:43:19 espie Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -429,8 +429,8 @@ Use without an arg to set back to default (extraction)
 group ownership.
 .Pp
 .It Cm @ignore
-Used internally to tell extraction to ignore the next file (don't
-copy it anywhere), as it's used for some special purpose.
+Was used internally to tell extraction to ignore the next file.
+No longer needed.
 .Pp
 .It Cm @info Ar filename
 Specialized version of