kill REQ script directly. I'm pretty sure it doesn't quite work anyways.

Deprecate INSTALL and DEINSTALL, write out warnings in pkg_create.

Clean up some more old cruft

3 files changed, 3 insertions, 22 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm
index b0447d0a7ec..17944b11e3d 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.67 2007/05/31 10:04:03 espie Exp $
+# $OpenBSD: Add.pm,v 1.68 2007/05/31 11:05:41 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -620,13 +620,6 @@ sub copy_info
 	File::Copy::move($self->fullname, $dest);
 }
 
-package OpenBSD::PackingElement::FREQUIRE;
-sub install
-{
-	my ($self, $state) = @_;
-	$self->run($state, 'INSTALL');
-}
-
 package OpenBSD::PackingElement::FINSTALL;
 sub install
 {
diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm
index f74184d8220..ddc27c4f668 100644
--- a/usr.sbin/pkg_add/OpenBSD/Delete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Delete.pm,v 1.55 2007/05/31 10:00:22 espie Exp $
+# $OpenBSD: Delete.pm,v 1.56 2007/05/31 11:05:41 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -605,14 +605,6 @@ sub delete
 	$self->mark_ldconfig_directory($state->{destdir});
 }
 
-package OpenBSD::PackingElement::FREQUIRE;
-sub delete
-{
-	my ($self, $state) = @_;
-
-	$self->run($state, "DEINSTALL");
-}
-
 package OpenBSD::PackingElement::FDEINSTALL;
 sub delete
 {
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 9a8855937a9..423b5c2f4f6 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.121 2007/05/31 10:00:22 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.122 2007/05/31 11:05:41 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -1349,10 +1349,6 @@ our @ISA=qw(OpenBSD::PackingElement::ScriptFile);
 sub category() { OpenBSD::PackageInfo::REQUIRE }
 sub beautify() { "Require" }
 
-package OpenBSD::PackingElement::FREQUIRED_BY;
-our @ISA=qw(OpenBSD::PackingElement::SpecialFile);
-sub category() { OpenBSD::PackageInfo::REQUIRED_BY }
-
 package OpenBSD::PackingElement::DisplayFile;
 our @ISA=qw(OpenBSD::PackingElement::SpecialFile);
 use OpenBSD::Error;