| @@ -1,15 +1,15 @@ | | | @@ -1,15 +1,15 @@ |
| 1 | #! @PERL@ | | 1 | #! @PERL@ |
| 2 | # $NetBSD: pkglint.pl,v 1.802 2009/03/22 05:41:44 rillig Exp $ | | 2 | # $NetBSD: pkglint.pl,v 1.803 2009/03/22 05:50:12 rillig Exp $ |
| 3 | # | | 3 | # |
| 4 | | | 4 | |
| 5 | # pkglint - static analyzer and checker for pkgsrc packages | | 5 | # pkglint - static analyzer and checker for pkgsrc packages |
| 6 | # | | 6 | # |
| 7 | # Written by: | | 7 | # Written by: |
| 8 | # Roland Illig <rillig@NetBSD.org> | | 8 | # Roland Illig <rillig@NetBSD.org> |
| 9 | # | | 9 | # |
| 10 | # Based on work by: | | 10 | # Based on work by: |
| 11 | # Hubert Feyrer <hubertf@NetBSD.org> | | 11 | # Hubert Feyrer <hubertf@NetBSD.org> |
| 12 | # Thorsten Frueauf <frueauf@NetBSD.org> | | 12 | # Thorsten Frueauf <frueauf@NetBSD.org> |
| 13 | # Thomas Klausner <wiz@NetBSD.org> | | 13 | # Thomas Klausner <wiz@NetBSD.org> |
| 14 | # and others. | | 14 | # and others. |
| 15 | # | | 15 | # |
| @@ -6630,27 +6630,27 @@ sub checklines_buildlink3_mk_2009($$$) { | | | @@ -6630,27 +6630,27 @@ sub checklines_buildlink3_mk_2009($$$) { |
| 6630 | $api_line->log_warning("... API version (${api_version})."); | | 6630 | $api_line->log_warning("... API version (${api_version})."); |
| 6631 | } | | 6631 | } |
| 6632 | } | | 6632 | } |
| 6633 | | | 6633 | |
| 6634 | if ($varname =~ m"^BUILDLINK_[\w_]+\.(.*)$") { | | 6634 | if ($varname =~ m"^BUILDLINK_[\w_]+\.(.*)$") { |
| 6635 | my ($varparam) = ($1); | | 6635 | my ($varparam) = ($1); |
| 6636 | | | 6636 | |
| 6637 | if ($varparam ne $bl_pkgbase) { | | 6637 | if ($varparam ne $bl_pkgbase) { |
| 6638 | $line->log_warning("Only buildlink variables for ${bl_pkgbase}, not ${varparam} may be set in this file."); | | 6638 | $line->log_warning("Only buildlink variables for ${bl_pkgbase}, not ${varparam} may be set in this file."); |
| 6639 | } | | 6639 | } |
| 6640 | } | | 6640 | } |
| 6641 | | | 6641 | |
| 6642 | if ($varname eq "pkgbase") { | | 6642 | if ($varname eq "pkgbase") { |
| 6643 | expect_re($lines, \$lineno, "^\.\s*include \"../../mk/pkg-build-options.mk\"$"); | | 6643 | expect_re($lines, \$lineno, qr"^\.\s*include \"../../mk/pkg-build-options.mk\"$"); |
| 6644 | } | | 6644 | } |
| 6645 | | | 6645 | |
| 6646 | # TODO: More checks. | | 6646 | # TODO: More checks. |
| 6647 | | | 6647 | |
| 6648 | } elsif (expect($lines, \$lineno, qr"^(?:#.*)?$")) { | | 6648 | } elsif (expect($lines, \$lineno, qr"^(?:#.*)?$")) { |
| 6649 | # Comments and empty lines are fine here. | | 6649 | # Comments and empty lines are fine here. |
| 6650 | | | 6650 | |
| 6651 | } elsif (expect($lines, \$lineno, qr"^\.\s*include \"\.\./\.\./([^/]+/[^/]+)/buildlink3\.mk\"$") | | 6651 | } elsif (expect($lines, \$lineno, qr"^\.\s*include \"\.\./\.\./([^/]+/[^/]+)/buildlink3\.mk\"$") |
| 6652 | || expect($lines, \$lineno, qr"^\.\s*include \"\.\./\.\./mk/(\S+)\.buildlink3\.mk\"$")) { | | 6652 | || expect($lines, \$lineno, qr"^\.\s*include \"\.\./\.\./mk/(\S+)\.buildlink3\.mk\"$")) { |
| 6653 | # TODO: Maybe check dependency lines. | | 6653 | # TODO: Maybe check dependency lines. |
| 6654 | | | 6654 | |
| 6655 | } elsif (expect($lines, \$lineno, qr"^\.if !empty\(PKG_BUILD_OPTIONS\.\Q${bl_pkgbase}\E:M\S+\)$")) { | | 6655 | } elsif (expect($lines, \$lineno, qr"^\.if !empty\(PKG_BUILD_OPTIONS\.\Q${bl_pkgbase}\E:M\S+\)$")) { |
| 6656 | $if_level++; | | 6656 | $if_level++; |