diff options
| author | rillig <rillig@pkgsrc.org> | 2006-12-06 23:42:43 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-12-06 23:42:43 +0000 |
| commit | 35fca5aa5f235d83809abd4e84997b8288e3d923 (patch) | |
| tree | 06e4e98ae65bcd3d57c0989e4d29ad9b75d0b537 /pkgtools | |
| parent | 4993666a7d2d34ac4e15c83bfa0b09018f965773 (diff) | |
| download | pkgsrc-35fca5aa5f235d83809abd4e84997b8288e3d923.tar.gz | |
Fixed the Assertion error on .include lines that end in trailing
white-space.
Instead of including intltool/buildlink3.mk directly, a simple
USE_TOOLS+=intltool suffices.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 9767fe067bc..9168f9a9c5f 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.685 2006/11/09 23:59:35 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.686 2006/12/06 23:42:43 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -1800,8 +1800,8 @@ use constant regex_gnu_configure_volatile_vars use constant regex_mk_comment => qr"^ *\s*#(.*)$"; use constant regex_mk_cond => qr"^\.(\s*)(if|ifdef|ifndef|else|elif|endif|for|endfor|undef)(?:\s+([^\s#][^#]*?))?\s*(?:#.*)?$"; use constant regex_mk_dependency=> qr"^([^\s:]+(?:\s*[^\s:]+)*):\s*([^#]*?)(?:\s*#.*)?$"; -use constant regex_mk_include => qr"^\.\s*s?include\s+\"([^\"]+)\"(?:\s*#.*)?$"; -use constant regex_mk_sysinclude=> qr"^\.\s*s?include\s+<([^>]+)>(?:\s*#.*)?$"; +use constant regex_mk_include => qr"^\.\s*s?include\s+\"([^\"]+)\"\s*(?:#.*)?$"; +use constant regex_mk_sysinclude=> qr"^\.\s*s?include\s+<([^>]+)>\s*(?:#.*)?$"; use constant regex_mk_shellvaruse => qr"(?:^|[^\$])\$\$\{?(\w+)\}?"; # XXX: not perfect use constant regex_pkgname => qr"^((?:[\w.+]|-[^\d])+)-(\d(?:\w|\.\d)*)$"; use constant regex_mk_shellcmd => qr"^\t(.*)$"; @@ -5834,6 +5834,9 @@ sub checklines_mk($) { if ($includefile =~ qr"/x11-links/buildlink3\.mk$") { $line->log_error("${includefile} must not be included directly. Include \"../../mk/x11.buildlink3.mk\" instead."); } + if ($includefile =~ qr"/intltool/buildlink3\.mk$") { + $line->log_warning("Please say \"USE_TOOLS+= intltool\" instead of this line."); + } if ($includefile =~ qr"(.*)/builtin\.mk$") { my ($dir) = ($1); $line->log_error("${includefile} must not be included directly. Include \"${dir}/buildlink3.mk\" instead."); |