pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Fixed a typo in the absolute pa...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4db6c0aeda7
branches:  trunk
changeset: 520617:d4db6c0aeda7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Oct 24 07:18:41 2006 +0000

description:
Fixed a typo in the absolute pathname checks.

${PREFIX}/${PKGMANDIR} is preferred over ${PREFIX}/man.

{ONLY,NOT}_FOR_PLATFORM may appear multiple times in the package
Makefile.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 32f1f1bc27d9 -r d4db6c0aeda7 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Tue Oct 24 06:59:38 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Tue Oct 24 07:18:41 2006 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.682 2006/10/22 05:25:35 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.683 2006/10/24 07:18:41 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -3628,7 +3628,7 @@
                } elsif ($string !~ qr"^/\w") {
                        # Assume that pathnames start with a letter or digit.
 
-               } elsif ($before =~ qr"\+\s*[\"']$") {
+               } elsif ($before =~ qr"\+\s*$") {
                        # Something like foodir + '/lib'
 
                } else {
@@ -4004,6 +4004,10 @@
                return;
        }
 
+       if ($shellword =~ qr"\$\{PREFIX\}/man(?:$|/)") {
+               $line->log_warning("Please use \${PKGMANDIR} instead of \"man\".");
+       }
+
        # Note: SWST means [S]hell[W]ord [ST]ate
        use constant SWST_PLAIN         => 0;
        use constant SWST_SQUOT         => 1;
@@ -5626,8 +5630,8 @@
                ],
                [ "Restrictions", optional,
                        [
-                               [ "NOT_FOR_PLATFORM", optional ],
-                               [ "ONLY_FOR_PLATFORM", optional ],
+                               [ "NOT_FOR_PLATFORM", many ],
+                               [ "ONLY_FOR_PLATFORM", many ],
                                [ "NO_BIN_ON_FTP", optional ],
                                [ "NO_SRC_ON_FTP", optional ],
                                [ "NO_BIN_ON_CDROM", optional ],



Home | Main Index | Thread Index | Old Index