diff options
| author | abs <abs@pkgsrc.org> | 2008-05-21 20:16:19 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2008-05-21 20:16:19 +0000 |
| commit | 8b033b03180747bb543a20b0521a9a5495ea2ca7 (patch) | |
| tree | b29b0f9b390e2357d5377db78080c0526a2bdd49 | |
| parent | 3341e37bba27bf4c15b496d2e9157872a0e65f9d (diff) | |
| download | pkgsrc-8b033b03180747bb543a20b0521a9a5495ea2ca7.tar.gz | |
update pkglint to 4.86 - necessary bu not sufficient to handle OWNER in
Makefiles. As a first pass make MAINTAINER optional and add an optional
OWNER directly after it in the same section. This will pass valid
OWNER/MAINTAINER combinations but not reject some invalid ones.
Full fix (hopefully) coming soon...
| -rw-r--r-- | doc/CHANGES-2008 | 3 | ||||
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/makevars.map | 3 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/doc/CHANGES-2008 b/doc/CHANGES-2008 index 22f83e4edd7..14d9e9bf373 100644 --- a/doc/CHANGES-2008 +++ b/doc/CHANGES-2008 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2008,v 1.1115 2008/05/21 15:26:43 wiz Exp $ +$NetBSD: CHANGES-2008,v 1.1116 2008/05/21 20:17:14 abs Exp $ Changes to the packages collection and infrastructure in 2008: @@ -1885,3 +1885,4 @@ Changes to the packages collection and infrastructure in 2008: Updated security/gsasl to 0.2.26 [obache 2008-05-21] Updated pkgtools/pkg_leaves to 1.1 [tnn 2008-05-21] Updated benchmarks/bonnie++ to 1.03c [wiz 2008-05-21] + Updated pkgtools/pkglint to 4.86 [abs 2008-05-21] diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index bcddd917b38..8155827b76c 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.373 2008/03/06 08:54:12 rillig Exp $ +# $NetBSD: Makefile,v 1.374 2008/05/21 20:16:19 abs Exp $ # # Please don't increase the version number if you are not rillig. -DISTNAME= pkglint-4.85 +DISTNAME= pkglint-4.86 CATEGORIES= pkgtools MASTER_SITES= # none DISTFILES= # none diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index a3c09006867..9e3836a773a 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.181 2008/02/01 08:50:22 rillig Exp $ +# $NetBSD: makevars.map,v 1.182 2008/05/21 20:16:19 abs Exp $ # # This file contains the guessed type of some variables, according to @@ -482,6 +482,7 @@ OSVERSION_SPECIFIC Yes [m:s,c:s] OS_VERSION Version [$system] OVERRIDE_DIRDEPTH* Integer [$package] OVERRIDE_GNU_CONFIG_SCRIPTS Yes [$package] +OWNER Mail_Address [m:s,c:d] OWN_DIRS List of Pathname [$package_list] OWN_DIRS_PERMS List of ShellWord [$package_list] PAMBASE Pathname [$system] diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 6cf302b05f2..68ea3e06c9a 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.768 2008/03/06 08:51:36 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.769 2008/05/21 20:16:19 abs Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -6064,7 +6064,8 @@ sub checklines_package_Makefile_varorder($) { ], [ "Unsorted stuff, part 2", once, [ - [ "MAINTAINER", once ], + [ "MAINTAINER", optional ], + [ "OWNER", optional ], [ "HOMEPAGE", optional ], [ "COMMENT", once ], ] |