ports/61449: [PATCH] devel/portlint: fix annoying warnings

[Sergei Kolobov]

>Number:         61449
>Category:       ports
>Synopsis:       [PATCH] devel/portlint: fix annoying warnings
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 16 14:40:12 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD elf.chetwood.ru 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Jan  1 21:27:24 MSK
>Description:
This patch fixes two kinds of superfluous fatal errors that annoys me:

FATAL: Makefile: category "GNATS" must be listed first
FATAL: file pr-patch not in CVS.
FATAL: file 61256 not in CVS.

I do my ports development in ~/ports. This directory is then split up 
by master site or port type (my own ports, GNATS updates, new ports, etc.):

	~/ports
		smarden.org
			socklog
			runit
			...
		untroubled.org
			bglibs
			mailfront
			...
		GNATS
			squid
			squid24
			...

I see nothing wrong with this setup, yet portlint fails with a fatal error 
in 'committer' mode (-c/-C). The patch performs this check only when run
from within ports tree under ${PORTSDIR} but not, for example, ~/ports.

The other part of the patch ignores errors that files like 61256 and pr-patch
(generated by getpr script) are not in CVS. Those files should never be added 
to CVS, for that matter.

Port maintainer (marcus at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.51
>How-To-Repeat:
>Fix:

--- portlint-2.5.6.patch begins here ---
Index: src/portlint.pl
===================================================================
RCS file: /FreeBSD/cvs/ports/devel/portlint/src/portlint.pl,v
retrieving revision 1.52
diff -u -u -r1.52 portlint.pl
--- src/portlint.pl	7 Jan 2004 06:42:55 -0000	1.52
+++ src/portlint.pl	16 Jan 2004 22:14:35 -0000
@@ -441,7 +441,8 @@
 			}
 			else {
 				if (!$entries{$_}) {
-					&perror("FATAL: file $filename not in CVS.");
+					&perror("FATAL: file $filename not in CVS.")
+						unless ($_ =~ m/^\d+$/ || $_ eq 'pr-patch');
 				}
 				elsif ($entries{$_} eq 'D') {
 					&perror("FATAL: file $filename is a directory in CVS.");
@@ -1417,7 +1418,7 @@
 		" if nothing seems apropriate.");
 	}
 
-	if ($committer && $makevar{'.CURDIR'} =~ m'ports/([^/]+)/[^/]+/?$') {
+	if ($committer && $makevar{'.CURDIR'} =~ m'^${portsdir}') {
 		if ($cat[0] ne $1 && $makevar{PKGCATEGORY} ne $1 ) {
 			&perror("FATAL: $file: category \"$1\" must be listed first");
 		}
--- portlint-2.5.6.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: