diff options
author | jlam <jlam> | 2005-02-05 00:28:58 +0000 |
---|---|---|
committer | jlam <jlam> | 2005-02-05 00:28:58 +0000 |
commit | a2355da07fb571f45c6679ef361e3b8813fe6b10 (patch) | |
tree | 55ba52c32adc4a072694e1e20f700a4cc18cbe4d /pkgtools | |
parent | c6fb447b05e6c2714f7f952e5fd27977a72acc49 (diff) | |
download | pkgsrc-a2355da07fb571f45c6679ef361e3b8813fe6b10.tar.gz |
Pull in documentation improvements and a minor change to allow building
with WARNS=2 from src/usr.sbin/pkg_install. No functional change and
no version bump.
Diffstat (limited to 'pkgtools')
-rw-r--r-- | pkgtools/pkg_install/files/add/pkg_add.1 | 6 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/delete/pkg_delete.1 | 14 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/delete/pkg_delete.cat1 | 8 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/lib/pkgdb.c | 6 |
4 files changed, 17 insertions, 17 deletions
diff --git a/pkgtools/pkg_install/files/add/pkg_add.1 b/pkgtools/pkg_install/files/add/pkg_add.1 index 1a204acee75..b8538f9aa97 100644 --- a/pkgtools/pkg_install/files/add/pkg_add.1 +++ b/pkgtools/pkg_install/files/add/pkg_add.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_add.1,v 1.12 2005/02/04 09:10:13 jlam Exp $ +.\" $NetBSD: pkg_add.1,v 1.13 2005/02/05 00:28:58 jlam Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -517,7 +517,7 @@ flag to The scripts are also called with the .Ev PKG_METADATA_DIR environment variable set to the location of the -.Ar +* +.Pa +* meta-data files, and with the .Ev PKG_REFCOUNT_DBDIR environment variable set to the location of the package reference counts @@ -554,7 +554,7 @@ FTP URLs may not end with a slash. .It Ev PKG_REFCOUNT_DBDIR Location of the package reference counts database directory. The default location is the path to the package database directory with -.Do .refcount Dc +.Dq .refcount appended to the path, e.g. .Pa /var/db/pkg.refcount . .It Ev PKG_TMPDIR diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.1 b/pkgtools/pkg_install/files/delete/pkg_delete.1 index c6fad81be23..dbb7f024450 100644 --- a/pkgtools/pkg_install/files/delete/pkg_delete.1 +++ b/pkgtools/pkg_install/files/delete/pkg_delete.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_delete.1,v 1.10 2005/02/04 09:10:13 jlam Exp $ +.\" $NetBSD: pkg_delete.1,v 1.11 2005/02/05 00:28:58 jlam Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -200,7 +200,7 @@ file (see then this is executed first as .Bd -filled -offset indent -compact .Cm require -.Ar \*[Lt]pkg-name\*[Gt] +.Aq Ar pkg-name .Ar DEINSTALL .Ed (where @@ -226,19 +226,19 @@ The script is called as: .Bd -filled -offset indent -compact .Cm deinstall -.Ar \*[Lt]pkg-name\*[Gt] +.Aq Ar pkg-name .Ar VIEW-DEINSTALL .Ed before removing the package from a view, and as: .Bd -filled -offset indent -compact .Cm deinstall -.Ar \*[Lt]pkg-name\*[Gt] +.Aq Ar pkg-name .Ar DEINSTALL .Ed before deleting all files and as: .Bd -filled -offset indent -compact .Cm deinstall -.Ar \*[Lt]pkg-name\*[Gt] +.Aq Ar pkg-name .Ar POST-DEINSTALL .Ed after deleting them. @@ -266,7 +266,7 @@ or The scripts are also called with the .Ev PKG_METADATA_DIR environment variable set to the location of the -.Ar +* +.Pa +* meta-data files, and with the .Ev PKG_REFCOUNT_DBDIR environment variable set to the location of the package reference counts @@ -284,7 +284,7 @@ The default package database directory is .It Ev PKG_REFCOUNT_DBDIR Location of the package reference counts database directory. The default location is the path to the package database directory with -.Do .refcount Dc +.Dq .refcount appended to the path, e.g. .Pa /var/db/pkg.refcount . .El diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 b/pkgtools/pkg_install/files/delete/pkg_delete.cat1 index 36defe12d24..305e0cabdc5 100644 --- a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 +++ b/pkgtools/pkg_install/files/delete/pkg_delete.cat1 @@ -114,7 +114,7 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS If the package contains a _r_e_q_u_i_r_e file (see pkg_create(1)), then this is executed first as - rreeqquuiirree _<_p_k_g_-_n_a_m_e_> _D_E_I_N_S_T_A_L_L + rreeqquuiirree <_p_k_g_-_n_a_m_e> _D_E_I_N_S_T_A_L_L (where _p_k_g_-_n_a_m_e is the name of the package in question and _D_E_I_N_S_T_A_L_L 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 @@ -125,11 +125,11 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS up any additional messy details around the package's installation, since all ppkkgg__ddeelleettee knows how to do is delete the files created in the origi- nal distribution. The ddeeiinnssttaallll script is called as: - ddeeiinnssttaallll _<_p_k_g_-_n_a_m_e_> _V_I_E_W_-_D_E_I_N_S_T_A_L_L + ddeeiinnssttaallll <_p_k_g_-_n_a_m_e> _V_I_E_W_-_D_E_I_N_S_T_A_L_L before removing the package from a view, and as: - ddeeiinnssttaallll _<_p_k_g_-_n_a_m_e_> _D_E_I_N_S_T_A_L_L + ddeeiinnssttaallll <_p_k_g_-_n_a_m_e> _D_E_I_N_S_T_A_L_L before deleting all files and as: - ddeeiinnssttaallll _<_p_k_g_-_n_a_m_e_> _P_O_S_T_-_D_E_I_N_S_T_A_L_L + ddeeiinnssttaallll <_p_k_g_-_n_a_m_e> _P_O_S_T_-_D_E_I_N_S_T_A_L_L after deleting them. Passing the keywords _V_I_E_W_-_D_E_I_N_S_T_A_L_L, _D_E_I_N_S_T_A_L_L and _P_O_S_T_-_D_E_I_N_S_T_A_L_L lets you potentially write only one program/script that handles all aspects of installation and deletion. diff --git a/pkgtools/pkg_install/files/lib/pkgdb.c b/pkgtools/pkg_install/files/lib/pkgdb.c index ae88f0465e4..f8017780770 100644 --- a/pkgtools/pkg_install/files/lib/pkgdb.c +++ b/pkgtools/pkg_install/files/lib/pkgdb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pkgdb.c,v 1.23 2005/02/04 09:10:13 jlam Exp $ */ +/* $NetBSD: pkgdb.c,v 1.24 2005/02/05 00:28:58 jlam Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -8,7 +8,7 @@ #include <sys/cdefs.h> #endif #ifndef lint -__RCSID("$NetBSD: pkgdb.c,v 1.23 2005/02/04 09:10:13 jlam Exp $"); +__RCSID("$NetBSD: pkgdb.c,v 1.24 2005/02/05 00:28:58 jlam Exp $"); #endif /* @@ -286,7 +286,7 @@ pkgdb_refcount_dir(void) static char buf[MaxPathSize]; char *tmp; - if (tmp = getenv(PKG_REFCOUNT_DBDIR_VNAME)) + if ((tmp = getenv(PKG_REFCOUNT_DBDIR_VNAME))) strlcpy(buf, tmp, sizeof(buf)); else snprintf(buf, sizeof(buf), "%s.refcount", _pkgdb_getPKGDB_DIR()); |