From e5aadae863d1ea6c3edd96fd9bfda93119df2715 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Sat, 6 Aug 2005 22:41:07 +0000
Subject: Fixed a bug which led to an endless loop. While happily changing the
 code, I had forgotten one assumption I made. It was that in the ifelse chain
 the case ( && ) couldn't occur because the outer loop already cought that.
 And then I had inserted code that violated exactly this assumption. Fixed.

---
 pkgtools/pkglint/files/pkglint.pl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 58b927bd20c..989eee678c0 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.234 2005/08/06 22:24:07 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.235 2005/08/06 22:41:07 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -2108,7 +2108,6 @@ sub check_category($) {
 
 			} elsif ($is_wip && $line->text eq "") {
 				# ignore the special case "wip", which defines its own "index" target.
-				$lines_atend = true;
 
 			} else {
 				$line->log_error("SUBDIR+= line expected.");
@@ -2133,7 +2132,7 @@ sub check_category($) {
 			$fetch_next_line = true;
 		}
 
-		if ($lines_index == $#{$lines} - 1) {
+		if ($lines_index == $#{$lines} - 1 || ($is_wip && $line->text eq "")) {
 			$lines_atend = true;
 		}
 		$filesys_atend = ($filesys_index == @filesys_subdirs);
-- 
cgit v1.2.3