diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-04-12 08:52:14 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-04-12 08:52:14 +0000 |
| commit | c763264884f2050dd5fac3357ad28c56c7ec71f4 (patch) | |
| tree | 2b47c5f06d75bb826449c193c119c26a60bb67ac /pkgtools | |
| parent | 28d471112f43970a12cb7b3336d8c5b9e7717743 (diff) | |
| download | pkgsrc-c763264884f2050dd5fac3357ad28c56c7ec71f4.tar.gz | |
Update to 3.70: give errors if the package installs documenation files under
PREFIX/doc or if it registers configuration files in PREFIX/etc (because it
does not honour PKG_SYSCONFDIR properly).
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 9be691cb5bf..1c5027b6a82 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.181 2004/04/12 01:02:19 salo Exp $ +# $NetBSD: Makefile,v 1.182 2004/04/12 08:52:14 jmmv Exp $ # -DISTNAME= pkglint-3.69 +DISTNAME= pkglint-3.70 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 7ed0fd20cfe..ed36a04dbd5 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.99 2004/04/12 01:02:19 salo Exp $ +# $NetBSD: pkglint.pl,v 1.100 2004/04/12 08:52:14 jmmv Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -394,6 +394,8 @@ sub checkplist { local($curdir) = ($localbase); local($installinfoseen) = 0; local($rcsidseen) = 0; + local($docseen) = 0; + local($etcseen) = 0; open(IN, "< $portdir/$file") || return 0; while (<IN>) { @@ -448,6 +450,19 @@ sub checkplist { "disallowed."); } + if ($_ =~ /^doc/ and !$docseen) { + &perror("FATAL: documentation must be installed under ". + "share/doc, not doc."); + $docseen = 1; + } + + if ($_ =~ /^etc/ && $_ !~ /^etc\/rc.d/ and !$etcseen) { + &perror("FATAL: configuration files must not be ". + "registered in the PLIST (don't you use the ". + "PKG_SYSCONFDIR framework?)"); + $etcseen = 1; + } + if ($_ =~ /^info\/dir$/) { &perror("FATAL: \"info/dir\" should not be listed in ". "$file. use install-info to add/remove ". |