diff options
| author | atatat <atatat@pkgsrc.org> | 2002-09-30 16:08:17 +0000 |
|---|---|---|
| committer | atatat <atatat@pkgsrc.org> | 2002-09-30 16:08:17 +0000 |
| commit | 3642d7598c7cc56d83534c335fc53403f30f53bb (patch) | |
| tree | 8db8c2566dba96bdf32e802321be05bb7ce22af8 | |
| parent | d6dc3de0e42e7b1b771910f0b3c351e890648e0c (diff) | |
| download | pkgsrc-3642d7598c7cc56d83534c335fc53403f30f53bb.tar.gz | |
Upgrade to 3.36. Fixes the problem with $pkg_installver being
"uninitialized" for some cases. Approved by the wiz.
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 064936afddb..eef31bc61e1 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.139 2002/09/25 09:34:21 wiz Exp $ +# $NetBSD: Makefile,v 1.140 2002/09/30 16:08:17 atatat Exp $ # -DISTNAME= pkglint-3.35 +DISTNAME= pkglint-3.36 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index aeeac79ef02..292ec1514b5 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #!@PREFIX@/bin/perl -# $NetBSD: lintpkgsrc.pl,v 1.70 2002/09/22 15:58:33 atatat Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.71 2002/09/30 16:08:18 atatat Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -396,6 +396,8 @@ sub fail sub get_default_makefile_vars { + chomp($pkg_installver = `pkg_info -V 2>/dev/null || echo 20010302`); + chomp($_ = `uname -srm`); ( $default_vars->{OPSYS}, $default_vars->{OS_VERSION}, @@ -533,9 +535,7 @@ sub list_installed_packages close(PKG_INFO); # pkg_install is not in the pkg_info -a output, add it manually - $pkg_installver = $pkgver = `pkg_info -V 2>/dev/null || echo 20010302`; - chomp($pkgver); - push(@pkgs, "pkg_install-$pkgver"); + push(@pkgs, "pkg_install-$pkg_installver"); @pkgs; } |