summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorwiz <wiz>2001-10-30 18:53:01 +0000
committerwiz <wiz>2001-10-30 18:53:01 +0000
commite1e0b93ddbb41551ce1be77e4ee8851edb252d51 (patch)
tree0d8d73953f2a0b18b902a1248aecd8e86bbd825e /pkgtools
parent4f72e1bb56a018ccf01722de21695952a0c60687 (diff)
downloadpkgsrc-e1e0b93ddbb41551ce1be77e4ee8851edb252d51.tar.gz
If pkg/ doesn't exist, use ./, just like bsd.pkg.mk does nowadays.
Requested by zuntum. Bump to 3.09.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/pkglint.pl5
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 6bab5d1e395..846f1116765 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.110 2001/09/09 20:50:16 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2001/10/30 18:53:01 wiz Exp $
#
-DISTNAME= pkglint-3.08
+DISTNAME= pkglint-3.09
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 8a4c3aa2960..b811de18175 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -12,7 +12,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.56 2001/09/09 20:50:17 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.57 2001/10/30 18:53:02 wiz Exp $
#
# This version contains lots of changes necessary for NetBSD packages
# done by Hubert Feyrer <hubertf@netbsd.org>,
@@ -628,6 +628,9 @@ sub checkmakefile {
$patchdir =~ s/\${PKGSRCDIR}/..\/../;
$pkgdir = "pkg";
+ if (! -d "$portdir/$pkgdir") {
+ $pkgdir = ".";
+ }
$pkgdir = $1 if ($whole =~ /\nPKGDIR[+?]?=[ \t]*([^\n]+)\n/);
$pkgdir =~ s/\$\{.CURDIR\}/./;