Removed the -l command line option from lintpkgsrc(1). Use "pkglint -r"

instead.

4 files changed, 26 insertions, 76 deletions

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 6c566290868..0c6b381c1e8 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.288 2005/11/08 22:55:22 rillig Exp $
+# $NetBSD: Makefile,v 1.289 2005/11/08 23:05:22 rillig Exp $
 #
 
-DISTNAME=	pkglint-4.38.2
+DISTNAME=	pkglint-4.38.3
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkglint/files/lintpkgsrc.0 b/pkgtools/pkglint/files/lintpkgsrc.0
index dd2bba2b41f..201a8fb7033 100644
--- a/pkgtools/pkglint/files/lintpkgsrc.0
+++ b/pkgtools/pkglint/files/lintpkgsrc.0
@@ -1,11 +1,11 @@
-LINTPKGSRC(1)               NetBSD Reference Manual              LINTPKGSRC(1)
+LINTPKGSRC(1)           NetBSD General Commands Manual           LINTPKGSRC(1)
 
 NNAAMMEE
-     lliinnttppkkggssrrcc - verifier for the pkgsrc tree
+     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,7 +14,6 @@ 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).
@@ -64,10 +63,8 @@ DDEESSCCRRIIPPTTIIOONN
 
                    Which would be an alternative to --KK.
 
-     --LL            List the filenames of Makefiles as they are parsed (for de-
-                   bugging).
-
-     --ll            Run pkglint(1) on every package in pkgsrc.
+     --LL            List the filenames of Makefiles as they are parsed (for
+                   debugging).
 
      --MM _D_I_S_T_D_I_R    Set directory for distfiles, defaults to
                    _$_{_P_K_G_S_R_C_D_I_R_}_/_d_i_s_t_f_i_l_e_s.
@@ -103,36 +100,32 @@ DDEESSCCRRIIPPTTIIOONN
 
      --SS            List packages missing from category _S_U_B_D_I_R lists.
 
-     --uu            As --ii plus for mismatched packages, display REQUIRED de-
-                   tails and run `@MAKE@ fetch-list | sh' to ensure all the
+     --uu            As --ii plus for mismatched packages, display REQUIRED
+                   details 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 lat-
-                   er version.
+                   Warning: The behaviour of this command may change in a
+                   later 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 directo-
-     ry from which to search for binary packages. If this includes OS or ar-
-     chitecture 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 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 `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).
+     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).
 
      Potentially others, but non serious to date.
 
-                                April 19, 1999                               3
+pkgsrc                         November 08, 2005                        pkgsrc
diff --git a/pkgtools/pkglint/files/lintpkgsrc.1 b/pkgtools/pkglint/files/lintpkgsrc.1
index fbba39093a7..4e12e843609 100644
--- a/pkgtools/pkglint/files/lintpkgsrc.1
+++ b/pkgtools/pkglint/files/lintpkgsrc.1
@@ -1,9 +1,9 @@
-.\"	$NetBSD: lintpkgsrc.1,v 1.27 2005/09/10 22:32:43 wiz Exp $
+.\"	$NetBSD: lintpkgsrc.1,v 1.28 2005/11/08 23:05:22 rillig Exp $
 .\"
 .\" Copyright (c) 1999 by David Brownlee (abs@netbsd.org)
 .\" Absolutely no warranty.
 .\"
-.Dd April 19, 1999
+.Dd November 08, 2005
 .Dt LINTPKGSRC 1
 .Sh NAME
 .Nm lintpkgsrc
@@ -102,10 +102,6 @@ Which would be an alternative to
 .Fl K .
 .It Fl L
 List the filenames of Makefiles as they are parsed (for debugging).
-.It Fl l
-Run
-.Xr pkglint 1
-on every package in pkgsrc.
 .It Fl M Ar DISTDIR
 Set directory for distfiles, defaults to
 .Pa ${PKGSRCDIR}/distfiles .
