pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Updated pkglint to 4.35.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9671f792cb91
branches:  trunk
changeset: 502389:9671f792cb91
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Nov 04 09:32:03 2005 +0000

description:
Updated pkglint to 4.35.

Removed the -Wworkdir option. Added an --import option that replaces
-Wworkdir. Changed the warning about uncleaned work* directories into an
error. Updated the man page.

diffstat:

 doc/CHANGES                       |   3 ++-
 pkgtools/pkglint/Makefile         |   4 ++--
 pkgtools/pkglint/files/pkglint.0  |  12 ++++++------
 pkgtools/pkglint/files/pkglint.1  |  11 ++++-------
 pkgtools/pkglint/files/pkglint.pl |   8 +++-----
 5 files changed, 17 insertions(+), 21 deletions(-)

diffs (145 lines):

diff -r cd0ebca05119 -r 9671f792cb91 doc/CHANGES
--- a/doc/CHANGES       Fri Nov 04 09:27:35 2005 +0000
+++ b/doc/CHANGES       Fri Nov 04 09:32:03 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11822 2005/11/04 09:27:35 rillig Exp $
+$NetBSD: CHANGES,v 1.11823 2005/11/04 09:32:34 rillig Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -5073,3 +5073,4 @@
        Added math/R-wle version 0.7.9 [rillig 2005-11-04]
        Updated pkgtools/pkglint to 4.34 [rillig 2005-11-04]
        Added chat/iip version 1.1.0 [rillig 2005-11-04]
+       Updated pkgtools/pkglint to 4.35 [rillig 2005-11-04]
diff -r cd0ebca05119 -r 9671f792cb91 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Fri Nov 04 09:27:35 2005 +0000
+++ b/pkgtools/pkglint/Makefile Fri Nov 04 09:32:03 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.278 2005/11/04 08:40:59 rillig Exp $
+# $NetBSD: Makefile,v 1.279 2005/11/04 09:32:03 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.34
+DISTNAME=      pkglint-4.35
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r cd0ebca05119 -r 9671f792cb91 pkgtools/pkglint/files/pkglint.0
--- a/pkgtools/pkglint/files/pkglint.0  Fri Nov 04 09:27:35 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.0  Fri Nov 04 09:32:03 2005 +0000
@@ -1,7 +1,7 @@
 PKGLINT(1)              NetBSD General Commands Manual              PKGLINT(1)
 
 NNAAMMEE
-     ppkkgglliinntt - a verifier for pkgsrc directories
+     ppkkgglliinntt -- a verifier for pkgsrc directories
 
 SSYYNNOOPPSSIISS
      ppkkgglliinntt [--ooppttiioonnss] [_d_i_r _._._.]
@@ -27,6 +27,9 @@
                                .include directives.  This flag is mainly for
                                debugging.
 
+           --ii|----iimmppoorrtt         Check if a package is ready to be imported into
+                               pkgsrc.
+
            --qq|----qquuiieett          Don't print the errors and warnings summary
                                before terminating.
 
@@ -86,10 +89,7 @@
            [[nnoo--]]ttyyppeess          Warn for some Makefile variables if their
                                assigned values do not match their type.
 
-           [[nnoo--]]wwoorrkkddiirr        Warn about existing _w_o_r_k_* directories.  They
-                               might be committed to CVS accidentally.
-
-           OOtthheerr aarrgguummeennttss
+     OOtthheerr aarrgguummeennttss
 
            _d_i_r _._._.             The pkgsrc directories to be checked.  If omit-
                                ted, the current directory is checked.
@@ -135,4 +135,4 @@
      If you don't understand the messages, feel free to ask on the
      <tech-pkg%NetBSD.org@localhost> mailing list.
 
-NetBSD 2.0                    September 28, 2005                    NetBSD 2.0
+pkgsrc                         November 04, 2005                        pkgsrc
diff -r cd0ebca05119 -r 9671f792cb91 pkgtools/pkglint/files/pkglint.1
--- a/pkgtools/pkglint/files/pkglint.1  Fri Nov 04 09:27:35 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.1  Fri Nov 04 09:32:03 2005 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pkglint.1,v 1.23 2005/09/28 10:39:35 rillig Exp $
+.\"    $NetBSD: pkglint.1,v 1.24 2005/11/04 09:32:03 rillig Exp $
 .\"    From FreeBSD: portlint.1,v 1.8 1997/11/25 14:53:14 itojun Exp
 .\"
 .\" Copyright (c) 1997 by Jun-ichiro Itoh <itojun%itojun.org@localhost>.
@@ -7,7 +7,7 @@
 .\" Roland Illig <roland.illig%gmx.de@localhost>, 2004, 2005.
 .\" Roland Illig <rillig%NetBSD.org@localhost>, 2005.
 .\"
-.Dd September 28, 2005
+.Dd November 04, 2005
 .Dt PKGLINT 1
 .Sh NAME
 .Nm pkglint
@@ -40,6 +40,8 @@
 Show the Makefile that is constructed by including all the files that
 are slurped in via .include directives.
 This flag is mainly for debugging.
+.It Fl i Ns | Ns Fl -import
+Check if a package is ready to be imported into pkgsrc.
 .It Fl q Ns | Ns Fl -quiet
 Don't print the errors and warnings summary before terminating.
 .It Fl R Ns | Ns Fl -rcsidstring
@@ -99,11 +101,6 @@
 .It Cm [no-]types
 Warn for some Makefile variables if their assigned values do not match
 their type.
-.It Cm [no-]workdir
-Warn about existing
-.Pa work*
-directories.
-They might be committed to CVS accidentally.
 .El
 .Pp
 .Sy Other arguments
diff -r cd0ebca05119 -r 9671f792cb91 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Fri Nov 04 09:27:35 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Fri Nov 04 09:32:03 2005 +0000
@@ -11,7 +11,7 @@
 # Freely redistributable.  Absolutely no warranty.
 #
 # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.325 2005/11/04 08:41:00 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.326 2005/11/04 09:32:03 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -519,7 +519,6 @@
 my $opt_warn_plist_sort        = false;
 my $opt_warn_types     = true;
 my $opt_warn_vague     = false;
-my $opt_warn_workdir   = true;
 my (%warnings) = (
        "absname"       => [\$opt_warn_absname, "warn about use of absolute file names"],
        "directcmd"     => [\$opt_warn_directcmd, "warn about use of direct command names instead of Make variables"],
@@ -529,7 +528,6 @@
        "plist-sort"    => [\$opt_warn_plist_sort, "warn about unsorted entries in PLISTs"],
        "types"         => [\$opt_warn_types, "do some simple type checking in Makefiles"],
        "vague"         => [\$opt_warn_vague, "show old (unreliable, vague) warnings"],
-       "workdir"       => [\$opt_warn_workdir, "warn that work* should not be committed into CVS"],
 );
 
 my $opt_autofix                = false;
@@ -2704,8 +2702,8 @@
        $have_patches = false;
        foreach my $f (@files) {
                if      ($f =~ qr"(?:work[^/]*|~|\.orig|\.rej)$") {
-                       if ($opt_warn_workdir) {
-                               log_warning($f, NO_LINE_NUMBER, "Should be cleaned up before committing the package.");
+                       if ($opt_import) {
+                               log_error($f, NO_LINE_NUMBER, "Must be cleaned up before committing the package.");
                        }
 
                } elsif (!-f $f) {



Home | Main Index | Thread Index | Old Index