diff options
| author | rillig <rillig@pkgsrc.org> | 2005-10-09 18:24:11 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-10-09 18:24:11 +0000 |
| commit | 22b947030e635b03dd478110629e59c8344968d0 (patch) | |
| tree | 7acc2bf501f05229546da5c2180719e6ac35f041 /pkgtools | |
| parent | 20089b26257531b66eca5b8e32fbd02900d7f0c7 (diff) | |
| download | pkgsrc-22b947030e635b03dd478110629e59c8344968d0.tar.gz | |
Updated pkglint to 4.26.
Improved the wording of two diagnostics. Added a check for SUBST_STAGE.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index cd0fbcc3bd6..707180f0a13 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.261 2005/10/07 17:34:11 rillig Exp $ +# $NetBSD: Makefile,v 1.262 2005/10/09 18:24:11 rillig Exp $ # -DISTNAME= pkglint-4.25 +DISTNAME= pkglint-4.26 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 86cf92893aa..30acb408139 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.295 2005/10/07 17:34:11 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.296 2005/10/09 18:24:11 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -407,6 +407,7 @@ my (@options) = ( # Constants my $regex_mail_address = qr"^[-\w\d_.]+\@[-\w\d.]+$"; my $regex_pkgname = qr"^((?:[\w.+]|-[^\d])+)-(\d(?:\w|\.\d)*)$"; +my $regex_shellcmd = qr"^\t"; my $regex_unresolved = qr"\$\{"; my $regex_url = qr"^(?:http://|ftp://|#)"; # allow empty URLs my $regex_url_directory = qr"(?:http://|ftp://)\S+/"; @@ -980,7 +981,7 @@ sub checkfile_PLIST($$) { $line->log_error("RCD_SCRIPTS must not be registered in the PLIST. Please use the RCD_SCRIPTS framework."); } elsif ($text =~ qr"^etc/") { - $line->log_error("Configuration files must not be registered in the PLIST. Please use the PKG_SYSCONFDIR framework."); + $line->log_error("Configuration files must not be registered in the PLIST. Please use the CONF_FILES framework, which is described in mk/install/bsd.pkginstall.mk."); } elsif ($text eq "info/dir") { $line->log_error("\"info/dir\" must not be listed. Use install-info to add/remove an entry."); @@ -1311,7 +1312,7 @@ sub checklines_Makefile_varuse($) { foreach my $line (@{$lines}) { if ($line->text =~ qr"^[^#]*[^\$]\$(\w+)") { my ($varname) = ($1); - $line->log_warning("please write either \${$varname} or \$\$$varname instead of \$$varname."); + $line->log_warning("\$$varname is ambiguous. Use \${$varname} if you mean a Makefile variable or \$\$$varname if you mean a shell variable."); } } @@ -1538,6 +1539,10 @@ sub checklines_package_Makefile($) { $line->log_error("Misspelled variable: Valid names are USE_{BIN,SRC}_ON_{FTP,CDROM}."); } } + + if ($varname =~ qr"^SUBST_STAGE\." && $value !~ qr"^(?:pre|do|post)-(?:patch|configure|build|install)$") { + $line->log_warning("SUBST_STAGE should be one of {pre,do,post}-{patch,configure,build,install}"); + } } } |