diff options
| author | rillig <rillig@pkgsrc.org> | 2008-11-19 07:46:35 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-11-19 07:46:35 +0000 |
| commit | 4f1a1d085ab29b273a9f8b82d774999d3196d832 (patch) | |
| tree | 2937b74b80931b34212f4ef497f42265d6ed0923 /pkgtools/pkglint | |
| parent | cfb5837ff13624aafa3c6daac178d20ed0ccddd2 (diff) | |
| download | pkgsrc-4f1a1d085ab29b273a9f8b82d774999d3196d832.tar.gz | |
Fixed the (hopefully) last issue with the downgrading warning.
Diffstat (limited to 'pkgtools/pkglint')
| -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 f01907d0b92..3dd89950b7b 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.788 2008/11/18 21:17:53 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.789 2008/11/19 07:46:35 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -6891,13 +6891,17 @@ sub checkfile_package_Makefile($$) { if (defined($distname) && defined($pkgname)) { $pkgname =~ s/\$\{DISTNAME\}/$distname/; - if ($pkgname =~ m"^(.*)\$\{DISTNAME:S(.)([^:]*)\2([^:]*)\2g?\}(.*)$") { - my ($before, $separator, $old, $new, $after) = ($1, $2, $3, $4, $5); + if ($pkgname =~ m"^(.*)\$\{DISTNAME:S(.)([^:]*)\2([^:]*)\2(g?)\}(.*)$") { + my ($before, $separator, $old, $new, $mod, $after) = ($1, $2, $3, $4, $5, $6); my $newname = $distname; $old = quotemeta($old); $old =~ s/^\\\^/^/; $old =~ s/\\\$$/\$/; - $newname =~ s/$old/$new/; + if ($mod eq "g") { + $newname =~ s/$old/$new/g; + } else { + $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"); |