INSTALL and DEINSTALL were deprecated in June 2007, and removed from
pkg_create in January 2010.
I think it's time to remove all traces of +MTREE_DIRS, +REQ, +INSTALL,
+DEINSTALL
from all commands.
Index: pkg_add.1
===================================================================
RCS file: /home/openbsd/cvs/src/usr.sbin/pkg_add/pkg_add.1,v
retrieving revision 1.110
diff -u -p -r1.110 pkg_add.1
--- pkg_add.1 17 Aug 2011 10:48:27 -0000 1.110
+++ pkg_add.1 20 Aug 2011 10:11:57 -0000
@@ -282,8 +282,6 @@ external scripts may fail.
.It Ar updatedepends
force update even if forward dependencies no longer match.
.El
-.It Fl I
-If scripts exist for a given package, do not execute them.
.It Fl i
Switch on interactive mode.
.Nm
Index: pkg_delete.1
===================================================================
RCS file: /home/openbsd/cvs/src/usr.sbin/pkg_add/pkg_delete.1,v
retrieving revision 1.41
diff -u -p -r1.41 pkg_delete.1
--- pkg_delete.1 17 Aug 2011 10:48:27 -0000 1.41
+++ pkg_delete.1 20 Aug 2011 10:12:26 -0000
@@ -92,8 +92,6 @@ uninstall even if not running as root.
.It Ar scripts
external scripts may fail.
.El
-.It Fl I
-If scripts exist for a given package, do not execute them.
.It Fl i
Switch on interactive mode.
.Nm
Index: OpenBSD/Add.pm
===================================================================
RCS file: /home/openbsd/cvs/src/usr.sbin/pkg_add/OpenBSD/Add.pm,v
retrieving revision 1.124
diff -u -p -r1.124 Add.pm
--- OpenBSD/Add.pm 12 Jul 2011 10:09:52 -0000 1.124
+++ OpenBSD/Add.pm 20 Aug 2011 10:08:36 -0000
@@ -707,13 +707,6 @@ sub copy_info
$self->fullname, $dest, $!);
}
-package OpenBSD::PackingElement::FINSTALL;
-sub install
-{
- my ($self, $state) = @_;
- $self->run($state, 'PRE-INSTALL');
-}
-
package OpenBSD::PackingElement::FCONTENTS;
sub copy_info
{
Index: OpenBSD/Delete.pm
===================================================================
RCS file: /home/openbsd/cvs/src/usr.sbin/pkg_add/OpenBSD/Delete.pm,v
retrieving revision 1.115
diff -u -p -r1.115 Delete.pm
--- OpenBSD/Delete.pm 12 Jul 2011 10:30:29 -0000 1.115
+++ OpenBSD/Delete.pm 20 Aug 2011 10:09:16 -0000
@@ -667,14 +667,6 @@ sub delete
$self->mark_ldconfig_directory($state);
}
-package OpenBSD::PackingElement::FDEINSTALL;
-sub delete
-{
- my ($self, $state) = @_;
-
- $self->run($state, "DEINSTALL");
-}
-
package OpenBSD::PackingElement::Depend;
sub copy_old_stuff
{
Index: OpenBSD/PackageInfo.pm
===================================================================
RCS file: /home/openbsd/cvs/src/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm,v
retrieving revision 1.55
diff -u -p -r1.55 PackageInfo.pm
--- OpenBSD/PackageInfo.pm 18 Aug 2011 07:53:59 -0000 1.55
+++ OpenBSD/PackageInfo.pm 20 Aug 2011 10:14:30 -0000
@@ -23,8 +23,8 @@ require Exporter;
our @ISA=qw(Exporter);
our @EXPORT=qw(installed_packages installed_info installed_name info_names
is_info_name installed_stems
lock_db unlock_db
- add_installed delete_installed is_installed borked_package CONTENTS
COMMENT DESC INSTALL DEINSTALL REQUIRE
- REQUIRED_BY REQUIRING DISPLAY UNDISPLAY MTREE_DIRS);
+ add_installed delete_installed is_installed borked_package CONTENTS
COMMENT DESC
+ REQUIRED_BY REQUIRING DISPLAY UNDISPLAY);
use OpenBSD::PackageName;
use OpenBSD::Paths;
@@ -32,21 +32,17 @@ use constant {
CONTENTS => '+CONTENTS',
COMMENT => '+COMMENT',
DESC => '+DESC',
- INSTALL => '+INSTALL',
- DEINSTALL => '+DEINSTALL',
- REQUIRE => '+REQUIRE',
REQUIRED_BY => '+REQUIRED_BY',
REQUIRING => '+REQUIRING',
DISPLAY => '+DISPLAY',
- UNDISPLAY => '+UNDISPLAY',
- MTREE_DIRS => '+MTREE_DIRS' };
+ UNDISPLAY => '+UNDISPLAY'};
use Fcntl qw/:flock/;
my $pkg_db = $ENV{"PKG_DBDIR"} || OpenBSD::Paths->pkgdb;
my ($list, $stemlist);
-our @info = (CONTENTS, COMMENT, DESC, REQUIRE, INSTALL, DEINSTALL,
REQUIRED_BY, REQUIRING, DISPLAY, UNDISPLAY, MTREE_DIRS);
+our @info = (CONTENTS, COMMENT, DESC, REQUIRED_BY, REQUIRING, DISPLAY,
UNDISPLAY);
our %info = ();
for my $i (@info) {
Index: OpenBSD/PackingElement.pm
===================================================================
RCS file: /home/openbsd/cvs/src/usr.sbin/pkg_add/OpenBSD/PackingElement.pm,v
retrieving revision 1.199
diff -u -p -r1.199 PackingElement.pm
--- OpenBSD/PackingElement.pm 24 Jun 2011 22:43:58 -0000 1.199
+++ OpenBSD/PackingElement.pm 20 Aug 2011 10:10:10 -0000
@@ -1631,35 +1631,6 @@ sub category() { OpenBSD::PackageInfo::C
sub write
{}
-package OpenBSD::PackingElement::ScriptFile;
-our @ISA=qw(OpenBSD::PackingElement::SpecialFile);
-use OpenBSD::Error;
-
-sub exec_on_add { 1 }
-sub exec_on_delete { 1 }
-
-sub run
-{
- my ($self, $state, @args) = @_;
-
- my $pkgname = $state->{pkgname};
- my $name = $self->fullname;
-
- return if $state->{dont_run_scripts};
-
- $state->ldconfig->ensure;
- $state->say("#1 script: #2 #3 #4", $self->beautify, $name, $pkgname,
- join(' ', @args)) if $state->verbose >= 2;
- return if $state->{not};
- chmod 0755, $name;
- return if $state->log->system($name, $pkgname, @args) == 0;
- if ($state->defines('scripts')) {
- $state->log->say($self->beautify." script failed");
- } else {
- $state->log->fatal($self->beautify." script failed");
- }
-}
-
package OpenBSD::PackingElement::FCOMMENT;
our @ISA=qw(OpenBSD::PackingElement::SpecialFile);
sub category() { OpenBSD::PackageInfo::COMMENT }
@@ -1668,23 +1639,6 @@ package OpenBSD::PackingElement::FDESC;
our @ISA=qw(OpenBSD::PackingElement::SpecialFile);
sub category() { OpenBSD::PackageInfo::DESC }
-package OpenBSD::PackingElement::FINSTALL;
-our @ISA=qw(OpenBSD::PackingElement::ScriptFile);
-sub exec_on_delete { 0 }
-sub category() { OpenBSD::PackageInfo::INSTALL }
-sub beautify() { "Install" }
-
-package OpenBSD::PackingElement::FDEINSTALL;
-our @ISA=qw(OpenBSD::PackingElement::ScriptFile);
-sub exec_on_add { 0 }
-sub category() { OpenBSD::PackageInfo::DEINSTALL }
-sub beautify() { "Deinstall" }
-
-package OpenBSD::PackingElement::FREQUIRE;
-our @ISA=qw(OpenBSD::PackingElement::ScriptFile);
-sub category() { OpenBSD::PackageInfo::REQUIRE }
-sub beautify() { "Require" }
-
package OpenBSD::PackingElement::DisplayFile;
our @ISA=qw(OpenBSD::PackingElement::SpecialFile);
use OpenBSD::Error;
@@ -1712,10 +1666,6 @@ sub category() { OpenBSD::PackageInfo::D
package OpenBSD::PackingElement::FUNDISPLAY;
our @ISA=qw(OpenBSD::PackingElement::DisplayFile);
sub category() { OpenBSD::PackageInfo::UNDISPLAY }
-
-package OpenBSD::PackingElement::FMTREE_DIRS;
-our @ISA=qw(OpenBSD::PackingElement::SpecialFile);
-sub category() { OpenBSD::PackageInfo::MTREE_DIRS }
package OpenBSD::PackingElement::Arch;
our @ISA=qw(OpenBSD::PackingElement::Unique);
Index: OpenBSD/Replace.pm
===================================================================
RCS file: /home/openbsd/cvs/src/usr.sbin/pkg_add/OpenBSD/Replace.pm,v
retrieving revision 1.82
diff -u -p -r1.82 Replace.pm
--- OpenBSD/Replace.pm 25 Jun 2011 11:10:11 -0000 1.82
+++ OpenBSD/Replace.pm 20 Aug 2011 10:10:23 -0000
@@ -129,29 +129,6 @@ sub extract
{
}
-package OpenBSD::PackingElement::ScriptFile;
-sub update_issue
-{
- my ($self, $installing) = @_;
- return $self->name." script";
-}
-
-package OpenBSD::PackingElement::FINSTALL;
-sub update_issue
-{
- my ($self, $installing) = @_;
- return if !$installing;
- return $self->SUPER::update_issue($installing);
-}
-
-package OpenBSD::PackingElement::FDEINSTALL;
-sub update_issue
-{
- my ($self, $installing) = @_;
- return if $installing;
- return $self->SUPER::update_issue($installing);
-}
-
package OpenBSD::PackingElement::Exec;
sub update_issue
{
