[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Correctly handle Python and Rub...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28b301473501
branches:  trunk
changeset: 508008:28b301473501
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Feb 12 18:35:59 2006 +0000

description:
Correctly handle Python and Ruby prefixes in binary package names. Patch
provided by YOMURA Masanori in private mail.

diffstat:

 pkgtools/pkglint/files/lintpkgsrc.pl |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 75b4a83f54c2 -r 28b301473501 pkgtools/pkglint/files/lintpkgsrc.pl
--- a/pkgtools/pkglint/files/lintpkgsrc.pl      Sun Feb 12 18:35:55 2006 +0000
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl      Sun Feb 12 18:35:59 2006 +0000
@@ -1,6 +1,6 @@
 #!@PERL@
 
-# $NetBSD: lintpkgsrc.pl,v 1.109 2005/12/31 09:07:22 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.110 2006/02/12 18:35:59 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -269,6 +269,11 @@
        my($pkg, $ver);
        ($pkg, $ver) = ($1, $2);
 
+       # XXX: hack for python and ruby prefix support
+       $pkg =~ s/^py[0-9][0-9]pth-/py-/;
+       $pkg =~ s/^py[0-9][0-9]-/py-/;
+       $pkg =~ s/^ruby[0-9][0-9]-/ruby-/;
+
        if ($opt{V} && $vuln{$pkg})
            {
            foreach my $chk (@{$vuln{$pkg}})
@@ -569,10 +574,12 @@
        {
        my ($pkg);
        $pkg = (split)[0];
+
        # XXX: hack for python and ruby prefix support
-       $pkg =~ s/^py..pth-/py-/;
-       $pkg =~ s/^py..-/py-/;
-       $pkg =~ s/^ruby..-/ruby-/;
+       $pkg =~ s/^py[0-9][0-9]pth-/py-/;
+       $pkg =~ s/^py[0-9][0-9]-/py-/;
+       $pkg =~ s/^ruby[0-9][0-9]-/ruby-/;
+
        push(@pkgs, $pkg);
        }
     close(PKG_INFO);