From 67d86f81da6184c9cea21b02b6ed559cef7dad73 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 24 Nov 2014 09:50:34 +0000 Subject: New sentence, new line. Sort options in SYNOPSIS. Bump date for previous. --- pkgtools/lintpkgsrc/files/lintpkgsrc.0 | 52 +++++++++++++++++----------------- pkgtools/lintpkgsrc/files/lintpkgsrc.1 | 25 +++++++++------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.0 b/pkgtools/lintpkgsrc/files/lintpkgsrc.0 index e66c3c7a611..b37a13948e4 100644 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.0 +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.0 @@ -1,18 +1,17 @@ - -LINTPKGSRC(1) BSD General Commands Manual LINTPKGSRC(1) +LINTPKGSRC(1) General Commands Manual LINTPKGSRC(1) NNAAMMEE lliinnttppkkggssrrcc -- verifier for the pkgsrc tree SSYYNNOOPPSSIISS - lliinnttppkkggssrrcc [--BBDDLLOORRSSVVddhhiillmmoopprruuyyzz] [--EE _f_i_l_e] [--gg _p_k_g_s_r_c_m_a_p] [--II _f_i_l_e] + lliinnttppkkggssrrcc [--BBDDddLLllmmOOooppRRrrSSuuVVyyzz] [--EE _f_i_l_e] [--gg _p_k_g_s_r_c_m_a_p] [--II _f_i_l_e] [--KK _P_A_C_K_A_G_E_S] [--MM _D_I_S_T_D_I_R] [--PP _P_K_G_S_R_C_D_I_R] [_m_a_k_e_f_i_l_e _._._.] DDEESSCCRRIIPPTTIIOONN lliinnttppkkggssrrcc tries to verify the entire contents of the pkgsrc tree. lliinnttppkkggssrrcc uses simple regular-expression matching for verifying files - that make up a pkgsrc directory. Note that it does NOT implement com- - plete Makefile parser. + that make up a pkgsrc directory. Note that it does NOT implement a + complete Makefile parser. OOppttiioonnss --BB List packages marked as BROKEN. @@ -32,17 +31,17 @@ DDEESSCCRRIIPPTTIIOONN a set of similarly configured machines (in the absence of extra copies of the pkgsrc tree) both quick and possible. - --gg _p_k_g_s_r_c_m_a_p Generate pkgsrcmap file containing an entry for each pack- - age of `pkgname pkgdir pkgver'. + --gg _p_k_g_s_r_c_m_a_p Generate pkgsrcmap file containing an entry for each + package of `pkgname pkgdir pkgver'. --hh Basic help and usage. --II _f_i_l_e Imports the data to construct the internal database for checking the installed versions of packages, among other things, against the current version found in pkgsrc. This - database provides most or all of the data required for run- - ning lliinnttppkkggssrrcc with any combination of --BB, --OO, --RR, --SS, --VV, - --dd, --gg, --ii, --pp, or --uu. + database provides most or all of the data required for + running lliinnttppkkggssrrcc with any combination of --BB, --OO, --RR, --SS, + --VV, --dd, --gg, --ii, --pp, or --uu. --ii Check the version of each installed package against the current version in pkgsrc. @@ -51,7 +50,7 @@ DDEESSCCRRIIPPTTIIOONN _/_e_t_c_/_m_k_._c_o_n_f or defaulted to _$_{_P_K_G_S_R_C_D_I_R_}_/_p_a_c_k_a_g_e_s. Note: lintpkgsrc treats _P_A_C_K_A_G_E_S slightly differently to - the pkgsrc build system. --pp, --RR and --VV check for binary + the pkgsrc build system. --pp, --RR, and --VV check for binary packages in any depth of PACKAGES subdirs - this allows packages for all architectures/OS versions to be checked simultaneously with an _/_e_t_c_/_m_k_._c_o_n_f construct of the form: @@ -71,7 +70,7 @@ DDEESSCCRRIIPPTTIIOONN _$_{_P_K_G_S_R_C_D_I_R_}_/_d_i_s_t_f_i_l_e_s. --mm For each current distfile, verify its checksum against the - appropriate package's distinfo file. Also report if any + appropriate package's distinfo file. Also report if any package's distinfo file references the same distfile with a different distinfo checksum. @@ -93,11 +92,11 @@ DDEESSCCRRIIPPTTIIOONN This is intended to help those making binary packages available for ftp. - --rr Remove distfiles which are not referenced from any pack- - age's distinfo file, or have an incorrect checksum (usually - due to an interrupted download), and any old binary pack- - ages. To remove any given type, additionally specify the - --oo, --mm, or --pp flags respectively. + --rr Remove distfiles which are not referenced from any + package's distinfo file, or have an incorrect checksum + (usually due to an interrupted download), and any old + binary packages. To remove any given type, additionally + specify the --oo, --mm, or --pp flags respectively. --SS List packages missing from category _S_U_B_D_I_R lists. @@ -112,8 +111,8 @@ DDEESSCCRRIIPPTTIIOONN known vulnerabilities, based on the data in _$_{_P_K_G_S_R_C_D_I_R_}_/_d_i_s_t_f_i_l_e_s_/_p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s. - --yy Remove orphaned distfiles, i.e. those that do not belong to - any currently installed package. + --yy Remove orphaned distfiles, i.e., those that do not belong + to any currently installed package. --zz Remove distfiles for currently installed packages. @@ -121,17 +120,18 @@ AAUUTTHHOORRSS David Brownlee <_a_b_s_@_n_e_t_b_s_d_._o_r_g> BBUUGGSS - The --RR, --VV, and --pp options default to using _P_A_C_K_A_G_E_S as the base direc- - tory from which to search for binary packages. If this includes OS or - architecture information then packages for other OS/architecture combina- - tions will be missed. In this case _P_A_C_K_A_G_E_S can be overridden with --KK or - set conditionally in _/_e_t_c_/_m_k_._c_o_n_f based on the value of _L_I_N_T_P_K_G_S_R_C. + The --RR, --VV, and --pp options default to using _P_A_C_K_A_G_E_S as the base + directory from which to search for binary packages. If this includes OS + or architecture information then packages for other OS/architecture + combinations will be missed. In this case _P_A_C_K_A_G_E_S can be overridden + with --KK or set conditionally in _/_e_t_c_/_m_k_._c_o_n_f based on the value of + _L_I_N_T_P_K_G_S_R_C. The `Makefile parsing' algorithm used to obtain package versions and DEPENDS information is geared towards speed rather than perfection, though it has got somewhat better over time, it only parses the simplest - Makefile conditionals. (a == b, no && etc). + Makefile conditionals. (a == b, no && etc). Potentially others, but non serious to date. - November 8, 2005 +LOCAL November 24, 2014 LOCAL diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.1 b/pkgtools/lintpkgsrc/files/lintpkgsrc.1 index 09a6b6cdec3..9b047cbf392 100644 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.1 +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.1 @@ -1,16 +1,16 @@ -.\" $NetBSD: lintpkgsrc.1,v 1.3 2014/11/24 09:41:25 bsiegert Exp $ +.\" $NetBSD: lintpkgsrc.1,v 1.4 2014/11/24 09:50:34 wiz Exp $ .\" .\" Copyright (c) 1999 by David Brownlee (abs@netbsd.org) .\" Absolutely no warranty. .\" -.Dd November 8, 2005 +.Dd November 24, 2014 .Dt LINTPKGSRC 1 .Sh NAME .Nm lintpkgsrc .Nd verifier for the pkgsrc tree .Sh SYNOPSIS .Nm -.Op Fl BDLORSVdhilmopruyz +.Op Fl BDdLlmOopRrSuVyz .Op Fl E Ar file .Op Fl g Ar pkgsrcmap .Op Fl I Ar file @@ -24,7 +24,7 @@ tries to verify the entire contents of the pkgsrc tree. .Nm uses simple regular-expression matching for verifying files that make up a pkgsrc directory. -Note that it does NOT implement complete Makefile parser. +Note that it does NOT implement a complete Makefile parser. .Ss Options .Bl -tag -width xxxxxxxxxxxx .It Fl B @@ -82,7 +82,7 @@ Note: lintpkgsrc treats .Em PACKAGES slightly differently to the pkgsrc build system. .Fl p , -.Fl R +.Fl R , and .Fl V check for @@ -107,7 +107,8 @@ Set directory for distfiles, defaults to .Pa ${PKGSRCDIR}/distfiles . .It Fl m For each current distfile, verify its checksum against the appropriate -package's distinfo file. Also report if any package's distinfo file references +package's distinfo file. +Also report if any package's distinfo file references the same distfile with a different distinfo checksum. .It Fl O Report any binary packages in any subdirs of @@ -136,8 +137,8 @@ This is intended to help those making binary packages available for ftp. .It Fl r Remove distfiles which are not referenced from any package's distinfo file, or have an incorrect checksum (usually due to an interrupted download), -and any old binary packages. To remove any given type, additionally -specify the +and any old binary packages. +To remove any given type, additionally specify the .Fl o , .Fl m , or @@ -162,7 +163,7 @@ List any prebuilt packages in any subdirs of with known vulnerabilities, based on the data in .Pa ${PKGSRCDIR}/distfiles/pkg-vulnerabilities . .It Fl y -Remove orphaned distfiles, i.e. those that do not belong to any +Remove orphaned distfiles, i.e., those that do not belong to any currently installed package. .It Fl z Remove distfiles for currently installed packages. @@ -178,7 +179,8 @@ and options default to using .Em PACKAGES as the base directory from which to -search for binary packages. If this includes OS or architecture information +search for binary packages. +If this includes OS or architecture information then packages for other OS/architecture combinations will be missed. In this case .Em PACKAGES @@ -194,6 +196,7 @@ The algorithm used to obtain package versions and DEPENDS information is geared towards speed rather than perfection, though it has got somewhat better over time, it only -parses the simplest Makefile conditionals. (a == b, no \*[Am]\*[Am] etc). +parses the simplest Makefile conditionals. +(a == b, no \*[Am]\*[Am] etc). .Pp Potentially others, but non serious to date. -- cgit v1.2.3