pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files After the obsoletion on Mar...
details: https://anonhg.NetBSD.org/pkgsrc/rev/06ac92cf0a6f
branches: trunk
changeset: 531247:06ac92cf0a6f
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Jul 26 11:30:55 2007 +0000
description:
After the obsoletion on March, remove the support for require scripts.
Also remove the documentation of the mtree parts as it is not supported.
diffstat:
pkgtools/pkg_install/files/add/perform.c | 20 +------
pkgtools/pkg_install/files/add/pkg_add.1 | 32 +---------
pkgtools/pkg_install/files/add/pkg_add.cat1 | 63 ++++++++--------------
pkgtools/pkg_install/files/delete/perform.c | 15 +----
pkgtools/pkg_install/files/delete/pkg_delete.1 | 30 +---------
pkgtools/pkg_install/files/delete/pkg_delete.cat1 | 19 +-----
pkgtools/pkg_install/files/info/info.h | 3 +-
pkgtools/pkg_install/files/info/main.c | 12 +--
pkgtools/pkg_install/files/info/perform.c | 13 +----
pkgtools/pkg_install/files/info/pkg_info.1 | 4 +-
pkgtools/pkg_install/files/info/pkg_info.cat1 | 2 -
pkgtools/pkg_install/files/lib/lib.h | 3 +-
pkgtools/pkg_install/files/view/pkg_view.1 | 8 +-
pkgtools/pkg_install/files/view/pkg_view.cat1 | 8 +-
14 files changed, 58 insertions(+), 174 deletions(-)
diffs (truncated from 558 to 300 lines):
diff -r 72dacbf32fd9 -r 06ac92cf0a6f pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c Thu Jul 26 11:27:58 2007 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c Thu Jul 26 11:30:55 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.49 2007/07/25 15:01:46 joerg Exp $ */
+/* $NetBSD: perform.c,v 1.50 2007/07/26 11:30:55 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -14,7 +14,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.49 2007/07/25 15:01:46 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.50 2007/07/26 11:30:55 joerg Exp $");
#endif
#endif
@@ -823,22 +823,6 @@
if (errc != 0)
goto bomb;
- /* Look for the requirements file */
- if (fexists(REQUIRE_FNAME)) {
- warnx("package %s uses obsoleted require scripts", PkgName);
- (void) fexec(CHMOD_CMD, "+x", REQUIRE_FNAME, NULL); /* be sure */
- if (Verbose)
- printf("Running requirements file first for %s.\n", PkgName);
- if (!Fake && fexec("./" REQUIRE_FNAME, PkgName, "INSTALL", NULL)) {
- warnx("package %s fails requirements %s", pkg,
- Force ? "installing anyway" : "- not installed");
- if (!Force) {
- errc = 1;
- goto success; /* close enough for government work */
- }
- }
- }
-
/* If we're really installing, and have an installation file, run it */
if (!NoInstall && fexists(INSTALL_FNAME)) {
(void) fexec(CHMOD_CMD, "+x", INSTALL_FNAME, NULL); /* make sure */
diff -r 72dacbf32fd9 -r 06ac92cf0a6f pkgtools/pkg_install/files/add/pkg_add.1
--- a/pkgtools/pkg_install/files/add/pkg_add.1 Thu Jul 26 11:27:58 2007 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.1 Thu Jul 26 11:30:55 2007 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.20 2007/07/25 15:01:46 joerg Exp $
+.\" $NetBSD: pkg_add.1,v 1.21 2007/07/26 11:30:55 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -65,11 +65,9 @@
flag to extract the package file, and inspect its contents and scripts
to ensure it poses no danger to your system's integrity.
Pay particular attention to any
-.Pa +INSTALL ,
-.Pa +DEINSTALL ,
-.Pa +REQUIRE ,
+.Pa +INSTALL
or
-.Pa +MTREE_DIRS
+.Pa +DEINSTALL
files, and inspect the
.Pa +CONTENTS
file for
@@ -118,7 +116,7 @@
removed.
.It Fl f
Force installation to proceed even if prerequisite packages are not
-installed or the requirements script fails.
+installed or the install script fails.
Although
.Nm
will still try to find and auto-install missing prerequisite packages,
@@ -407,24 +405,6 @@
If the package was built with ABI dependency recommendations ignored,
a warning will be issued.
.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:
@@ -483,9 +463,7 @@
.Pp
The
.Ar install
-and
-.Ar require
-scripts are called with the environment variable
+script is called with the environment variable
.Ev PKG_PREFIX
set to the installation prefix (see the
.Fl p
diff -r 72dacbf32fd9 -r 06ac92cf0a6f pkgtools/pkg_install/files/add/pkg_add.cat1
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1 Thu Jul 26 11:27:58 2007 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1 Thu Jul 26 11:30:55 2007 +0000
@@ -28,10 +28,10 @@
_s_i_g_n_a_t_u_r_e_s _p_r_o_v_i_d_e_d _w_h_e_r_e _p_o_s_s_i_b_l_e _(_s_e_e _t_h_e --ss _o_p_t_i_o_n_)_, _o_r_, _f_a_i_l_i_n_g
_t_h_a_t_,
_u_s_e _t_h_e --MM _f_l_a_g _t_o _e_x_t_r_a_c_t _t_h_e _p_a_c_k_a_g_e _f_i_l_e_, _a_n_d _i_n_s_p_e_c_t _i_t_s _c_o_n_t_e_n_t_s _a_n_d
_s_c_r_i_p_t_s _t_o _e_n_s_u_r_e _i_t _p_o_s_e_s _n_o _d_a_n_g_e_r _t_o _y_o_u_r _s_y_s_t_e_m_'_s _i_n_t_e_g_r_i_t_y_. _P_a_y
- _p_a_r_t_i_c_u_l_a_r _a_t_t_e_n_t_i_o_n _t_o _a_n_y _+_I_N_S_T_A_L_L_, _+_D_E_I_N_S_T_A_L_L_, _+_R_E_Q_U_I_R_E_, _o_r
- _+_M_T_R_E_E___D_I_R_S _f_i_l_e_s_, _a_n_d _i_n_s_p_e_c_t _t_h_e _+_C_O_N_T_E_N_T_S _f_i_l_e _f_o_r @@ccwwdd_, @@mmooddee
_(_c_h_e_c_k
- _f_o_r _s_e_t_u_i_d_)_, @@ddiirrrrmm_, @@eexxeecc_, _a_n_d @@uunneexxeecc _d_i_r_e_c_t_i_v_e_s_, _a_n_d_/_o_r _u_s_e _t_h_e
- pkg_info(_1) _c_o_m_m_a_n_d _t_o _e_x_a_m_i_n_e _t_h_e _p_a_c_k_a_g_e _f_i_l_e_.
+ _p_a_r_t_i_c_u_l_a_r _a_t_t_e_n_t_i_o_n _t_o _a_n_y _+_I_N_S_T_A_L_L _o_r _+_D_E_I_N_S_T_A_L_L _f_i_l_e_s_, _a_n_d _i_n_s_p_e_c_t
_t_h_e
+ _+_C_O_N_T_E_N_T_S _f_i_l_e _f_o_r @@ccwwdd_, @@mmooddee _(_c_h_e_c_k _f_o_r _s_e_t_u_i_d_)_, @@ddiirrrrmm_, @@eexxeecc_, _a_n_d
+ @@uunneexxeecc _d_i_r_e_c_t_i_v_e_s_, _a_n_d_/_o_r _u_s_e _t_h_e pkg_info(_1) _c_o_m_m_a_n_d _t_o _e_x_a_m_i_n_e _t_h_e
+ _p_a_c_k_a_g_e _f_i_l_e_.
OOPPTTIIOONNSS
The following command line arguments are supported:
@@ -55,12 +55,11 @@
removed.
--ff Force installation to proceed even if prerequisite packages are
- not installed or the requirements script fails. Although ppkkgg__aadddd
- will still try to find and auto-install missing prerequisite
- packages, a failure to find one will not be fatal. This flag
- also overrides the fatal error when the operating system or
- architecture the package was built on differ from that of the
- host.
+ not installed or the install script fails. Although ppkkgg__aadddd will
+ still try to find and auto-install missing prerequisite packages,
+ a failure to find one will not be fatal. This flag also over-
+ rides the fatal error when the operating system or architecture
+ the package was built on differ from that of the host.
--II If an installation script exists for a given package, do not exe-
cute it.
@@ -226,20 +225,7 @@
age was built with ABI dependency recommendations ignored, a
warning will be issued.
- 8. If the package contains a _r_e_q_u_i_r_e script (see pkg_create(1)),
- it is executed with the following arguments:
-
- _p_k_g_-_n_a_m_e The name of the package being installed
-
- IINNSSTTAALLLL Keyword denoting to the script that it is to run
- an installation requirements check. (The key-
- word is useful only to scripts which serve mul-
- tiple functions).
-
- If the _r_e_q_u_i_r_e script exits with a non-zero status code, the
- installation is terminated.
-
- 9. If the package contains an _i_n_s_t_a_l_l script, it is executed with
+ 8. If the package contains an _i_n_s_t_a_l_l script, it is executed with
the following arguments:
_p_k_g_-_n_a_m_e The name of the package being installed.
@@ -251,12 +237,12 @@
If the _i_n_s_t_a_l_l script exits with a non-zero status code, the
installation is terminated.
- 10. If @@ooppttiioonn eexxttrraacctt--iinn--ppllaaccee is not present in the packing
+ 9. If @@ooppttiioonn eexxttrraacctt--iinn--ppllaaccee is not present in the packing
list, then it is used as a guide for moving (or copying, as
necessary) files from the staging area into their final loca-
tions.
- 11. If an _i_n_s_t_a_l_l script exists for the package, it is executed
+ 10. If an _i_n_s_t_a_l_l script exists for the package, it is executed
with the following arguments:
_p_k_g___n_a_m_e The name of the package being installed.
@@ -265,7 +251,7 @@
any actions needed after the package has been
installed.
- 12. After installation is complete, a copy of the packing list,
+ 11. After installation is complete, a copy of the packing list,
_d_e_i_n_s_t_a_l_l script, description, and display files are copied
into _/_v_a_r_/_d_b_/_p_k_g_/_<_p_k_g_-_n_a_m_e_> for subsequent possible use by
pkg_delete(1). Any package dependencies are recorded in the
@@ -273,24 +259,23 @@
an alternate package database directory is specified, then it
overrides the _/_v_a_r_/_d_b_/_p_k_g path shown above).
- 13. If the package is a depoted package, then add it to the
+ 12. If the package is a depoted package, then add it to the
default view.
- 14. The staging area is deleted and the program terminates.
+ 13. The staging area is deleted and the program terminates.
- 15. Finally, if we were upgrading a package, any _+_R_E_Q_U_I_R_E_D___B_Y file
+ 14. Finally, if we were upgrading a package, any _+_R_E_Q_U_I_R_E_D___B_Y file
that was moved aside before upgrading was started is now moved
back into place.
- The _i_n_s_t_a_l_l and _r_e_q_u_i_r_e scripts are called with the environment variable
- PKG_PREFIX set to the installation prefix (see the --pp option above).
- This allows a package author to write a script that reliably performs
- some action on the directory where the package is installed, even if the
- user might change it with the --pp flag to ppkkgg__aadddd. The scripts are also
- called with the PKG_METADATA_DIR environment variable set to the location
- of the _+_* meta-data files, and with the PKG_REFCOUNT_DBDIR environment
- variable set to the location of the package reference counts database
- directory.
+ The _i_n_s_t_a_l_l script is called with the environment variable PKG_PREFIX set
+ to the installation prefix (see the --pp option above). This allows a
+ package author to write a script that reliably performs some action on
+ the directory where the package is installed, even if the user might
+ change it with the --pp flag to ppkkgg__aadddd. The scripts are also called with
+ the PKG_METADATA_DIR environment variable set to the location of the _+_*
+ meta-data files, and with the PKG_REFCOUNT_DBDIR environment variable set
+ to the location of the package reference counts database directory.
EENNVVIIRROONNMMEENNTT
LOCALBASE This is the location of the _v_i_e_w_b_a_s_e directory in which all
diff -r 72dacbf32fd9 -r 06ac92cf0a6f pkgtools/pkg_install/files/delete/perform.c
--- a/pkgtools/pkg_install/files/delete/perform.c Thu Jul 26 11:27:58 2007 +0000
+++ b/pkgtools/pkg_install/files/delete/perform.c Thu Jul 26 11:30:55 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.17 2007/07/20 22:22:52 joerg Exp $ */
+/* $NetBSD: perform.c,v 1.18 2007/07/26 11:30:55 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.17 2007/07/20 22:22:52 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.18 2007/07/26 11:30:55 joerg Exp $");
#endif
#endif
@@ -740,17 +740,6 @@
}
setenv(PKG_PREFIX_VNAME, p->name, 1);
setenv(PKG_METADATA_DIR_VNAME, LogDir, 1);
- if (fexists(REQUIRE_FNAME)) {
- if (Verbose)
- printf("Executing 'require' script.\n");
- (void) fexec(CHMOD_CMD, "+x", REQUIRE_FNAME, NULL); /* be sure */
- if (fexec("./" REQUIRE_FNAME, pkg, "DEINSTALL", NULL)) {
- warnx("package %s fails requirements %s", pkg,
- Force ? "" : "- not deleted");
- if (!Force)
- return 1;
- }
- }
/*
* Ensure that we don't do VIEW-DEINSTALL action for old packages
* or for the package in its depot directory.
diff -r 72dacbf32fd9 -r 06ac92cf0a6f pkgtools/pkg_install/files/delete/pkg_delete.1
--- a/pkgtools/pkg_install/files/delete/pkg_delete.1 Thu Jul 26 11:27:58 2007 +0000
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.1 Thu Jul 26 11:30:55 2007 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_delete.1,v 1.14 2007/07/25 15:01:47 joerg Exp $
+.\" $NetBSD: pkg_delete.1,v 1.15 2007/07/26 11:30:55 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -57,11 +57,9 @@
.Pa ( /var/db/pkg/\*[Lt]pkg-name\*[Gt]/ ) .
Pay particular
attention to any
-.Pa +INSTALL ,
-.Pa +DEINSTALL ,
-.Pa +REQUIRE ,
+.Pa +INSTALL
or
-.Pa +MTREE_DIRS
+.Pa +DEINSTALL
files, and inspect the
.Pa +CONTENTS
file for
@@ -110,7 +108,7 @@
instead of the package-name.
.It Fl f
Force removal of the package, even if a dependency is recorded or the
-deinstall or require script fails.
+deinstall script fails.
.It Fl K Ar pkg_dbdir
Set
.Ar pkg_dbdir
@@ -195,26 +193,6 @@
.Fl aF
command.
.Pp
-If the package contains a
Home |
Main Index |
Thread Index |
Old Index