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.

4 files changed, 15 insertions, 20 deletions

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index b2c4579ad8d..13b54fdd6b4 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -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 --git a/pkgtools/pkglint/files/pkglint.0 b/pkgtools/pkglint/files/pkglint.0
index c8a300b61c9..15857828e87 100644
--- a/pkgtools/pkglint/files/pkglint.0
+++ b/pkgtools/pkglint/files/pkglint.0
@@ -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 @@ DDEESSCCRRIIPPTTIIOONN
                                .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 @@ DDEESSCCRRIIPPTTIIOONN
            [[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 @@ BBUUGGSS
      If you don't understand the messages, feel free to ask on the
      <tech-pkg@NetBSD.org> mailing list.
 
-NetBSD 2.0                    September 28, 2005                    NetBSD 2.0
+pkgsrc                         November 04, 2005                        pkgsrc
diff --git a/pkgtools/pkglint/files/pkglint.1 b/pkgtools/pkglint/files/pkglint.1
index 85dbde32d34..94ce8d5b5a4 100644
--- a/pkgtools/pkglint/files/pkglint.1
+++ b/pkgtools/pkglint/files/pkglint.1
@@ -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>.
@@ -7,7 +7,7 @@
 .\" Roland Illig <roland.illig@gmx.de>, 2004, 2005.
 .\" Roland Illig <rillig@NetBSD.org>, 2005.
 .\"
-.Dd September 28, 2005
+.Dd November 04, 2005
 .Dt PKGLINT 1
 .Sh NAME
 .Nm pkglint
@@ -40,6 +40,8 @@ Show the summary of command line options, then exit.
 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 @@ This warning is disabled by default.
 .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 --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index ec7f08a901c..8adc0f9a1d1 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -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_paren	= true;
 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 @@ my (%warnings) = (
 	"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 @@ sub checkdir_package() {
 	$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) {