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 Pull in documentation/white...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b39576f39551
branches: trunk
changeset: 488559:b39576f39551
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Feb 04 01:19:03 2005 +0000
description:
Pull in documentation/whitespace fixes and improvements from the HEAD
revision of src/usr.sbin/pkg_install as of 20050204. I ran:
cd pkgsrc/pkg_install/files
./pkg_install2nbcompat .
Then I ran "cvs diff" and looked for portability-related changes that
were removed as a result of the import and resurrected them from the
repository.
diffstat:
pkgtools/pkg_install/files/README | 5 ++-
pkgtools/pkg_install/files/add/pkg_add.1 | 42 ++++++++++++++--------
pkgtools/pkg_install/files/add/pkg_add.cat1 | 26 +++++++-------
pkgtools/pkg_install/files/admin/pkg_admin.1 | 15 +++++--
pkgtools/pkg_install/files/admin/pkg_admin.cat1 | 6 +-
pkgtools/pkg_install/files/delete/pkg_delete.1 | 13 +++++-
pkgtools/pkg_install/files/delete/pkg_delete.cat1 | 8 ++--
pkgtools/pkg_install/files/info/perform.c | 6 +-
pkgtools/pkg_install/files/view/pkg_view.1 | 13 +++++-
pkgtools/pkg_install/files/view/pkg_view.cat1 | 2 +-
10 files changed, 85 insertions(+), 51 deletions(-)
diffs (truncated from 365 to 300 lines):
diff -r 7e7ed7c1dbf3 -r b39576f39551 pkgtools/pkg_install/files/README
--- a/pkgtools/pkg_install/files/README Fri Feb 04 01:00:23 2005 +0000
+++ b/pkgtools/pkg_install/files/README Fri Feb 04 01:19:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: README,v 1.5 2004/04/11 06:56:11 rh Exp $
+# $NetBSD: README,v 1.6 2005/02/04 01:19:03 jlam Exp $
# Original from FreeBSD, no rcs id.
This is the pkg_install suite of tools for doing maintainance of
@@ -16,3 +16,6 @@
When making snapshots, please modify PKGTOOLS_VERSION in lib/version.h
to that day's date.
+
+This is the canonical location for these sources. Any changes should
+be made here first, then merged over to pkgsrc.
diff -r 7e7ed7c1dbf3 -r b39576f39551 pkgtools/pkg_install/files/add/pkg_add.1
--- a/pkgtools/pkg_install/files/add/pkg_add.1 Fri Feb 04 01:00:23 2005 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.1 Fri Feb 04 01:19:03 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.10 2004/12/10 21:14:40 erh Exp $
+.\" $NetBSD: pkg_add.1,v 1.11 2005/02/04 01:19:03 jlam Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -17,7 +17,7 @@
.\"
.\" @(#)pkg_add.1
.\"
-.Dd April 11, 2004
+.Dd December 10, 2004
.Dt PKG_ADD 1
.Os
.Sh NAME
@@ -74,8 +74,15 @@
.Fl M
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 +INSTALL, +DEINSTALL, +REQUIRE
-or +MTREE_DIRS files, and inspect the +CONTENTS file for
+Pay particular attention to any
+.Pa +INSTALL ,
+.Pa +DEINSTALL ,
+.Pa +REQUIRE ,
+or
+.Pa +MTREE_DIRS
+files, and inspect the
+.Pa +CONTENTS
+file for
.Cm @cwd ,
.Cm @mode
(check for setuid),
@@ -239,9 +246,9 @@
.Pa /usr .
.It Fl u
If the package that's being installed is already installed, either
-in the same or a different version, an update is performed. If this
-is specified twice, then any dependant packages that are too old will
-also be updated to fulfill the dependecy.
+in the same or a different version, an update is performed.
+If this is specified twice, then any dependant packages that are
+too old will also be updated to fulfill the dependency.
See below for a more detailed description of the process.
.It Fl V
Print version number and exit.
@@ -279,7 +286,7 @@
Thus you may extract files directly from their anonymous ftp or WWW
locations (e.g.,
.Nm
-ftp://ftp.NetBSD.org/pub/NetBSD/packages/1.5/i386/shells/bash-2.04.tgz
+ftp://ftp.NetBSD.org/pub/NetBSD/packages/2.0/i386/shells/bash-3.0nb1.tgz
or
.Nm
http://www.example.org/packages/screen-4.0.tbz).
@@ -319,7 +326,8 @@
If the
.Fl u
option is given, it's assumed the package should be replaced by the
-new version instead. Before doing so, all packages that depend on the
+new version instead.
+Before doing so, all packages that depend on the
pkg being upgraded are checked if they also work with the new version.
If that test is successful, replacing is prepared by moving an existing
.Pa +REQUIRED_BY
@@ -346,11 +354,15 @@
If any of 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. If the
+the installation is terminated.
+If the
.Fl u
-option was specified twice, required packages that are installed,
-but with too old of a version, are also updated. The dependant
-packages are found according to the normal PKG_PATH rules.
+option was specified twice, any required packages that are installed,
+but which have a version number that is considered to be too old,
+are also updated.
+The dependant packages are found according to the normal
+.Ev PKG_PATH
+rules.
.It
A search is made for any
.Cm @option
@@ -566,9 +578,9 @@
The URL can be put into an environment variable,
.Ev PKG_PATH .
.Bd -literal
-# pkg_add -v ftp://ftp.NetBSD.org/pub/NetBSD/packages/1.5/i386/All/mozilla-0.8.1.tgz
+# pkg_add -v ftp://ftp.NetBSD.org/pub/NetBSD/packages/2.0/i386/All/mozilla-1.7.3nb2.tgz
-# export PKG_PATH=ftp://ftp.NetBSD.org/pub/NetBSD/packages/1.5/i386/All
+# export PKG_PATH=ftp://ftp.NetBSD.org/pub/NetBSD/packages/2.0/i386/All
# pkg_add -v mozilla
.Ed
.Sh SEE ALSO
diff -r 7e7ed7c1dbf3 -r b39576f39551 pkgtools/pkg_install/files/add/pkg_add.cat1
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1 Fri Feb 04 01:00:23 2005 +0000
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1 Fri Feb 04 01:19:03 2005 +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_, _+_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_.
OOPPTTIIOONNSS
The following command line arguments are supported:
@@ -132,7 +132,7 @@
--uu If the package that's being installed is already installed,
either in the same or a different version, an update is per-
formed. If this is specified twice, then any dependant packages
- that are too old will also be updated to fulfill the dependecy.
+ that are too old will also be updated to fulfill the dependency.
See below for a more detailed description of the process.
--VV Print version number and exit.
@@ -154,7 +154,7 @@
a URL pointing at a file available on an ftp or web site. Thus you may
extract files directly from their anonymous ftp or WWW locations (e.g.,
ppkkgg__aadddd ftp://ftp.NetBSD.org/pub/NetBSD/pack-
- ages/1.5/i386/shells/bash-2.04.tgz or ppkkgg__aadddd http://www.exam-
+ ages/2.0/i386/shells/bash-3.0nb1.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-
@@ -191,10 +191,10 @@
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.
- If the --uu option was specified twice, required packages that
- are installed, but with too old of a version, are also
- updated. The dependant packages are found according to the
- normal PKG_PATH rules.
+ If the --uu option was specified twice, any required packages
+ that are installed, but which have a version number that is
+ considered to be too old, are also updated. The dependant
+ packages are found according to the normal PKG_PATH rules.
4. A search is made for any @@ooppttiioonn directives which control how
the package is added to the system. The only currently imple-
@@ -327,9 +327,9 @@
You can grab a compiled binary package from remote location, by specify-
ing a URL. The URL can be put into an environment variable, PKG_PATH.
- # pkg_add -v ftp://ftp.NetBSD.org/pub/NetBSD/packages/1.5/i386/All/mozilla-0.8.1.tgz
+ # pkg_add -v ftp://ftp.NetBSD.org/pub/NetBSD/packages/2.0/i386/All/mozilla-1.7.3nb2.tgz
- # export PKG_PATH=ftp://ftp.NetBSD.org/pub/NetBSD/packages/1.5/i386/All
+ # export PKG_PATH=ftp://ftp.NetBSD.org/pub/NetBSD/packages/2.0/i386/All
# pkg_add -v mozilla
SSEEEE AALLSSOO
@@ -359,4 +359,4 @@
Sure to be others.
-NetBSD 2.0 April 11, 2004 NetBSD 2.0
+NetBSD 2.0 December 10, 2004 NetBSD 2.0
diff -r 7e7ed7c1dbf3 -r b39576f39551 pkgtools/pkg_install/files/admin/pkg_admin.1
--- a/pkgtools/pkg_install/files/admin/pkg_admin.1 Fri Feb 04 01:00:23 2005 +0000
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.1 Fri Feb 04 01:19:03 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_admin.1,v 1.8 2004/08/20 20:09:53 jlam Exp $
+.\" $NetBSD: pkg_admin.1,v 1.9 2005/02/04 01:19:03 jlam Exp $
.\"
.\" Copyright (c) 1999-2002 Hubert Feyrer. All rights reserved.
.\"
@@ -102,14 +102,17 @@
.Bl -tag -width indent
.It Cm add Ar pkg ...
For each listed package, write the absolute pathnames of the files listed in
-its +CONTENTS file together with the package they belong to into the package
-database.
+its
+.Pa +CONTENTS
+file together with the package they belong to into the package database.
This should be used only by
.Xr pkg_view 1 .
.It Cm check Op Ar pkg ...
Use this command to check the files belonging to some or all of the
packages installed on the local machine against the checksum
-which was recorded in the +CONTENTS files at package installation time.
+which was recorded in the
+.Pa +CONTENTS
+files at package installation time.
Symbolic links also have their integrity checked against the recorded
value at package installation time.
If no additional argument is given, the files of all installed packages
@@ -117,7 +120,9 @@
be used here, see
.Xr pkg_info 1 ) .
.Pp
-The packages' +CONTENTS files will be parsed and the
+The packages'
+.Pa +CONTENTS
+files will be parsed and the
checksum will be checked for every file found.
A warning message is printed if the expected checksum differs from the
checksum of the file on disk.
diff -r 7e7ed7c1dbf3 -r b39576f39551 pkgtools/pkg_install/files/admin/pkg_admin.cat1
--- a/pkgtools/pkg_install/files/admin/pkg_admin.cat1 Fri Feb 04 01:00:23 2005 +0000
+++ b/pkgtools/pkg_install/files/admin/pkg_admin.cat1 Fri Feb 04 01:19:03 2005 +0000
@@ -45,21 +45,21 @@
aadddd _p_k_g _._._.
For each listed package, write the absolute pathnames of the
- files listed in its +CONTENTS file together with the package they
+ files listed in its _+_C_O_N_T_E_N_T_S file together with the package they
belong to into the package database. This should be used only by
pkg_view(1).
cchheecckk [_p_k_g _._._.]
Use this command to check the files belonging to some or all of
the packages installed on the local machine against the checksum
- which was recorded in the +CONTENTS files at package installation
+ which was recorded in the _+_C_O_N_T_E_N_T_S files at package installation
time. Symbolic links also have their integrity checked against
the recorded value at package installation time. If no addi-
tional argument is given, the files of all installed packages are
checked, else only the named packages will be checked (wildcards
can be used here, see pkg_info(1)).
- The packages' +CONTENTS files will be parsed and the checksum
+ The packages' _+_C_O_N_T_E_N_T_S files will be parsed and the checksum
will be checked for every file found. A warning message is
printed if the expected checksum differs from the checksum of the
file on disk. Symbolic links are also checked, ensuring that the
diff -r 7e7ed7c1dbf3 -r b39576f39551 pkgtools/pkg_install/files/delete/pkg_delete.1
--- a/pkgtools/pkg_install/files/delete/pkg_delete.1 Fri Feb 04 01:00:23 2005 +0000
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.1 Fri Feb 04 01:19:03 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_delete.1,v 1.8 2004/11/03 14:03:53 wiz Exp $
+.\" $NetBSD: pkg_delete.1,v 1.9 2005/02/04 01:19:03 jlam Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -54,8 +54,15 @@
package record directory
.Pa ( /var/db/pkg/\*[Lt]pkg-name\*[Gt]/ ) .
Pay particular
-attention to any +INSTALL, +DEINSTALL, +REQUIRE or +MTREE_DIRS files,
-and inspect the +CONTENTS file for
+attention to any
+.Pa +INSTALL ,
+.Pa +DEINSTALL ,
+.Pa +REQUIRE ,
+or
+.Pa +MTREE_DIRS
+files, and inspect the
+.Pa +CONTENTS
+file for
.Cm @cwd ,
.Cm @mode
(check for setuid),
diff -r 7e7ed7c1dbf3 -r b39576f39551 pkgtools/pkg_install/files/delete/pkg_delete.cat1
--- a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 Fri Feb 04 01:00:23 2005 +0000
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.cat1 Fri Feb 04 01:19:03 2005 +0000
@@ -20,10 +20,10 @@
_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_, _e_x_a_m_i_n_e _a_l_l _t_h_e
_p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s _i_n _t_h_e _p_a_c_k_a_g_e _r_e_c_o_r_d _d_i_r_e_c_t_o_r_y
_(_/_v_a_r_/_d_b_/_p_k_g_/_<_p_k_g_-_n_a_m_e_>_/_)_. _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 _i_n_s_t_a_l_l_e_d _p_a_c_k_-
- _a_g_e _c_o_n_t_r_o_l _f_i_l_e_s_.
+ _+_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 _i_n_s_t_a_l_l_e_d
+ _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s_.
OOPPTTIIOONNSS
The following command line options are supported:
diff -r 7e7ed7c1dbf3 -r b39576f39551 pkgtools/pkg_install/files/info/perform.c
Home |
Main Index |
Thread Index |
Old Index