CVS commit: pkgsrc/pkgtools/lintpkgsrc/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue Aug 16 20:10:32 UTC 2022

Modified Files:
        pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl

Log Message:
lintpkgsrc: fix PKGNAME guessing for Lua packages

Previously, the guessed PKGNAME of devel/lua-busted was '-busted-2.0.0',
now it is 'lua-busted-2.0.0'.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.104 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.105
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.104        Tue Aug 16 20:06:05 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Tue Aug 16 20:10:32 2022
@@ -1,5 +1,5 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.104 2022/08/16 20:06:05 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.105 2022/08/16 20:10:32 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -201,6 +201,7 @@ sub listdir($base, $dir = undef) {
 }
 
 sub canonicalize_pkgname($pkgname) {
+       $pkgname =~ s,^lua\d+-,lua-,;
        $pkgname =~ s,^py\d+(?:pth|)-,py-,;
        $pkgname =~ s,^ruby\d+-,ruby-,;
        $pkgname =~ s,^php\d+-,php-,;
@@ -705,6 +706,8 @@ sub get_default_makefile_vars() {
        }
 
        $default_vars->{PACKAGES} ||= $default_vars->{PKGSRCDIR} . '/packages';
+
+       $default_vars->{LUA_PKGPREFIX} = 'lua54';
 }
 
 # Determine if a package version is current. If not, report the correct