diff options
| author | rillig <rillig@pkgsrc.org> | 2008-11-18 21:17:53 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-11-18 21:17:53 +0000 |
| commit | 30458d7406eb98448fe5c44aef5b200f13d5711a (patch) | |
| tree | e1f3d21f64c2b54f8a400bf7fa2daf3d3bd69595 /pkgtools | |
| parent | e93b6cbb30281481152f696d2d1b941d9ee017af (diff) | |
| download | pkgsrc-30458d7406eb98448fe5c44aef5b200f13d5711a.tar.gz | |
It's pretty tricky to get the bmake substitution right. At least if
you're a lazy programmer. Now the ${DISTNAME:S...} is interpreted
correctly.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 1e0eada4da6..f01907d0b92 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.787 2008/11/18 19:39:49 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.788 2008/11/18 21:17:53 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -6891,11 +6891,16 @@ sub checkfile_package_Makefile($$) { if (defined($distname) && defined($pkgname)) { $pkgname =~ s/\$\{DISTNAME\}/$distname/; - if ($pkgname =~ m"^(.*)\$\{DISTNAME:S(.)([^:]*)\2([^:]*)\2\}(.*)$") { + if ($pkgname =~ m"^(.*)\$\{DISTNAME:S(.)([^:]*)\2([^:]*)\2g?\}(.*)$") { my ($before, $separator, $old, $new, $after) = ($1, $2, $3, $4, $5); my $newname = $distname; + $old = quotemeta($old); + $old =~ s/^\\\^/^/; + $old =~ s/\\\$$/\$/; $newname =~ s/$old/$new/; + $opt_debug_misc and $pkgname_line->log_debug("old pkgname=$pkgname"); $pkgname = $before . $newname . $after; + $opt_debug_misc and $pkgname_line->log_debug("new pkgname=$pkgname"); } } |