diff options
| author | rillig <rillig> | 2006-10-24 07:18:41 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-10-24 07:18:41 +0000 |
| commit | ea9a12b0f2737c817b121ed2b5c6d3b25ab5d79a (patch) | |
| tree | e93d5075c8a3a7432bfc9869bdf1a7d49c82710d /pkgtools | |
| parent | 3b19fce0b3c12ea598e1ec8822dcb536f776dbd1 (diff) | |
| download | pkgsrc-ea9a12b0f2737c817b121ed2b5c6d3b25ab5d79a.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 677b165d5b7..e2e691eff57 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -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 @@ sub checkline_source_absolute_pathname($$) { } 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 @@ sub checkline_mk_shellword($$$) { 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 @@ sub checklines_package_Makefile_varorder($) { ], [ "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 ], |