summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-02-24 22:50:44 +0000
committerrillig <rillig@pkgsrc.org>2005-02-24 22:50:44 +0000
commit8d1bfd3b58513398267466e9bd28a1049211025c (patch)
tree1ba0a53bc65547dc4d7e9a84c535333b3e4d8a1e
parent8a969b68b98b6ae79dd092f219efa7d66ee82cce (diff)
downloadpkgsrc-8d1bfd3b58513398267466e9bd28a1049211025c.tar.gz
Minor wording changes. Fixed a bug. (The string "$line->text" does not call
the method text() on $line, so I had to get the method call out of the string quotes. Approved by jlam.
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/pkglint.pl14
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 3b36b92657c..d65524f3d07 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.223 2005/02/23 11:45:16 wiz Exp $
+# $NetBSD: Makefile,v 1.224 2005/02/24 22:50:55 rillig Exp $
#
-DISTNAME= pkglint-4.07
+DISTNAME= pkglint-4.08
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index f06e056e8ae..c973ccca2a2 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.134 2005/02/23 11:45:16 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.135 2005/02/24 22:50:44 rillig Exp $
#
# This version contains lots of changes necessary for NetBSD packages
# done by Hubert Feyrer <hubertf@netbsd.org>,
@@ -880,17 +880,15 @@ sub checkfile_PLIST($) {
}
if ($line->text =~ /^info\/dir$/) {
- log_error($line->file, $line->lineno, "\"info/dir\" should not be listed in ".
- "$file. use install-info to add/remove an entry.");
+ log_error($line->file, $line->lineno, "\"info/dir\" should not be listed. Use install-info to add/remove an entry.");
}
if ($line->text =~ /^lib\/locale/) {
- log_error($line->file, $line->lineno, "\"lib/locale\" should not be listed ".
- "in $file. Use \${PKGLOCALEDIR}/locale and set USE_PKGLOCALEDIR instead.");
+ log_error($line->file, $line->lineno, "\"lib/locale\" should not be listed. Use \${PKGLOCALEDIR}/locale and set USE_PKGLOCALEDIR instead.");
}
if ($line->text =~ /^share\/locale/) {
- log_warning($line->file, $line->lineno, "use of \"share/locale\" in $file is ".
+ log_warning($line->file, $line->lineno, "use of \"share/locale\" is ".
"deprecated. Use \${PKGLOCALEDIR}/locale and set USE_PKGLOCALEDIR instead.");
}
@@ -903,8 +901,8 @@ sub checkfile_PLIST($) {
log_warning($line->file, $line->lineno, "installing to directory $curdir discouraged. could you please avoid it?");
}
- if ("$curdir/$line->text" =~ m:^$conf_localbase/share/doc:) {
- log_info($line->file, $line->lineno, "seen installation to share/doc ($curdir/$line).");
+ if ("$curdir/".$line->text =~ m:^$conf_localbase/share/doc:) {
+ log_info($line->file, $line->lineno, "seen installation to share/doc.");
}
}