[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files When detecting the pkgsrc root ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d80dc4e8c89
branches:  trunk
changeset: 493498:1d80dc4e8c89
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat May 07 22:21:23 2005 +0000

description:
When detecting the pkgsrc root directory, don't rely on Packages.txt, as
that will be removed soon. Approved by wiz.

diffstat:

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

diffs (26 lines):

diff -r 0144c8ae3411 -r 1d80dc4e8c89 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sat May 07 22:20:40 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Sat May 07 22:21:23 2005 +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.143 2005/05/07 21:22:40 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.144 2005/05/07 22:21:23 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by Hubert Feyrer <hubertf%netbsd.org@localhost>,
@@ -526,11 +526,11 @@
        log_info(NO_FILE, NO_LINE_NUMBER, "rcsidstr: $conf_rcsidstr");
        log_info(NO_FILE, NO_LINE_NUMBER, "localbase: $conf_localbase");
 
-       if (-f "$opt_packagedir/../Packages.txt") {
+       if (-f "$opt_packagedir/../mk/bsd.pkg.mk") {
                $pkgsrc_rootdir = "$opt_packagedir/..";
                log_info(NO_FILE, NO_LINE_NUMBER, "checking category Makefile.");
                category_check();
-       } elsif (-f "$opt_packagedir/../../Packages.txt") {
+       } elsif (-f "$opt_packagedir/../../mk/bsd.pkg.mk") {
                $pkgsrc_rootdir = "$opt_packagedir/../..";
                load_predefined_sites();
                check_package();