diff options
| author | rillig <rillig> | 2005-11-10 10:26:46 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-11-10 10:26:46 +0000 |
| commit | b7669382ccf1f4ba4b073b3774607c6169e8a665 (patch) | |
| tree | 76f4f786351ac2eab50b802068dd0c1411427b00 /pkgtools | |
| parent | 32c8fbbdb43d05b9e987f8fcbf1bac083fd5fb96 (diff) | |
| download | pkgsrc-b7669382ccf1f4ba4b073b3774607c6169e8a665.tar.gz | |
Updated pkglint to 4.38.4.
- Improved detection of valid tool names.
- In the post-install target, output does to stderr instead of stdout.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 0c6b381c1e8..db76f9548bb 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.289 2005/11/08 23:05:22 rillig Exp $ +# $NetBSD: Makefile,v 1.290 2005/11/10 10:26:46 rillig Exp $ # -DISTNAME= pkglint-4.38.3 +DISTNAME= pkglint-4.38.4 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty @@ -60,6 +60,6 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/deprecated.map ${PREFIX}/share/pkglint/ post-install: - ${PREFIX}/bin/pkglint -q + ${PREFIX}/bin/pkglint -q 1>&2 .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index d68e6e04ab3..174c1152f6a 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -11,7 +11,7 @@ # Freely redistributable. Absolutely no warranty. # # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp -# $NetBSD: pkglint.pl,v 1.342 2005/11/10 07:46:24 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.343 2005/11/10 10:26:46 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -1461,7 +1461,7 @@ sub get_tool_names() { } my $tools = {}; - foreach my $file (qw(autoconf automake ldconfig make replace rpcgen texinfo)) { + foreach my $file (qw(autoconf automake defaults ldconfig make replace rpcgen texinfo)) { my $fname = "${pkgsrcdir}/mk/tools/${file}.mk"; my $lines = load_lines($fname, true); @@ -1475,7 +1475,7 @@ sub get_tool_names() { my ($varname, undef, $value, undef) = ($1, $2, $3, $4); if ($varname eq "TOOLS_CREATE" && $value =~ qr"^([-\w.]+)$") { $tools->{$value} = true; - } elsif ($varname =~ qr"^TOOLS_PATH\.([-\w.]+)$") { + } elsif ($varname =~ qr"^(?:TOOLS_PATH|_TOOLS_VARNAME)\.([-\w.]+)$") { $tools->{$1} = true; } } |