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 Sync pkgtools/pkg_install w...
details: https://anonhg.NetBSD.org/pkgsrc/rev/db081d6f1f9f
branches: trunk
changeset: 464381:db081d6f1f9f
user: grant <grant%pkgsrc.org@localhost>
date: Mon Dec 08 13:50:50 2003 +0000
description:
Sync pkgtools/pkg_install with src/usr.sbin/pkg_install from 20031121.
diffstat:
pkgtools/pkg_install/files/add/pkg_add.cat1 | 114 +++++++++++----------
pkgtools/pkg_install/files/create/pkg_create.cat1 | 88 ++++++++--------
pkgtools/pkg_install/files/delete/pkg_delete.cat1 | 26 ++--
pkgtools/pkg_install/files/info/pkg_info.1 | 4 +-
pkgtools/pkg_install/files/info/pkg_info.cat1 | 54 +++++-----
pkgtools/pkg_install/files/lib/file.c | 30 +++--
pkgtools/pkg_install/files/lib/version.h | 4 +-
pkgtools/pkg_install/files/view/linkfarm.1 | 4 +-
pkgtools/pkg_install/files/view/linkfarm.cat1 | 2 +-
pkgtools/pkg_install/files/view/pkg_view.1 | 4 +-
pkgtools/pkg_install/files/view/pkg_view.cat1 | 42 ++++----
11 files changed, 192 insertions(+), 180 deletions(-)
diffs (truncated from 838 to 300 lines):
diff -r dadec6aeb477 -r db081d6f1f9f pkgtools/pkg_install/files/add/pkg_add.cat1
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1 Mon Dec 08 13:39:11 2003 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1 Mon Dec 08 13:50:50 2003 +0000
@@ -1,4 +1,4 @@
-PKG_ADD(1) NetBSD Reference Manual PKG_ADD(1)
+PKG_ADD(1) NetBSD General Commands Manual PKG_ADD(1)
NNAAMMEE
ppkkgg__aadddd - a utility for installing and upgrading software package distri-
@@ -14,13 +14,14 @@
been previously created with the pkg_create(1) command. Packages are
prepared collections of pre-built binaries, documentation, configura-
tions, installation instructions and/or other files. ppkkgg__aadddd can recur-
- sively install other packages that the current package depends on or re-
- quires from both local disk and via FTP or HTTP.
+ sively install other packages that the current package depends on or
+ requires from both local disk and via FTP or HTTP.
WWAARRNNIINNGG
- _S_i_n_c_e _t_h_e ppkkgg__aadddd _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _c_o_n_t_a_i_n_e_d
_w_i_t_h_-
- _i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_e_s_'_'
_o_r
- _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e
_f_i_l_e_s_.
+ _S_i_n_c_e _t_h_e ppkkgg__aadddd _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _c_o_n_t_a_i_n_e_d
+ _w_i_t_h_i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n
+ _h_o_r_s_e_s_'_' _o_r _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s
+ _p_a_c_k_a_g_e _f_i_l_e_s_.
_Y_o_u _a_r_e _a_d_v_i_s_e_d _t_o _v_e_r_i_f_y _t_h_e _c_o_m_p_e_t_e_n_c_e _a_n_d _i_d_e_n_t_i_t_y _o_f _t_h_o_s_e _w_h_o _p_r_o_-
_v_i_d_e _i_n_s_t_a_l_l_a_b_l_e _p_a_c_k_a_g_e _f_i_l_e_s_. _F_o_r _e_x_t_r_a _p_r_o_t_e_c_t_i_o_n_, _u_s_e _t_h_e _d_i_g_i_t_a_l
@@ -40,9 +41,9 @@
or a local pathname, a package name of "-" will cause ppkkgg__aadddd to
read from stdin. If the packages are not found in the current
working directory, ppkkgg__aadddd will search them in each directory
- named by the PKG_PATH environment variable. Any dependencies re-
- quired by the installed package will be searched in the same lo-
- cation that the original package was installed from.
+ named by the PKG_PATH environment variable. Any dependencies
+ required by the installed package will be searched in the same
+ location that the original package was installed from.
--ff Force installation to proceed even if prerequisite packages are
not installed or the requirements script fails. Although ppkkgg__aadddd
@@ -77,12 +78,12 @@
Set _p_r_e_f_i_x as the directory in which to extract files from a
package. If a package has set its default directory, it will be
overridden by this flag. Note that only the first @@ccwwdd directive
- will be replaced, since ppkkgg__aadddd has no way of knowing which di-
- rectory settings are relative and which are absolute. It is rare
- in any case to see more than one directory transition made, but
- when such does happen and you wish to have control over *all* di-
- rectory transitions, then you may then wish to look into the use
- of MMAASSTTEERR and SSLLAAVVEE modes (see the --MM and --SS options).
+ will be replaced, since ppkkgg__aadddd has no way of knowing which
+ directory settings are relative and which are absolute. It is
+ rare in any case to see more than one directory transition made,
+ but when such does happen and you wish to have control over *all*
+ directory transitions, then you may then wish to look into the
+ use of MMAASSTTEERR and SSLLAAVVEE modes (see the --MM and --SS options).
--RR Do not record the installation of a package. This means that you
cannot deinstall it later, so only use this option if you know
@@ -104,14 +105,14 @@
are defined: none, gpg and pgp5. The signature will be verified
at install time, and the results will be displayed. If the sig-
nature type is anything other than none, the user will be asked
- if ppkkgg__aadddd should proceed to install the binary package. The us-
- er must then take the decision whether to proceed or not, depend-
- ing upon the amount of trust that is placed in the signatory of
- the binary package. Please note that, at the current time, it is
- not possible to use the verification feature when using ppkkgg__aadddd
- to add a binary package via a URL - the package, and the related
- detached signature file, must be local for the verification to
- work.
+ if ppkkgg__aadddd should proceed to install the binary package. The
+ user must then take the decision whether to proceed or not,
+ depending upon the amount of trust that is placed in the signa-
+ tory of the binary package. Please note that, at the current
+ time, it is not possible to use the verification feature when
+ using ppkkgg__aadddd to add a binary package via a URL - the package,
+ and the related detached signature file, must be local for the
+ verification to work.
--tt _t_e_m_p_l_a_t_e
Use _t_e_m_p_l_a_t_e as the input to mktemp(3) when creating a ``staging
@@ -125,9 +126,10 @@
_t_e_m_p_l_a_t_e to reside on the same disk partition as target directo-
ries for package file installation; often this is _/_u_s_r.
- --uu If the package that's being installed is already installed, ei-
- ther in the same or a different version, an update is performed.
- See below for a more detailed description of the process.
+ --uu If the package that's being installed is already installed,
+ either in the same or a different version, an update is per-
+ formed. See below for a more detailed description of the
+ process.
--VV Print version number and exit.
@@ -135,8 +137,8 @@
--WW _v_i_e_w_b_a_s_e
Set _v_i_e_w_b_a_s_e as the base directory for the managed views. The
- default _v_i_e_w_b_a_s_e directory is set by pkg_view(1). This value al-
- so may be set from the LOCALBASE environment variable.
+ default _v_i_e_w_b_a_s_e directory is set by pkg_view(1). This value
+ also may be set from the LOCALBASE environment variable.
--ww _v_i_e_w
Set the _v_i_e_w to which packages should be added after installa-
@@ -150,15 +152,15 @@
ppkkgg__aadddd ftp://ftp.NetBSD.org/pub/NetBSD/pack-
ages/1.5/i386/shells/bash-2.04.tgz or ppkkgg__aadddd http://www.exam-
ple.org/packages/screen-4.0.tbz). Note: For ftp transfers, if you wish
- to use _p_a_s_s_i_v_e _m_o_d_e ftp in such transfers, set the variable _F_T_P___P_A_S_-
- _S_I_V_E___M_O_D_E to some value in your environment. Otherwise, the more stan-
+ to use _p_a_s_s_i_v_e _m_o_d_e ftp in such transfers, set the variable _F_T_P___P_A_S_-
+ _S_I_V_E___M_O_D_E to some value in your environment. Otherwise, the more stan-
dard ACTIVE mode may be used. If ppkkgg__aadddd consistently fails to fetch a
package from a site known to work, it may be because you have a firewall
- that demands the usage of _p_a_s_s_i_v_e _m_o_d_e ftp.
+ that demands the usage of _p_a_s_s_i_v_e _m_o_d_e ftp.
TTEECCHHNNIICCAALL DDEETTAAIILLSS
- ppkkgg__aadddd extracts each package's "packing list" into a special staging di-
- rectory in /var/tmp (or $PKG_TMPDIR if set) and then runs through the
+ ppkkgg__aadddd extracts each package's "packing list" into a special staging
+ directory in /var/tmp (or $PKG_TMPDIR if set) and then runs through the
following sequence to fully extract the contents of the package:
1. A check is made to determine if the package or another version
@@ -172,18 +174,18 @@
ful, replacing is prepared by moving an existing _+_R_E_Q_U_I_R_E_D___B_Y
file aside (if it exists), and running pkg_delete(1) on the
installed package. Installation then proceeds as if the pack-
- age was not installed, and restores the _+_R_E_Q_U_I_R_E_D___B_Y file af-
- terwards.
+ age was not installed, and restores the _+_R_E_Q_U_I_R_E_D___B_Y file
+ afterwards.
2. A check is made to determine if the package conflicts (from
- @@ppkkggccffll directives, see pkg_create(1)) with an already record-
- ed as installed package. If it is, installation is terminat-
- ed.
+ @@ppkkggccffll directives, see pkg_create(1)) with an already
+ recorded as installed package. If it is, installation is ter-
+ minated.
3. All package dependencies (from @@ppkkggddeepp directives, see
pkg_create(1)) are read from the packing list. If any of
- these required packages are not currently installed, an at-
- tempt is made to find and install it; if the missing package
+ these required packages are not currently installed, an
+ attempt is made to find and install it; if the missing package
cannot be found or installed, the installation is terminated.
4. A search is made for any @@ooppttiioonn directives which control how
@@ -192,9 +194,9 @@
package to be extracted directly into its prefix directory
rather than moving it through a staging area in _/_v_a_r_/_t_m_p.
- 5. If @@ooppttiioonn eexxttrraacctt--iinn--ppllaaccee is enabled, the package is now ex-
- tracted directly into its final location, otherwise it is ex-
- tracted into the staging area.
+ 5. If @@ooppttiioonn eexxttrraacctt--iinn--ppllaaccee is enabled, the package is now
+ extracted directly into its final location, otherwise it is
+ extracted into the staging area.
6. If the package contains a _r_e_q_u_i_r_e script (see pkg_create(1)),
it is executed with the following arguments:
@@ -215,8 +217,8 @@
_p_k_g_-_n_a_m_e The name of the package being installed.
PPRREE--IINNSSTTAALLLL Keyword denoting that the script is to perform
- any actions needed before the package is in-
- stalled.
+ any actions needed before the package is
+ installed.
If the _i_n_s_t_a_l_l script exits with a non-zero status code, the
installation is terminated.
@@ -250,8 +252,8 @@
an alternate package database directory is specified, then it
overrides the _/_v_a_r_/_d_b_/_p_k_g path shown above).
- 12. If the package is a depoted package, then add it to the de-
- fault view.
+ 12. If the package is a depoted package, then add it to the
+ default view.
13. The staging area is deleted and the program terminates.
@@ -275,12 +277,12 @@
directory is _/_v_a_r_/_d_b_/_p_k_g.
PKG_PATH The value of the PKG_PATH is used if a given package can't be
- found, it's usually set to _/_u_s_r_/_p_k_g_s_r_c_/_p_a_c_k_a_g_e_s_/_A_l_l. The en-
- vironment variable should be a series of entries separated by
- semicolons. Each entry consists of a directory name or URL.
- The current directory may be indicated implicitly by an empty
- directory name, or explicitly by a single period. FTP URLs
- may not end with a slash.
+ found, it's usually set to _/_u_s_r_/_p_k_g_s_r_c_/_p_a_c_k_a_g_e_s_/_A_l_l. The
+ environment variable should be a series of entries separated
+ by semicolons. Each entry consists of a directory name or
+ URL. The current directory may be indicated implicitly by an
+ empty directory name, or explicitly by a single period. FTP
+ URLs may not end with a slash.
PKG_TMPDIR Staging directory for installing packages, defaults to
/var/tmp. Set to directory with lots of free disk if you run
@@ -290,8 +292,8 @@
variable.
EEXXAAMMPPLLEESS
- In all cases, ppkkgg__aadddd will try to install binary packages listed in de-
- pendencies list.
+ In all cases, ppkkgg__aadddd will try to install binary packages listed in
+ dependencies list.
You can specify a compiled binary package explicitly on the command line.
@@ -337,4 +339,4 @@
Sure to be others.
-NetBSD 1.6.1 October 3, 2003 6
+NetBSD 1.6 October 3, 2003 NetBSD 1.6
diff -r dadec6aeb477 -r db081d6f1f9f pkgtools/pkg_install/files/create/pkg_create.cat1
--- a/pkgtools/pkg_install/files/create/pkg_create.cat1 Mon Dec 08 13:39:11 2003 +0000
+++ b/pkgtools/pkg_install/files/create/pkg_create.cat1 Mon Dec 08 13:50:50 2003 +0000
@@ -14,8 +14,8 @@
DDEESSCCRRIIPPTTIIOONN
The ppkkgg__ccrreeaattee command is used to create packages that will subsequently
- be fed to one of the package extraction/info utilities. The input de-
- scription and command line arguments for the creation of a package are
+ be fed to one of the package extraction/info utilities. The input
+ description and command line arguments for the creation of a package are
not really meant to be human-generated, though it is easy enough to do
so. It is more expected that you will use a front-end tool for the job
rather than muddling through it yourself. Nonetheless, a short descrip-
@@ -35,16 +35,16 @@
Install the file _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e so that users of binary pack-
ages can see what versions of the files used to control the build
were used when creating the binary package. This allows some
- fine-grained version control information to be retained in a bi-
- nary package and viewed wherever it is installed, using
+ fine-grained version control information to be retained in a
+ binary package and viewed wherever it is installed, using
pkg_info(1).
--CC _c_p_k_g_s
Set the initial package conflict list to _c_p_k_g_s. This is assumed
to be a whitespace separated list of package names and is meant
as a convenient shorthand for specifying multiple @@ppkkggccffll direc-
- tives in the packing list (see PACKING LIST DETAILS section be-
- low).
+ tives in the packing list (see PACKING LIST DETAILS section
+ below).
--cc _[_-_]_d_e_s_c
Fetch package (one line description) from file _d_e_s_c or, if pre-
@@ -75,8 +75,8 @@
--ii _i_s_c_r_i_p_t
Set _i_s_c_r_i_p_t to be the install procedure for the package. This
- can be any executable program (or shell script). It will be in-
- voked automatically when the package is later installed.
+ can be any executable program (or shell script). It will be
+ invoked automatically when the package is later installed.
--KK _p_k_g___d_b_d_i_r
Set _p_k_g___d_b_d_i_r as the package database directory. If this option
@@ -86,9 +86,9 @@
--kk _d_s_c_r_i_p_t
Set _d_s_c_r_i_p_t to be the de-install procedure for the package. This
- can be any executable program (or shell script). It will be in-
- voked automatically when the package is later (if ever) de-in-
- stalled.
+ can be any executable program (or shell script). It will be
+ invoked automatically when the package is later (if ever) de-
+ installed.
--LL _S_r_c_D_i_r
This sets the package's @src directive; see below for a descrip-
@@ -100,15 +100,15 @@
which are targeted at full path names.
--mm _m_t_r_e_e_f_i_l_e
- Run mtree(8) with input from mtreefile before the package is in-
- stalled. Mtree is invoked as mmttrreeee --uu --ff _m_t_r_e_e_f_i_l_e --dd --ee --pp
+ Run mtree(8) with input from mtreefile before the package is
+ installed. Mtree is invoked as mmttrreeee --uu --ff _m_t_r_e_e_f_i_l_e --dd --ee --pp
_p_r_e_f_i_x, where _p_r_e_f_i_x is the name of the first directory named by
a @@ccwwdd directive.
--nn _p_r_e_s_e_r_v_e_-_f_i_l_e
- The file is used to denote that the package should not be delet-
- ed. This is intended for use where the deletion of packages may
Home |
Main Index |
Thread Index |
Old Index