pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint Another fix for python and ruby packa...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/920a5703fe6a
branches:  trunk
changeset: 488653:920a5703fe6a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Feb 05 15:39:44 2005 +0000

description:
Another fix for python and ruby packages, this time for installed ones.
Standardize the prefix so they can be compared with the packages
more easily (pkg_chk is better at this anyway, but since I fixed
the other cases already...).
Welcome to 4.00!

diffstat:

 pkgtools/pkglint/Makefile            |   4 ++--
 pkgtools/pkglint/files/lintpkgsrc.pl |  12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 72a56d5fbf09 -r 920a5703fe6a pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Sat Feb 05 14:56:12 2005 +0000
+++ b/pkgtools/pkglint/Makefile Sat Feb 05 15:39:44 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.213 2005/02/04 15:46:58 wiz Exp $
+# $NetBSD: Makefile,v 1.214 2005/02/05 15:39:44 wiz Exp $
 #
 
-DISTNAME=      pkglint-3.99
+DISTNAME=      pkglint-4.00
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 72a56d5fbf09 -r 920a5703fe6a pkgtools/pkglint/files/lintpkgsrc.pl
--- a/pkgtools/pkglint/files/lintpkgsrc.pl      Sat Feb 05 14:56:12 2005 +0000
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl      Sat Feb 05 15:39:44 2005 +0000
@@ -1,6 +1,6 @@
 #!@PERL@
 
-# $NetBSD: lintpkgsrc.pl,v 1.95 2005/02/04 15:46:58 wiz Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.96 2005/02/05 15:39:44 wiz Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -562,7 +562,15 @@
 
     open(PKG_INFO, 'pkg_info -a|') || fail("Unable to run pkg_info: $!");
     while ( <PKG_INFO> )
-       { push(@pkgs, (split)[0]); }
+       {
+       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-/;
+       push(@pkgs, $pkg);
+       }
     close(PKG_INFO);
 
     # pkg_install is not in the pkg_info -a output, add it manually



Home | Main Index | Thread Index | Old Index