diff options
| author | rillig <rillig@pkgsrc.org> | 2005-10-07 10:24:42 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-10-07 10:24:42 +0000 |
| commit | 2614ff83d01836ed17a7373ab0a4eb248bedb9f4 (patch) | |
| tree | 1937d2546835dce61ac277993ead28a6637c430e | |
| parent | 198dbb21039469d5a5f7a54a01b3faf81f21280b (diff) | |
| download | pkgsrc-2614ff83d01836ed17a7373ab0a4eb248bedb9f4.tar.gz | |
Updated pkglint to 4.24.
Warn if option names contain underscore characters (suggested by dillo).
NO_TOOLS and NO_WRAPPER are deprecated, as they are not used anymore.
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/deprecated.map | 6 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 8 |
4 files changed, 16 insertions, 5 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 7146d2a4afe..33997e5ded2 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.11361 2005/10/07 10:21:53 rillig Exp $ +$NetBSD: CHANGES,v 1.11362 2005/10/07 10:25:08 rillig Exp $ Changes to the packages collection and infrastructure in 2005: @@ -4311,3 +4311,4 @@ Changes to the packages collection and infrastructure in 2005: Updated graphics/mayavi to 1.5 [drochner 2005-10-06] Updated sysutils/estd to 0.4 [adam 2005-10-07] Updated games/xscrabble to 1.0nb3 [rillig 2005-10-07] + Updated pkgtools/pkglint to 4.24 [rillig 2005-10-07] diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 3d307bb6a7c..2158303e7bd 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.259 2005/09/29 13:38:37 rillig Exp $ +# $NetBSD: Makefile,v 1.260 2005/10/07 10:24:42 rillig Exp $ # -DISTNAME= pkglint-4.23.2 +DISTNAME= pkglint-4.24 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map index f9b973a51d9..159c2b9c7ae 100644 --- a/pkgtools/pkglint/files/deprecated.map +++ b/pkgtools/pkglint/files/deprecated.map @@ -1,4 +1,4 @@ -# $NetBSD: deprecated.map,v 1.9 2005/08/01 11:40:56 wiz Exp $ +# $NetBSD: deprecated.map,v 1.10 2005/10/07 10:24:43 rillig Exp $ # # This file contains names of Makefile variables and a short explanation @@ -42,3 +42,7 @@ USE_PKGLIBTOOL Use USE_LIBTOOL instead. # The following entries can be removed after the 2005Q4 branch. USE_PERL5 Use USE_TOOLS+=perl or USE_TOOLS+=perl:run instead. + +# The following entries can be removed after the 2006Q1 branch. +NO_TOOLS You can just remove it. +NO_WRAPPER You can just remove it. diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index ff620e63b6e..b42cc5aec7b 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.293 2005/09/28 21:39:05 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.294 2005/10/07 10:24:43 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -1508,6 +1508,12 @@ sub checklines_package_Makefile($) { } } + if ($varname eq "PKG_SUPPORTED_OPTIONS" || $varname eq "PKG_SUGGESTED_OPTIONS") { + if ($value =~ qr"_") { + $line->log_warning("Options should not contain underscores."); + } + } + if ($value eq "# defined" && $varname !~ qr".*(?:_MK|_COMMON)$") { $line->log_warning("Please use \"# empty\", \"# none\" or \"yes\" instead of \"# defined\"."); } |