[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint Check for pkgsrc-wip remnants. Welco...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40b501173ec9
branches:  trunk
changeset: 472737:40b501173ec9
user:      salo <salo%pkgsrc.org@localhost>
date:      Mon Apr 12 01:02:19 2004 +0000

description:
Check for pkgsrc-wip remnants.  Welcome to 3.69.

diffstat:

 pkgtools/pkglint/Makefile         |   4 ++--
 pkgtools/pkglint/files/pkglint.pl |  23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diffs (67 lines):

diff -r 92ac4134c604 -r 40b501173ec9 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Mon Apr 12 00:54:40 2004 +0000
+++ b/pkgtools/pkglint/Makefile Mon Apr 12 01:02:19 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.180 2004/04/11 18:29:34 jschauma Exp $
+# $NetBSD: Makefile,v 1.181 2004/04/12 01:02:19 salo Exp $
 #
 
-DISTNAME=      pkglint-3.68
+DISTNAME=      pkglint-3.69
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 92ac4134c604 -r 40b501173ec9 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Apr 12 00:54:40 2004 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Apr 12 01:02:19 2004 +0000
@@ -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.98 2004/02/23 12:33:29 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.99 2004/04/12 01:02:19 salo Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by Hubert Feyrer <hubertf%netbsd.org@localhost>,
@@ -82,6 +82,14 @@
        exit 0;
 }
 
+if (-e <$portdir/../../Packages.txt>) {
+       if ($portdir eq ".") {
+               $category = basename(dirname($ENV{'PWD'}));
+       } else {
+               $category = basename(dirname($portdir));
+       }
+}
+
 #
 # variables for global checks.
 #
@@ -902,6 +910,13 @@
                        " (BUILD_)DEPENDS, use (BUILD_)DEPENDS+= instead.");
        }
 
+       # whole file: check for pkgsrc-wip remnants
+       #
+       if ($whole =~ /\/wip\//
+        && $category ne "wip") {
+               &perror("FATAL: possible pkgsrc-wip pathname detected.");
+       }
+
        #
        # whole file: full path name
        #
@@ -984,6 +999,12 @@
                }
        }
 
+       # check for pkgsrc-wip remnants in CATEGORIES
+       if ($tmp =~ /\nCATEGORIES=[ \t]*.*wip.*\n/
+        && $category ne "wip") {
+               &perror("FATAL: don't forget to remove \"wip\" from CATEGORIES.");
+       }
+
        # check the URL
        if ($tmp =~ /\nMASTER_SITES[+?]?=[ \t]*([^\n]*)\n/
         && $1 !~ /^[ \t]*$/) {