summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES3
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/pkglint.07
-rw-r--r--pkgtools/pkglint/files/pkglint.18
-rw-r--r--pkgtools/pkglint/files/pkglint.pl8
5 files changed, 7 insertions, 23 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 5b8dd105477..66b05819c20 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11988 2005/11/20 18:55:38 minskim Exp $
+$NetBSD: CHANGES,v 1.11989 2005/11/20 20:10:04 rillig Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -5293,3 +5293,4 @@ Changes to the packages collection and infrastructure in 2005:
Added graphics/f4l version 0.2 [xtraeme 2005-11-20]
Updated misc/nxtvepg to 2.7.6 [magick 2005-11-20]
Updated print/dvipdfmx to 0.0.0.20050627 [minskim 2005-11-20]
+ Updated pkgtools/pkglint to 4.44 [rillig 2005-11-20]
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index d3f75e42fde..b3e3057f81e 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.303 2005/11/20 13:14:17 rillig Exp $
+# $NetBSD: Makefile,v 1.304 2005/11/20 20:09:35 rillig Exp $
#
-DISTNAME= pkglint-4.43.2
+DISTNAME= pkglint-4.44
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkglint/files/pkglint.0 b/pkgtools/pkglint/files/pkglint.0
index ea413640653..89a873f4cb6 100644
--- a/pkgtools/pkglint/files/pkglint.0
+++ b/pkgtools/pkglint/files/pkglint.0
@@ -88,16 +88,9 @@ DDEESSCCRRIIPPTTIIOONN
[[nnoo--]]ddiirreeccttccmmdd Warn if a system command name is used instead
of a variable (e.g. sed instead of ${SED}).
- [[nnoo--]]eexxeecc Warn if a file in the package directory is exe-
- cutable. Most files should not be executable
- until they are installed.
-
[[nnoo--]]oorrddeerr Warn if Makefile variables are not in the pre-
ferred order.
- [[nnoo--]]ppaarreenn Warn if variables are used like $(VAR) in Make-
- files. They should always be used like ${VAR}.
-
[[nnoo--]]pplliisstt--ssoorrtt Warn if items of a PLIST file are not sorted
alphabetically. This warning is disabled by
default.
diff --git a/pkgtools/pkglint/files/pkglint.1 b/pkgtools/pkglint/files/pkglint.1
index 04bd634890d..3bae5e6733b 100644
--- a/pkgtools/pkglint/files/pkglint.1
+++ b/pkgtools/pkglint/files/pkglint.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkglint.1,v 1.28 2005/11/19 17:22:21 rillig Exp $
+.\" $NetBSD: pkglint.1,v 1.29 2005/11/20 20:09:35 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>.
@@ -103,14 +103,8 @@ Warn if a file contains an absolute pathname.
.It Cm [no-]directcmd
Warn if a system command name is used instead of a variable (e.g. sed
instead of ${SED}).
-.It Cm [no-]exec
-Warn if a file in the package directory is executable.
-Most files should not be executable until they are installed.
.It Cm [no-]order
Warn if Makefile variables are not in the preferred order.
-.It Cm [no-]paren
-Warn if variables are used like $(VAR) in Makefiles.
-They should always be used like ${VAR}.
.It Cm [no-]plist-sort
Warn if items of a PLIST file are not sorted alphabetically.
This warning is disabled by default.
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 5e3001dbff8..db2243a6b75 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.373 2005/11/20 19:58:46 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.374 2005/11/20 20:09:35 rillig Exp $
#
# This version contains lots of changes necessary for NetBSD packages
# done by:
@@ -622,17 +622,13 @@ my (%checks) = (
my $opt_warn_absname = true;
my $opt_warn_directcmd = true;
-my $opt_warn_exec = true;
my $opt_warn_order = true;
-my $opt_warn_paren = true;
my $opt_warn_plist_sort = false;
my $opt_warn_types = 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"],
- "exec" => [\$opt_warn_exec, "warn if source files are executable"],
"order" => [\$opt_warn_order, "warn if Makefile entries are unordered"],
- "paren" => [\$opt_warn_paren, "warn about use of \$(VAR) instead of \${VAR} in Makefiles"],
"plist-sort" => [\$opt_warn_plist_sort, "warn about unsorted entries in PLISTs"],
"types" => [\$opt_warn_types, "do some simple type checking in Makefiles"],
);
@@ -1001,7 +997,7 @@ sub get_subdirs($) {
sub checkperms($) {
my ($fname) = @_;
- if ($opt_warn_exec && -f $fname && -x $fname && !is_committed($fname)) {
+ if (-f $fname && -x $fname && !is_committed($fname)) {
log_warning($fname, NO_LINE_NUMBER, "Should not be executable.");
}
}