diff options
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 9 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Delete.pm | 10 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 20 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_create | 15 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_create.1 | 21 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_delete.1 | 23 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pod/OpenBSD::PackingElement.pod | 8 |
8 files changed, 24 insertions, 88 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; diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1 index b9ec140ab39..8c49ec6d392 100644 --- a/usr.sbin/pkg_add/pkg_add.1 +++ b/usr.sbin/pkg_add/pkg_add.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_add.1,v 1.63 2007/05/07 08:14:51 espie Exp $ +.\" $OpenBSD: pkg_add.1,v 1.64 2007/05/31 11:05:41 espie Exp $ .\" .\" Documentation and design originally from FreeBSD. All the code has .\" been rewritten since. We keep the documentation's notice: @@ -392,24 +392,6 @@ the installation is terminated. checks for collisions with installed file names, read-only file systems, and enough space to store files. .It -If the package contains a -.Ar require -script (see -.Xr pkg_create 1 ) , -it is executed with the following arguments: -.Bl -tag -width indentindent -.It Ar pkg-name -The name of the package being installed -.It Cm INSTALL -Keyword denoting to the script that it is to run an installation requirements -check -(the keyword is useful only to scripts which serve multiple functions). -.El -.Pp -If the -.Ar require -script exits with a non-zero status code, the installation is terminated. -.It If the package contains an .Ar install script, it is executed with the following arguments: diff --git a/usr.sbin/pkg_add/pkg_create b/usr.sbin/pkg_add/pkg_create index 3626cfad8c3..d114ea615cc 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.108 2007/05/30 12:37:07 espie Exp $ +# $OpenBSD: pkg_create,v 1.109 2007/05/31 11:05:41 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -331,7 +331,7 @@ sub copy_subst copy_subst_fh($srcname, $dest); } -our ($opt_p, $opt_f, $opt_c, $opt_d, $opt_v, $opt_i, $opt_k, $opt_r, +our ($opt_p, $opt_f, $opt_c, $opt_d, $opt_v, $opt_i, $opt_k, $opt_S, $opt_s, $opt_O, $opt_A, $opt_L, $opt_m, $opt_M, $opt_U, $opt_P, $opt_W, $opt_n, $opt_B, $opt_q, $opt_Q); @@ -475,12 +475,12 @@ my $regen_package = 0; set_usage( 'pkg_create [-nQqv] [-A arches] [-B pkg-destdir] [-D name=value]', '[-i iscript] [-k dscript] [-L localbase] [-M displayfile]', -'[-P pkg-dependency] [-p prefix] [-r rscript] [-S pkg-destdir]', +'[-P pkg-dependency] [-p prefix] [-S pkg-destdir]', '[-U undisplayfile] [-W wantedlib] -c desc -d desc -f packinglist pkg-name'); my $plist = new OpenBSD::PackingList; try { - getopts('p:f:c:d:vi:k:r:m:M:U:S:hs:OA:L:B:D:P:W:nqQ', + getopts('p:f:c:d:vi:k:m:M:U:S:hs:OA:L:B:D:P:W:nqQ', {'D' => sub { local $_ = shift; @@ -548,6 +548,12 @@ if ($regen_package) { $plist->fromfile($contents[0]) or Fatal "Can't read packing list $contents[0]"; } else { + if (defined $opt_i) { + print STDERR "Warning: INSTALL scripts are deprecated\n"; + } + if (defined $opt_k) { + print STDERR "Warning: DEINSTALL scripts are deprecated\n"; + } print "Creating package $ARGV[0]\n" if !(defined $opt_q) && $opt_v; if (!$opt_q) { $plist->set_infodir(OpenBSD::Temp::dir()); @@ -555,7 +561,6 @@ if ($regen_package) { add_description($plist, DESC, $opt_c, $opt_d); add_special_file($plist, INSTALL, $opt_i); add_special_file($plist, DEINSTALL, $opt_k); - add_special_file($plist, REQUIRE, $opt_r); add_special_file($plist, DISPLAY, $opt_M); add_special_file($plist, MODULE, $opt_m); add_special_file($plist, UNDISPLAY, $opt_U); diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1 index 94ccc026287..dd1cee7553f 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.37 2007/05/22 11:02:57 espie Exp $ +.\" $OpenBSD: pkg_create.1,v 1.38 2007/05/31 11:05:41 espie Exp $ .\" .\" Documentation and design originally from FreeBSD. All the code has .\" been rewritten since. We keep the documentation's notice: @@ -42,7 +42,6 @@ .Op Fl M Ar displayfile .Op Fl P Ar pkg-dependency .Op Fl p Ar prefix -.Op Fl r Ar rscript .Op Fl S Ar pkg-destdir .Op Fl U Ar undisplayfile .Op Fl W Ar wantedlib @@ -123,14 +122,18 @@ concatenated together. .It Fl i Ar iscript Set .Ar iscript -to be the install procedure for the package. +to be the install procedure for the package (deprecated, use +.Cm @exec +instead). This can be any executable program (or shell script). It will be invoked automatically when the package is later installed. .It Fl k Ar dscript Set .Ar dscript -to be the de-install procedure for the package. +to be the de-install procedure for the package (deprecated, use +.Cm @unexec +instead). This can be any executable program (or shell script). It will be invoked automatically when the package is later (if ever) de-installed. @@ -172,16 +175,6 @@ Print out the actual packing-list of the package being generated (query mode). Most often used in combination with .Fl n . -.It Fl r Ar rscript -Set -.Ar rscript -to be the -.Dq requirements -procedure for the package. -This can be any executable program (or shell script). -It will be invoked automatically -at installation/deinstallation time to determine whether or not -installation/deinstallation should proceed. .It Fl S Ar pkg-destdir Set .Ar pkg-destdir diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1 index 416302577a2..62d128825ca 100644 --- a/usr.sbin/pkg_add/pkg_delete.1 +++ b/usr.sbin/pkg_add/pkg_delete.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_delete.1,v 1.22 2007/04/15 10:17:29 espie Exp $ +.\" $OpenBSD: pkg_delete.1,v 1.23 2007/05/31 11:05:41 espie Exp $ .\" .\" Documentation and design originally from FreeBSD. All the code has .\" been rewritten since. We keep the documentation's notice: @@ -114,27 +114,6 @@ the list of packages to remove, .Nm will list those dependent packages and refuse to delete the package. .Pp -If the package contains a -.Ar require -file (see -.Xr pkg_create 1 ) , -then this is executed first as -.Bd -filled -offset indent -.Cm require -.Ar <pkg-name> -.Ar DEINSTALL -.Ed -.Pp -(where -.Ar pkgname -is the name of the package in question and -.Ar DEINSTALL -is a keyword denoting that this is a deinstallation) -to see whether or not deinstallation should continue. -A non-zero exit status means no, unless the -.Fl f -option is specified. -.Pp If a .Cm deinstall script exists for the package, it is executed before any files are removed. diff --git a/usr.sbin/pkg_add/pod/OpenBSD::PackingElement.pod b/usr.sbin/pkg_add/pod/OpenBSD::PackingElement.pod index ac3bf58d531..ab17d573935 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::PackingElement.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::PackingElement.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::PackingElement.pod,v 1.6 2005/08/17 19:28:24 espie Exp $ +$OpenBSD: OpenBSD::PackingElement.pod,v 1.7 2007/05/31 11:05:41 espie Exp $ =head1 NAME @@ -90,11 +90,7 @@ package description. =item ::FREQUIRE -registration of forward dependencies (see L<OpenBSD::RequiredBy(3p)>). - -=item ::FREQUIRED_BY - -registration of reverse dependencies. +Deprecated. =item ::FMTREE_DIRS |