diff options
| author | rillig <rillig@pkgsrc.org> | 2005-05-07 22:21:23 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-05-07 22:21:23 +0000 |
| commit | 7a3218caeb3118fece4edf88a5be8fb900034547 (patch) | |
| tree | c341c4488aab84ee51072b139d457a7852a94f0f | |
| parent | 6a80e98ffacc13b2775c71520f04a5e3e56d083f (diff) | |
| download | pkgsrc-7a3218caeb3118fece4edf88a5be8fb900034547.tar.gz | |
When detecting the pkgsrc root directory, don't rely on Packages.txt, as
that will be removed soon. Approved by wiz.
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 56246108b23..a0d433b3518 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.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>, @@ -526,11 +526,11 @@ sub main() { 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(); |