From ad63b80827951d1aec73c3b14779e2d3efee12b0 Mon Sep 17 00:00:00 2001 From: reed Date: Sat, 24 Apr 2004 00:17:19 +0000 Subject: pkglint now reports if sees etc/rc.d in Makefile or PLIST. Should use RCD_SCRIPTS mechanism (which can automatically install to ${RCD_SCRIPTS_EXAMPLEDIR}) which automatically registers the rc.d script(s) in the PLIST. New version is 3.73. --- doc/CHANGES | 3 ++- pkgtools/pkglint/Makefile | 4 ++-- pkgtools/pkglint/files/pkglint.pl | 14 +++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/doc/CHANGES b/doc/CHANGES index 2dbc8c35978..ced1f89fe66 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.5720 2004/04/23 18:43:37 itojun Exp $ +$NetBSD: CHANGES,v 1.5721 2004/04/24 00:17:21 reed Exp $ Changes to the packages collection and infrastructure in 2004: @@ -2224,3 +2224,4 @@ Changes to the packages collection and infrastructure in 2004: Updated mathomatic to 11.0cnb1 [minskim 2004-04-23] Added screws-0.52 [xtraeme 2004-04-23] Updated nsd to 2.0.2 [itojun 2004-04-23] + Updated pkglint to 3.73 [reed 2004-04-23] diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 5d01b3934a7..b1ec09c5163 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.184 2004/04/17 17:26:40 seb Exp $ +# $NetBSD: Makefile,v 1.185 2004/04/24 00:17:20 reed Exp $ # -DISTNAME= pkglint-3.72 +DISTNAME= pkglint-3.73 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 5041c23aaff..8bb28aea4f3 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.102 2004/04/17 17:26:40 seb Exp $ +# $NetBSD: pkglint.pl,v 1.103 2004/04/24 00:17:19 reed Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer , @@ -464,6 +464,13 @@ sub checkplist { $etcseen = 1; } + if ($_ =~ /etc\/rc\.d/ and !$etcrcdseen) { + &perror("FATAL: RCD_SCRIPTS must not be ". + "registered in the PLIST (don't you use the ". + "RCD_SCRIPTS framework?)"); + $etcrcdseen = 1; + } + if ($_ =~ /^info\/dir$/) { &perror("FATAL: \"info/dir\" should not be listed in ". "$file. use install-info to add/remove ". @@ -933,6 +940,11 @@ EOF &perror("FATAL: possible pkgsrc-wip pathname detected."); } + if ($whole =~ /etc\/rc\.d/) { + &perror("WARN: Use RCD_SCRIPTS mechanism to install rc.d ". + "scripts automatically to \${RCD_SCRIPTS_EXAMPLEDIR}."); + } + # # whole file: full path name # -- cgit v1.2.3