Update to 2.16: make the actions of the switches -a, -b and -c

on by default now, to get EVERYTHING checked by default.

Suggested by Kimmo Suominen <kim@netbsd.org>

4 files changed, 11 insertions, 32 deletions

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index d186bfeb8e5..06000100261 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2000/08/30 12:54:22 abs Exp $
+# $NetBSD: Makefile,v 1.57 2000/09/04 00:29:51 hubertf Exp $
 #
 
-DISTNAME=		pkglint-2.15
+DISTNAME=		pkglint-2.16
 CATEGORIES=		pkgtools devel
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/pkgtools/pkglint/files/pkglint.1 b/pkgtools/pkglint/files/pkglint.1
index c68d6ea5d3c..ce52b15aabe 100644
--- a/pkgtools/pkglint/files/pkglint.1
+++ b/pkgtools/pkglint/files/pkglint.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkglint.1,v 1.2 1999/04/19 07:32:10 abs Exp $
+.\"	$NetBSD: pkglint.1,v 1.3 2000/09/04 00:29:52 hubertf 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>.
@@ -11,7 +11,7 @@
 .Nd a verifier for pkgsrc directories
 .Sh SYNOPSIS
 .Nm pkglint
-.Op Fl abchvN
+.Op Fl hvN
 .Op Fl B Ar n
 .Op Ar dir
 .Sh DESCRIPTION
@@ -35,24 +35,6 @@ especially when checking complex
 .Pp
 .Sy Options
 .Bl -tag -width Fl
-.It Fl a
-Perform additional checks for extra files, such as
-.Pa scripts/*
-and
-.Pa pkg/* .
-.It Fl b
-Warn the use of
-.Pa $(VARIABLE) .
-Some of the committers prefer
-.Pa ${VARIABLE}
-instead of 
-.Pa $(VARIABLE) ,
-even though they are semantically same.
-.It Fl c
-Committer flag.
-It will add several checks useful only for committers.
-If you are a committer and performing check just before commiting a port,
-use this option.
 .It Fl h
 Show the summary of command line options, then exit.
 .It Fl v
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index ed6bf45b2c0..7a1ff64babd 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -12,7 +12,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.33 2000/07/20 13:53:41 rh Exp $
+# $NetBSD: pkglint.pl,v 1.34 2000/09/04 00:29:52 hubertf Exp $
 #
 # This version contains some changes necessary for NetBSD packages
 # done by Hubert Feyrer <hubertf@netbsd.org> and
@@ -23,7 +23,8 @@ use Getopt::Std;
 
 
 $err = $warn = 0;
-$extrafile = $parenwarn = $committer = $verbose = $newport = 0;
+$extrafile = $parenwarn = $committer = 1;	# -abc
+$verbose = $newport = 0;			# -vN
 $contblank = 1;
 $portdir = '.';
 
@@ -43,19 +44,15 @@ getopts('habcNB:v');
 if ($opt_h) {
 		($prog) = ($0 =~ /([^\/]+)$/);
 		print STDERR <<EOF;
-usage: $prog [-abcvN] [-B#] [package_directory]
-	-a	additional check for scripts/* and pkg/*
-	-b	warn \$(VARIABLE)
-	-c	committer mode
+usage: $prog [-vN] [-B#] [package_directory]
 	-v	verbose mode
 	-N	writing a new package
 	-B#	allow # contiguous blank lines (default: $contblank line)
 EOF
 		exit 0;
 };
-$extrafile = 1	if $opt_a;
-$parenwarn = 1	if $opt_b;
-$committer = 1	if $opt_c;
+print "One or more if the given options are on now by default.\n"
+	if $opt_a or $opt_b or $opt_c;
 $verbose = 1	if $opt_v;
 $newport = 1	if $opt_N;
 $contblank = $opt_B	if $opt_B;
diff --git a/pkgtools/pkglint/pkg/PLIST b/pkgtools/pkglint/pkg/PLIST
index 5897bf11535..f3a2fbba1c9 100644
--- a/pkgtools/pkglint/pkg/PLIST
+++ b/pkgtools/pkglint/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/04/19 07:32:10 abs Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/09/04 00:29:52 hubertf Exp $
 bin/lintpkgsrc
 bin/pkglint
 bin/plist-clash