lintpkgsrc(1) honors the PKGLINT_FLAGS environment variable, which can be

used together with the -l option.

3 files changed, 34 insertions, 20 deletions

diff --git a/pkgtools/pkglint/files/lintpkgsrc.0 b/pkgtools/pkglint/files/lintpkgsrc.0
index 026557609c2..dd2bba2b41f 100644
--- a/pkgtools/pkglint/files/lintpkgsrc.0
+++ b/pkgtools/pkglint/files/lintpkgsrc.0
@@ -1,11 +1,11 @@
-LINTPKGSRC(1)           NetBSD General Commands Manual           LINTPKGSRC(1)
+LINTPKGSRC(1)               NetBSD Reference Manual              LINTPKGSRC(1)
 
 NNAAMMEE
      lliinnttppkkggssrrcc - verifier for the pkgsrc tree
 
 SSYYNNOOPPSSIISS
-     lliinnttppkkggssrrcc [--BBDDLLOORRSSVVddhhiillmmoopprruu] [--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 _._._.]
+     lliinnttppkkggssrrcc [--BBDDLLOORRSSVVddhhiillmmoopprruu] [--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.
@@ -14,6 +14,7 @@ DDEESSCCRRIIPPTTIIOONN
      plete Makefile parser.
 
    OOppttiioonnss
+
      --BB            List packages marked as BROKEN.
 
      --DD _p_a_t_h_s      Parse Makefiles and output contents (useful for debugging).
@@ -63,8 +64,8 @@ DDEESSCCRRIIPPTTIIOONN
 
                    Which would be an alternative to --KK.
 
-     --LL            List the filenames of Makefiles as they are parsed (for
-                   debugging).
+     --LL            List the filenames of Makefiles as they are parsed (for de-
+                   bugging).
 
      --ll            Run pkglint(1) on every package in pkgsrc.
 
@@ -102,32 +103,36 @@ DDEESSCCRRIIPPTTIIOONN
 
      --SS            List packages missing from category _S_U_B_D_I_R lists.
 
-     --uu            As --ii plus for mismatched packages, display REQUIRED
-                   details and run `@MAKE@ fetch-list | sh' to ensure all the
+     --uu            As --ii plus for mismatched packages, display REQUIRED de-
+                   tails and run `@MAKE@ fetch-list | sh' to ensure all the
                    distfiles needed for the latest version are present.
 
-                   Warning: The behaviour of this command may change in a
-                   later version.
+                   Warning: The behaviour of this command may change in a lat-
+                   er version.
 
      --VV            List any prebuilt packages in any subdirs of _P_A_C_K_A_G_E_S with
                    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.
 
+EENNVVIIRROONNMMEENNTT
+     PKGLINT_FLAGS are the flags passed to pkglint(1) when lliinnttppkkggssrrcc is in-
+     voked with the --ll option.
+
 AAUUTTHHOORRSS
      David Brownlee <abs@netbsd.org>
 
 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-
+     The --RR, --VV, and --pp options default to using _P_A_C_K_A_G_E_S as the base directo-
+     ry from which to search for binary packages. If this includes OS or ar-
+     chitecture 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 `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).
+     The `Makefile parsing' algorithm used to obtain package versions and DE-
+     PENDS information is geared towards speed rather than perfection, though
+     it has got somewhat better over time, it only parses the simplest Make-
+     file conditionals. (a == b, no && etc).
 
      Potentially others, but non serious to date.
 
-NetBSD 2.0                      April 19, 1999                      NetBSD 2.0
+                                April 19, 1999                               3
diff --git a/pkgtools/pkglint/files/lintpkgsrc.1 b/pkgtools/pkglint/files/lintpkgsrc.1
index c31a32e53e4..80dd7825554 100644
--- a/pkgtools/pkglint/files/lintpkgsrc.1
+++ b/pkgtools/pkglint/files/lintpkgsrc.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: lintpkgsrc.1,v 1.25 2005/02/04 15:44:50 wiz Exp $
+.\"	$NetBSD: lintpkgsrc.1,v 1.26 2005/05/23 08:35:41 rillig Exp $
 .\"
 .\" Copyright (c) 1999 by David Brownlee (abs@netbsd.org)
 .\" Absolutely no warranty.
@@ -166,6 +166,15 @@ List any prebuilt packages in any subdirs of
 with known vulnerabilities, based on the data in
 .Pa ${PKGSRCDIR}/distfiles/pkg-vulnerabilities .
 .El
+.Sh ENVIRONMENT
+.Ev PKGLINT_FLAGS
+are the flags passed to
+.Xr pkglint 1
+when
+.Nm
+is invoked with the
+.Fl l
+option.
 .Sh AUTHORS
 .An David Brownlee Aq abs@netbsd.org
 .Sh BUGS
diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl
index e207e97ef94..38f0fa420e1 100755
--- a/pkgtools/pkglint/files/lintpkgsrc.pl
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl
@@ -1,6 +1,6 @@
 #!@PERL@
 
-# $NetBSD: lintpkgsrc.pl,v 1.100 2005/05/10 19:07:07 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.101 2005/05/23 08:35:41 rillig Exp $
 
 # Written by David Brownlee <abs@netbsd.org>.
 #
@@ -73,7 +73,7 @@ if ($opt{D} && @ARGV)
 
     $pkgsrcdir = $default_vars->{PKGSRCDIR};
     $pkgdistdir = $default_vars->{DISTDIR};
-    $pkglint_flags = '-q -Wno-workdir';
+    $pkglint_flags = $ENV{"PKGLINT_FLAGS"} || '-q -Wno-workdir';
 
     if ($opt{r} && !$opt{o} && !$opt{m} && !$opt{p})
 	{ $opt{o} = $opt{m} = $opt{p} = 1; }