diff options
| author | wiz <wiz> | 2005-02-05 15:39:44 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2005-02-05 15:39:44 +0000 |
| commit | b8e1965c3976a0fc30e628d5e7ab856bd7d576c3 (patch) | |
| tree | fc17ebd4a8c7a66d0d7f0bfcd5906f1747402560 /pkgtools | |
| parent | f412d6cc8baaed1bf2a2ac0c3760688f3c5f9a0d (diff) | |
| download | pkgsrc-b8e1965c3976a0fc30e628d5e7ab856bd7d576c3.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 508fb8df28b..24986eba070 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -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 --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index 7469434c80a..752cb2b10b2 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -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>. # @@ -562,7 +562,15 @@ sub list_installed_packages 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 |