diff options
| author | rillig <rillig@pkgsrc.org> | 2022-08-17 18:22:26 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2022-08-17 18:22:26 +0000 |
| commit | 3c3d69a8695123ecd459dbd783792391ca40fb0c (patch) | |
| tree | 4863e0c56f9bc67b0b3309c29ed60d287a58ed42 /pkgtools/lintpkgsrc | |
| parent | f2bf4dca5d7312370e308a2604f7560815aad457 (diff) | |
| download | pkgsrc-3c3d69a8695123ecd459dbd783792391ca40fb0c.tar.gz | |
lintpkgsrc: cleanup: condense guess-parsing of PKGNAME
Diffstat (limited to 'pkgtools/lintpkgsrc')
| -rwxr-xr-x | pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index de1809ba8ee..4f8584878f9 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -1,5 +1,5 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.111 2022/08/17 18:18:20 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.112 2022/08/17 18:22:26 rillig Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -952,23 +952,16 @@ sub package_globmatch($pkgmatch) { # Parse a pkgsrc package makefile and return the pkgname and set variables # sub parse_makefile_pkgsrc($file) { - my ($pkgname, $vars); - - $vars = parse_makefile_vars($file, undef); + my $vars = parse_makefile_vars($file, undef); defined $vars or return undef; # Missing Makefile. - if (defined $vars->{PKGNAME}) { - $pkgname = $vars->{PKGNAME}; - } elsif (defined $vars->{DISTNAME}) { - $pkgname = $vars->{DISTNAME}; - } + my $pkgname = $vars->{PKGNAME}; + my $distname = $vars->{DISTNAME}; - if (defined $vars->{PKGNAME}) { - debug("$file: PKGNAME=$vars->{PKGNAME}"); - } - if (defined $vars->{DISTNAME}) { - debug("$file: DISTNAME=$vars->{DISTNAME}"); - } + debug("$file: PKGNAME=$pkgname") if defined $pkgname; + debug("$file: DISTNAME=$distname") if defined $distname; + + $pkgname = $distname unless defined $pkgname; if (!defined $pkgname || $pkgname =~ /\$/ || $pkgname !~ /(.*)-(\d.*)/) { |