@@ -166,15 +162,6 @@ 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 538d86b9c6c..9f7b0ed6005 100755
--- a/pkgtools/pkglint/files/lintpkgsrc.pl
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl
@@ -1,6 +1,6 @@
 #!@PERL@
 
-# $NetBSD: lintpkgsrc.pl,v 1.103 2005/05/25 17:41:18 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.104 2005/11/08 23:05:22 rillig Exp $
 
 # Written by David Brownlee <abs@netbsd.org>.
 #
@@ -32,9 +32,9 @@ my(	$pkglist,		# list of Pkg packages
 
 $ENV{PATH} .= ':/bin:/usr/bin:/sbin:/usr/sbin:@PREFIX@/sbin:@PREFIX@/bin';
 
-if (! getopts('BDE:I:K:LM:OP:RSVdg:hilmopru', \%opt) || $opt{h} ||
+if (! getopts('BDE:I:K:LM:OP:RSVdg:himopru', \%opt) || $opt{h} ||
 	! ( defined($opt{d}) || defined($opt{g}) || defined($opt{i}) ||
-	    defined($opt{l}) || defined($opt{m}) || defined($opt{o}) ||
+	                        defined($opt{m}) || defined($opt{o}) ||
 	    defined($opt{p}) || defined($opt{r}) || defined($opt{u}) ||
 	    defined($opt{B}) || defined($opt{D}) || defined($opt{R}) ||
 	    defined($opt{O}) || defined($opt{S}) || defined($opt{V}) ||
@@ -70,11 +70,10 @@ if ($opt{D} && @ARGV)
 
 # main
     {
-    my($pkglint_flags, $pkgsrcdir, $pkgdistdir);
+    my($pkgsrcdir, $pkgdistdir);
 
     $pkgsrcdir = $default_vars->{PKGSRCDIR};
     $pkgdistdir = $default_vars->{DISTDIR};
-    $pkglint_flags = $ENV{"PKGLINT_FLAGS"} || '-q -Wno-workdir';
 
     if ($opt{r} && !$opt{o} && !$opt{m} && !$opt{p})
 	{ $opt{o} = $opt{m} = $opt{p} = 1; }
@@ -245,8 +244,6 @@ if ($opt{D} && @ARGV)
 		}
 	    }
 	}
-    if ($opt{l})
-	{ pkglint_all_pkgsrc($pkgsrcdir, $pkglint_flags); }
     if ($opt{E})
 	{
 	scan_pkgsrc_makefiles($pkgsrcdir);
@@ -1145,32 +1142,6 @@ sub parse_eval_make_false
     $false;
     }
 
-# Run pkglint on every pkgsrc entry
-#
-sub pkglint_all_pkgsrc
-    {
-    my($pkgsrcdir, $pkglint_flags) = @_;
-    my(@categories, @output);
-
-    @categories = list_pkgsrc_categories($pkgsrcdir);
-    foreach my $cat ( sort @categories )
-	{
-	safe_chdir("$pkgsrcdir/$cat");
-	foreach my $pkgdir (list_pkgsrc_pkgdirs($pkgsrcdir, $cat))
-	    {
-	    if (-f "$pkgdir/Makefile")
-		{
-		if (!open(PKGLINT, "cd $pkgdir && pkglint $pkglint_flags |"))
-		    { fail("Unable to run pkglint: $!"); }
-		@output = <PKGLINT>;
-		close(PKGLINT);
-		if (@output)
-		    { print "===> $cat/$pkgdir\n\n", @output, "\n"; }
-		}
-	    }
-	}
-    }
-
 # chdir() || fail()
 #
 sub safe_chdir
@@ -1415,7 +1386,6 @@ Misc:
   -E file : Export the internal pkgsrc database to file
   -I file : Import the internal pkgsrc database to file (for use with -i)
   -g file : Generate 'pkgname pkgdir pkgver' map in file
-  -l	  : Pkglint all packages
   -r	  : Remove bad files (Without -m -o -p or -V implies all, can use -R)
 
 Modifiers: