Subject: Re: pkg/29848
To: None <riz@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org>
From: Jeff Rizzo <riz@netbsd.org>
List: pkgsrc-bugs
Date: 04/06/2005 20:23:01
The following reply was made to PR pkg/29848; it has been noted by GNATS.

From: Jeff Rizzo <riz@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/29848
Date: Wed, 6 Apr 2005 13:20:05 -0700

 This is my proposed fix:
 
 Index: Makefile
 ===================================================================
 RCS file: /usr/mirror/main/pkgsrc/pkgtools/pkglint/Makefile,v
 retrieving revision 1.226
 diff -u -r1.226 Makefile
 --- Makefile	4 Apr 2005 11:04:33 -0000	1.226
 +++ Makefile	6 Apr 2005 20:03:52 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile,v 1.226 2005/04/04 11:04:33 abs Exp $
  #
  
 -DISTNAME=	pkglint-4.10
 +DISTNAME=	pkglint-4.11
  CATEGORIES=	pkgtools devel
  MASTER_SITES=	# empty
  DISTFILES=	# empty
 Index: files/pkglint.pl
 ===================================================================
 RCS file: /usr/mirror/main/pkgsrc/pkgtools/pkglint/files/pkglint.pl,v
 retrieving revision 1.136
 diff -u -r1.136 pkglint.pl
 --- files/pkglint.pl	28 Mar 2005 02:16:55 -0000	1.136
 +++ files/pkglint.pl	6 Apr 2005 20:03:52 -0000
 @@ -299,6 +299,7 @@
  my $scriptdir		= "scripts";
  my %cmdnames		= ();
  my $seen_PLIST_SRC	= false;
 +my $seen_PLIST_SUBST	= false;
  my $seen_NO_PKG_REGISTER= false;
  my $seen_NO_CHECKSUM	= false;
  my $seen_USE_PKGLOCALEDIR = false;
 @@ -638,10 +639,11 @@
  		log_warning("$opt_packagedir/scripts", NO_LINE_NUMBER, "this directory and its contents are deprecated! Please call the script(s) explicitly from the corresponding target(s) in the pkg's Makefile.");
  	}
  	if (! -f "$opt_packagedir/$pkgdir/PLIST"
 -	    and ! -f "$opt_packagedir/$pkgdir/PLIST-mi"
 +	    and ! -f "$opt_packagedir/$pkgdir/PLIST.common"
  	    and ! $seen_PLIST_SRC
 +	    and ! $seen_PLIST_SUBST
  	    and ! $seen_NO_PKG_REGISTER ) {
 -		log_warning(NO_FILE, NO_LINE_NUMBER, "no PLIST or PLIST-mi, and PLIST_SRC and NO_PKG_REGISTER unset. Are you sure PLIST handling is ok?");
 +		log_warning(NO_FILE, NO_LINE_NUMBER, "no PLIST or PLIST.common, and PLIST_SRC, PLIST_SUBST and NO_PKG_REGISTER unset. Are you sure PLIST handling is ok?");
  	}
  	if ($opt_committer) {
  		foreach my $wrkdir (<$opt_packagedir/work*>) {
 @@ -1287,6 +1289,10 @@
  	if ($whole =~ /\nPLIST_SRC/) {
  		$seen_PLIST_SRC = true;
  	}
 +	log_info(NO_FILE, NO_LINE_NUMBER, "checking for PLIST_SUBST.");
 +	if ($whole =~ /\nPLIST_SUBST/) {
 +		$seen_PLIST_SUBST = true;
 +	}
  	log_info(NO_FILE, NO_LINE_NUMBER, "checking for NO_PKG_REGISTER.");
  	if ($whole =~ /\nNO_PKG_REGISTER/) {
  		$seen_NO_PKG_REGISTER = true;