diff options
| author | wiz <wiz@pkgsrc.org> | 2014-01-05 11:26:06 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-01-05 11:26:06 +0000 |
| commit | a45c33004a67e5e311f9deec43e7176dfaa5cdc0 (patch) | |
| tree | cef0d8c347aac5741dec0816c88c890183a45edb /pkgtools | |
| parent | b2700997e54175a4dd452d7bba3a2616a06d0871 (diff) | |
| download | pkgsrc-a45c33004a67e5e311f9deec43e7176dfaa5cdc0.tar.gz | |
Skip :build and :run from tools to recognize 'perl:run' etc.
Allow https in one more place.
Bump version.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index d48d2b9540c..c96cccd9fe5 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.436 2013/10/24 06:23:35 dholland Exp $ +# $NetBSD: Makefile,v 1.437 2014/01/05 11:26:06 wiz Exp $ # Note: if you update the version number, please have a look at the # changes between the CVS tag "pkglint_current" and HEAD. # After updating, please re-set the CVS tag to HEAD. -DISTNAME= pkglint-4.133 +DISTNAME= pkglint-4.134 CATEGORIES= pkgtools MASTER_SITES= # none DISTFILES= # none diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 46cb3893bab..dbcaece7866 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.860 2013/10/12 18:09:59 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.861 2014/01/05 11:26:06 wiz Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -4478,8 +4478,8 @@ sub checkline_mk_vartype_basic($$$$$$$$) { } elsif ($value =~ m"^([0-9A-Za-z]+)://([^/]+)(.*)$") { my ($scheme, $host, $abs_path) = ($1, $2, $3); - if ($scheme ne "ftp" && $scheme ne "http" && $scheme ne "gopher") { - $line->log_warning("\"${value}\" is not a valid URL. Only http, ftp and gopher URLs are allowed here."); + if ($scheme ne "ftp" && $scheme ne "http" && $scheme ne "https" && $scheme ne "gopher") { + $line->log_warning("\"${value}\" is not a valid URL. Only ftp, gopher, http, and https URLs are allowed here."); } elsif ($abs_path eq "") { $line->log_note("For consistency, please add a trailing slash to \"${value}\"."); @@ -5137,6 +5137,7 @@ sub checklines_mk($) { } elsif ($varcanon eq "USE_TOOLS") { foreach my $tool (split(qr"\s+", $line->get("value"))) { + $tool =~ s/:(build|run)//; $mkctx_tools->{$tool} = true; $opt_debug_misc and $line->log_debug("${tool} is added to USE_TOOLS."); } |