[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint Minor wording changes. Fixed a bug. (...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7523e466ea9
branches:  trunk
changeset: 489693:c7523e466ea9
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Feb 24 22:50:44 2005 +0000

description:
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.

diffstat:

 pkgtools/pkglint/Makefile         |   4 ++--
 pkgtools/pkglint/files/pkglint.pl |  14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diffs (57 lines):

diff -r ed2e236e9fd0 -r c7523e466ea9 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Thu Feb 24 22:43:33 2005 +0000
+++ b/pkgtools/pkglint/Makefile Thu Feb 24 22:50:44 2005 +0000
@@ -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 -r ed2e236e9fd0 -r c7523e466ea9 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Thu Feb 24 22:43:33 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Thu Feb 24 22:50:44 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.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@localhost>,
@@ -880,17 +880,15 @@
                }
 
                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 @@
                        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.");
                }
        }